Author: ffang
Date: Tue Aug 28 07:53:08 2012
New Revision: 1378006
URL: http://svn.apache.org/viewvc?rev=1378006&view=rev
Log:
[SMX4-1225]upgrade to cxf 2.6.2
Modified:
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
servicemix/smx4/features/trunk/itests/tests/pom.xml
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/parent/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml?rev=1378006&r1=1378005&r2=1378006&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml Tue Aug 28
07:53:08 2012
@@ -41,6 +41,24 @@
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.core</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aop</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: servicemix/smx4/features/trunk/itests/tests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/pom.xml?rev=1378006&r1=1378005&r2=1378006&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/itests/tests/pom.xml Tue Aug 28 07:53:08 2012
@@ -79,6 +79,10 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.ant</artifactId>
</dependency>
<dependency>
@@ -258,6 +262,10 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
+
<artifactId>org.apache.servicemix.specs.java-persistence-api-2.0</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
</dependency>
<dependency>
Modified:
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1378006&r1=1378005&r2=1378006&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Tue Aug 28 07:53:08 2012
@@ -69,6 +69,7 @@ public class CXFNMRIntegrationTest exten
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.saaj-api-1.3"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.2"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.2"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.java-persistence-api-2.0"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.cglib"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl"),
@@ -77,6 +78,7 @@ public class CXFNMRIntegrationTest exten
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.commons-pool"),
getBundle("org.codehaus.woodstox", "stax2-api"),
getBundle("org.codehaus.woodstox", "woodstox-core-asl"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.dom4j"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
getBundle("org.apache.ws.xmlschema", "xmlschema-core"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
Modified:
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1378006&r1=1378005&r2=1378006&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Tue Aug 28 07:53:08 2012
@@ -105,6 +105,7 @@ public class IntegrationTest extends Abs
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.saaj-api-1.3"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.2"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.2"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.java-persistence-api-2.0"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.cglib"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl"),
@@ -112,6 +113,7 @@ public class IntegrationTest extends Abs
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.saaj-impl"),
getBundle("org.codehaus.woodstox", "stax2-api"),
getBundle("org.codehaus.woodstox", "woodstox-core-asl"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.dom4j"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
getBundle("org.apache.ws.xmlschema", "xmlschema-core"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1378006&r1=1378005&r2=1378006&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Tue Aug 28 07:53:08 2012
@@ -40,7 +40,7 @@
<activemq.version>5.5.1</activemq.version>
<activiti.version>5.9</activiti.version>
<camel.version>2.9.0</camel.version>
- <cxf.version>2.6.1</cxf.version>
+ <cxf.version>2.6.2</cxf.version>
<felix.obr.version>1.6.4</felix.obr.version>
@@ -605,6 +605,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
+
<artifactId>org.apache.servicemix.specs.java-persistence-api-2.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1378006&r1=1378005&r2=1378006&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Aug 28 07:53:08 2012
@@ -142,6 +142,7 @@
<geronimo-ws-metadata.version>1.1.3</geronimo-ws-metadata.version>
<!-- ServiceMix Bundles -->
+ <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
<abdera.bundle.version>0.4.0-incubating_4</abdera.bundle.version>
<antlr2.bundle.version>2.7.7_5</antlr2.bundle.version>
<antlr.bundle.version>3.0.1_6</antlr.bundle.version>
@@ -222,7 +223,7 @@
<scriptengines.version>1.1</scriptengines.version>
<spring.version>3.0.6.RELEASE</spring.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
- <wss4j.version>1.6.5</wss4j.version>
+ <wss4j.version>1.6.7</wss4j.version>
<neethi.version>3.0.0</neethi.version>
<xfire.version>1.0.1</xfire.version>
<xbean.version>3.11.1</xbean.version>
@@ -325,6 +326,11 @@
<!-- ServiceMix Bundles -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+ <version>${dom4j.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.abdera</artifactId>
<version>${abdera.bundle.version}</version>
</dependency>
