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

maven: fix dependency version support by JDK7

Browse Source 
- 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>
This commit is contained in:
Rohit Yadav 2016-01-28 13:06:08 +01:00
parent 101668994d
commit 8af677a0f0
7 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/pom.xml
View File

@ -431,6 +431,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>${cs.jetty.version}</version>
<dependencies> <dependencies>
<!-- specify the dependent jdbc driver here --> <!-- specify the dependent jdbc driver here -->
<dependency> <dependency>

2
plugins/event-bus/kafka/pom.xml
View File

@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>org.apache.kafka</groupId> <groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId> <artifactId>kafka-clients</artifactId>
<version>0.9.0.0</version> <version>0.9.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

2
plugins/event-bus/rabbitmq/pom.xml
View File

@ -31,7 +31,7 @@
<dependency> <dependency>
<groupId>com.rabbitmq</groupId> <groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId> <artifactId>amqp-client</artifactId>
<version>3.6.0</version> <version>3.6.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>

2
plugins/storage/volume/cloudbyte/pom.xml
View File

@ -54,7 +54,7 @@
<dependency> <dependency>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId> <artifactId>jersey-bundle</artifactId>
<version>1.19</version> <version>1.19.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

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

@ -47,5 +47,11 @@
<artifactId>cloud-framework-config</artifactId> <artifactId>cloud-framework-config</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

40
pom.xml
View File

@ -51,7 +51,7 @@
<cs.log4j.version>1.2.17</cs.log4j.version> <cs.log4j.version>1.2.17</cs.log4j.version>
<cs.log4j.extras.version>1.2.17</cs.log4j.extras.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.dbcp.version>1.4</cs.dbcp.version>
<cs.pool.version>1.6</cs.pool.version> <cs.pool.version>1.6</cs.pool.version>
<cs.codec.version>1.10</cs.codec.version> <cs.codec.version>1.10</cs.codec.version>
@ -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.54</cs.bcprov.version> <cs.bcprov.version>1.46</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>
@ -73,11 +73,11 @@
<cs.guava-testlib.version>18.0</cs.guava-testlib.version> <cs.guava-testlib.version>18.0</cs.guava-testlib.version>
<cs.guava.version>19.0</cs.guava.version> <cs.guava.version>19.0</cs.guava.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.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.httpcore.version>4.4.4</cs.httpcore.version>
<cs.commons-httpclient.version>3.1</cs.commons-httpclient.version> <cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
<cs.mysql.version>5.1.34</cs.mysql.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.xmlrpc.version>3.1.3</cs.xmlrpc.version>
<cs.mail.version>1.5.0-b01</cs.mail.version> <cs.mail.version>1.5.0-b01</cs.mail.version>
<cs.axis.version>1.4</cs.axis.version> <cs.axis.version>1.4</cs.axis.version>
@ -88,11 +88,11 @@
<cs.servlet.version>2.5</cs.servlet.version> <cs.servlet.version>2.5</cs.servlet.version>
<cs.jstl.version>1.2.1</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>6.0</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.64</cs.aws.sdk.version>
<cs.jackson.version>2.7.1</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>
@ -117,12 +117,10 @@
<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.batik.version>1.8</cs.batik.version>
<cs.servicemix.version>2.3.4_1</cs.servicemix.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.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.groovy.version>2.4.6</cs.groovy.version>
<cs.spring-security-core.version>4.0.3.RELEASE</cs.spring-security-core.version> <cs.apache-jsp.version>9.2.15.v20160210</cs.apache-jsp.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> <cs.nitro.version>10.1</cs.nitro.version>
</properties> </properties>
@ -225,16 +223,6 @@
<artifactId>groovy-all</artifactId> <artifactId>groovy-all</artifactId>
<version>${cs.groovy.version}</version> <version>${cs.groovy.version}</version>
</dependency> </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> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
@ -377,7 +365,7 @@
<dependency> <dependency>
<groupId>org.owasp.esapi</groupId> <groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId> <artifactId>esapi</artifactId>
<version>2.1.0</version> <version>2.1.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.persistence</groupId> <groupId>org.eclipse.persistence</groupId>
@ -447,12 +435,12 @@
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId> <artifactId>aspectjtools</artifactId>
<version>1.8.8</version> <version>1.8.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<version>1.8.8</version> <version>1.8.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>
@ -477,12 +465,12 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.14</version> <version>1.7.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.7.14</version> <version>1.7.21</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

6
usage/pom.xml
View File

@ -53,17 +53,17 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.14</version> <version>1.7.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.7.14</version> <version>1.7.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dbunit</groupId> <groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId> <artifactId>dbunit</artifactId>
<version>2.5.1</version> <version>2.5.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>