Update to latest Jetty versions, cannot use depMgmt in parent pom or that will override deps pulled in directly causing version issues.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2229ce2b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2229ce2b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2229ce2b Branch: refs/heads/master Commit: 2229ce2b1f9f80ec75decdf0213d80ae64ff9304 Parents: 8edbc24 Author: Daniel Kulp <dk...@apache.org> Authored: Wed Feb 18 11:10:40 2015 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Wed Feb 18 11:11:42 2015 -0500 ---------------------------------------------------------------------- components/camel-cmis/pom.xml | 2 + components/camel-cometd/pom.xml | 5 ++ components/camel-gae/pom.xml | 2 + components/camel-jetty-common/pom.xml | 13 ++++++ components/camel-jetty8/pom.xml | 6 +++ components/camel-jetty9/pom.xml | 6 +++ .../camel-salesforce-component/pom.xml | 3 ++ components/camel-solr/pom.xml | 2 + components/camel-spring-ws/pom.xml | 3 ++ components/camel-web/pom.xml | 2 + parent/pom.xml | 49 +------------------- 11 files changed, 45 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-cmis/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml index 0691648..de44eca 100644 --- a/components/camel-cmis/pom.xml +++ b/components/camel-cmis/pom.xml @@ -73,11 +73,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-cometd/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml index aa7e0ed..24e371b 100644 --- a/components/camel-cometd/pom.xml +++ b/components/camel-cometd/pom.xml @@ -52,22 +52,27 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.cometd.java</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-gae/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml index 7529a78..7c1988b 100644 --- a/components/camel-gae/pom.xml +++ b/components/camel-gae/pom.xml @@ -88,11 +88,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-jetty-common/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml index 8f1019d..e22b941 100644 --- a/components/camel-jetty-common/pom.xml +++ b/components/camel-jetty-common/pom.xml @@ -54,6 +54,9 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> + <!-- provided scope as the Jetty8/9 component will provide the proper version --> + <scope>provided</scope> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -68,22 +71,32 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty-version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> + <version>${jetty-version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> + <version>${jetty-version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> + <version>${jetty-version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> + <version>${jetty-version}</version> + <scope>provided</scope> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-jetty8/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty8/pom.xml b/components/camel-jetty8/pom.xml index 42545a7..c0b96c1 100644 --- a/components/camel-jetty8/pom.xml +++ b/components/camel-jetty8/pom.xml @@ -58,6 +58,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty8-version}</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -72,22 +73,27 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> + <version>${jetty8-version}</version> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-jetty9/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml index 87b8105..14996e0 100644 --- a/components/camel-jetty9/pom.xml +++ b/components/camel-jetty9/pom.xml @@ -59,6 +59,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty9-version}</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -73,22 +74,27 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty9-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> + <version>${jetty9-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> + <version>${jetty9-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> + <version>${jetty9-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> + <version>${jetty9-version}</version> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-salesforce/camel-salesforce-component/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index 888e21a..76fe5cf 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -50,14 +50,17 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-solr/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml index abe0a12..2be06ce 100644 --- a/components/camel-solr/pom.xml +++ b/components/camel-solr/pom.xml @@ -107,11 +107,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-spring-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml index e8ed03f..d651b93 100644 --- a/components/camel-spring-ws/pom.xml +++ b/components/camel-spring-ws/pom.xml @@ -79,16 +79,19 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty-version}</version> <scope>test</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/components/camel-web/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml index 1607185..83c2a77 100644 --- a/components/camel-web/pom.xml +++ b/components/camel-web/pom.xml @@ -173,11 +173,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> + <version>${jetty-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/2229ce2b/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index eb0b6dc..3dad36e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -252,7 +252,7 @@ <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version> <jetty6-version>6.1.26</jetty6-version> <jetty8-version>8.1.16.v20140903</jetty8-version> - <jetty9-version>9.2.4.v20141103</jetty9-version> + <jetty9-version>9.2.7.v20150116</jetty9-version> <jetty-version>${jetty8-version}</jetty-version> <jetty-runner-groupId>org.mortbay.jetty</jetty-runner-groupId> <jettison-version>1.3.6</jettison-version> @@ -2049,53 +2049,6 @@ <version>${slf4j-version}</version> </dependency> - <!-- optional jetty support --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-client</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jetty-version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> - <version>${jetty-version}</version> - </dependency> - <!-- optional jakarta http core support --> <dependency> <groupId>org.apache.httpcomponents</groupId>
