Author: jbonofre
Date: Mon Jun 21 19:54:41 2010
New Revision: 956678
URL: http://svn.apache.org/viewvc?rev=956678&view=rev
Log:
[SMXCOMP-764] Cleanup CXF/NMR bundle imports.
Modified:
servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/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=956678&r1=956677&r2=956678&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-binding-nmr/pom.xml Mon Jun 21
19:54:41 2010
@@ -95,14 +95,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- javax.xml.rpc*;resolution:=optional,
- javax.xml.soap,
- com.ctc.wstx.stax;resolution:=optional,
- org.apache.axis.soap;resolution:=optional,
- org.apache.axis2.saaj;resolution:=optional,
-
com.sun.xml.messaging.saaj.soap.ver1_1;resolution:=optional,
-
com.sun.xml.messaging.saaj.client.p2p;resolution:=optional,
-
com.sun.xml.messaging.saaj.soap;resolution:=optional,
+ javax.xml.stream;version="[0.0,2)",
*
</Import-Package>
<!-- Needed for jaxb annotations classes -->
@@ -114,6 +107,7 @@
<Private-Package />
<_failok>true</_failok>
<Spring-Context>*;publish-context:=false</Spring-Context>
+
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml?rev=956678&r1=956677&r2=956678&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/pom.xml Mon Jun 21
19:54:41 2010
@@ -87,14 +87,10 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
- javax.xml.rpc*;resolution:=optional,
- javax.xml.soap,
- com.ctc.wstx.stax;resolution:=optional,
- org.apache.axis.soap;resolution:=optional,
- org.apache.axis2.saaj;resolution:=optional,
-
com.sun.xml.messaging.saaj.soap.ver1_1;resolution:=optional,
-
com.sun.xml.messaging.saaj.client.p2p;resolution:=optional,
-
com.sun.xml.messaging.saaj.soap;resolution:=optional,
+ javax.xml.bind*;version="[0.0,3)",
+ javax.activation;version="[0.0,2)",
+ javax.annotation;version="[0.0,2)",
+ javax.jws*;version="[0.0,3)",
*
</Import-Package>
<!-- Needed for jaxb annotations classes -->
@@ -107,6 +103,7 @@
<Private-Package />
<_failok>true</_failok>
<Spring-Context>*;publish-context:=false</Spring-Context>
+
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
