apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

further maven dependency updates from Daan

Browse Source 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Daan Hoogland 2016-04-22 16:25:27 +05:30 committed by Rohit Yadav
parent 770aa0133e
commit 101668994d
13 changed files with 95 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/pom.xml
View File

@ -429,9 +429,8 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.mortbay.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>6.1.26</version>
<dependencies> <dependencies>
<!-- specify the dependent jdbc driver here --> <!-- specify the dependent jdbc driver here -->
<dependency> <dependency>

15
engine/service/pom.xml
View File

@ -60,17 +60,6 @@
<artifactId>cloud-engine-network</artifactId> <artifactId>cloud-engine-network</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </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> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
@ -84,9 +73,9 @@
<finalName>engine</finalName> <finalName>engine</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.mortbay.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>8.1.7.v20120910</version> <version>${cs.jetty.version}</version>
<configuration> <configuration>
<scanIntervalSeconds>10</scanIntervalSeconds> <scanIntervalSeconds>10</scanIntervalSeconds>
<webApp> <webApp>

14
framework/rest/pom.xml
View File

@ -33,32 +33,32 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.module</groupId> <groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId> <artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.7.1</version> <version>${cs.jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>2.7.1</version> <version>${cs.jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>2.7.1</version> <version>${cs.jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.7.1</version> <version>${cs.jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.7.1</version> <version>${cs.jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId> <artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>2.7.18</version> <version>${cs.cxf.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

5
plugins/hypervisors/hyperv/pom.xml
View File

@ -41,11 +41,6 @@
<artifactId>cloud-core</artifactId> <artifactId>cloud-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.26</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-utils</artifactId> <artifactId>cloud-utils</artifactId>

4
plugins/network-elements/netscaler/pom.xml
View File

@ -30,12 +30,12 @@
<dependency> <dependency>
<groupId>com.citrix.netscaler.nitro</groupId> <groupId>com.citrix.netscaler.nitro</groupId>
<artifactId>nitro</artifactId> <artifactId>nitro</artifactId>
<version>10.1</version> <version>${cs.nitro.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.citrix.netscaler.nitro</groupId> <groupId>com.citrix.netscaler.nitro</groupId>
<artifactId>sdx_nitro</artifactId> <artifactId>sdx_nitro</artifactId>
<version>10.1</version> <version>${cs.nitro.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
plugins/user-authenticators/ldap/pom.xml
View File

@ -97,12 +97,14 @@
<groupId>org.spockframework</groupId> <groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId> <artifactId>spock-core</artifactId>
<version>1.0-groovy-2.4</version> <version>1.0-groovy-2.4</version>
<scope>test</scope>
</dependency> </dependency>
<!-- Optional dependencies for using Spock --> <!-- Optional dependencies for using Spock -->
<dependency> <!-- enables mocking of classes (in addition to interfaces) --> <dependency> <!-- enables mocking of classes (in addition to interfaces) -->
<groupId>cglib</groupId> <groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId> <artifactId>cglib-nodep</artifactId>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

5
plugins/user-authenticators/saml2/pom.xml
View File

@ -27,11 +27,6 @@
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>
<dependency>
<groupId>org.springframework.security.extensions</groupId>
<artifactId>spring-security-saml2-core</artifactId>
<version>1.0.1.RELEASE</version>
</dependency>
<dependency> <dependency>
<groupId>org.opensaml</groupId> <groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId> <artifactId>opensaml</artifactId>

86
pom.xml
View File

@ -63,7 +63,7 @@
<!-- do not forget to also upgrade hamcrest library with junit --> <!-- do not forget to also upgrade hamcrest library with junit -->
<cs.junit.version>4.12</cs.junit.version> <cs.junit.version>4.12</cs.junit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.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.jsch.version>0.1.53</cs.jsch.version>
<cs.jpa.version>2.1.1</cs.jpa.version> <cs.jpa.version>2.1.1</cs.jpa.version>
<cs.jasypt.version>1.9.2</cs.jasypt.version> <cs.jasypt.version>1.9.2</cs.jasypt.version>
@ -86,17 +86,19 @@
<cs.axiom.version>1.2.8</cs.axiom.version> <cs.axiom.version>1.2.8</cs.axiom.version>
<cs.neethi.version>2.0.4</cs.neethi.version> <cs.neethi.version>2.0.4</cs.neethi.version>
<cs.servlet.version>2.5</cs.servlet.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.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>5.5</cs.vmware.api.version>
<org.springframework.version>3.2.16.RELEASE</org.springframework.version> <org.springframework.version>3.2.16.RELEASE</org.springframework.version>
<cs.mockito.version>1.10.19</cs.mockito.version> <cs.mockito.version>1.10.19</cs.mockito.version>
<cs.powermock.version>1.6.4</cs.powermock.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.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.lang.version>2.6</cs.lang.version>
<cs.commons-lang3.version>3.4</cs.commons-lang3.version> <cs.commons-lang3.version>3.4</cs.commons-lang3.version>
<cs.commons-io.version>2.4</cs.commons-io.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.commons-validator.version>1.5.0</cs.commons-validator.version>
<cs.reflections.version>0.9.10</cs.reflections.version> <cs.reflections.version>0.9.10</cs.reflections.version>
<cs.java-ipv6.version>0.16</cs.java-ipv6.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.mycila.license.version>2.11</cs.mycila.license.version>
<cs.findbugs.version>3.0.3</cs.findbugs.version> <cs.findbugs.version>3.0.3</cs.findbugs.version>
<cs.javadoc.version>2.10.3</cs.javadoc.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.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.joda-time.version>2.8.1</cs.joda-time.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> </properties>
<distributionManagement> <distributionManagement>
@ -204,6 +215,51 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <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> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
@ -241,26 +297,26 @@
<artifactId>ehcache-core</artifactId> <artifactId>ehcache-core</artifactId>
<version>${cs.ehcache.version}</version> <version>${cs.ehcache.version}</version>
</dependency> </dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>${cs.pool.version}</version>
</dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>${cs.codec.version}</version> <version>${cs.codec.version}</version>
</dependency> </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> <dependency>
<groupId>commons-validator</groupId> <groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
<version>${cs.commons-validator.version}</version> <version>${cs.commons-validator.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>${cs.bcprov.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId> <artifactId>jsch</artifactId>
@ -386,7 +442,7 @@
<dependency> <dependency>
<groupId>org.apache.servicemix.bundles</groupId> <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId> <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
<version>2.3.4_1</version> <version>${cs.servicemix.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>

5
server/pom.xml
View File

@ -70,8 +70,9 @@
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jstl</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl</artifactId> <artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>${cs.jstl.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>

1
services/console-proxy-rdp/rdpconsole/pom.xml
View File

@ -77,6 +77,7 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId> <artifactId>bcprov-jdk16</artifactId>
<version>1.46</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
tools/whisker/LICENSE
View File

@ -2896,7 +2896,7 @@ Within the target/jar directory
cloud-axis.jar from http://axis.apache.org/axis/ cloud-axis.jar from http://axis.apache.org/axis/
cloud-cglib.jar from http://cglib.sourceforge.net/ cloud-cglib.jar from http://cglib.sourceforge.net/
cloud-commons-codec-1.5.jar from http://commons.apache.org/codec/ 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-configuration-1.8.jar from http://commons.apache.org/configuration/
cloud-commons-dbcp-1.4.jar from http://commons.apache.org/dbcp/ 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/ cloud-commons-httpclient-3.1.jar from http://hc.apache.org/httpclient-3.x/

4
tools/whisker/descriptor-for-packaging.xml
View File

@ -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; 2009-2011 Bryan Kearney &lt;bkearney@redhat.com&gt;
</copyright-notice> </copyright-notice>
<by-organisation id='libvirt.org'> <by-organisation id='libvirt.org'>
<resource name='libvirt-java-0.4.9' /> <resource name='libvirt-java-0.5.1' />
</by-organisation> </by-organisation>
</with-license> </with-license>
<with-license id="ApacheLicenseVersion2"> <with-license id="ApacheLicenseVersion2">
@ -2683,7 +2683,7 @@ Copyright (c) 2012 The Apache Software Foundation
<by-organisation id="apache.org.2"> <by-organisation id="apache.org.2">
<resource name="cloud-axis.jar" source="http://axis.apache.org/axis/" notice='axis2.notice'/> <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-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-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-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/" /> <resource name="cloud-commons-httpclient-3.1.jar" source="http://hc.apache.org/httpclient-3.x/" />

2
utils/pom.xml
View File

@ -69,7 +69,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId> <artifactId>bcprov-jdk15on</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>