Skip to content
Permalink
Browse files
Move to jakarta.transaction for builds, update exclusions and such so…
… CXF builds in eclipse
  • Loading branch information
dkulp committed Apr 13, 2022
1 parent 30dd215 commit ea0212e271a1df063cba57b80d658d78efe5eb1f
Showing 9 changed files with 27 additions and 29 deletions.
@@ -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
@@ -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
60|Active | 1|minimalosgi (0.0.0)|0.0.0
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

0 comments on commit ea0212e

Please sign in to comment.