You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/07/10 01:34:33 UTC
[cxf] branch main updated: Switching from com.sun.activation/jakarta.activation to org.eclipse.angus/angus-activation (continued) (#970)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 8cba83cdbb Switching from com.sun.activation/jakarta.activation to org.eclipse.angus/angus-activation (continued) (#970)
8cba83cdbb is described below
commit 8cba83cdbb6a1b0d28f6fd7e218b342a42305963
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jul 9 21:34:27 2022 -0400
Switching from com.sun.activation/jakarta.activation to org.eclipse.angus/angus-activation (continued) (#970)
---
core/pom.xml | 2 --
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 24 ++++++++++++++++++++++++
pom.xml | 1 +
rt/bindings/soap/pom.xml | 9 ++++-----
rt/frontend/jaxrs/pom.xml | 9 ++++-----
rt/frontend/jaxws/pom.xml | 1 -
services/wsn/wsn-core/pom.xml | 4 ++++
8 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index e85b3e8932..cb64abdaf4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -178,7 +178,6 @@
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
@@ -233,7 +232,6 @@
<artifactId>saaj-impl</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
<plugins>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 1e003cd21f..1bb30a3e3d 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -273,7 +273,7 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>2.0.1</version>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 806074da39..07ad10e3f1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -767,6 +767,12 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${cxf.jaxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
@@ -1647,6 +1653,12 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>${cxf.jaxb.xjc.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--jaxb-xjc transitive dependency update to avoid ant.jar on classpath -->
<dependency>
@@ -1674,6 +1686,12 @@
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${cxf.jakarta.wsapi.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
@@ -1684,6 +1702,12 @@
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
<version>${cxf.jakarta.soapapi.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
diff --git a/pom.xml b/pom.xml
index 56683f02ce..2fe4a93d6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -689,6 +689,7 @@
<exclude>javax.xml.soap:javax.xml.soap-api</exclude>
<exclude>javax.activation:javax.activation-api</exclude>
<exclude>com.sun.activation:javax.activation</exclude>
+ <exclude>com.sun.activation:jakarta.activation</exclude>
<exclude>javax.annotation:javax.annotation-api</exclude>
<exclude>javax.validation:validation-api</exclude>
<exclude>javax.servlet:servlet-api</exclude>
diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml
index a34d27e391..ffb753e019 100644
--- a/rt/bindings/soap/pom.xml
+++ b/rt/bindings/soap/pom.xml
@@ -105,14 +105,13 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml
index 318c481468..35ac3e9cdf 100644
--- a/rt/frontend/jaxrs/pom.xml
+++ b/rt/frontend/jaxrs/pom.xml
@@ -131,6 +131,10 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
@@ -175,11 +179,6 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>angus-activation</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml
index 55497b4af3..bfb0dce588 100644
--- a/rt/frontend/jaxws/pom.xml
+++ b/rt/frontend/jaxws/pom.xml
@@ -196,7 +196,6 @@
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index 9aaa2fcfbf..75b2803e79 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -128,6 +128,10 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>