diff --git a/client/pom.xml b/client/pom.xml index f015f89331a..a0fe596677e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-war-plugin - 2.5 + 2.3 ./target/generated-webapp/WEB-INF/web.xml ./target/generated-webapp @@ -744,7 +744,7 @@ org.apache.maven.plugins maven-war-plugin - 2.5 + 2.3 target/client ./target/generated-webapp/WEB-INF/web.xml diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 40d0ecb3549..3368bd82305 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -38,7 +38,7 @@ org.apache.cxf cxf-bundle-jaxrs - 2.7.13 + 2.7.0 org.eclipse.jetty diff --git a/engine/service/pom.xml b/engine/service/pom.xml index c3b17d3d244..1fc68fac258 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -63,7 +63,7 @@ org.apache.cxf cxf-bundle-jaxrs - 2.7.13 + 2.7.0 org.eclipse.jetty diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index e6feb6f776c..cdbee8e8f6e 100644 --- a/framework/rest/pom.xml +++ b/framework/rest/pom.xml @@ -33,32 +33,32 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.4.4 + 2.1.1 com.fasterxml.jackson.core jackson-annotations - 2.4.4 + 2.1.1 com.fasterxml.jackson.core jackson-core - 2.4.4 + 2.1.1 com.fasterxml.jackson.core jackson-databind - 2.4.4 + 2.1.1 com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.4.4 + 2.1.1 org.apache.cxf cxf-bundle-jaxrs - 2.7.13 + 2.7.0 org.eclipse.jetty diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml index b5f4408ac9a..aeeda0819a6 100644 --- a/plugins/event-bus/rabbitmq/pom.xml +++ b/plugins/event-bus/rabbitmq/pom.xml @@ -31,7 +31,7 @@ com.rabbitmq amqp-client - 3.4.2 + 3.4.1 org.apache.cloudstack diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml index 1e9b6ea0fe4..1aadd5efdce 100644 --- a/plugins/network-elements/juniper-contrail/pom.xml +++ b/plugins/network-elements/juniper-contrail/pom.xml @@ -104,7 +104,7 @@ org.apache.commons commons-exec - 1.3 + 1.1 org.mockito diff --git a/plugins/network-elements/midonet/pom.xml b/plugins/network-elements/midonet/pom.xml index ac5f329f9c5..de8d9a7a0f6 100644 --- a/plugins/network-elements/midonet/pom.xml +++ b/plugins/network-elements/midonet/pom.xml @@ -47,13 +47,13 @@ org.codehaus.jackson jackson-core-asl - 1.9.11 + 1.9.3 runtime org.codehaus.jackson jackson-mapper-asl - 1.9.11 + 1.9.3 runtime diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml index 6db2402eee5..8ef0c29ca4c 100755 --- a/plugins/storage/volume/cloudbyte/pom.xml +++ b/plugins/storage/volume/cloudbyte/pom.xml @@ -54,7 +54,7 @@ com.sun.jersey jersey-bundle - 1.18.3 + 1.17.1 diff --git a/pom.xml b/pom.xml index 1583f620d6c..fa3713863f9 100644 --- a/pom.xml +++ b/pom.xml @@ -38,13 +38,13 @@ UTF-8 UTF-8 - 1.2.17 - 1.2.17 - 3.1 + 1.2.16 + 1.1 + 2.2.2 1.4 1.6 - 1.10 - 1.10 + 1.6 + 1.8 3.2.1 1.1.1 0.5 @@ -53,44 +53,42 @@ 4.11 1.3 1.46 - 0.1.51 - 2.1.0 - 1.9.2 - 1.0.0-build217 - 2.6.9 + 0.1.42 + 2.0.0 + 1.9.0 + build213-svnkit-1.3-patch + 2.6.6 1.7.2 - 18.0 + 14.0-rc1 6.2.0-3.1 - 4.3.6 - 4.3.3 - 3.1 - 5.1.34 - 1.4.7 + 3.1 + 4.2.1 + 5.1.21 + 1.3.1 3.1.3 - 1.4.7 + 1.4 1.4 1.5.6 1.5.1 1.2.8 2.0.4 - 2.5 + 2.4 1.2 1.0-20081010.060147 5.1 - 3.2.12.RELEASE + 3.2.4.RELEASE 1.9.5 1.5.3 - 1.9.8 + 1.3.22 2.6 - 2.4 - 1.4.0 + 1.4 0.9.8 - 0.15 + 0.10 build/replace.properties 0.5.1 0.1.4 target - 1.0.15 + 1.0.10 4.0.0 2.11 2.5 @@ -300,7 +298,7 @@ org.owasp.esapi esapi - 2.1.0 + 2.0.1 org.eclipse.persistence @@ -325,7 +323,7 @@ org.apache.httpcomponents httpclient - ${cs.httpclient.version} + ${cs.httpcore.version} com.thoughtworks.xstream @@ -365,17 +363,17 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.snmp4j - 2.3.1_1 + 2.1.0_1 org.aspectj aspectjtools - 1.8.4 + 1.7.0 org.aspectj aspectjweaver - 1.8.4 + 1.7.0 org.apache.axis @@ -395,17 +393,17 @@ wsdl4j wsdl4j - 1.6.3 + 1.4 org.slf4j slf4j-api - 1.7.7 + 1.7.5 org.slf4j slf4j-log4j12 - 1.7.7 + 1.7.5 @@ -426,7 +424,7 @@ org.mockito mockito-all - ${cs.mockito.version} + 1.9.5 test diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml index 1d5c7b96200..351015dcc17 100755 --- a/services/console-proxy-rdp/rdpconsole/pom.xml +++ b/services/console-proxy-rdp/rdpconsole/pom.xml @@ -66,7 +66,7 @@ org.apache.tomcat.embed tomcat-embed-core - 8.0.15 + 7.0.30 diff --git a/test/pom.xml b/test/pom.xml index 6fa901349bb..06cbcb9ae1a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -67,7 +67,7 @@ commons-httpclient commons-httpclient - ${cs.commons-httpclient.version} + ${cs.httpclient.version} diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java index 8a6287156ac..96c3bafc631 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