You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2012/04/25 07:03:58 UTC
svn commit: r1330102 - in /camel/trunk: components/camel-cxf/pom.xml
components/camel-soap/pom.xml parent/pom.xml tests/camel-itest-osgi/pom.xml
Author: dkulp
Date: Wed Apr 25 05:03:58 2012
New Revision: 1330102
URL: http://svn.apache.org/viewvc?rev=1330102&view=rev
Log:
[CAMEL-5214] Update to CXF 2.6.0
Modified:
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-soap/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1330102&r1=1330101&r2=1330102&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Wed Apr 25 05:03:58 2012
@@ -206,6 +206,19 @@
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -317,26 +330,6 @@
</build>
<profiles>
- <profile>
- <id>cxf-2.6</id>
- <properties>
- <cxf-version>2.6.0-SNAPSHOT</cxf-version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>${cxf-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </profile>
<profile>
<id>fastinstall</id>
<properties>
Modified: camel/trunk/components/camel-soap/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=1330102&r1=1330101&r2=1330102&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Wed Apr 25 05:03:58 2012
@@ -72,7 +72,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
+ <artifactId>cxf-api</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1330102&r1=1330101&r2=1330102&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Apr 25 05:03:58 2012
@@ -61,8 +61,8 @@
<commons-net-version>3.1</commons-net-version>
<commons-pool-version>1.6</commons-pool-version>
<concurrentlinkedhashmap.version>1.2</concurrentlinkedhashmap.version>
- <cxf-version>2.5.3</cxf-version>
- <cxf-xjc-utils-version>2.4.0</cxf-xjc-utils-version>
+ <cxf-version>2.6.0</cxf-version>
+ <cxf-xjc-utils-version>2.6.0</cxf-xjc-utils-version>
<derby-version>10.8.2.2</derby-version>
<dnsjava-version>2.1.1</dnsjava-version>
<dozer-version>5.3.2</dozer-version>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1330102&r1=1330101&r2=1330102&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Wed Apr 25 05:03:58 2012
@@ -344,10 +344,28 @@
<!-- cxf -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>