You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2021/11/18 16:05:19 UTC

[karaf] branch karaf-4.2.x updated: [KARAF-7276]LinkageError when receiving SOAP message with attachments

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

ffang pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 2a66ce7  [KARAF-7276]LinkageError when receiving SOAP message with attachments
2a66ce7 is described below

commit 2a66ce7651332cdf3161dbc8ce5159dd8eed7e22
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Nov 18 11:03:31 2021 -0500

    [KARAF-7276]LinkageError when receiving SOAP message with attachments
    
    (cherry picked from commit 81168a5d5694c6d4ca6e1dd4003a8e231d7e6edb)
    (cherry picked from commit 6d44d65a84a581802904c3185a46462d4f98ad63)
---
 assemblies/features/base/pom.xml                               | 10 +++++-----
 .../src/main/filtered-resources/resources/etc/jre.properties   |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
index d2290eb..ac69baa 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -59,9 +59,9 @@
             <version>${javax.annotation.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.activation</groupId>
-            <artifactId>javax.activation</artifactId>
-            <version>1.2.0</version>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.activation-api-1.2.1</artifactId>
+            <version>1.2.1_3</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
@@ -203,8 +203,8 @@
                                     <outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>com.sun.activation</groupId>
-                                    <artifactId>javax.activation</artifactId>
+                                    <groupId>org.apache.servicemix.specs</groupId>
+                                    <artifactId>org.apache.servicemix.specs.activation-api-1.2.1</artifactId>
                                     <outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
index 46ffd27..2dcf885 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
@@ -578,6 +578,7 @@ jre-9= \
  javax.activity, \
  javax.annotation;version="1.3", \
  javax.annotation.processing;version="1.0", \
+ javax.activation;version="1.2.1", \
  javax.crypto, \
  javax.crypto.interfaces, \
  javax.crypto.spec, \