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

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git

commit d6a95f206503934a31e5e494c0fd2dcfb5b099ad
Author: Andreas Veithen <[email protected]>
AuthorDate: Sun Oct 29 16:13:58 2023 +0000

    AXIOM-506: Only include Jakarta versions of JARs in the distribution
    
    Otherwise we end up with conflicting classes.
---
 distribution/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index f59e83248..e983ad219 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -58,7 +58,12 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>axiom-javax-jaxb</artifactId>
+            <artifactId>axiom-jakarta-activation</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axiom-jakarta-jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

Reply via email to