CAMEL-9908: Removing jetty 8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/081b56bc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/081b56bc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/081b56bc Branch: refs/heads/master Commit: 081b56bc3c1e1b37a7286f4fb769966e9384ac38 Parents: 3f5e225 Author: Claus Ibsen <[email protected]> Authored: Wed Apr 27 08:45:54 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Apr 27 09:05:04 2016 +0200 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 ---- apache-camel/src/main/descriptors/common-bin.xml | 1 - .../camel-salesforce-component/pom.xml | 11 +++++++---- .../camel-salesforce-maven-plugin/pom.xml | 7 ++++++- components/camel-spring-ws/pom.xml | 10 +++++++--- components/camel-websocket/pom.xml | 15 +++++++-------- parent/pom.xml | 15 +++------------ 7 files changed, 30 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/081b56bc/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index 1d9ded5..95b808a 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -429,10 +429,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-jetty8</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-jetty9</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/081b56bc/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index 6d28bb3..34a34f1 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -119,7 +119,6 @@ <include>org.apache.camel:camel-jdbc</include> <include>org.apache.camel:camel-jetty-common</include> <include>org.apache.camel:camel-jetty</include> - <include>org.apache.camel:camel-jetty8</include> <include>org.apache.camel:camel-jetty9</include> <include>org.apache.camel:camel-jgroups</include> <include>org.apache.camel:camel-jibx</include> http://git-wip-us.apache.org/repos/asf/camel/blob/081b56bc/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 a16e6f5..79267a0 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -31,6 +31,9 @@ <description>Camel Salesforce support</description> <properties> + <!-- TODO: upgrade to jetty 9 --> + <jetty8-version>8.1.17.v20150415</jetty8-version> + <camel.osgi.import.before.defaults> org.joda.time.*;version="[1.6,3)" </camel.osgi.import.before.defaults> @@ -50,17 +53,17 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> @@ -122,7 +125,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/081b56bc/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index 6ca701c..f1bf969 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -32,6 +32,11 @@ <name>Camel :: Salesforce :: Maven plugin</name> <description>Camel Salesforce Maven plugin</description> + <properties> + <!-- TODO: upgrade to jetty 9 --> + <jetty8-version>8.1.17.v20150415</jetty8-version> + </properties> + <dependencyManagement> <dependencies> <dependency> @@ -129,7 +134,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/081b56bc/components/camel-spring-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml index 2cb7c26..9d838ca 100644 --- a/components/camel-spring-ws/pom.xml +++ b/components/camel-spring-ws/pom.xml @@ -32,6 +32,10 @@ <description>Camel support for Spring Web Services</description> <properties> + + <!-- TODO: upgrade to jetty 9 --> + <jetty8-version>8.1.17.v20150415</jetty8-version> + <camel.osgi.import.before.defaults> org.springframework.beans.*;version="${spring-version-range}", org.springframework.util.*;version="${spring-version-range}" @@ -72,19 +76,19 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> <scope>test</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/camel/blob/081b56bc/components/camel-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index 9fd1bfb..9b262f5 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -36,12 +36,11 @@ </camel.osgi.export.pkg> <camel.osgi.import.pkg> !org.apache.camel.component.websocket.*, - org.eclipse.jetty.util.ssl;version="[9,9.5)";resolution:=optional, + org.eclipse.jetty.util.ssl;version="[9,10)";resolution:=optional, ${camel.osgi.import.defaults}, * </camel.osgi.import.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=websocket</camel.osgi.export.service> - <!-- ><jetty-version>8.1.3.v20120416</jetty-version>--> </properties> <dependencies> @@ -54,32 +53,32 @@ <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-client</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-api</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/081b56bc/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 55be196..0b31710 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -299,14 +299,10 @@ <jedis-client-version>2.7.3</jedis-client-version> <jedis-client-bundle-version>2.7.3_1</jedis-client-bundle-version> <jersey-version>2.11</jersey-version> - <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version> - <jetty6-version>6.1.26</jetty6-version> - <jetty8-version>8.1.17.v20150415</jetty8-version> <jetty9-version>9.2.15.v20160210</jetty9-version> - <jetty-version>${jetty8-version}</jetty-version> - <!-- jetty-plugin 8.1.7 does not exists --> - <jetty-plugin-version>8.1.16.v20140903</jetty-plugin-version> - <jetty-runner-groupId>org.mortbay.jetty</jetty-runner-groupId> + <jetty-version>${jetty9-version}</jetty-version> + <jetty-plugin-version>${jetty-version}</jetty-plugin-version> + <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId> <jettison-version>1.3.7</jettison-version> <jgit-version>4.3.0.201604071810-r</jgit-version> <jgroups-version>3.6.9.Final</jgroups-version> @@ -1169,11 +1165,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-jetty8</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-jetty9</artifactId> <version>${project.version}</version> </dependency>
