Author: dkulp
Date: Tue Jan 24 21:54:22 2012
New Revision: 1235517
URL: http://svn.apache.org/viewvc?rev=1235517&view=rev
Log:
Updates to features.xml and various imports
Modified:
cxf/trunk/api/pom.xml
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/rt/databinding/aegis/pom.xml
cxf/trunk/rt/ws/rm/pom.xml
cxf/trunk/rt/ws/security/pom.xml
Modified: cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1235517&r1=1235516&r2=1235517&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Tue Jan 24 21:54:22 2012
@@ -42,6 +42,7 @@
org.apache.commons.lang*;resolution:=optional;version="${cxf.osgi.commons.lang.version}",
javax.resource*;resolution:=optional
</cxf.osgi.import>
+ <cxf.osgi.dynamic.import>org.apache.cxf.bus</cxf.osgi.dynamic.import>
</properties>
<dependencies>
@@ -116,16 +117,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Fragment-Host></Fragment-Host>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<version>${cxf.xjc-utils.version}</version>
Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1235517&r1=1235516&r2=1235517&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Tue Jan 24
21:54:22 2012
@@ -53,6 +53,8 @@
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
<bundle
start-level='10'>mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
<bundle
start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${cxf.servicemix.specs.version}</bundle>
+ <bundle
start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
+ <bundle
start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
</feature>
<feature name='cxf-jaxb' version='${project.version}' resolver='(obr)'>
@@ -62,6 +64,7 @@
</feature>
<!-- Current the abdera bundle is not working as we expect -->
<feature name='cxf-abdera' version='${project.version}' resolver='(obr)'>
+ <feature version='${project.version}'>cxf-jaxb</feature>
<bundle
dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-impl/${cxf.axiom.version}</bundle>
<bundle>mvn:org.apache.ws.commons.axiom/axiom-api/${cxf.axiom.version}</bundle>
@@ -75,16 +78,21 @@
<bundle>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-client/${cxf.abdera.version}</bundle>
<bundle>mvn:org.apache.abdera/abdera-server/${cxf.abdera.version}</bundle-->
- <feature version='${project.version}'>cxf-jaxb</feature>
</feature>
<feature name="opensaml" version="${cxf.opensaml.osgi.version}"
resolver='(obr)'>
<bundle>mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
</feature>
<feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
+ <feature version='${project.version}'>cxf-core</feature>
<feature version='[2.4,3)'>opensaml</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${cxf.xmlsec.bundle.version}</bundle>
- <bundle>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
+ <feature version='${project.version}'>cxf-saaj-impl</feature>
+ <feature version='${project.version}'>cxf-bindings-soap</feature>
+ <bundle start-level="30"
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
+ <bundle start-level="30"
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
+ <bundle start-level="30"
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
+ <bundle start-level="30"
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${cxf.xmlsec.bundle.version}</bundle>
+ <bundle
start-level="35">mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
</feature>
<feature name="cxf-saaj-impl" version="${project.version}"
resolver='(obr)'>
@@ -98,20 +106,170 @@
org.ops4j.pax.url.war.importPaxLoggingPackages=true
</config>
<feature>http</feature>
- <bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/1.0.7</bundle>
-
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.0.7</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-deployer/1.0.7</bundle>
- <bundle>mvn:org.ops4j.pax.url/pax-url-war/1.2.8</bundle>
+ <bundle
start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-war/1.0.7</bundle>
+ <bundle
start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/1.0.7</bundle>
+ <bundle
start-level="30">mvn:org.ops4j.pax.web/pax-web-deployer/1.0.7</bundle>
+ <bundle
start-level="30">mvn:org.ops4j.pax.url/pax-url-war/1.2.8</bundle>
+ </feature>
+
+
+ <feature name="cxf-core" version="${project.version}" resolver='(obr)'>
+ <feature version='${project.version}'>cxf-specs</feature>
+ <feature version='${project.version}'>cxf-jaxb</feature>
+
+ <bundle start-level='30'
dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
+ <bundle start-level='30'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
+ <bundle start-level='30'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
+ <bundle start-level='30'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
+ <bundle start-level='30'
dependency="true">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
+
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-common-utilities/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-api/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-core/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-management/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf.karaf/cxf-karaf-commands/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-ws-policy" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle start-level='30'
dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-policy/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-ws-rm" version="${project.version}" resolver='(obr)'>
+ <feature version="${project.version}">cxf-ws-policy</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-rm/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-ws-mex" version="${project.version}" resolver='(obr)'>
+ <feature version="${project.version}">cxf-ws-policy</feature>
+ <bundle start-level='40'
dependency="true">mvn:org.apache.cxf/cxf-rt-ws-addr/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-mex/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-ws-security" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-ws-policy</feature>
+ <feature version="${cxf.wss4j.version}">wss4j</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
</feature>
+ <feature name="cxf-http" version="${project.version}" resolver='(obr)'>
+ <feature version="[2,3)">http</feature>
+ <feature version="[2,3)">cxf-war-java5</feature>
+
+ <feature version="${project.version}">cxf-core</feature>
+ <feature version="${project.version}">cxf-ws-policy</feature>
+
+ <bundle start-level='40'
dependency="true">mvn:org.apache.cxf/cxf-rt-transports-common/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-http-jetty" version="${project.version}"
resolver='(obr)'>
+ <feature version="[2,3)">cxf-http</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-bindings-soap" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-policy/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-soap/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-addr/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-jaxws" version="${project.version}" resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <feature version="${project.version}">cxf-http-jetty</feature>
+ <feature version="${project.version}">cxf-saaj-impl</feature>
+ <feature version="${project.version}">cxf-databinding-jaxb</feature>
+
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-simple/${project.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxws/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-jaxrs" version="${project.version}" resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-databinding-aegis" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-databinding-aegis/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-databinding-jaxb" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-databinding-jaxb/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-databinding-xmlbeans" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle start-level='30'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${cxf.xmlbeans.bundle.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-databinding-xmlbeans/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-bindings-corba" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-corba/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-bindings-coloc" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-coloc/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-bindings-object" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-coloc/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-transports-local" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-local/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-transports-jms" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <feature version="[3,4)">spring-jms</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}</bundle>
+ </feature>
+
+ <feature name="cxf-javascript" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-javascript/${project.version}</bundle>
+ </feature>
+ <feature name="cxf-frontend-javascript" version="${project.version}"
resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+ <bundle start-level='40'
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${cxf.rhino.bundle.version}</bundle>
+ <bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-js/${project.version}</bundle>
+ </feature>
+
+
+ <feature name="cxf-tools" version="${project.version}" resolver='(obr)'>
+ <feature version="${project.version}">cxf-core</feature>
+
+ <feature version="${project.version}">cxf-databinding-jaxb</feature>
+ <feature version="${project.version}">cxf-databinding-aegis</feature>
+ <feature version="${project.version}">cxf-bindings-soap</feature>
+ <feature version="${project.version}">cxf-jaxrs</feature>
+ <feature version="${project.version}">cxf-jaxws</feature>
+ <feature version="${project.version}">cxf-javascript</feature>
+
+
<bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
+
<bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
+
+
+ <bundle>mvn:org.apache.cxf/cxf-tools-common/${project.version}</bundle>
+
<bundle>mvn:org.apache.cxf/cxf-tools-java2ws/${project.version}</bundle>
+
<bundle>mvn:org.apache.cxf/cxf-tools-misctools/${project.version}</bundle>
+
<bundle>mvn:org.apache.cxf/cxf-tools-validator/${project.version}</bundle>
+
<bundle>mvn:org.apache.cxf/cxf-tools-wadlto-jaxrs/${project.version}</bundle>
+
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-core/${project.version}</bundle>
+
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-databinding-jaxb/${project.version}</bundle>
+
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-javascript/${project.version}</bundle>
+
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-jaxws/${project.version}</bundle>
+ </feature>
+
+
+
+
+
<feature name="cxf-alldeps" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-specs</feature>
<bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
<bundle
start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle>
- <bundle
start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
- <bundle
start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
<feature version='${project.version}'>cxf-jaxb</feature>
<feature version="[2,3)">http</feature>
@@ -141,66 +299,38 @@
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
</feature>
- <feature name="cxf" version="${project.version}" resolver='(obr)'>
+ <feature name="cxf-bigbundle" version="${project.version}"
resolver='(obr)'>
<feature version="${project.version}">cxf-alldeps</feature>
<bundle
start-level='30'>mvn:org.apache.cxf/cxf-bundle/${project.version}</bundle>
<bundle>mvn:org.apache.cxf.karaf/cxf-karaf-commands/${project.version}</bundle>
</feature>
- <feature name="cxf-core" version="${project.version}" resolver='(obr)'>
- <feature version="${project.version}">cxf-alldeps</feature>
-
<bundle>mvn:org.apache.cxf/cxf-common-utilities/${project.version}</bundle>
-
- <bundle>mvn:org.apache.cxf/cxf-api/${project.version}</bundle>
- <bundle>mvn:org.apache.cxf/cxf-rt-core/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-management/${project.version}</bundle>
-
- <bundle>mvn:org.apache.cxf/cxf-rt-ws-policy/${project.version}</bundle>
- <bundle>mvn:org.apache.cxf/cxf-rt-ws-addr/${project.version}</bundle>
-
-
<bundle>mvn:org.apache.cxf/cxf-rt-databinding-jaxb/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-databinding-aegis/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-databinding-xmlbeans/${project.version}</bundle>
-
- <bundle>mvn:org.apache.cxf/cxf-tools-common/${project.version}</bundle>
-
-
<bundle>mvn:org.apache.cxf/cxf-rt-transports-common/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-transports-local/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}</bundle>
-
-
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-soap/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-coloc/${project.version}</bundle>
-
-
-
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-corba/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-object/${project.version}</bundle>
-
-
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-simple/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxws/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-js/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-javascript/${project.version}</bundle>
-
- <bundle>mvn:org.apache.cxf/cxf-rt-ws-mex/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle>
-
- <bundle>mvn:org.apache.cxf/cxf-rt-ws-rm/${project.version}</bundle>
+ <feature name="cxf" version="${project.version}" resolver='(obr)'>
+ <feature version="[3,4)">spring</feature>
+ <feature version="[1.2,2)">spring-dm</feature>
+ <feature version="${project.version}">cxf-core</feature>
+ <feature version="${project.version}">cxf-jaxws</feature>
+ <feature version="${project.version}">cxf-jaxrs</feature>
+
+ <feature version="${project.version}">cxf-databinding-aegis</feature>
+ <feature
version="${project.version}">cxf-databinding-xmlbeans</feature>
+ <feature version="${project.version}">cxf-bindings-corba</feature>
+ <feature version="${project.version}">cxf-bindings-coloc</feature>
+ <feature version="${project.version}">cxf-bindings-object</feature>
+
+ <feature version="${project.version}">cxf-transports-local</feature>
+ <feature version="${project.version}">cxf-transports-jms</feature>
+
+ <feature version="${project.version}">cxf-tools</feature>
+
+ <feature version="${project.version}">cxf-ws-security</feature>
+ <feature version="${project.version}">cxf-ws-rm</feature>
+ <feature version="${project.version}">cxf-ws-mex</feature>
+ <feature version="${project.version}">cxf-javascript</feature>
+ <feature version="${project.version}">cxf-frontend-javascript</feature>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
-
-
<bundle>mvn:org.apache.cxf/cxf-tools-java2ws/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-tools-misctools/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-tools-validator/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-tools-wadlto-jaxrs/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-core/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-databinding-jaxb/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-javascript/${project.version}</bundle>
-
<bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-jaxws/${project.version}</bundle>
-
<!-- needs jra
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-http/${project.version}</bundle-->
<!-- need msv
Modified: cxf/trunk/rt/databinding/aegis/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/pom.xml?rev=1235517&r1=1235516&r2=1235517&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ cxf/trunk/rt/databinding/aegis/pom.xml Tue Jan 24 21:54:22 2012
@@ -83,6 +83,7 @@
<artifactId>jdom</artifactId>
<version>${cxf.jdom.version}</version>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: cxf/trunk/rt/ws/rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=1235517&r1=1235516&r2=1235517&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Tue Jan 24 21:54:22 2012
@@ -45,11 +45,13 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -113,6 +115,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
</dependencies>
Modified: cxf/trunk/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=1235517&r1=1235516&r2=1235517&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Tue Jan 24 21:54:22 2012
@@ -71,12 +71,14 @@
<artifactId>cxf-rt-ws-mex</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
