Skip to content

Commit b6b55b7

Browse files
rohityadavcloudrohityadavcloud
committed
CLOUDSTACK-8011: Upgrade maven dependencies
Changes; - Upgrades maven-war plugin to 4.5 (faster war packaging) - Upgrade spring framework to latest minor release - Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies - Upgrade mockito, powermock dependencies - Upgrade to latest ipv6 library, fix unit test NetUtilsTest Newer dependencies can be listed using: mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm Testing; - Tested using Maven 3.2.1 - Local noredist build with unit tests succeeds - CloudStack mgmt server started, basic business layer tests work - Observed 10-15% build time improvement using new maven-war plugin Signed-off-by: Rohit Yadav <[email protected]>
1 parent b0d74ad commit b6b55b7

File tree

11 files changed

+52
-52
lines changed

11 files changed

+52
-52
lines changed

‎client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@
388388
<plugin>
389389
<groupId>org.apache.maven.plugins</groupId>
390390
<artifactId>maven-war-plugin</artifactId>
391-
<version>2.3</version>
391+
<version>2.5</version>
392392
<configuration>
393393
<webXml>./target/generated-webapp/WEB-INF/web.xml</webXml>
394394
<warSourceDirectory>./target/generated-webapp</warSourceDirectory>
@@ -744,7 +744,7 @@
744744
<plugin>
745745
<groupId>org.apache.maven.plugins</groupId>
746746
<artifactId>maven-war-plugin</artifactId>
747-
<version>2.3</version>
747+
<version>2.5</version>
748748
<configuration>
749749
<webappDirectory>target/client</webappDirectory>
750750
<webXml>./target/generated-webapp/WEB-INF/web.xml</webXml>

‎engine/api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.apache.cxf</groupId>
4040
<artifactId>cxf-bundle-jaxrs</artifactId>
41-
<version>2.7.0</version>
41+
<version>2.7.13</version>
4242
<exclusions>
4343
<exclusion>
4444
<groupId>org.eclipse.jetty</groupId>

‎engine/service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.apache.cxf</groupId>
6565
<artifactId>cxf-bundle-jaxrs</artifactId>
66-
<version>2.7.0</version>
66+
<version>2.7.13</version>
6767
<exclusions>
6868
<exclusion>
6969
<groupId>org.eclipse.jetty</groupId>

‎framework/rest/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,32 @@
3333
<dependency>
3434
<groupId>com.fasterxml.jackson.module</groupId>
3535
<artifactId>jackson-module-jaxb-annotations</artifactId>
36-
<version>2.1.1</version>
36+
<version>2.4.4</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>com.fasterxml.jackson.core</groupId>
4040
<artifactId>jackson-annotations</artifactId>
41-
<version>2.1.1</version>
41+
<version>2.4.4</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>com.fasterxml.jackson.core</groupId>
4545
<artifactId>jackson-core</artifactId>
46-
<version>2.1.1</version>
46+
<version>2.4.4</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>com.fasterxml.jackson.core</groupId>
5050
<artifactId>jackson-databind</artifactId>
51-
<version>2.1.1</version>
51+
<version>2.4.4</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>com.fasterxml.jackson.jaxrs</groupId>
5555
<artifactId>jackson-jaxrs-json-provider</artifactId>
56-
<version>2.1.1</version>
56+
<version>2.4.4</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.apache.cxf</groupId>
6060
<artifactId>cxf-bundle-jaxrs</artifactId>
61-
<version>2.7.0</version>
61+
<version>2.7.13</version>
6262
<exclusions>
6363
<exclusion>
6464
<groupId>org.eclipse.jetty</groupId>

‎plugins/event-bus/rabbitmq/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.rabbitmq</groupId>
3333
<artifactId>amqp-client</artifactId>
34-
<version>3.4.1</version>
34+
<version>3.4.2</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.apache.cloudstack</groupId>

‎plugins/network-elements/juniper-contrail/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>org.apache.commons</groupId>
106106
<artifactId>commons-exec</artifactId>
107-
<version>1.1</version>
107+
<version>1.3</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>org.mockito</groupId>

‎plugins/network-elements/midonet/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@
4747
<dependency>
4848
<groupId>org.codehaus.jackson</groupId>
4949
<artifactId>jackson-core-asl</artifactId>
50-
<version>1.9.3</version>
50+
<version>1.9.11</version>
5151
<scope>runtime</scope>
5252
</dependency>
5353
<dependency>
5454
<groupId>org.codehaus.jackson</groupId>
5555
<artifactId>jackson-mapper-asl</artifactId>
56-
<version>1.9.3</version>
56+
<version>1.9.11</version>
5757
<scope>runtime</scope>
5858
</dependency>
5959
</dependencies>

‎plugins/storage/volume/cloudbyte/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.sun.jersey</groupId>
5656
<artifactId>jersey-bundle</artifactId>
57-
<version>1.17.1</version>
57+
<version>1.18.3</version>
5858
</dependency>
5959
</dependencies>
6060
<build>

‎pom.xml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3939
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4040

41-
<cs.log4j.version>1.2.16</cs.log4j.version>
42-
<cs.log4j.extras.version>1.1</cs.log4j.extras.version>
43-
<cs.cglib.version>2.2.2</cs.cglib.version>
41+
<cs.log4j.version>1.2.17</cs.log4j.version>
42+
<cs.log4j.extras.version>1.2.17</cs.log4j.extras.version>
43+
<cs.cglib.version>3.1</cs.cglib.version>
4444
<cs.dbcp.version>1.4</cs.dbcp.version>
4545
<cs.pool.version>1.6</cs.pool.version>
46-
<cs.codec.version>1.6</cs.codec.version>
47-
<cs.configuration.version>1.8</cs.configuration.version>
46+
<cs.codec.version>1.10</cs.codec.version>
47+
<cs.configuration.version>1.10</cs.configuration.version>
4848
<cs.collections.version>3.2.1</cs.collections.version>
4949
<cs.logging.version>1.1.1</cs.logging.version>
5050
<cs.discovery.version>0.5</cs.discovery.version>
@@ -53,43 +53,43 @@
5353
<cs.junit.version>4.11</cs.junit.version>
5454
<cs.hamcrest.version>1.3</cs.hamcrest.version>
5555
<cs.bcprov.version>1.46</cs.bcprov.version>
56-
<cs.jsch.version>0.1.42</cs.jsch.version>
57-
<cs.jpa.version>2.0.0</cs.jpa.version>
58-
<cs.jasypt.version>1.9.0</cs.jasypt.version>
59-
<cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
60-
<cs.ehcache.version>2.6.6</cs.ehcache.version>
61-
<cs.gson.version>1.7.2</cs.gson.version>
62-
<cs.guava.version>14.0-rc1</cs.guava.version>
56+
<cs.jsch.version>0.1.51</cs.jsch.version>
57+
<cs.jpa.version>2.1.0</cs.jpa.version>
58+
<cs.jasypt.version>1.9.2</cs.jasypt.version>
59+
<cs.trilead.version>1.0.0-build217</cs.trilead.version>
60+
<cs.ehcache.version>2.6.9</cs.ehcache.version>
61+
<cs.gson.version>2.3.1</cs.gson.version>
62+
<cs.guava.version>18.0</cs.guava.version>
6363
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
64-
<cs.httpclient.version>3.1</cs.httpclient.version>
65-
<cs.httpcore.version>4.2.1</cs.httpcore.version>
66-
<cs.mysql.version>5.1.21</cs.mysql.version>
67-
<cs.xstream.version>1.3.1</cs.xstream.version>
64+
<cs.httpclient.version>4.3.6</cs.httpclient.version>
65+
<cs.httpcore.version>4.3.3</cs.httpcore.version>
66+
<cs.mysql.version>5.1.34</cs.mysql.version>
67+
<cs.xstream.version>1.4.7</cs.xstream.version>
6868
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
69-
<cs.mail.version>1.4</cs.mail.version>
69+
<cs.mail.version>1.4.7</cs.mail.version>
7070
<cs.axis.version>1.4</cs.axis.version>
7171
<cs.axis2.version>1.5.6</cs.axis2.version>
7272
<cs.rampart.version>1.5.1</cs.rampart.version>
7373
<cs.axiom.version>1.2.8</cs.axiom.version>
7474
<cs.neethi.version>2.0.4</cs.neethi.version>
75-
<cs.servlet.version>2.4</cs.servlet.version>
75+
<cs.servlet.version>2.5</cs.servlet.version>
7676
<cs.jstl.version>1.2</cs.jstl.version>
7777
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
7878
<cs.vmware.api.version>5.1</cs.vmware.api.version>
79-
<org.springframework.version>3.2.4.RELEASE</org.springframework.version>
80-
<cs.mockito.version>1.9.5</cs.mockito.version>
81-
<cs.powermock.version>1.5.3</cs.powermock.version>
82-
<cs.aws.sdk.version>1.3.22</cs.aws.sdk.version>
79+
<org.springframework.version>3.2.12.RELEASE</org.springframework.version>
80+
<cs.mockito.version>1.10.8</cs.mockito.version>
81+
<cs.powermock.version>1.6.0</cs.powermock.version>
82+
<cs.aws.sdk.version>1.9.8</cs.aws.sdk.version>
8383
<cs.lang.version>2.6</cs.lang.version>
84-
<cs.commons-io.version>1.4</cs.commons-io.version>
84+
<cs.commons-io.version>2.4</cs.commons-io.version>
8585
<cs.commons-validator.version>1.4.0</cs.commons-validator.version>
86-
<cs.reflections.version>0.9.8</cs.reflections.version>
87-
<cs.java-ipv6.version>0.10</cs.java-ipv6.version>
86+
<cs.reflections.version>0.9.9</cs.reflections.version>
87+
<cs.java-ipv6.version>0.15</cs.java-ipv6.version>
8888
<cs.replace.properties>build/replace.properties</cs.replace.properties>
8989
<cs.libvirt-java.version>0.5.1</cs.libvirt-java.version>
9090
<cs.rados-java.version>0.1.4</cs.rados-java.version>
9191
<cs.target.dir>target</cs.target.dir>
92-
<cs.daemon.version>1.0.10</cs.daemon.version>
92+
<cs.daemon.version>1.0.15</cs.daemon.version>
9393
<cs.jna.version>4.0.0</cs.jna.version>
9494
<cs.checkstyle.version>2.11</cs.checkstyle.version>
9595
<cs.mycila.license.version>2.5</cs.mycila.license.version>
@@ -304,7 +304,7 @@
304304
<dependency>
305305
<groupId>org.owasp.esapi</groupId>
306306
<artifactId>esapi</artifactId>
307-
<version>2.0.1</version>
307+
<version>2.1.0</version>
308308
</dependency>
309309
<dependency>
310310
<groupId>org.eclipse.persistence</groupId>
@@ -369,17 +369,17 @@
369369
<dependency>
370370
<groupId>org.apache.servicemix.bundles</groupId>
371371
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
372-
<version>2.1.0_1</version>
372+
<version>2.3.1_1</version>
373373
</dependency>
374374
<dependency>
375375
<groupId>org.aspectj</groupId>
376376
<artifactId>aspectjtools</artifactId>
377-
<version>1.7.0</version>
377+
<version>1.8.4</version>
378378
</dependency>
379379
<dependency>
380380
<groupId>org.aspectj</groupId>
381381
<artifactId>aspectjweaver</artifactId>
382-
<version>1.7.0</version>
382+
<version>1.8.4</version>
383383
</dependency>
384384
<dependency>
385385
<groupId>org.apache.axis</groupId>
@@ -399,17 +399,17 @@
399399
<dependency>
400400
<groupId>wsdl4j</groupId>
401401
<artifactId>wsdl4j</artifactId>
402-
<version>1.4</version>
402+
<version>1.6.3</version>
403403
</dependency>
404404
<dependency>
405405
<groupId>org.slf4j</groupId>
406406
<artifactId>slf4j-api</artifactId>
407-
<version>1.7.5</version>
407+
<version>1.7.7</version>
408408
</dependency>
409409
<dependency>
410410
<groupId>org.slf4j</groupId>
411411
<artifactId>slf4j-log4j12</artifactId>
412-
<version>1.7.5</version>
412+
<version>1.7.7</version>
413413
</dependency>
414414
</dependencies>
415415
</dependencyManagement>
@@ -430,7 +430,7 @@
430430
<dependency>
431431
<groupId>org.mockito</groupId>
432432
<artifactId>mockito-all</artifactId>
433-
<version>1.9.5</version>
433+
<version>${cs.mockito.version}</version>
434434
<scope>test</scope>
435435
</dependency>
436436
<dependency>

‎services/console-proxy-rdp/rdpconsole/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.apache.tomcat.embed</groupId>
6868
<artifactId>tomcat-embed-core</artifactId>
69-
<version>7.0.30</version>
69+
<version>8.0.15</version>
7070
</dependency>
7171
<!-- Another implementation of SSL protocol. Does not work with broken MS RDP SSL too. -->
7272
<dependency>

‎utils/test/com/cloud/utils/net/NetUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ public void testIsIp6RangeOverlap() {
214214

215215
@Test
216216
public void testStandardizeIp6Address() {
217-
assertEquals(NetUtils.standardizeIp6Address("1234:0000:0000:5678:0000:000:ABCD:0001"), "1234::5678:0:0:abcd:1");
218-
assertEquals(NetUtils.standardizeIp6Cidr("1234:0000:0000:5678:0000:000:ABCD:0001/64"), "1234::5678:0:0:0:0/64");
217+
assertEquals(NetUtils.standardizeIp6Address("1234:0000:0000:5678:0000:0000:ABCD:0001"), "1234::5678:0:0:abcd:1");
218+
assertEquals(NetUtils.standardizeIp6Cidr("1234:0000:0000:5678:0000:0000:ABCD:0001/64"), "1234:0:0:5678::/64");
219219
}
220220

221221
@Test

0 commit comments

Comments
 (0)