You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/10/22 22:52:07 UTC
git commit: CAMEL-6885: Replace the Geronimo Servlet 2.5 spec. bundle
dependency with the version 3.0 of it.
Updated Branches:
refs/heads/master 8ef57b0f6 -> 2019236e3
CAMEL-6885: Replace the Geronimo Servlet 2.5 spec. bundle dependency with the version 3.0 of it.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2019236e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2019236e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2019236e
Branch: refs/heads/master
Commit: 2019236e390da99bed9cf8c157610c76966115d7
Parents: 8ef57b0
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Oct 22 22:51:55 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Oct 22 22:51:55 2013 +0200
----------------------------------------------------------------------
components/camel-cdi/pom.xml | 2 +-
components/camel-gae/pom.xml | 2 +-
components/camel-servletlistener/pom.xml | 2 +-
components/camel-urlrewrite/pom.xml | 2 +-
examples/camel-example-gauth/pom.xml | 2 +-
parent/pom.xml | 6 ------
6 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2019236e/components/camel-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index dbf44d9..4da2f70 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -113,7 +113,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/2019236e/components/camel-gae/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml
index 054335f..eb64df3 100644
--- a/components/camel-gae/pom.xml
+++ b/components/camel-gae/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/2019236e/components/camel-servletlistener/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml
index a1f0598..e65a2fc 100644
--- a/components/camel-servletlistener/pom.xml
+++ b/components/camel-servletlistener/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/2019236e/components/camel-urlrewrite/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml
index c075eb8..bde50f9 100644
--- a/components/camel-urlrewrite/pom.xml
+++ b/components/camel-urlrewrite/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/2019236e/examples/camel-example-gauth/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-gauth/pom.xml b/examples/camel-example-gauth/pom.xml
index 0beff95..5603846 100644
--- a/examples/camel-example-gauth/pom.xml
+++ b/examples/camel-example-gauth/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/2019236e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b1bca55..09e75f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -153,7 +153,6 @@
<geronimo-jsp-spec-version>1.1</geronimo-jsp-spec-version>
<geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
<geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version>
- <geronimo-servlet-25-spec-version>1.2</geronimo-servlet-25-spec-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmaven-plugin-version>1.4</gmaven-plugin-version>
<google-app-engine-version>1.8.3</google-app-engine-version>
@@ -1611,11 +1610,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>${geronimo-servlet-25-spec-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>${geronimo-servlet-spec-version}</version>
</dependency>