Author: hadrian
Date: Fri Apr 8 01:20:54 2011
New Revision: 1090080
URL: http://svn.apache.org/viewvc?rev=1090080&view=rev
Log:
CAMEL-3786. Backport to 2.7.1
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/tests/camel-itest-osgi/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 8 01:20:54 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087856,1088583,1088916-1088917,1089275
+/camel/trunk:1083696,1087276,1087856,1088583,1088916-1088917,1089275
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 8 01:20:54 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087856,1088583,1088916-1088917,1089275
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087856,1088583,1088916-1088917,1089275
Modified: camel/branches/camel-2.7.x/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tests/camel-itest-osgi/pom.xml?rev=1090080&r1=1090079&r2=1090080&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tests/camel-itest-osgi/pom.xml (original)
+++ camel/branches/camel-2.7.x/tests/camel-itest-osgi/pom.xml Fri Apr 8
01:20:54 2011
@@ -61,18 +61,38 @@
<artifactId>pax-exam-junit-extender-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.0.1</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tinybundles</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>org.apache.karaf.tooling.testing</artifactId>
+ <version>2.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>manual</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -201,11 +221,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
