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/c59ef731 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c59ef731 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c59ef731 Branch: refs/heads/master Commit: c59ef7317407a48c70b498c1af21811f53582af2 Parents: 081b56b Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Apr 27 09:07:03 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Apr 27 09:08:20 2016 +0200 ---------------------------------------------------------------------- components/camel-ahc-ws/pom.xml | 10 +++++----- components/camel-atmosphere-websocket/pom.xml | 4 ++-- components/camel-atom/pom.xml | 4 ++-- components/camel-cometd/pom.xml | 10 +++++----- components/camel-flink/pom.xml | 2 +- components/camel-http/pom.xml | 2 +- components/camel-jetty9/pom.xml | 1 - .../camel-olingo2/camel-olingo2-component/pom.xml | 6 +++--- components/camel-rss/pom.xml | 4 ++-- components/camel-servlet/pom.xml | 6 +++--- components/camel-solr/pom.xml | 4 ++-- components/camel-spark-rest/pom.xml | 12 ++++++------ 12 files changed, 32 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-ahc-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml index ba023f4..329afab 100644 --- a/components/camel-ahc-ws/pom.xml +++ b/components/camel-ahc-ws/pom.xml @@ -78,31 +78,31 @@ <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-api</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-servlet</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-atmosphere-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index 6bb3f8d..e1d644f 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -101,13 +101,13 @@ <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-server</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-atom/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml index 43c2ee9..edcd743 100644 --- a/components/camel-atom/pom.xml +++ b/components/camel-atom/pom.xml @@ -198,13 +198,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-cometd/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml index 83b5c56..4c365c8 100644 --- a/components/camel-cometd/pom.xml +++ b/components/camel-cometd/pom.xml @@ -51,27 +51,27 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</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-util</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> <dependency> <groupId>org.cometd.java</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-flink/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml index 8e774dd..f176dd4 100644 --- a/components/camel-flink/pom.xml +++ b/components/camel-flink/pom.xml @@ -86,4 +86,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-http/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index 2a698bb..63679cf 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -83,7 +83,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-jetty9/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml index 9037a71..d91c982 100644 --- a/components/camel-jetty9/pom.xml +++ b/components/camel-jetty9/pom.xml @@ -35,7 +35,6 @@ </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.jetty9</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> - <jetty-version>${jetty9-version}</jetty-version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-olingo2/camel-olingo2-component/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml index 58c84b5..184fa6c 100644 --- a/components/camel-olingo2/camel-olingo2-component/pom.xml +++ b/components/camel-olingo2/camel-olingo2-component/pom.xml @@ -134,13 +134,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -152,7 +152,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-rss/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml index b8f8d21..6ca47a9 100644 --- a/components/camel-rss/pom.xml +++ b/components/camel-rss/pom.xml @@ -82,13 +82,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-servlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index 56c1050..fadf999 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -149,19 +149,19 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-deploy</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-annotations</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>runtime</scope> </dependency>--> <!--tomcat--> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-solr/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml index 4fd4b59..23f7f4d 100644 --- a/components/camel-solr/pom.xml +++ b/components/camel-solr/pom.xml @@ -106,13 +106,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/c59ef731/components/camel-spark-rest/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml index 7c771b7..69626a4 100644 --- a/components/camel-spark-rest/pom.xml +++ b/components/camel-spark-rest/pom.xml @@ -50,32 +50,32 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</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-security</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>${jetty9-version}</version> + <version>${jetty-version}</version> </dependency> <!-- test dependencies -->
