You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/05/04 09:12:21 UTC
svn commit: r1099344 - in /camel/trunk/platforms/karaf/features: pom.xml
src/main/resources/config.properties src/main/resources/features.xml
Author: ningjiang
Date: Wed May 4 07:12:20 2011
New Revision: 1099344
URL: http://svn.apache.org/viewvc?rev=1099344&view=rev
Log:
CAMEL-3879 updated the camel-cxf feature for CXF 2.4.0
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/config.properties
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1099344&r1=1099343&r2=1099344&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed May 4 07:12:20 2011
@@ -96,7 +96,7 @@
<lucene-bundle-version>3.0.3_1</lucene-bundle-version>
<mvel-bundle-version>2.0.8_4</mvel-bundle-version>
<mina-bundle-version>1.1.7_3</mina-bundle-version>
- <neethi-bundle-version>2.0.4_2</neethi-bundle-version>
+ <neethi-bundle-version>3.0.0</neethi-bundle-version>
<oro-bundle-version>2.0.8_3</oro-bundle-version>
<openjpa-bundle-version>1.2.1_2</openjpa-bundle-version>
<opensaml-version>1.1_3</opensaml-version>
@@ -125,7 +125,7 @@
<xalan-bundle-version>2.7.1_2</xalan-bundle-version>
<xerces-bundle-version>2.9.1_3</xerces-bundle-version>
<xmlbeans-bundle-version>2.5.0_1</xmlbeans-bundle-version>
- <xmlschema-version>1.4.5</xmlschema-version>
+ <xmlschema-version>2.0</xmlschema-version>
<xmlsec-bundle-version>1.4.4_1</xmlsec-bundle-version>
<xmlresolver-bundle-version>1.2_2</xmlresolver-bundle-version>
<xpp3-bundle-version>1.1.4c_3</xpp3-bundle-version>
@@ -135,7 +135,7 @@
<stax2-api-bundle-version>3.0.1</stax2-api-bundle-version>
<saaj-impl-version>1.3.2_1</saaj-impl-version>
<wsdl4j-bundle-version>1.6.2_2</wsdl4j-bundle-version>
- <wss4j-version>1.5.11</wss4j-version>
+ <wss4j-version>1.6.0</wss4j-version>
</properties>
<!-- The validate plugin will export these provided dependencies bundles' export packages first -->
Modified: camel/trunk/platforms/karaf/features/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/config.properties?rev=1099344&r1=1099343&r2=1099344&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/config.properties (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/config.properties Wed May 4 07:12:20 2011
@@ -35,6 +35,7 @@ org.osgi.framework.bootdelegation=sun.*,
# - some com.sun.org.apache.* are exported
# - com.sun.jndi.ldap package is exported
# - javax.transaction* is exported with a mandatory attribute
+# Added the javax.script into jre-1.5 to workaround the configure issue of karaf feature plugin
jre-1.5=, \
com.sun.org.apache.xalan.internal.xsltc.trax, \
com.sun.org.apache.xerces.internal.dom, \
@@ -76,6 +77,7 @@ jre-1.5=, \
javax.rmi, \
javax.rmi.CORBA, \
javax.rmi.ssl, \
+ javax.script, \
javax.security.auth, \
javax.security.auth.callback, \
javax.security.auth.kerberos, \
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1099344&r1=1099343&r2=1099344&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed May 4 07:12:20 2011
@@ -67,14 +67,14 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-core-bundle-version}</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle>
- <bundle dependency="true">mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${xmlschema-version}</bundle>
<bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
<bundle dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi-bundle-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.neethi/neethi/${neethi-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>