Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4BEDF101A1 for ; Wed, 3 Dec 2014 11:22:45 +0000 (UTC) Received: (qmail 90960 invoked by uid 500); 3 Dec 2014 11:22:45 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 90929 invoked by uid 500); 3 Dec 2014 11:22:45 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 90920 invoked by uid 99); 3 Dec 2014 11:22:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Dec 2014 11:22:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BD858A081C9; Wed, 3 Dec 2014 11:22:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: <70b4844419b841889742c1daac923032@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/bugfix/4.5-8011 to bf72f87 Date: Wed, 3 Dec 2014 11:22:44 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/bugfix/4.5-8011 71a94998d -> bf72f8714 (forced update) 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 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bf72f871 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bf72f871 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bf72f871 Branch: refs/heads/bugfix/4.5-8011 Commit: bf72f8714da0847668070397d3cf517296c98be9 Parents: b0d74ad Author: Rohit Yadav Authored: Wed Dec 3 16:14:59 2014 +0530 Committer: Rohit Yadav Committed: Wed Dec 3 16:51:49 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 | 62 ++++++++++---------- services/console-proxy-rdp/rdpconsole/pom.xml | 2 +- .../test/com/cloud/utils/net/NetUtilsTest.java | 4 +- 11 files changed, 49 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 6803f9a..927cba7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 2.5 ./target/generated-webapp/WEB-INF/web.xml ./target/generated-webapp @@ -744,7 +744,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + 2.5 target/client ./target/generated-webapp/WEB-INF/web.xml http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/engine/api/pom.xml ---------------------------------------------------------------------- diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 1ed2b6e..aeb09da 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -38,7 +38,7 @@ org.apache.cxf cxf-bundle-jaxrs - 2.7.0 + 2.7.13 org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/engine/service/pom.xml ---------------------------------------------------------------------- diff --git a/engine/service/pom.xml b/engine/service/pom.xml index 5f8bbb3..ade15f9 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -63,7 +63,7 @@ org.apache.cxf cxf-bundle-jaxrs - 2.7.0 + 2.7.13 org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/framework/rest/pom.xml ---------------------------------------------------------------------- diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index 1de61ba..fdc7032 100644 --- a/framework/rest/pom.xml +++ b/framework/rest/pom.xml @@ -33,32 +33,32 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.1.1 + 2.4.4 com.fasterxml.jackson.core jackson-annotations - 2.1.1 + 2.4.4 com.fasterxml.jackson.core jackson-core - 2.1.1 + 2.4.4 com.fasterxml.jackson.core jackson-databind - 2.1.1 + 2.4.4 com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.1.1 + 2.4.4 org.apache.cxf cxf-bundle-jaxrs - 2.7.0 + 2.7.13 org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/plugins/event-bus/rabbitmq/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml index 5f002a0..6133e4c 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.1 + 3.4.2 org.apache.cloudstack http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/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 53edea6..b3fa007 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.1 + 1.3 org.mockito http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/plugins/network-elements/midonet/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/midonet/pom.xml b/plugins/network-elements/midonet/pom.xml index a4c8429..d0480ba 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.3 + 1.9.11 runtime org.codehaus.jackson jackson-mapper-asl - 1.9.3 + 1.9.11 runtime http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/plugins/storage/volume/cloudbyte/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml index ca0d9f7..1b89507 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.17.1 + 1.18.3 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e68b307..c05f024 100644 --- a/pom.xml +++ b/pom.xml @@ -38,13 +38,13 @@ UTF-8 UTF-8 - 1.2.16 - 1.1 - 2.2.2 + 1.2.17 + 1.2.17 + 3.1 1.4 1.6 - 1.6 - 1.8 + 1.10 + 1.10 3.2.1 1.1.1 0.5 @@ -53,43 +53,43 @@ 4.11 1.3 1.46 - 0.1.42 - 2.0.0 - 1.9.0 - build213-svnkit-1.3-patch - 2.6.6 + 0.1.51 + 2.1.0 + 1.9.2 + 1.0.0-build217 + 2.6.9 1.7.2 - 14.0-rc1 + 18.0 6.2.0-3.1 - 3.1 - 4.2.1 - 5.1.21 - 1.3.1 + 4.3.6 + 4.3.3 + 5.1.34 + 1.4.7 3.1.3 - 1.4 + 1.4.7 1.4 1.5.6 1.5.1 1.2.8 2.0.4 - 2.4 + 2.5 1.2 1.0-20081010.060147 5.1 - 3.2.4.RELEASE + 3.2.12.RELEASE 1.9.5 1.5.3 - 1.3.22 + 1.9.8 2.6 - 1.4 + 2.4 1.4.0 - 0.9.8 - 0.10 + 0.9.9 + 0.15 build/replace.properties 0.5.1 0.1.4 target - 1.0.10 + 1.0.15 4.0.0 2.11 2.5 @@ -304,7 +304,7 @@ org.owasp.esapi esapi - 2.0.1 + 2.1.0 org.eclipse.persistence @@ -369,17 +369,17 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.snmp4j - 2.1.0_1 + 2.3.1_1 org.aspectj aspectjtools - 1.7.0 + 1.8.4 org.aspectj aspectjweaver - 1.7.0 + 1.8.4 org.apache.axis @@ -399,17 +399,17 @@ wsdl4j wsdl4j - 1.4 + 1.6.3 org.slf4j slf4j-api - 1.7.5 + 1.7.7 org.slf4j slf4j-log4j12 - 1.7.5 + 1.7.7 @@ -430,7 +430,7 @@ org.mockito mockito-all - 1.9.5 + ${cs.mockito.version} test http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/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 b4d17ba..b9704a3 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 - 7.0.30 + 8.0.15 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf72f871/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 e48faa1..62476ea 100644 --- a/utils/test/com/cloud/utils/net/NetUtilsTest.java +++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java @@ -214,8 +214,8 @@ public class NetUtilsTest { @Test public void testStandardizeIp6Address() { - 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"); + 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"); } @Test