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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb63d713
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb63d713
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb63d713
Branch: refs/heads/internallb
Commit: bb63d713ce1e6b45f5affb7bb105295b486a2eff
Parents: 47dd482
Author: Prasanna Santhanam <[email protected]>
Authored: Wed May 1 08:59:22 2013 +0530
Committer: Prasanna Santhanam <[email protected]>
Committed: Wed May 1 08:59:22 2013 +0530
----------------------------------------------------------------------
plugins/pom.xml | 3 +-
pom.xml | 114 +++++++++++++++++++++++++++++++++-----------------
2 files changed, 77 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb63d713/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 471253f..b940271 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb63d713/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index be8aa62..9526d92 100644
--- a/pom.xml
+++ b/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>[email protected]</subscribe>
-
<unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</archive>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</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>[email protected]</subscribe>
-
<unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</archive>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</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>[email protected]</subscribe>
-
<unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</archive>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</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>[email protected]</email>
- <url>http://incubator.apache.org/projects/cloudstack.html</url>
+ <email>[email protected]</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>
@@ -481,6 +509,16 @@
</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>
<property>
