mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 11:52:28 +01:00
Revert "removing unused commented dependencies"
This reverts commit 8e917b1ad3c0d3076b0c6425ea3318a6d6dd5c25. Fixing the eclipse setting issue caused by excluding <cs.target.dir>. This also fixes the incubation -> graduation links in the various poms. Conflicts: pom.xml
This commit is contained in:
Prasanna Santhanam
parent
47dd4828d2
commit
bb63d713ce
@ -16,8 +16,7 @@
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>cloudstack-plugins</artifactId>
|
||||
<name>Apache CloudStack Plugin POM</name>
|
||||
|
||||
114
pom.xml
114
pom.xml
@ -1,23 +1,15 @@
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
|
||||
license agreements. See the NOTICE file distributed with this work for additional
|
||||
information regarding copyright ownership. The ASF licenses this file to
|
||||
you under the Apache License, Version 2.0 (the "License"); you may not use
|
||||
this file except in compliance with the License. You may obtain a copy of
|
||||
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
|
||||
by applicable law or agreed to in writing, software distributed under the
|
||||
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
|
||||
OF ANY KIND, either express or implied. See the License for the specific
|
||||
language governing permissions and limitations under the License. -->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
@ -34,8 +26,8 @@
|
||||
<description>Apache CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform.</description>
|
||||
<url>http://www.cloudstack.org</url>
|
||||
<scm>
|
||||
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</connection>
|
||||
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</developerConnection>
|
||||
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</connection>
|
||||
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</developerConnection>
|
||||
</scm>
|
||||
<issueManagement>
|
||||
<system>jira</system>
|
||||
@ -43,7 +35,7 @@
|
||||
</issueManagement>
|
||||
|
||||
<properties>
|
||||
<!--skipTests>true</skipTests-->
|
||||
<!--skipTests>true</skipTests -->
|
||||
<cs.jdk.version>1.6</cs.jdk.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
@ -92,6 +84,7 @@
|
||||
<cs.java-ipv6.version>0.10</cs.java-ipv6.version>
|
||||
<cs.replace.properties>build/replace.properties</cs.replace.properties>
|
||||
<cs.libvirt-java.version>0.4.9</cs.libvirt-java.version>
|
||||
<cs.target.dir>target</cs.target.dir>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
@ -106,40 +99,49 @@
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>Apache CloudStack User List</name>
|
||||
<subscribe>cloudstack-users-subscribe@incubator.apache.org</subscribe>
|
||||
<unsubscribe>cloudstack-users-unsubscribe@incubator.apache.org</unsubscribe>
|
||||
<post>cloudstack-users@incubator.apache.org</post>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</archive>
|
||||
<subscribe>users-subscribe@cloudstack.apache.org</subscribe>
|
||||
<unsubscribe>users-unsubscribe@cloudstack.apache.org</unsubscribe>
|
||||
<post>users@cloudstack.apache.org</post>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-users</archive>
|
||||
<otherArchives>
|
||||
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</otherArchive>
|
||||
</otherArchives>
|
||||
</mailingList>
|
||||
<mailingList>
|
||||
<name>Apache CloudStack Developer List</name>
|
||||
<subscribe>cloudstack-dev-subscribe@incubator.apache.org</subscribe>
|
||||
<unsubscribe>cloudstack-dev-unsubscribe@incubator.apache.org</unsubscribe>
|
||||
<post>cloudstack-dev@incubator.apache.org</post>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</archive>
|
||||
<subscribe>dev-subscribe@cloudstack.apache.org</subscribe>
|
||||
<unsubscribe>dev-unsubscribe@cloudstack.apache.org</unsubscribe>
|
||||
<post>dev@cloudstack.apache.org</post>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-dev</archive>
|
||||
<otherArchives>
|
||||
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</otherArchive>
|
||||
</otherArchives>
|
||||
</mailingList>
|
||||
<mailingList>
|
||||
<name>Apache CloudStack Commits List</name>
|
||||
<subscribe>cloudstack-commits-subscribe@incubator.apache.org</subscribe>
|
||||
<unsubscribe>cloudstack-commits-unsubscribe@incubator.apache.org</unsubscribe>
|
||||
<post>cloudstack-commits@incubator.apache.org</post>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</archive>
|
||||
<subscribe>commits-subscribe@cloudstack.apache.org</subscribe>
|
||||
<unsubscribe>commits-unsubscribe@cloudstack.apache.org</unsubscribe>
|
||||
<post>commits@cloudstack.apache.org</post>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-commits</archive>
|
||||
<otherArchives>
|
||||
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</otherArchive>
|
||||
</otherArchives>
|
||||
</mailingList>
|
||||
</mailingLists>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<name>The Apache CloudStack Team</name>
|
||||
<email>cloudstack-dev@incubator.apache.org</email>
|
||||
<url>http://incubator.apache.org/projects/cloudstack.html</url>
|
||||
<email>dev@cloudstack.apache.org</email>
|
||||
<url>http://cloudstack.apache.org/</url>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
<organizationUrl>http://apache.org/</organizationUrl>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<ciManagement>
|
||||
<system>Jenkin</system>
|
||||
<url>http://jenkins.cloudstack.org/</url>
|
||||
<system>Jenkins</system>
|
||||
<url>http://builds.apache.org/</url>
|
||||
</ciManagement>
|
||||
|
||||
<licenses>
|
||||
@ -204,6 +206,24 @@
|
||||
<artifactId>spring-web</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
<!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> -->
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-all</artifactId>
|
||||
@ -235,6 +255,8 @@
|
||||
|
||||
<build>
|
||||
<defaultGoal>install</defaultGoal>
|
||||
<outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory>
|
||||
<testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
@ -471,6 +493,12 @@
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>eclipse</id>
|
||||
<properties>
|
||||
<cs.target.dir>target-eclipse</cs.target.dir>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>developer</id>
|
||||
<properties>
|
||||
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
|
||||
@ -480,6 +508,16 @@
|
||||
<module>tools</module>
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>impatient</id>
|
||||
<properties>
|
||||
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
|
||||
</properties>
|
||||
<modules>
|
||||
<module>developer</module>
|
||||
<!--module>tools/devcloud</module-->
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>vmware</id>
|
||||
<activation>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user