You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/05/16 08:22:11 UTC
svn commit: r1103619 - in /cxf/trunk:
distribution/karaf/features/src/main/resources/features.xml parent/pom.xml
Author: ningjiang
Date: Mon May 16 06:22:11 2011
New Revision: 1103619
URL: http://svn.apache.org/viewvc?rev=1103619&view=rev
Log:
CXF-3515, CXF-3519 reuse the Jetty features of karaf and update the Karaf version to 2.2.1
Modified:
cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.xml
Modified: cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/src/main/resources/features.xml?rev=1103619&r1=1103618&r2=1103619&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Mon May 16 06:22:11 2011
@@ -36,7 +36,6 @@
<bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
<bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
</feature>
-
<feature name="spring-jms" version="${cxf.spring.version}">
<feature version="${cxf.spring.version}">spring</feature>
<bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle>
@@ -45,18 +44,6 @@
<bundle>mvn:org.springframework/spring-tx/${cxf.spring.version}</bundle>
<bundle>mvn:org.springframework/spring-web/${cxf.spring.version}</bundle>
</feature>
- <feature name='jetty' version='${cxf.jetty.version}'>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${cxf.geronimo.servlet25.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${cxf.asm.bundle.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-util/${cxf.jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-io/${cxf.jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-http/${cxf.jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-continuation/${cxf.jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-server/${cxf.jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-security/${cxf.jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-servlet/${cxf.jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-xml/${cxf.jetty.version}</bundle>
- </feature>
<!-- Current the abdera bundle is not working as we expect -->
<feature name='abdera' version='${cxf.abdera.version}'>
<bundle>mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1103619&r1=1103618&r2=1103619&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon May 16 06:22:11 2011
@@ -114,7 +114,7 @@
<!-- various OSGi related versions -->
<cxf.aries.version>0.3</cxf.aries.version>
<cxf.osgi.version>4.2.0</cxf.osgi.version>
- <cxf.karaf.version>2.2.0</cxf.karaf.version>
+ <cxf.karaf.version>2.2.1</cxf.karaf.version>
<cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
<cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
@@ -123,7 +123,7 @@
<cxf.javax.mail.version>1.4.3</cxf.javax.mail.version>
<cxf.jaxb.bundle.version>2.2.1.1_1</cxf.jaxb.bundle.version>
<cxf.saaj-impl.bundle.version>1.3.2_2</cxf.saaj-impl.bundle.version>
- <cxf.asm.bundle.version>3.3_1</cxf.asm.bundle.version>
+ <cxf.asm.bundle.version>3.3_2</cxf.asm.bundle.version>
<cxf.wsdl4j.bundle.version>1.6.2_3</cxf.wsdl4j.bundle.version>
<cxf.xmlsec.bundle.version>1.4.4_1</cxf.xmlsec.bundle.version>
<cxf.rhino.bundle.version>1.7R2_1</cxf.rhino.bundle.version>