Skip to content

Commit

Permalink
maven: fix dependency version support by JDK7
Browse files Browse the repository at this point in the history 
- 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>
  • Loading branch information
@rohityadavcloud
rohityadavcloud committed Apr 22, 2016
1 parent 1016689 commit 8af677a
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 32 deletions.
1 change: 1 addition & 0 deletions client/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion plugins/event-bus/kafka/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion plugins/event-bus/rabbitmq/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion plugins/storage/volume/cloudbyte/pom.xml
View file
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions plugins/user-authenticators/saml2/pom.xml
View file
Expand Up @@ -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>
40 changes: 14 additions & 26 deletions pom.xml
View file
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>

This comment has been minimized.

Sign in to view

Copy link
@pdion891

pdion891 May 27, 2016

Contributor

@rhtyd, did you get noredis to build with this new lib? on my side I need to change "install-non-oss.sh" to get it to work because the build does not find the 6.0 version of the lib.

@swill

This comment has been minimized.

Sign in to view

Copy link
@rohityadavcloud

rohityadavcloud May 28, 2016

Author Member

@pdion891 @swill get it here: https://github.com/rhtyd/cloudstack-nonoss

This comment has been minimized.

Sign in to view

Copy link
@swill

swill May 28, 2016

Contributor

Where was it coming from before?

This comment has been minimized.

Sign in to view

Copy link
@pdion891

pdion891 May 28, 2016 •
edited

Contributor

@rhtyd is it possible there is a missing line in "install-non-oss.sh" like:

mvn install:install-file -Dfile=vim25_60.jar -DgroupId=com.cloud.com.vmware \
-DartifactId=vmware-vim25    -Dversion=6.0   -Dpackaging=jar

Because on a new jenkins slave, with the file vim25_60.jar in deps folder, it failed to build because of a missing lib and work after I've ran this command.

I want to make sure I'm not alone with this issue ?

This comment has been minimized.

Sign in to view

Copy link
@rohityadavcloud

rohityadavcloud May 29, 2016

Author Member

Since noredist required additional jars, recommended approach is to git clone this repo https://github.com/rhtyd/cloudstack-nonoss and execute the install-non-oss.sh script in that repo. I've been maintaining this for build purposes since 4.3.

This comment has been minimized.

Sign in to view

Copy link
@pdion891

pdion891 May 29, 2016

Contributor

👍 Rohit for that git repo. shouldn't it be part le the cloudstack-extra org. Did create #1569

This comment has been minimized.

Sign in to view

Copy link
@swill

swill May 29, 2016

Contributor

I was not aware of a cloudstack extra org, but I like that idea. Once I get our main cloudstack repo moved we can figure out how to handle what we can put in the apachecloudstack org and maybe we use another org for stuff that we are not allowed to put inside apache (now apachecloudstack). More discussion needed on this I think.

This comment has been minimized.

Sign in to view

Copy link
@pdion891

pdion891 May 29, 2016

Contributor

https://github.com/CloudStack-extras

This comment has been minimized.

Sign in to view

Copy link
@rohityadavcloud

rohityadavcloud May 30, 2016

Author Member

@pdion891 I think it's a grey area on where to host the noredist jars, also I don't have access to the above org. I'm open to transferring this repository to any org if needed. I can maintain it there as well.
<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>
Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions usage/pom.xml
View file
Expand Up @@ -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>
Expand Down

0 comments on commit 8af677a

Please sign in to comment.