You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/01/30 15:49:18 UTC
[cxf] branch saaj-impl updated: osgi
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch saaj-impl
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/saaj-impl by this push:
new cefc995 osgi
cefc995 is described below
commit cefc995712856c9fda026123028b5d75368115fa
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Jan 30 11:17:51 2020 +0300
osgi
---
osgi/karaf/features/src/main/resources/features.xml | 13 ++++++++-----
parent/pom.xml | 10 ++++++----
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 239ce65..cb77a87 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -22,7 +22,7 @@
<feature name="cxf-specs" version="${project.version}">
<bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
- <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
+ <bundle start-level="10" dependency="true">mvn:com.sun.activation/jakarta.activation/${cxf.jakarta.activation.version}</bundle>
<bundle start-level="10" dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/${cxf.javax.annotation-api.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.3/${cxf.servicemix.specs.jaxb.version}</bundle>
@@ -58,16 +58,20 @@
<!--bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle>
<bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>-->
</feature>
+ <feature name="saaj-impl" version="${cxf.saaj-impl.version}">
+ <bundle start-level="25">mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}</bundle>
+ <bundle start-level="25">mvn:org.jvnet.mimepull/mimepull/1.9.11</bundle>
+ <bundle start-level="25">mvn:com.sun.xml.messaging.saaj/saaj-impl/${cxf.saaj-impl.version}</bundle>
+ </feature>
<feature name="wss4j" version="${cxf.wss4j.version}">
<feature version="${project.version}">cxf-specs</feature>
+ <feature version="${cxf.saaj-impl.version}">saaj-impl</feature>
<bundle start-level="25" dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
<bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
<bundle start-level="25" dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
<bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.guava.version}</bundle>
<bundle start-level="25" dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cxf.dropwizard3.version}</bundle>
<bundle start-level="25" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
- <bundle start-level="25">mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}</bundle>
- <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
<bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
<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">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
@@ -220,8 +224,7 @@
</feature>
<feature name="cxf-bindings-soap" version="${project.version}">
<feature version="${project.version}">cxf-wsdl</feature>
- <bundle start-level="25">mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}</bundle>
- <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
+ <feature version="${cxf.saaj-impl.version}">saaj-impl</feature>
<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>
</feature>
diff --git a/parent/pom.xml b/parent/pom.xml
index 03113a3..88d92c6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -135,6 +135,7 @@
<cxf.jackson.databind.version>2.10.2</cxf.jackson.databind.version>
<cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.0.0</cxf.jaeger.version>
+ <cxf.jakarta.activation.version>1.2.1</cxf.jakarta.activation.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.javassist.version>3.25.0-GA</cxf.javassist.version>
<cxf.javax.annotation-api.version>1.3.5</cxf.javax.annotation-api.version>
@@ -185,6 +186,7 @@
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.rxjava.version>1.3.8</cxf.rxjava.version>
<cxf.rxjava2.version>2.2.11</cxf.rxjava2.version>
+ <cxf.saaj-impl.version>1.5.1</cxf.saaj-impl.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact>
@@ -199,7 +201,7 @@
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.security.version>5.2.1.RELEASE</cxf.spring.security.version>
<cxf.spring.version>5.2.3.RELEASE</cxf.spring.version>
- <cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>
+ <cxf.stax-ex.version>1.8.1</cxf.stax-ex.version>
<cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.1</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.0</cxf.swagger2.version>
@@ -251,7 +253,7 @@
<cxf.pax.exam.version>4.13.1</cxf.pax.exam.version>
<cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
<cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
- <cxf.saaj-impl.bundle.version>1.3.23_2</cxf.saaj-impl.bundle.version>
+ <cxf.saaj-impl.bundle.version>1.5.1_1</cxf.saaj-impl.bundle.version>
<cxf.servicemix.aspectj.version>1.9.1_1</cxf.servicemix.aspectj.version>
<cxf.servicemix.cglib.version>3.3.0_1</cxf.servicemix.cglib.version>
<cxf.servicemix.javax.el.version>3.0.0_1</cxf.servicemix.javax.el.version>
@@ -2862,7 +2864,7 @@
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
- <version>1.2.1</version>
+ <version>${cxf.jakarta.activation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
@@ -2877,7 +2879,7 @@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>1.5.1</version>
+ <version>${cxf.saaj-impl.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>