further maven dependency updates - jstl - commons-fileupload - commons-collections - opensaml - batik - bcprov-15on - servicemix - jetty - cxf - spring-security-saml2-core - spring-security-core - groovy - apache-jsp
and some centralizing of dependency versioning to the main pom Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/89c36898 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89c36898 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89c36898 Branch: refs/heads/4.9-mvn-upgrade Commit: 89c368983c13809451ea78e2e636839b15395040 Parents: ee5a5dd Author: Daan Hoogland <[email protected]> Authored: Wed Feb 3 10:36:50 2016 +0100 Committer: Rohit Yadav <[email protected]> Committed: Tue Mar 22 12:43:08 2016 +0100 ---------------------------------------------------------------------- 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 +- .../network/resource/NetscalerResource.java | 1225 ++++++++---------- plugins/user-authenticators/ldap/pom.xml | 4 +- plugins/user-authenticators/saml2/pom.xml | 5 - pom.xml | 80 +- server/pom.xml | 5 +- .../cloudstack/network/lb/CertServiceImpl.java | 255 ++-- .../cloudstack/network/lb/CertServiceTest.java | 367 +++--- tools/whisker/LICENSE | 2 +- tools/whisker/descriptor-for-packaging.xml | 4 +- .../cloud/utils/security/CertificateHelper.java | 69 +- 15 files changed, 1010 insertions(+), 1049 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89c36898/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 5cafd83..1f3665d 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> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89c36898/engine/service/pom.xml ---------------------------------------------------------------------- diff --git a/engine/service/pom.xml b/engine/service/pom.xml index b816f29..7f07323 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -61,17 +61,6 @@ <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> </dependency> @@ -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> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89c36898/framework/rest/pom.xml ---------------------------------------------------------------------- diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index 54cc4b6..03aad76 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> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89c36898/plugins/hypervisors/hyperv/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml index d88fd14..165eaf6 100644 --- a/plugins/hypervisors/hyperv/pom.xml +++ b/plugins/hypervisors/hyperv/pom.xml @@ -42,11 +42,6 @@ <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> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89c36898/plugins/network-elements/netscaler/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index 2475c41..d7b54e9 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>
