Author: dkulp
Date: Fri Sep 16 21:32:38 2011
New Revision: 1171802
URL: http://svn.apache.org/viewvc?rev=1171802&view=rev
Log:
Merged revisions 1171798 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1171798 | dkulp | 2011-09-16 17:29:55 -0400 (Fri, 16 Sep 2011) | 1 line
Update to new saaj osgi bundle that doesn't need jaxp-ri
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
cxf/branches/2.4.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml?rev=1171802&r1=1171801&r2=1171802&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
(original)
+++
cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
Fri Sep 16 21:32:38 2011
@@ -17,10 +17,6 @@
limitations under the License.
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";
name="cxf-${project.version}">
- <feature name="jaxp-ri" version="1.4.4_2" resolver='(obr)'>
- <!-- just needed on IBM JDK for SAAJ to work, but not needed otherwise
-->
- <bundle
start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxp-ri/1.4.4_2</bundle>
- </feature>
<feature name="saaj-impl" version="${cxf.saaj.impl.version}"
resolver='(obr)'>
<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='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1171802&r1=1171801&r2=1171802&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Fri Sep 16 21:32:38 2011
@@ -127,7 +127,7 @@
<cxf.servicemix.specs.version>1.8.0</cxf.servicemix.specs.version>
<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.saaj-impl.bundle.version>1.3.9_1</cxf.saaj-impl.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.5_1</cxf.xmlsec.bundle.version>
