You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2022/04/13 16:54:13 UTC
[cxf] branch master updated: Move to jakarta.transaction for builds, update exclusions and such so CXF builds in eclipse
This is an automated email from the ASF dual-hosted git repository.
dkulp 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 ea0212e271 Move to jakarta.transaction for builds, update exclusions and such so CXF builds in eclipse
ea0212e271 is described below
commit ea0212e271a1df063cba57b80d658d78efe5eb1f
Author: Daniel Kulp <da...@kulp.com>
AuthorDate: Wed Apr 13 12:53:32 2022 -0400
Move to jakarta.transaction for builds, update exclusions and such so CXF builds in eclipse
---
distribution/src/main/release/lib/WHICH_JARS | 2 +-
.../main/release/samples/jax_rs/minimal_osgi/README.txt | 3 +--
distribution/src/main/release/samples/pom.xml | 4 ----
parent/pom.xml | 17 +++++++----------
rt/rs/security/sso/oidc/pom.xml | 4 ----
rt/transports/jms/pom.xml | 13 +++++++------
systests/transport-jms/pom.xml | 2 +-
systests/transports/pom.xml | 9 +++++++++
systests/uncategorized/pom.xml | 2 +-
9 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/distribution/src/main/release/lib/WHICH_JARS b/distribution/src/main/release/lib/WHICH_JARS
index 47777fee92..f286c0c040 100755
--- a/distribution/src/main/release/lib/WHICH_JARS
+++ b/distribution/src/main/release/lib/WHICH_JARS
@@ -100,7 +100,7 @@ For JAX-RS support:
For JMS transport
- geronimo-jms.jar (Or the Sun equivalent)
-- geronimo-jta.jar (Or the Sun equivalent)
+- jakarta.transaction-api
- cxf-rt-transports-jms.jar
For the UDP transport
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
index c48debd426..ce2abf2ceb 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
@@ -141,6 +141,5 @@ Bundles
55|Active | 1|geronimo-stax-api_1.0_spec (1.0.1)|1.0.1
56|Active | 1|Apache ServiceMix :: Specs :: JAXB API 2.2 (2.9.0)|2.9.0
57|Active | 1|slf4j-api (1.7.25)|1.7.25
- 58|Active | 1|geronimo-jta_1.1_spec (1.1.1)|1.1.1
59|Active | 1|SAAJ 1.3 (1.1.0)|1.1.0
- 60|Active | 1|minimalosgi (0.0.0)|0.0.0
\ No newline at end of file
+ 60|Active | 1|minimalosgi (0.0.0)|0.0.0
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 1aab56f370..ec61c2ba0f 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -285,10 +285,6 @@
<version>1.5.3</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index f6ed64339b..b6248e4fdf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -136,6 +136,7 @@
<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.jakarta.transaction.version>1.3.3</cxf.jakarta.transaction.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.javassist.version>3.27.0-GA</cxf.javassist.version>
<cxf.javax.annotation-api.version>1.3.5</cxf.javax.annotation-api.version>
@@ -749,6 +750,11 @@
<artifactId>logback-classic</artifactId>
<version>${cxf.logback.classic.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${cxf.jakarta.transaction.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
@@ -1662,11 +1668,6 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${cxf.geronimo.jms.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${cxf.geronimo.jta.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
@@ -1684,7 +1685,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -2255,10 +2256,6 @@
<version>${cxf.saaj-impl.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml
index 0e3856691a..427262aea8 100644
--- a/rt/rs/security/sso/oidc/pom.xml
+++ b/rt/rs/security/sso/oidc/pom.xml
@@ -147,10 +147,6 @@
<version>${cxf.slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index b4de9591d2..cfa6145435 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -26,11 +26,16 @@
<cxf.spi-dir>spi-2.1</cxf.spi-dir>
<cxf.osgi.import>
javax.jms;version="[1.1,3)",
+ javax.transaction;version="[1.1,2)",
javax.xml.bind*;version="${cxf.osgi.javax.bind.version}"
</cxf.osgi.import>
<cxf.module.name>org.apache.cxf.transport.jms</cxf.module.name>
</properties>
<dependencies>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
@@ -46,10 +51,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
@@ -108,7 +109,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -129,7 +130,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml
index e648627657..a49432c054 100644
--- a/systests/transport-jms/pom.xml
+++ b/systests/transport-jms/pom.xml
@@ -231,7 +231,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml
index 1b40dd841f..afc2423843 100644
--- a/systests/transports/pom.xml
+++ b/systests/transports/pom.xml
@@ -246,8 +246,17 @@
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.22</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index 3638c9e219..ce53adc2a6 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -302,7 +302,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>