Skip to content

Commit 15a97ec

Browse files
spark404spark404
committed
Cleanup pom.xml in various projects to properly use managed versions and other defaults
1 parent 4945d46 commit 15a97ec

11 files changed

Lines changed: 4 additions & 16 deletions

File tree

‎developer/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
</plugin>
7575
<plugin>
7676
<artifactId>maven-antrun-plugin</artifactId>
77-
<version>1.7</version>
7877
<executions>
7978
<execution>
8079
<phase>generate-resources</phase>

‎engine/storage/integration-test/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@
119119
<dependency>
120120
<groupId>org.apache.httpcomponents</groupId>
121121
<artifactId>httpclient</artifactId>
122+
<!-- TODO: Is this version override required -->
122123
<version>4.2.2</version>
123124
<scope>compile</scope>
124125
</dependency>
125126
<dependency>
126127
<groupId>mysql</groupId>
127128
<artifactId>mysql-connector-java</artifactId>
128-
<version>${cs.mysql.version}</version>
129129
<scope>provided</scope>
130130
</dependency>
131131
<dependency>
@@ -150,7 +150,6 @@
150150
</plugin>
151151
<plugin>
152152
<artifactId>maven-antrun-plugin</artifactId>
153-
<version>1.7</version>
154153
<executions>
155154
<execution>
156155
<id>generate-resource</id>

‎plugins/hypervisors/ucs/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
<version>4.3.0-SNAPSHOT</version>
1919
<relativePath>../../pom.xml</relativePath>
2020
</parent>
21-
<groupId>org.apache.cloudstack</groupId>
2221
<artifactId>cloud-plugin-hypervisor-ucs</artifactId>
23-
<version>4.3.0-SNAPSHOT</version>
2422
<name>Apache CloudStack Plugin - Hypervisor UCS</name>
2523
<url>http://maven.apache.org</url>
2624
<properties>

‎plugins/hypervisors/xen/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<dependency>
3434
<groupId>org.apache.httpcomponents</groupId>
3535
<artifactId>httpclient</artifactId>
36+
<!-- TODO: Check if we need this version override -->
3637
<version>4.2.2</version>
3738
<scope>compile</scope>
3839
</dependency>

‎plugins/network-elements/dns-notifier/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<version>4.3.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
28-
<groupId>org.apache.cloudstack</groupId>
2928
<artifactId>cloud-plugin-example-dns-notifier</artifactId>
3029
<name>Apache CloudStack Plugin - Dns Notifier Example</name>
3130
<description>This is sample source code on how to write a plugin for CloudStack</description>

‎services/secondary-storage/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<plugin>
6060
<groupId>org.apache.maven.plugins</groupId>
6161
<artifactId>maven-surefire-plugin</artifactId>
62-
<version>2.14</version>
6362
<configuration>
6463
<skipTests>${skipTests}</skipTests>
6564
<systemPropertyVariables>

‎test/pom.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
<dependency>
3535
<groupId>log4j</groupId>
3636
<artifactId>log4j</artifactId>
37-
<version>${cs.log4j.version}</version>
38-
</dependency>
37+
</dependency>
3938
<dependency>
4039
<groupId>junit</groupId>
4140
<artifactId>junit</artifactId>
@@ -44,12 +43,10 @@
4443
<dependency>
4544
<groupId>com.trilead</groupId>
4645
<artifactId>trilead-ssh2</artifactId>
47-
<version>${cs.trilead.version}</version>
48-
</dependency>
46+
</dependency>
4947
<dependency>
5048
<groupId>log4j</groupId>
5149
<artifactId>apache-log4j-extras</artifactId>
52-
<version>${cs.log4j.extras.version}</version>
5350
<exclusions>
5451
<exclusion>
5552
<artifactId>log4j</artifactId>

‎tools/devcloud-kvm/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<dependency>
2525
<groupId>mysql</groupId>
2626
<artifactId>mysql-connector-java</artifactId>
27-
<version>5.1.21</version>
2827
<scope>runtime</scope>
2928
</dependency>
3029
<dependency>

‎tools/devcloud/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<dependency>
2525
<groupId>mysql</groupId>
2626
<artifactId>mysql-connector-java</artifactId>
27-
<version>5.1.21</version>
2827
<scope>runtime</scope>
2928
</dependency>
3029
<dependency>

‎tools/marvin/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<plugins>
2525
<plugin>
2626
<artifactId>maven-antrun-plugin</artifactId>
27-
<version>1.7</version>
2827
<executions>
2928
<execution>
3029
<id>clean</id>

0 commit comments

Comments
 (0)