Skip to content
This repository was archived by the owner on Jan 15, 2020. It is now read-only.

Commit bb63d71

Browse files
author
Prasanna Santhanam
committed
Revert "removing unused commented dependencies"
This reverts commit 8e917b1. 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
1 parent 47dd482 commit bb63d71

2 files changed

Lines changed: 77 additions & 40 deletions

File tree

‎plugins/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
KIND, either express or implied. See the License for the
1717
specific language governing permissions and limitations
1818
under the License.
19-
-->
20-
<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">
19+
--><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">
2120
<modelVersion>4.0.0</modelVersion>
2221
<artifactId>cloudstack-plugins</artifactId>
2322
<name>Apache CloudStack Plugin POM</name>

‎pom.xml‎

Lines changed: 76 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
1+
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
license agreements. See the NOTICE file distributed with this work for additional
3+
information regarding copyright ownership. The ASF licenses this file to
4+
you under the Apache License, Version 2.0 (the "License"); you may not use
5+
this file except in compliance with the License. You may obtain a copy of
6+
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
7+
by applicable law or agreed to in writing, software distributed under the
8+
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
9+
OF ANY KIND, either express or implied. See the License for the specific
10+
language governing permissions and limitations under the License. -->
1911
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
12+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2113
<modelVersion>4.0.0</modelVersion>
2214

2315
<parent>
@@ -34,16 +26,16 @@
3426
<description>Apache CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform.</description>
3527
<url>http://www.cloudstack.org</url>
3628
<scm>
37-
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</connection>
38-
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git</developerConnection>
29+
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</connection>
30+
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</developerConnection>
3931
</scm>
4032
<issueManagement>
4133
<system>jira</system>
4234
<url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
4335
</issueManagement>
4436

4537
<properties>
46-
<!--skipTests>true</skipTests-->
38+
<!--skipTests>true</skipTests -->
4739
<cs.jdk.version>1.6</cs.jdk.version>
4840
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4941

@@ -92,6 +84,7 @@
9284
<cs.java-ipv6.version>0.10</cs.java-ipv6.version>
9385
<cs.replace.properties>build/replace.properties</cs.replace.properties>
9486
<cs.libvirt-java.version>0.4.9</cs.libvirt-java.version>
87+
<cs.target.dir>target</cs.target.dir>
9588
</properties>
9689

9790
<distributionManagement>
@@ -106,40 +99,49 @@
10699
<mailingLists>
107100
<mailingList>
108101
<name>Apache CloudStack User List</name>
109-
<subscribe>cloudstack-users-subscribe@incubator.apache.org</subscribe>
110-
<unsubscribe>cloudstack-users-unsubscribe@incubator.apache.org</unsubscribe>
111-
<post>cloudstack-users@incubator.apache.org</post>
112-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</archive>
102+
<subscribe>users-subscribe@cloudstack.apache.org</subscribe>
103+
<unsubscribe>users-unsubscribe@cloudstack.apache.org</unsubscribe>
104+
<post>users@cloudstack.apache.org</post>
105+
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-users</archive>
106+
<otherArchives>
107+
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users</otherArchive>
108+
</otherArchives>
113109
</mailingList>
114110
<mailingList>
115111
<name>Apache CloudStack Developer List</name>
116-
<subscribe>cloudstack-dev-subscribe@incubator.apache.org</subscribe>
117-
<unsubscribe>cloudstack-dev-unsubscribe@incubator.apache.org</unsubscribe>
118-
<post>cloudstack-dev@incubator.apache.org</post>
119-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</archive>
112+
<subscribe>dev-subscribe@cloudstack.apache.org</subscribe>
113+
<unsubscribe>dev-unsubscribe@cloudstack.apache.org</unsubscribe>
114+
<post>dev@cloudstack.apache.org</post>
115+
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-dev</archive>
116+
<otherArchives>
117+
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev</otherArchive>
118+
</otherArchives>
120119
</mailingList>
121120
<mailingList>
122121
<name>Apache CloudStack Commits List</name>
123-
<subscribe>cloudstack-commits-subscribe@incubator.apache.org</subscribe>
124-
<unsubscribe>cloudstack-commits-unsubscribe@incubator.apache.org</unsubscribe>
125-
<post>cloudstack-commits@incubator.apache.org</post>
126-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</archive>
122+
<subscribe>commits-subscribe@cloudstack.apache.org</subscribe>
123+
<unsubscribe>commits-unsubscribe@cloudstack.apache.org</unsubscribe>
124+
<post>commits@cloudstack.apache.org</post>
125+
<archive>http://mail-archives.apache.org/mod_mbox/cloudstack-commits</archive>
126+
<otherArchives>
127+
<otherArchive>http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits</otherArchive>
128+
</otherArchives>
127129
</mailingList>
128130
</mailingLists>
129131

130132
<developers>
131133
<developer>
132134
<name>The Apache CloudStack Team</name>
133-
<email>cloudstack-dev@incubator.apache.org</email>
134-
<url>http://incubator.apache.org/projects/cloudstack.html</url>
135+
<email>dev@cloudstack.apache.org</email>
136+
<url>http://cloudstack.apache.org/</url>
135137
<organization>Apache Software Foundation</organization>
136138
<organizationUrl>http://apache.org/</organizationUrl>
137139
</developer>
138140
</developers>
139141

140142
<ciManagement>
141-
<system>Jenkin</system>
142-
<url>http://jenkins.cloudstack.org/</url>
143+
<system>Jenkins</system>
144+
<url>http://builds.apache.org/</url>
143145
</ciManagement>
144146

145147
<licenses>
@@ -204,6 +206,24 @@
204206
<artifactId>spring-web</artifactId>
205207
<version>${org.springframework.version}</version>
206208
</dependency>
209+
<!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId>
210+
<version>${org.springframework.version}</version> </dependency> <dependency>
211+
<groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId>
212+
<version>${org.springframework.version}</version> </dependency> <dependency>
213+
<groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId>
214+
<version>${org.springframework.version}</version> </dependency> <dependency>
215+
<groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId>
216+
<version>${org.springframework.version}</version> </dependency> <dependency>
217+
<groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
218+
<version>${org.springframework.version}</version> </dependency> <dependency>
219+
<groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId>
220+
<version>${org.springframework.version}</version> </dependency> <dependency>
221+
<groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId>
222+
<version>${org.springframework.version}</version> </dependency> <dependency>
223+
<groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId>
224+
<version>${org.springframework.version}</version> </dependency> <dependency>
225+
<groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId>
226+
<version>${org.springframework.version}</version> </dependency> -->
207227
<dependency>
208228
<groupId>org.mockito</groupId>
209229
<artifactId>mockito-all</artifactId>
@@ -235,6 +255,8 @@
235255

236256
<build>
237257
<defaultGoal>install</defaultGoal>
258+
<outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory>
259+
<testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
238260
<pluginManagement>
239261
<plugins>
240262
<plugin>
@@ -471,6 +493,12 @@
471493
</modules>
472494
</profile>
473495
<profile>
496+
<id>eclipse</id>
497+
<properties>
498+
<cs.target.dir>target-eclipse</cs.target.dir>
499+
</properties>
500+
</profile>
501+
<profile>
474502
<id>developer</id>
475503
<properties>
476504
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
@@ -480,6 +508,16 @@
480508
<module>tools</module>
481509
</modules>
482510
</profile>
511+
<profile>
512+
<id>impatient</id>
513+
<properties>
514+
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
515+
</properties>
516+
<modules>
517+
<module>developer</module>
518+
<!--module>tools/devcloud</module-->
519+
</modules>
520+
</profile>
483521
<profile>
484522
<id>vmware</id>
485523
<activation>

0 commit comments

Comments
 (0)