This is an automated email from the ASF dual-hosted git repository.
buhhunyx 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 5330712 use jakarta.inject-api
5330712 is described below
commit 5330712b1160b904d093d8579652e8000e1ba253
Author: Alexey Markevich <[email protected]>
AuthorDate: Sun Mar 28 00:08:42 2021 +0300
use jakarta.inject-api
---
.../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +-
integration/cdi/pom.xml | 6 +++---
osgi/itests-felix/pom.xml | 8 ++++----
osgi/itests/pom.xml | 17 ++++-------------
parent/pom.xml | 4 ++--
services/xkms/xkms-itests/pom.xml | 8 ++++----
systests/cdi/cdi-owb/pom.xml | 13 ++++---------
7 files changed, 22 insertions(+), 36 deletions(-)
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 c4fa652..7781c51 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
@@ -79,7 +79,7 @@
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
- <version>1.0.1</version>
+ <version>1.0.3</version>
</dependency>
</dependencies>
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index fa9de31..0d6c31c 100644
--- a/integration/cdi/pom.xml
+++ b/integration/cdi/pom.xml
@@ -49,12 +49,12 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
- <version>1.0.1</version>
- </dependency>
+ <version>${cxf.jakarta.injectapi.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index b000a3b..89467e0 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -132,11 +132,11 @@
<artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${cxf.geronimo.inject.version}</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${cxf.jakarta.injectapi.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 18813d3..17d10fc 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -102,14 +102,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- TODO: remove it when 5.16.1 is released,
https://issues.apache.org/jira/browse/AMQ-8009 -->
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>spring-legacy</artifactId>
- <version>${cxf.karaf.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- </dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
@@ -133,11 +125,10 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${cxf.geronimo.inject.version}</version>
- <scope>provided</scope>
- </dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${cxf.jakarta.injectapi.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5497e71..15e2228 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,6 @@
<cxf.ehcache3.version>3.9.0</cxf.ehcache3.version>
<cxf.el-api.version>3.0.3</cxf.el-api.version>
<cxf.findbugs.version>3.0.2</cxf.findbugs.version>
- <cxf.geronimo.inject.version>1.1</cxf.geronimo.inject.version>
<cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
<cxf.geronimo.json.version>1.4</cxf.geronimo.json.version>
@@ -131,8 +130,9 @@
<cxf.jacorb.version>3.9</cxf.jacorb.version>
<cxf.jaeger.version>1.5.0</cxf.jaeger.version>
<cxf.jakarta.activation.version>1.2.2</cxf.jakarta.activation.version>
- <cxf.jakarta.soapapi.version>1.4.2</cxf.jakarta.soapapi.version>
+ <cxf.jakarta.injectapi.version>1.0.3</cxf.jakarta.injectapi.version>
<cxf.jakarta.jwsapi.version>2.1.0</cxf.jakarta.jwsapi.version>
+ <cxf.jakarta.soapapi.version>1.4.2</cxf.jakarta.soapapi.version>
<cxf.jakarta.wsapi.version>2.3.3</cxf.jakarta.wsapi.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.javassist.version>3.25.0-GA</cxf.javassist.version>
diff --git a/services/xkms/xkms-itests/pom.xml
b/services/xkms/xkms-itests/pom.xml
index 8cb1c7c..ee9984b 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -103,11 +103,11 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${cxf.geronimo.inject.version}</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${cxf.jakarta.injectapi.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml
index 3a69ec8..0ba9f7b 100644
--- a/systests/cdi/cdi-owb/pom.xml
+++ b/systests/cdi/cdi-owb/pom.xml
@@ -62,15 +62,10 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.1_spec</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${cxf.geronimo.inject.version}</version>
- </dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${cxf.jakarta.injectapi.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
