From 8af677a0f0b2a74db74223fc3d0e2d3e9549e960 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Thu, 28 Jan 2016 13:06:08 +0100
Subject: [PATCH] maven: fix dependency version support by JDK7

- Fix jetty dependency that is compatible with Java7
- Upgrade minor revisions of dependencies
- Upgrade vmware mvn sdk dependency to 6.0
- Downgrade bounty castle version to 1.46 (same as before)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 client/pom.xml                            |  1 +
 plugins/event-bus/kafka/pom.xml           |  2 +-
 plugins/event-bus/rabbitmq/pom.xml        |  2 +-
 plugins/storage/volume/cloudbyte/pom.xml  |  2 +-
 plugins/user-authenticators/saml2/pom.xml |  6 ++++
 pom.xml                                   | 40 ++++++++---------------
 usage/pom.xml                             |  6 ++--
 7 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 1f3665d61f4e..a1e4f609f4c2 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -431,6 +431,7 @@
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
+        <version>${cs.jetty.version}</version>
          <dependencies>
           <!-- specify the dependent jdbc driver here -->
           <dependency>
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index 2c79aa873825..2bae70344369 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.9.0.0</version>
+      <version>0.9.0.1</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index 937d5bb0daaa..7e797099c050 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.6.0</version>
+        <version>3.6.1</version>
     </dependency>
     <dependency>
     <groupId>org.apache.cloudstack</groupId>
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index 9cc874e716a9..5372ab801344 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.19</version>
+	<version>1.19.1</version>
 </dependency>
   </dependencies>
   <build>
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index a54190239e63..5e24df35c558 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -47,5 +47,11 @@
       <artifactId>cloud-framework-config</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.11.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 3b78e990c02e..01828d4393d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,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.2.0</cs.cglib.version>
+    <cs.cglib.version>3.2.1</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>
@@ -63,7 +63,7 @@
     <!-- do not forget to also upgrade hamcrest library with junit -->
     <cs.junit.version>4.12</cs.junit.version>
     <cs.hamcrest.version>1.3</cs.hamcrest.version>
-    <cs.bcprov.version>1.54</cs.bcprov.version>
+    <cs.bcprov.version>1.46</cs.bcprov.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>
@@ -73,11 +73,11 @@
     <cs.guava-testlib.version>18.0</cs.guava-testlib.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.1</cs.httpclient.version>
+    <cs.httpclient.version>4.5.2</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.8</cs.xstream.version>
+    <cs.xstream.version>1.4.9</cs.xstream.version>
     <cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
     <cs.mail.version>1.5.0-b01</cs.mail.version>
     <cs.axis.version>1.4</cs.axis.version>
@@ -88,11 +88,11 @@
     <cs.servlet.version>2.5</cs.servlet.version>
     <cs.jstl.version>1.2.1</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>
+    <cs.vmware.api.version>6.0</cs.vmware.api.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.aws.sdk.version>1.10.64</cs.aws.sdk.version>
     <cs.jackson.version>2.7.1</cs.jackson.version>
     <cs.lang.version>2.6</cs.lang.version>
     <cs.commons-lang3.version>3.4</cs.commons-lang3.version>
@@ -117,12 +117,10 @@
     <cs.joda-time.version>2.8.1</cs.joda-time.version>
     <cs.batik.version>1.8</cs.batik.version>
     <cs.servicemix.version>2.3.4_1</cs.servicemix.version>
-    <cs.jetty.version>9.3.7.v20160115</cs.jetty.version>
+    <cs.jetty.version>9.2.15.v20160210</cs.jetty.version>
     <cs.cxf.version>3.1.4</cs.cxf.version>
-    <cs.spring-security-saml2-core.version>1.0.1.RELEASE</cs.spring-security-saml2-core.version>
-    <cs.spring-security-core.version>4.0.3.RELEASE</cs.spring-security-core.version>
-    <cs.groovy.version>2.4.3</cs.groovy.version>
-    <cs.apache-jsp.version>9.3.7.v20160115</cs.apache-jsp.version>
+    <cs.groovy.version>2.4.6</cs.groovy.version>
+    <cs.apache-jsp.version>9.2.15.v20160210</cs.apache-jsp.version>
     <cs.nitro.version>10.1</cs.nitro.version>
   </properties>
 
@@ -225,16 +223,6 @@
         <artifactId>groovy-all</artifactId>
         <version>${cs.groovy.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-core</artifactId>
-        <version>${cs.spring-security-core.version}</version>
-      </dependency>
-      <dependency>
-	    <groupId>org.springframework.security.extensions</groupId>
-	    <artifactId>spring-security-saml2-core</artifactId>
-	    <version>${cs.spring-security-saml2-core.version}</version>
-	  </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-jdk15on</artifactId>
@@ -377,7 +365,7 @@
       <dependency>
         <groupId>org.owasp.esapi</groupId>
         <artifactId>esapi</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.0.1</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
@@ -447,12 +435,12 @@
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjtools</artifactId>
-        <version>1.8.8</version>
+        <version>1.8.9</version>
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjweaver</artifactId>
-        <version>1.8.8</version>
+        <version>1.8.9</version>
       </dependency>
       <dependency>
         <groupId>org.apache.axis</groupId>
@@ -477,12 +465,12 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.14</version>
+        <version>1.7.21</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.14</version>
+        <version>1.7.21</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/usage/pom.xml b/usage/pom.xml
index 7e9e8c4f9091..dd80e82ce775 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.14</version>
+        <version>1.7.21</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.14</version>
+        <version>1.7.21</version>
       </dependency>
     <dependency>
       <groupId>org.dbunit</groupId>
       <artifactId>dbunit</artifactId>
-      <version>2.5.1</version>
+      <version>2.5.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>