You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/28 22:01:24 UTC
[2/9] git commit: updated refs/heads/master to 1f53adb
maven: Upgrade dependency versions
Updated most dependencies to latest minor releases, EXCEPT:
- Gson 2.x
- Major spring framework version
- Servlet version
- Embedded jetty version
- Mockito version (beta)
- Mysql lib minor version upgrade (breaks mysql-ha plugin)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb29b1d0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb29b1d0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb29b1d0
Branch: refs/heads/master
Commit: bb29b1d06389e41c779d94f2d433f3b7c48009b3
Parents: d518b61
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 01:41:02 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Apr 22 16:20:16 2016 +0530
----------------------------------------------------------------------
engine/api/pom.xml | 2 +-
engine/service/pom.xml | 2 +-
framework/rest/pom.xml | 12 ++--
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/juniper-contrail/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
pom.xml | 58 +++++++++-----------
services/console-proxy-rdp/rdpconsole/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
tools/checkstyle/pom.xml | 7 +--
usage/pom.xml | 6 +-
utils/pom.xml | 2 +-
16 files changed, 49 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/engine/api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 01a6051..1f539fb 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.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/engine/service/pom.xml
----------------------------------------------------------------------
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index 38b6035..b816f29 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.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 830b7ec..54cc4b6 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.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.13</version>
+ <version>2.7.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/event-bus/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index b6827a1..2c79aa8 100644
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>0.8.2.0</version>
+ <version>0.9.0.0</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/event-bus/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index bc8f78c..937d5bb 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.5.4</version>
+ <version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/network-elements/globodns/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
index 9e177a5..9d2c354 100644
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>com.globo.globodns</groupId>
<artifactId>globodns-client</artifactId>
- <version>0.0.15</version>
+ <version>0.0.20</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/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 cac4d59..13a3c5b 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <version>1.10.19</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/storage/volume/cloudbyte/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index 2a4e02d..9cc874e 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.19</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index a2af718..32970a7 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
- <version>0.7-groovy-2.0</version>
+ <version>1.0-groovy-2.4</version>
</dependency>
<!-- Optional dependencies for using Spock -->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/user-authenticators/saml2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index a978860..bff0814 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.springframework.security.extensions</groupId>
<artifactId>spring-security-saml2-core</artifactId>
- <version>1.0.0.RELEASE</version>
+ <version>1.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c18c377..3f546e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,10 +44,6 @@
<url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
</issueManagement>
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
<properties>
<cs.jdk.version>1.7</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -55,7 +51,7 @@
<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.cglib.version>3.2.0</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>
@@ -65,25 +61,25 @@
<cs.discovery.version>0.5</cs.discovery.version>
<cs.ejb.version>3.0</cs.ejb.version>
<!-- do not forget to also upgrade hamcrest library with junit -->
- <cs.junit.version>4.11</cs.junit.version>
+ <cs.junit.version>4.12</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.jsch.version>0.1.53</cs.jsch.version>
+ <cs.jpa.version>2.1.1</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.trilead.version>1.0.0-build220</cs.trilead.version>
+ <cs.ehcache.version>2.6.11</cs.ehcache.version>
<cs.gson.version>1.7.2</cs.gson.version>
<cs.guava-testlib.version>18.0</cs.guava-testlib.version>
- <cs.guava.version>18.0</cs.guava.version>
+ <cs.guava.version>19.0</cs.guava.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
- <cs.httpclient.version>4.5</cs.httpclient.version>
- <cs.httpcore.version>4.4</cs.httpcore.version>
+ <cs.httpclient.version>4.5.1</cs.httpclient.version>
+ <cs.httpcore.version>4.4.4</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.xstream.version>1.4.8</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.5.0-b01</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>
@@ -93,27 +89,27 @@
<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.5</cs.vmware.api.version>
- <org.springframework.version>3.2.12.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.10.34</cs.aws.sdk.version>
+ <org.springframework.version>3.2.16.RELEASE</org.springframework.version>
+ <cs.mockito.version>1.10.19</cs.mockito.version>
+ <cs.powermock.version>1.6.4</cs.powermock.version>
+ <cs.aws.sdk.version>1.10.50</cs.aws.sdk.version>
<cs.jackson.version>2.6.3</cs.jackson.version>
<cs.lang.version>2.6</cs.lang.version>
<cs.commons-lang3.version>3.4</cs.commons-lang3.version>
<cs.commons-io.version>2.4</cs.commons-io.version>
- <cs.commons-validator.version>1.4.0</cs.commons-validator.version>
- <cs.reflections.version>0.9.9</cs.reflections.version>
- <cs.java-ipv6.version>0.15</cs.java-ipv6.version>
+ <cs.commons-validator.version>1.5.0</cs.commons-validator.version>
+ <cs.reflections.version>0.9.10</cs.reflections.version>
+ <cs.java-ipv6.version>0.16</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.2.0</cs.rados-java.version>
<cs.target.dir>target</cs.target.dir>
<cs.daemon.version>1.0.15</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.7</cs.mycila.license.version>
- <cs.findbugs.version>3.0.1</cs.findbugs.version>
- <cs.javadoc.version>2.10.1</cs.javadoc.version>
+ <cs.checkstyle.version>2.17</cs.checkstyle.version>
+ <cs.mycila.license.version>2.11</cs.mycila.license.version>
+ <cs.findbugs.version>3.0.3</cs.findbugs.version>
+ <cs.javadoc.version>2.10.3</cs.javadoc.version>
<cs.opensaml.version>2.6.1</cs.opensaml.version>
<cs.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.joda-time.version>2.8.1</cs.joda-time.version>
@@ -390,17 +386,17 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
- <version>2.3.1_1</version>
+ <version>2.3.4_1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.8.4</version>
+ <version>1.8.8</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.8.4</version>
+ <version>1.8.8</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
@@ -425,12 +421,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/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 ba31183..a27f2eb 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>8.0.15</version>
+ <version>8.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/bb29b1d0/services/secondary-storage/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml
index b6bfbf7..f3d0176 100644
--- a/services/secondary-storage/server/pom.xml
+++ b/services/secondary-storage/server/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.25.Final</version>
+ <version>4.0.33.Final</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/tools/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index f4ee2b8..c0c39c9 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -25,12 +25,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
<version>4.9.0-SNAPSHOT</version>
-
-
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index ff10e81..7e9e8c4 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -53,17 +53,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.4.9</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 3a23a58..93d7d01 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -157,7 +157,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.3</version>
+ <version>3.4</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>