You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2020/01/08 10:35:34 UTC
[cxf] branch CXF-7910_jakarta_jaxws-api updated: [CXF-7910] use
Jakarta activation
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch CXF-7910_jakarta_jaxws-api
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/CXF-7910_jakarta_jaxws-api by this push:
new bc4ea13 [CXF-7910] use Jakarta activation
bc4ea13 is described below
commit bc4ea132eafb8d6668b07667f7acfcd94f1f7d62
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Wed Jan 8 11:34:49 2020 +0100
[CXF-7910] use Jakarta activation
---
distribution/src/main/release/samples/pom.xml | 6 +++---
osgi/karaf/features/pom.xml | 4 ++++
parent/pom.xml | 4 ++--
pom.xml | 4 ++++
rt/rs/extensions/search/pom.xml | 4 ++++
rt/rs/security/oauth-parent/oauth2/pom.xml | 12 ++++++++----
rt/rs/security/sso/oidc/pom.xml | 12 ++++++++----
services/wsn/wsn-core/pom.xml | 8 ++++++++
systests/rs-security/pom.xml | 4 ++++
9 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index c5f3f34..7a91310 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -266,9 +266,9 @@
<version>2.3.2</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
diff --git a/osgi/karaf/features/pom.xml b/osgi/karaf/features/pom.xml
index 4829175..f9e3a35 100644
--- a/osgi/karaf/features/pom.xml
+++ b/osgi/karaf/features/pom.xml
@@ -41,6 +41,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9fe5168..8409903 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2884,8 +2884,8 @@
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- <version>1.2.0</version>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
diff --git a/pom.xml b/pom.xml
index dc58d2f..8d71e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -686,6 +686,10 @@
<exclude>javax.xml.ws:jaxws-api</exclude>
<exclude>javax.jws:javax.jws-api</exclude>
<exclude>javax.xml.soap:javax.xml.soap-api</exclude>
+ <exclude>javax.activation:javax.activation-api</exclude>
+ <exclude>com.sun.activation:javax.activation</exclude>
+ <!--<exclude>javax.validation:validation-api</exclude>
+ <exclude>javax.annotation:javax.annotation-api</exclude>-->
</excludes>
</bannedDependencies>
</rules>
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index baa81da..b45594c 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -143,6 +143,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 98ef41d..bfa251b 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -123,10 +123,14 @@
<scope>test</scope>
<optional>true</optional>
<exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index cc20747..17a1dae 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -85,10 +85,14 @@
<version>${cxf.hibernate.em.version}</version>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml
index fa35277..ba13435 100644
--- a/services/wsn/wsn-core/pom.xml
+++ b/services/wsn/wsn-core/pom.xml
@@ -136,6 +136,14 @@
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index 8bb870f..67a1b60 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -244,6 +244,10 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>