You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2019/01/31 14:37:54 UTC

[servicemix-bundles] branch master updated: [SM-3962] Extend java.xml.soap package version range in saaj-impl bundles

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git


The following commit(s) were added to refs/heads/master by this push:
     new ad35a90  [SM-3962] Extend java.xml.soap package version range in saaj-impl bundles
ad35a90 is described below

commit ad35a90a80c7f853647bf9eb85d7597792484d68
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Jan 31 15:31:22 2019 +0100

    [SM-3962] Extend java.xml.soap package version range in saaj-impl bundles
---
 pom.xml                                                      |  1 +
 {saaj-impl-1.5.1 => saaj-impl-1.4.0}/pom.xml                 | 12 ++++++------
 .../META-INF/services/javax.xml.soap.MessageFactory          |  1 +
 .../resources/META-INF/services/javax.xml.soap.MetaFactory   |  1 +
 .../META-INF/services/javax.xml.soap.SOAPConnectionFactory   |  1 +
 .../resources/META-INF/services/javax.xml.soap.SOAPFactory   |  1 +
 saaj-impl-1.4.0/src/main/resources/OSGI-INF/bundle.info      | 11 +++++++++++
 saaj-impl-1.5.1/pom.xml                                      |  2 +-
 8 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67e5bf9..638f53b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,6 +152,7 @@
         <module>c3p0-0.9.5.3</module>
         <module>dom4j-2.1.1</module>
         <module>saaj-impl-1.5.1</module>
+        <module>saaj-impl-1.4.0</module>
     </modules>
 
 </project>
diff --git a/saaj-impl-1.5.1/pom.xml b/saaj-impl-1.4.0/pom.xml
similarity index 94%
copy from saaj-impl-1.5.1/pom.xml
copy to saaj-impl-1.4.0/pom.xml
index b930636..ae1ea91 100644
--- a/saaj-impl-1.5.1/pom.xml
+++ b/saaj-impl-1.4.0/pom.xml
@@ -30,28 +30,28 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
-    <version>1.5.1_1-SNAPSHOT</version>
+    <version>1.4.0_2-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
 
     <scm>
-        <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
-        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
-        <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
+        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-bundles.git</url>
   </scm>
 
     <properties>
         <pkgGroupId>com.sun.xml.messaging.saaj</pkgGroupId>
         <pkgArtifactId>saaj-impl</pkgArtifactId>
-        <pkgVersion>1.5.1</pkgVersion>
+        <pkgVersion>1.4.0</pkgVersion>
         <servicemix.osgi.failok>true</servicemix.osgi.failok>
         <servicemix.osgi.export.pkg>
             com.sun.xml.messaging.saaj
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             org.jvnet.mimepull*;resolution:=optional,
-            javax.xml.soap,
+            javax.xml.soap;version="[1.3,2)",
             javax.xml.transform.stax*;resolution:=optional,
             javax.activation,
             javax.imageio,
diff --git a/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory b/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory
new file mode 100644
index 0000000..62ff39b
--- /dev/null
+++ b/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.MessageFactory
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl
diff --git a/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory b/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory
new file mode 100644
index 0000000..a09cd2b
--- /dev/null
+++ b/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.MetaFactory
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl
diff --git a/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory b/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
new file mode 100644
index 0000000..0b7aac8
--- /dev/null
+++ b/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory
diff --git a/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory b/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory
new file mode 100644
index 0000000..30accae
--- /dev/null
+++ b/saaj-impl-1.4.0/src/main/resources/META-INF/services/javax.xml.soap.SOAPFactory
@@ -0,0 +1 @@
+com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl
diff --git a/saaj-impl-1.4.0/src/main/resources/OSGI-INF/bundle.info b/saaj-impl-1.4.0/src/main/resources/OSGI-INF/bundle.info
new file mode 100644
index 0000000..0cd523a
--- /dev/null
+++ b/saaj-impl-1.4.0/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,11 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    SAAJ (SOAP with Attachments API for Java) allows the support of attachment to the SOAP protocol.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://java.net/projects/saaj/\u001B[0m
diff --git a/saaj-impl-1.5.1/pom.xml b/saaj-impl-1.5.1/pom.xml
index b930636..9d5199c 100644
--- a/saaj-impl-1.5.1/pom.xml
+++ b/saaj-impl-1.5.1/pom.xml
@@ -51,7 +51,7 @@
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             org.jvnet.mimepull*;resolution:=optional,
-            javax.xml.soap,
+            javax.xml.soap;version="[1.3,2)",
             javax.xml.transform.stax*;resolution:=optional,
             javax.activation,
             javax.imageio,