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/06/10 18:43:01 UTC
[cxf] branch master updated: CXF-8198: Update CDI module to use
Jakarta CDI and Inject API dependencies
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b7e7939 CXF-8198: Update CDI module to use Jakarta CDI and Inject API dependencies
b7e7939 is described below
commit b7e79397c65260c59c51fb50c76a82de437abb82
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Wed Jun 10 20:42:40 2020 +0200
CXF-8198: Update CDI module to use Jakarta CDI and Inject API dependencies
---
distribution/javadoc/pom.xml | 4 ++--
distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml | 4 ++--
.../src/main/release/samples/jax_rs/sse_spring/pom.xml | 6 +++---
integration/cdi/pom.xml | 10 +++++-----
parent/pom.xml | 6 +++---
rt/rs/microprofile-client/pom.xml | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index dcf240d..4269ccb 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -219,8 +219,8 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
index 6a1988a..f45082a 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
@@ -13,8 +13,8 @@
<dependencies>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
index 0f64f5d..5a5374c 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
@@ -77,9 +77,9 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>1.0.1</version>
</dependency>
</dependencies>
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index 9621484..6cf9ac7 100644
--- a/integration/cdi/pom.xml
+++ b/integration/cdi/pom.xml
@@ -47,13 +47,13 @@
<dependencies>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index be602ea..bfe0872 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
<cxf.brave.version>5.10.1</cxf.brave.version>
<cxf.brave.zipkin.version>2.19.3</cxf.brave.zipkin.version>
<cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
- <cxf.cdi.api.version>2.0</cxf.cdi.api.version>
+ <cxf.cdi.api.version>2.0.2</cxf.cdi.api.version>
<cxf.classgraph.version>4.8.25</cxf.classgraph.version>
<cxf.classmate.version>1.5.1</cxf.classmate.version>
<cxf.commons-codec.version>1.14</cxf.commons-codec.version>
@@ -1004,8 +1004,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${cxf.cdi.api.version}</version>
<optional>true</optional>
</dependency>
diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml
index 4326528..cf70a86 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -140,8 +140,8 @@
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>