Author: davsclaus
Date: Tue Jun 15 07:20:58 2010
New Revision: 954728
URL: http://svn.apache.org/viewvc?rev=954728&view=rev
Log:
CAMEL-2807: Upgraded to Jetty 7.1.4. Fixed camel-cometd to not depend on
camel-stream as it was only used for testing purpose.
Modified:
camel/trunk/components/camel-cometd/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-cometd/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/pom.xml?rev=954728&r1=954727&r2=954728&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/pom.xml (original)
+++ camel/trunk/components/camel-cometd/pom.xml Tue Jun 15 07:20:58 2010
@@ -40,10 +40,6 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-stream</artifactId>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
@@ -52,6 +48,10 @@
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-server</artifactId>
<version>1.0.1</version>
@@ -68,11 +68,15 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <!-- stream is used for interactive test -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-stream</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=954728&r1=954727&r2=954728&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Jun 15 07:20:58 2010
@@ -1029,6 +1029,11 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty-version}</version>
</dependency>
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml?rev=954728&r1=954727&r2=954728&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring3.xml
Tue Jun 15 07:20:58 2010
@@ -227,7 +227,6 @@
<bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
- <feature version='${pom.version}'>camel-stream</feature>
<bundle>mvn:org.apache.camel/camel-cometd/${pom.version}</bundle>
</feature>
<feature name='camel-csv' version='${pom.version}'>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=954728&r1=954727&r2=954728&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Jun 15 07:20:58 2010
@@ -227,7 +227,6 @@
<bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
- <feature version='${pom.version}'>camel-stream</feature>
<bundle>mvn:org.apache.camel/camel-cometd/${pom.version}</bundle>
</feature>
<feature name='camel-csv' version='${pom.version}'>