L.S.,
I think we should consider to defer these changes until after the 4.5.0 release and only upgrade to CXF 2.6.4 in 4.5.1 - we plan to use the Camel 2.10.3 release which still has a reference to CXF 2.6.3 in its features.xml file (cfr. http://search.maven.org/remotecontent?filepath=org/apache/camel/karaf/apache-camel/2.10.3/apache-camel-2.10.3-features.xml) so if we do this now, we will end up with two different CXF features descriptors in the container. The alternative would be to delay the 4.5.0 release again in order for Camel to pick up on CXF 2.6.4 and do a release with that version as well. Regards, Gert On Thu, Dec 13, 2012 at 11:28 AM, <[email protected]> wrote: > Author: ffang > Date: Thu Dec 13 10:28:05 2012 > New Revision: 1421198 > > URL: http://svn.apache.org/viewvc?rev=1421198&view=rev > Log: > [SMX4-1318]upgrade to cxf 2.6.4 > > Modified: > servicemix/smx4/features/trunk/parent/pom.xml > servicemix/smx4/features/trunk/pom.xml > > Modified: servicemix/smx4/features/trunk/parent/pom.xml > URL: > http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1421198&r1=1421197&r2=1421198&view=diff > > ============================================================================== > --- servicemix/smx4/features/trunk/parent/pom.xml (original) > +++ servicemix/smx4/features/trunk/parent/pom.xml Thu Dec 13 10:28:05 2012 > @@ -40,7 +40,7 @@ > <activemq.version>5.7.0</activemq.version> > <activiti.version>5.10</activiti.version> > <camel.version>2.10.2</camel.version> > - <cxf.version>2.6.3</cxf.version> > + <cxf.version>2.6.4</cxf.version> > > <felix.obr.version>1.6.4</felix.obr.version> > > > Modified: servicemix/smx4/features/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1421198&r1=1421197&r2=1421198&view=diff > > ============================================================================== > --- servicemix/smx4/features/trunk/pom.xml (original) > +++ servicemix/smx4/features/trunk/pom.xml Thu Dec 13 10:28:05 2012 > @@ -187,7 +187,7 @@ > <xerces.bundle.version>2.9.1_4</xerces.bundle.version> > <xmlbeans.bundle.version>2.5.0_1</xmlbeans.bundle.version> > <xmlresolver.bundle.version>1.2_3</xmlresolver.bundle.version> > - <xmlsec.bundle.version>1.5.1</xmlsec.bundle.version> > + <xmlsec.bundle.version>1.5.2</xmlsec.bundle.version> > > <!-- ServiceMix legal shared resources --> > <servicemix.legal.version>1.0</servicemix.legal.version> > @@ -204,7 +204,7 @@ > > <!-- Other Dependencies --> > <axiom.version>1.2.12</axiom.version> > - <bouncycastle.version>140</bouncycastle.version> > + <bouncycastle.version>1.47</bouncycastle.version> > <commons-jexl.version>2.0.1</commons-jexl.version> > <commons-lang.version>2.6</commons-lang.version> > <commons-logging.version>1.1.1</commons-logging.version> > @@ -224,7 +224,7 @@ > <scriptengines.version>1.1</scriptengines.version> > <spring.version>3.0.7.RELEASE</spring.version> > <spring.osgi.version>1.2.1</spring.osgi.version> > - <wss4j.version>1.6.7</wss4j.version> > + <wss4j.version>1.6.8</wss4j.version> > <neethi.version>3.0.0</neethi.version> > <xfire.version>1.0.1</xfire.version> > <xbean.version>3.11.1</xbean.version> > @@ -523,8 +523,8 @@ > > <!-- Other Dependencies --> > <dependency> > - <groupId>bouncycastle</groupId> > - <artifactId>bcprov-jdk14</artifactId> > + <groupId>org.bouncycastle</groupId> > + <artifactId>bcprov-jdk15on</artifactId> > <version>${bouncycastle.version}</version> > </dependency> > <dependency> > > >
