From 101668994dd27e3ca67c09a8118dbcea255805fd Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Fri, 22 Apr 2016 16:25:27 +0530
Subject: [PATCH] further maven dependency updates from Daan

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 client/pom.xml                                |  5 +-
 engine/service/pom.xml                        | 15 +---
 framework/rest/pom.xml                        | 14 +--
 plugins/hypervisors/hyperv/pom.xml            |  5 --
 plugins/network-elements/netscaler/pom.xml    |  4 +-
 plugins/user-authenticators/ldap/pom.xml      |  4 +-
 plugins/user-authenticators/saml2/pom.xml     |  5 --
 pom.xml                                       | 86 +++++++++++++++----
 server/pom.xml                                |  5 +-
 services/console-proxy-rdp/rdpconsole/pom.xml |  1 +
 tools/whisker/LICENSE                         |  2 +-
 tools/whisker/descriptor-for-packaging.xml    |  4 +-
 utils/pom.xml                                 |  2 +-
 13 files changed, 95 insertions(+), 57 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 5cafd832d208..1f3665d61f4e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -429,9 +429,8 @@
         </configuration>
       </plugin>
       <plugin>
-         <groupId>org.mortbay.jetty</groupId>
-         <artifactId>maven-jetty-plugin</artifactId>
-         <version>6.1.26</version>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
          <dependencies>
           <!-- specify the dependent jdbc driver here -->
           <dependency>
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index b816f2959fcd..7f07323d48a0 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -60,17 +60,6 @@
       <artifactId>cloud-engine-network</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-bundle-jaxrs</artifactId>
-      <version>2.7.18</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-server</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -84,9 +73,9 @@
     <finalName>engine</finalName>
     <plugins>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>8.1.7.v20120910</version>
+        <version>${cs.jetty.version}</version>
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
           <webApp>
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 54cc4b6b6ee2..03aad768dcb1 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.7.1</version>
+      <version>${cs.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.7.1</version>
+      <version>${cs.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.7.1</version>
+      <version>${cs.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.7.1</version>
+      <version>${cs.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.7.1</version>
+      <version>${cs.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-bundle-jaxrs</artifactId>
-      <version>2.7.18</version>
+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+      <version>${cs.cxf.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.eclipse.jetty</groupId>
diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml
index d88fd141885e..165eaf6cf4d2 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -41,11 +41,6 @@
       <artifactId>cloud-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.26</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-utils</artifactId>
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index 2475c413636e..d7b54e92e74f 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -30,12 +30,12 @@
     <dependency>
         <groupId>com.citrix.netscaler.nitro</groupId>
         <artifactId>nitro</artifactId>
-        <version>10.1</version>
+        <version>${cs.nitro.version}</version>
     </dependency>
     <dependency>
       <groupId>com.citrix.netscaler.nitro</groupId>
       <artifactId>sdx_nitro</artifactId>
-      <version>10.1</version>
+      <version>${cs.nitro.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 32970a790b06..7b3b8f76e162 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -97,12 +97,14 @@
       <groupId>org.spockframework</groupId>
       <artifactId>spock-core</artifactId>
       <version>1.0-groovy-2.4</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- Optional dependencies for using Spock -->
     <dependency> <!-- enables mocking of classes (in addition to interfaces) -->
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      </dependency>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index bff081425c64..a54190239e63 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -27,11 +27,6 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework.security.extensions</groupId>
-      <artifactId>spring-security-saml2-core</artifactId>
-      <version>1.0.1.RELEASE</version>
-    </dependency>
     <dependency>
       <groupId>org.opensaml</groupId>
       <artifactId>opensaml</artifactId>
diff --git a/pom.xml b/pom.xml
index 3f546e9fe803..3b78e990c02e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.46</cs.bcprov.version>
+    <cs.bcprov.version>1.54</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>
@@ -86,17 +86,19 @@
     <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.jstl.version>1.2</cs.jstl.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>
     <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.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>
     <cs.commons-io.version>2.4</cs.commons-io.version>
+    <cs.commons-fileupload.version>1.3.1</cs.commons-fileupload.version>
+    <cs.commons-collections.version>3.2.2</cs.commons-collections.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>
@@ -110,9 +112,18 @@
     <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.opensaml.version>2.6.4</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>
+    <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.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.nitro.version>10.1</cs.nitro.version>
   </properties>
 
   <distributionManagement>
@@ -204,6 +215,51 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>apache-jsp</artifactId>
+        <version>${cs.apache-jsp.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <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>
+        <version>${cs.bcprov.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-css</artifactId>
+        <version>${cs.batik.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-ext</artifactId>
+        <version>${cs.batik.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>batik-util</artifactId>
+        <version>${cs.batik.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${cs.commons-collections.version}</version>
+      </dependency>
       <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
@@ -241,26 +297,26 @@
         <artifactId>ehcache-core</artifactId>
         <version>${cs.ehcache.version}</version>
       </dependency>
-      <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
-        <version>${cs.pool.version}</version>
-      </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>${cs.codec.version}</version>
       </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>${cs.commons-fileupload.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <version>${cs.pool.version}</version>
+      </dependency>
       <dependency>
         <groupId>commons-validator</groupId>
         <artifactId>commons-validator</artifactId>
         <version>${cs.commons-validator.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk16</artifactId>
-        <version>${cs.bcprov.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.jcraft</groupId>
         <artifactId>jsch</artifactId>
@@ -386,7 +442,7 @@
       <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
-        <version>2.3.4_1</version>
+        <version>${cs.servicemix.version}</version>
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index b8e3598e3e61..8461d18a4f46 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -70,8 +70,9 @@
       <artifactId>mail</artifactId>
     </dependency>
     <dependency>
-      <groupId>jstl</groupId>
-      <artifactId>jstl</artifactId>
+      <groupId>javax.servlet.jsp.jstl</groupId>
+      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+      <version>${cs.jstl.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index a27f2eb4ac2e..628d039a6e63 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -77,6 +77,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk16</artifactId>
+      <version>1.46</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index 61ebc50f106d..da8aaedfd9ea 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -2896,7 +2896,7 @@ Within the target/jar directory
             cloud-axis.jar  from http://axis.apache.org/axis/
             cloud-cglib.jar  from http://cglib.sourceforge.net/
             cloud-commons-codec-1.5.jar  from http://commons.apache.org/codec/
-            cloud-commons-collections-3.2.1.jar  from http://commons.apache.org/collections/
+            cloud-commons-collections-3.2.2.jar  from http://commons.apache.org/collections/
             cloud-commons-configuration-1.8.jar  from http://commons.apache.org/configuration/
             cloud-commons-dbcp-1.4.jar  from http://commons.apache.org/dbcp/
             cloud-commons-httpclient-3.1.jar  from http://hc.apache.org/httpclient-3.x/
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 1a68a0d9c5c0..01e60269f480 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2673,7 +2673,7 @@ Copyright (C) 2008      Tóth István &lt;stoty@tvnet.hu&gt;
               2009-2011 Bryan Kearney &lt;bkearney@redhat.com&gt;
             </copyright-notice>
             <by-organisation id='libvirt.org'>
-                <resource name='libvirt-java-0.4.9' />
+                <resource name='libvirt-java-0.5.1' />
             </by-organisation>
         </with-license>
         <with-license id="ApacheLicenseVersion2">
@@ -2683,7 +2683,7 @@ Copyright (c) 2012 The Apache Software Foundation
             <by-organisation id="apache.org.2">
                 <resource name="cloud-axis.jar" source="http://axis.apache.org/axis/" notice='axis2.notice'/>
                 <resource name="cloud-commons-codec-1.5.jar" source="http://commons.apache.org/codec/" notice="codec" />
-                <resource name="cloud-commons-collections-3.2.1.jar" source="http://commons.apache.org/collections/"/>
+                <resource name="cloud-commons-collections-3.2.2.jar" source="http://commons.apache.org/collections/"/>
                 <resource name="cloud-commons-configuration-1.8.jar" source="http://commons.apache.org/configuration/"/>
                 <resource name="cloud-commons-dbcp-1.4.jar" source="http://commons.apache.org/dbcp/" />
                 <resource name="cloud-commons-httpclient-3.1.jar" source="http://hc.apache.org/httpclient-3.x/" />
diff --git a/utils/pom.xml b/utils/pom.xml
index 93d7d01a06f6..206eb1896a6a 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -69,7 +69,7 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk16</artifactId>
+      <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
     <dependency>
       <groupId>com.jcraft</groupId>