Revert "CLOUDSTACK-8011: Upgrade maven dependencies" This reverts commit 482815d084e549b4cf8ba893d7c5174092e33437.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf88be5b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf88be5b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf88be5b Branch: refs/heads/4.5 Commit: bf88be5b259119ebe44446f7c1cc0ea099da177e Parents: 752980f Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Thu Dec 4 19:47:23 2014 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Dec 4 19:47:23 2014 +0530 ---------------------------------------------------------------------- client/pom.xml | 4 +- engine/api/pom.xml | 2 +- engine/service/pom.xml | 2 +- framework/rest/pom.xml | 12 ++-- plugins/event-bus/rabbitmq/pom.xml | 2 +- .../network-elements/juniper-contrail/pom.xml | 2 +- plugins/network-elements/midonet/pom.xml | 4 +- plugins/storage/volume/cloudbyte/pom.xml | 2 +- pom.xml | 64 ++++++++++---------- services/console-proxy-rdp/rdpconsole/pom.xml | 2 +- test/pom.xml | 2 +- .../test/com/cloud/utils/net/NetUtilsTest.java | 4 +- 12 files changed, 50 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index f015f89..a0fe596 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -388,7 +388,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.5</version> + <version>2.3</version> <configuration> <webXml>./target/generated-webapp/WEB-INF/web.xml</webXml> <warSourceDirectory>./target/generated-webapp</warSourceDirectory> @@ -744,7 +744,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.5</version> + <version>2.3</version> <configuration> <webappDirectory>target/client</webappDirectory> <webXml>./target/generated-webapp/WEB-INF/web.xml</webXml> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/engine/api/pom.xml ---------------------------------------------------------------------- diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 40d0ecb..3368bd8 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-bundle-jaxrs</artifactId> - <version>2.7.13</version> + <version>2.7.0</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/engine/service/pom.xml ---------------------------------------------------------------------- diff --git a/engine/service/pom.xml b/engine/service/pom.xml index c3b17d3..1fc68fa 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -63,7 +63,7 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-bundle-jaxrs</artifactId> - <version>2.7.13</version> + <version>2.7.0</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/framework/rest/pom.xml ---------------------------------------------------------------------- diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index e6feb6f..cdbee8e 100644 --- a/framework/rest/pom.xml +++ b/framework/rest/pom.xml @@ -33,32 +33,32 @@ <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> - <version>2.4.4</version> + <version>2.1.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.4.4</version> + <version>2.1.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.4.4</version> + <version>2.1.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.4.4</version> + <version>2.1.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.4.4</version> + <version>2.1.1</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-bundle-jaxrs</artifactId> - <version>2.7.13</version> + <version>2.7.0</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/plugins/event-bus/rabbitmq/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml index b5f4408..aeeda08 100644 --- a/plugins/event-bus/rabbitmq/pom.xml +++ b/plugins/event-bus/rabbitmq/pom.xml @@ -31,7 +31,7 @@ <dependency> <groupId>com.rabbitmq</groupId> <artifactId>amqp-client</artifactId> - <version>3.4.2</version> + <version>3.4.1</version> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/plugins/network-elements/juniper-contrail/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml index 1e9b6ea..1aadd5e 100644 --- a/plugins/network-elements/juniper-contrail/pom.xml +++ b/plugins/network-elements/juniper-contrail/pom.xml @@ -104,7 +104,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-exec</artifactId> - <version>1.3</version> + <version>1.1</version> </dependency> <dependency> <groupId>org.mockito</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/plugins/network-elements/midonet/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/midonet/pom.xml b/plugins/network-elements/midonet/pom.xml index ac5f329..de8d9a7 100644 --- a/plugins/network-elements/midonet/pom.xml +++ b/plugins/network-elements/midonet/pom.xml @@ -47,13 +47,13 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>1.9.11</version> + <version>1.9.3</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.11</version> + <version>1.9.3</version> <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/plugins/storage/volume/cloudbyte/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml index 6db2402..8ef0c29 100755 --- a/plugins/storage/volume/cloudbyte/pom.xml +++ b/plugins/storage/volume/cloudbyte/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-bundle</artifactId> - <version>1.18.3</version> + <version>1.17.1</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1583f62..fa37138 100644 --- a/pom.xml +++ b/pom.xml @@ -38,13 +38,13 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <cs.log4j.version>1.2.17</cs.log4j.version> - <cs.log4j.extras.version>1.2.17</cs.log4j.extras.version> - <cs.cglib.version>3.1</cs.cglib.version> + <cs.log4j.version>1.2.16</cs.log4j.version> + <cs.log4j.extras.version>1.1</cs.log4j.extras.version> + <cs.cglib.version>2.2.2</cs.cglib.version> <cs.dbcp.version>1.4</cs.dbcp.version> <cs.pool.version>1.6</cs.pool.version> - <cs.codec.version>1.10</cs.codec.version> - <cs.configuration.version>1.10</cs.configuration.version> + <cs.codec.version>1.6</cs.codec.version> + <cs.configuration.version>1.8</cs.configuration.version> <cs.collections.version>3.2.1</cs.collections.version> <cs.logging.version>1.1.1</cs.logging.version> <cs.discovery.version>0.5</cs.discovery.version> @@ -53,44 +53,42 @@ <cs.junit.version>4.11</cs.junit.version> <cs.hamcrest.version>1.3</cs.hamcrest.version> <cs.bcprov.version>1.46</cs.bcprov.version> - <cs.jsch.version>0.1.51</cs.jsch.version> - <cs.jpa.version>2.1.0</cs.jpa.version> - <cs.jasypt.version>1.9.2</cs.jasypt.version> - <cs.trilead.version>1.0.0-build217</cs.trilead.version> - <cs.ehcache.version>2.6.9</cs.ehcache.version> + <cs.jsch.version>0.1.42</cs.jsch.version> + <cs.jpa.version>2.0.0</cs.jpa.version> + <cs.jasypt.version>1.9.0</cs.jasypt.version> + <cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version> + <cs.ehcache.version>2.6.6</cs.ehcache.version> <cs.gson.version>1.7.2</cs.gson.version> - <cs.guava.version>18.0</cs.guava.version> + <cs.guava.version>14.0-rc1</cs.guava.version> <cs.xapi.version>6.2.0-3.1</cs.xapi.version> - <cs.httpclient.version>4.3.6</cs.httpclient.version> - <cs.httpcore.version>4.3.3</cs.httpcore.version> - <cs.commons-httpclient.version>3.1</cs.commons-httpclient.version> - <cs.mysql.version>5.1.34</cs.mysql.version> - <cs.xstream.version>1.4.7</cs.xstream.version> + <cs.httpclient.version>3.1</cs.httpclient.version> + <cs.httpcore.version>4.2.1</cs.httpcore.version> + <cs.mysql.version>5.1.21</cs.mysql.version> + <cs.xstream.version>1.3.1</cs.xstream.version> <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version> - <cs.mail.version>1.4.7</cs.mail.version> + <cs.mail.version>1.4</cs.mail.version> <cs.axis.version>1.4</cs.axis.version> <cs.axis2.version>1.5.6</cs.axis2.version> <cs.rampart.version>1.5.1</cs.rampart.version> <cs.axiom.version>1.2.8</cs.axiom.version> <cs.neethi.version>2.0.4</cs.neethi.version> - <cs.servlet.version>2.5</cs.servlet.version> + <cs.servlet.version>2.4</cs.servlet.version> <cs.jstl.version>1.2</cs.jstl.version> <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version> <cs.vmware.api.version>5.1</cs.vmware.api.version> - <org.springframework.version>3.2.12.RELEASE</org.springframework.version> + <org.springframework.version>3.2.4.RELEASE</org.springframework.version> <cs.mockito.version>1.9.5</cs.mockito.version> <cs.powermock.version>1.5.3</cs.powermock.version> - <cs.aws.sdk.version>1.9.8</cs.aws.sdk.version> + <cs.aws.sdk.version>1.3.22</cs.aws.sdk.version> <cs.lang.version>2.6</cs.lang.version> - <cs.commons-io.version>2.4</cs.commons-io.version> - <cs.commons-validator.version>1.4.0</cs.commons-validator.version> + <cs.commons-io.version>1.4</cs.commons-io.version> <cs.reflections.version>0.9.8</cs.reflections.version> - <cs.java-ipv6.version>0.15</cs.java-ipv6.version> + <cs.java-ipv6.version>0.10</cs.java-ipv6.version> <cs.replace.properties>build/replace.properties</cs.replace.properties> <cs.libvirt-java.version>0.5.1</cs.libvirt-java.version> <cs.rados-java.version>0.1.4</cs.rados-java.version> <cs.target.dir>target</cs.target.dir> - <cs.daemon.version>1.0.15</cs.daemon.version> + <cs.daemon.version>1.0.10</cs.daemon.version> <cs.jna.version>4.0.0</cs.jna.version> <cs.checkstyle.version>2.11</cs.checkstyle.version> <cs.mycila.license.version>2.5</cs.mycila.license.version> @@ -300,7 +298,7 @@ <dependency> <groupId>org.owasp.esapi</groupId> <artifactId>esapi</artifactId> - <version>2.1.0</version> + <version>2.0.1</version> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> @@ -325,7 +323,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${cs.httpclient.version}</version> + <version>${cs.httpcore.version}</version> </dependency> <dependency> <groupId>com.thoughtworks.xstream</groupId> @@ -365,17 +363,17 @@ <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> - <version>2.3.1_1</version> + <version>2.1.0_1</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjtools</artifactId> - <version>1.8.4</version> + <version>1.7.0</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.8.4</version> + <version>1.7.0</version> </dependency> <dependency> <groupId>org.apache.axis</groupId> @@ -395,17 +393,17 @@ <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> - <version>1.6.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> + <version>1.7.5</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.7</version> + <version>1.7.5</version> </dependency> </dependencies> </dependencyManagement> @@ -426,7 +424,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>${cs.mockito.version}</version> + <version>1.9.5</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/services/console-proxy-rdp/rdpconsole/pom.xml ---------------------------------------------------------------------- diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml index 1d5c7b9..351015d 100755 --- a/services/console-proxy-rdp/rdpconsole/pom.xml +++ b/services/console-proxy-rdp/rdpconsole/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>8.0.15</version> + <version>7.0.30</version> </dependency> <!-- Another implementation of SSL protocol. Does not work with broken MS RDP SSL too. --> <dependency> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index 6fa9013..06cbcb9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -67,7 +67,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>${cs.commons-httpclient.version}</version> + <version>${cs.httpclient.version}</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf88be5b/utils/test/com/cloud/utils/net/NetUtilsTest.java ---------------------------------------------------------------------- diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java index 8a62871..96c3baf 100644 --- a/utils/test/com/cloud/utils/net/NetUtilsTest.java +++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java @@ -199,8 +199,8 @@ public class NetUtilsTest { @Test public void testStandardizeIp6Address() { - assertEquals(NetUtils.standardizeIp6Address("1234:0000:0000:5678:0000:0000:ABCD:0001"), "1234::5678:0:0:abcd:1"); - assertEquals(NetUtils.standardizeIp6Cidr("1234:0000:0000:5678:0000:0000:ABCD:0001/64"), "1234:0:0:5678::/64"); + assertEquals(NetUtils.standardizeIp6Address("1234:0000:0000:5678:0000:000:ABCD:0001"), "1234::5678:0:0:abcd:1"); + assertEquals(NetUtils.standardizeIp6Cidr("1234:0000:0000:5678:0000:000:ABCD:0001/64"), "1234::5678:0:0:0:0/64"); } @Test
