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/eed0e8ac Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eed0e8ac Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eed0e8ac Branch: refs/heads/camel-2.19.x Commit: eed0e8ace86bd96c235ff1ccabc4beb1d7fa62a9 Parents: d0a98af 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:03:13 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/eed0e8ac/components/camel-ahc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml index d853456..f4924b4 100644 --- a/components/camel-ahc/pom.xml +++ b/components/camel-ahc/pom.xml @@ -45,6 +45,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/eed0e8ac/components/camel-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index b93ce05..cdbfe71 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -102,11 +102,16 @@ </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> <version>${cxf-version}</version> </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> @@ -122,12 +127,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/eed0e8ac/components/camel-http/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index e9ac951..f5415b3 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -47,6 +47,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/eed0e8ac/components/camel-http4/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml index 1ae682f..7945913 100644 --- a/components/camel-http4/pom.xml +++ b/components/camel-http4/pom.xml @@ -53,10 +53,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> @@ -65,7 +66,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/eed0e8ac/components/camel-netty4-http/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml index 4ebdc1b..0155505 100644 --- a/components/camel-netty4-http/pom.xml +++ b/components/camel-netty4-http/pom.xml @@ -45,6 +45,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/eed0e8ac/components/camel-restlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml index 57fe616..5e433c8 100644 --- a/components/camel-restlet/pom.xml +++ b/components/camel-restlet/pom.xml @@ -54,7 +54,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/eed0e8ac/components/camel-undertow/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml index 093c369..70ec8b8 100644 --- a/components/camel-undertow/pom.xml +++ b/components/camel-undertow/pom.xml @@ -44,6 +44,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/eed0e8ac/components/camel-urlrewrite/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml index c6c01c7..2b52dae 100644 --- a/components/camel-urlrewrite/pom.xml +++ b/components/camel-urlrewrite/pom.xml @@ -52,15 +52,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>
