You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/03/14 06:26:08 UTC
svn commit: r922764 - in /camel/branches/camel-1.x:
components/camel-rest/pom.xml parent/pom.xml platforms/karaf/features/pom.xml
Author: ningjiang
Date: Sun Mar 14 05:26:08 2010
New Revision: 922764
URL: http://svn.apache.org/viewvc?rev=922764&view=rev
Log:
CAMEL-2548 upgrade jetty version 6.1.22 in camel-1.x branch
Modified:
camel/branches/camel-1.x/components/camel-rest/pom.xml
camel/branches/camel-1.x/parent/pom.xml
camel/branches/camel-1.x/platforms/karaf/features/pom.xml
Modified: camel/branches/camel-1.x/components/camel-rest/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-rest/pom.xml?rev=922764&r1=922763&r2=922764&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-rest/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-rest/pom.xml Sun Mar 14 05:26:08 2010
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
+ <artifactId>jsp-2.1-jetty</artifactId>
<version>${jetty-version}</version>
<scope>test</scope>
</dependency>
Modified: camel/branches/camel-1.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=922764&r1=922763&r2=922764&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Sun Mar 14 05:26:08 2010
@@ -48,7 +48,7 @@
<httpcore-version>4.0-beta3</httpcore-version>
<httpcore-niossl-version>4.0-alpha6</httpcore-niossl-version>
<httpclient-version>3.1</httpclient-version>
- <jetty-version>6.1.14</jetty-version>
+ <jetty-version>6.1.22</jetty-version>
<slf4j-version>1.5.6</slf4j-version>
<openjpa-version>1.2.0</openjpa-version>
<spring-version>2.5.6</spring-version>
Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=922764&r1=922763&r2=922764&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Sun Mar 14 05:26:08 2010
@@ -71,8 +71,7 @@
<jcr-bundle-version>1.0_2</jcr-bundle-version>
<jdom-bundle-version>1.1_2</jdom-bundle-version>
<jettison-bundle-version>1.1</jettison-bundle-version>
- <jetty-bundle-version>6.1.14_2</jetty-bundle-version>
- <jetty-cometd-bundle-version>6.1.11_3</jetty-cometd-bundle-version>
+ <jetty-bundle-version>6.1.22_1</jetty-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
<jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
<josql-bundle-version>1.5_3</josql-bundle-version>