CAMEL-11531: add servlet-api where needed. CAMEL-11591 reported also this as a bug.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1038f273 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1038f273 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1038f273 Branch: refs/heads/master Commit: 1038f27317c2b75f4c5ed345cd90edcedad059e7 Parents: 77bc452 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jul 25 12:55:17 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jul 25 13:55:26 2017 +0200 ---------------------------------------------------------------------- components/camel-ahc/pom.xml | 5 +++++ components/camel-cxf/pom.xml | 9 ++++++--- components/camel-http/pom.xml | 5 +++++ components/camel-http4/pom.xml | 9 +++++---- components/camel-netty4-http/pom.xml | 5 +++++ components/camel-restlet/pom.xml | 1 - components/camel-undertow/pom.xml | 5 +++++ components/camel-urlrewrite/pom.xml | 11 ++++++----- 8 files changed, 37 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1038f273/components/camel-ahc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml index 60d21c7..367ea9d 100644 --- a/components/camel-ahc/pom.xml +++ b/components/camel-ahc/pom.xml @@ -48,6 +48,11 @@ <artifactId>camel-http-common</artifactId> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> + </dependency> + <dependency> <groupId>org.asynchttpclient</groupId> <artifactId>async-http-client</artifactId> <version>${ahc-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/1038f273/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index d507bb9..e0b5a08 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -105,10 +105,15 @@ </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> + </dependency> + + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> @@ -123,12 +128,10 @@ <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/1038f273/components/camel-http/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index d0746ac..c35087d 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -49,6 +49,11 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-http-common</artifactId> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> + </dependency> <dependency> <groupId>commons-httpclient</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/1038f273/components/camel-http4/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml index 8d9662d..569a40d 100644 --- a/components/camel-http4/pom.xml +++ b/components/camel-http4/pom.xml @@ -55,10 +55,11 @@ <artifactId>camel-http-common</artifactId> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> - <scope>test</scope> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> </dependency> + <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> @@ -67,7 +68,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-spring</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1038f273/components/camel-netty4-http/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml index da1e308..eb6a904 100644 --- a/components/camel-netty4-http/pom.xml +++ b/components/camel-netty4-http/pom.xml @@ -48,6 +48,11 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-http-common</artifactId> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> + </dependency> <!-- testing --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1038f273/components/camel-restlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml index 408566b..5a8570e 100644 --- a/components/camel-restlet/pom.xml +++ b/components/camel-restlet/pom.xml @@ -57,7 +57,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-http-common</artifactId> </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/1038f273/components/camel-undertow/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml index eb8d445..5cc4103 100644 --- a/components/camel-undertow/pom.xml +++ b/components/camel-undertow/pom.xml @@ -46,6 +46,11 @@ <artifactId>camel-http-common</artifactId> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> + </dependency> + <dependency> <groupId>io.undertow</groupId> <artifactId>undertow-core</artifactId> <version>${undertow-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/1038f273/components/camel-urlrewrite/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml index 4ae5968..4bc5897 100644 --- a/components/camel-urlrewrite/pom.xml +++ b/components/camel-urlrewrite/pom.xml @@ -54,15 +54,16 @@ <artifactId>camel-http-common</artifactId> </dependency> <dependency> - <groupId>org.tuckey</groupId> - <artifactId>urlrewritefilter</artifactId> - <version>${urlrewritefilter-version}</version> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> + <version>${javax.servlet-api-version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.tuckey</groupId> + <artifactId>urlrewritefilter</artifactId> + <version>${urlrewritefilter-version}</version> + </dependency> <!-- test dependencies --> <dependency>
