Author: veithen
Date: Sun Oct 28 11:08:16 2018
New Revision: 1845015
URL: http://svn.apache.org/viewvc?rev=1845015&view=rev
Log:
Use the standard javax.transaction API artifact.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/kernel/pom.xml
axis/axis2/java/core/trunk/modules/osgi/pom.xml
axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/jmsService/pom.xml
axis/axis2/java/core/trunk/modules/transport/jms/pom.xml
axis/axis2/java/core/trunk/modules/webapp/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1845015&r1=1845014&r2=1845015&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Oct 28 11:08:16
2018
@@ -224,10 +224,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=1845015&r1=1845014&r2=1845015&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Sun Oct 28 11:08:16 2018
@@ -46,8 +46,8 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: axis/axis2/java/core/trunk/modules/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi/pom.xml?rev=1845015&r1=1845014&r2=1845015&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Sun Oct 28 11:08:16 2018
@@ -85,7 +85,7 @@
javax.ws.rs; resolution:=optional,
javax.servlet; version=2.4.0,
javax.servlet.http; version=2.4.0,
- javax.transaction,
+ javax.transaction; resolution:=optional,
org.apache.commons.io,
org.osgi.framework; version=1.3.0,
org.osgi.service.http; version=1.2.0,
Modified:
axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/jmsService/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/jmsService/pom.xml?rev=1845015&r1=1845014&r2=1845015&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/jmsService/pom.xml
(original)
+++
axis/axis2/java/core/trunk/modules/samples/transport/jms-sample/jmsService/pom.xml
Sun Oct 28 11:08:16 2018
@@ -39,17 +39,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- <dependency> -->
- <!-- <groupId>org.apache.geronimo.specs</groupId> -->
- <!-- <artifactId>geronimo-jms_1.1_spec</artifactId> -->
- <!-- <version>1.1</version> -->
- <!-- </dependency> -->
-
- <!-- <dependency> -->
- <!-- <groupId>org.apache.geronimo.specs</groupId> -->
- <!-- <artifactId>geronimo-jta_1.0.1B_spec</artifactId> -->
- <!-- <version>1.0</version> -->
- <!-- </dependency> -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Modified: axis/axis2/java/core/trunk/modules/transport/jms/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/jms/pom.xml?rev=1845015&r1=1845014&r2=1845015&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/jms/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/jms/pom.xml Sun Oct 28
11:08:16 2018
@@ -154,9 +154,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>${jta-spec.version}</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
</dependency>
<dependency>
@@ -178,7 +177,6 @@
<properties>
<jms-1.1-spec.version>1.1</jms-1.1-spec.version>
- <jta-spec.version>1.0</jta-spec.version>
</properties>
</project>
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=1845015&r1=1845014&r2=1845015&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sun Oct 28 11:08:16 2018
@@ -164,10 +164,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1845015&r1=1845014&r2=1845015&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sun Oct 28 11:08:16 2018
@@ -553,7 +553,6 @@
<!-- The build failing if tests are skipped is very annoying -->
<failIfNoTests>false</failIfNoTests>
<m2Repository>'${settings.localRepository}'</m2Repository>
- <geronimo-spec.jta.version>1.1</geronimo-spec.jta.version>
<jaxws.tools.version>2.3.1</jaxws.tools.version>
<jaxws.rt.version>2.3.1</jaxws.rt.version>
<jsr311.api.version>1.1.1</jsr311.api.version>
@@ -1060,9 +1059,9 @@
<version>${commons.lang.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo-spec.jta.version}</version>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <version>1.3</version>
</dependency>
<dependency>
<!-- Both google-java-format and Maven depend on Guava. We
need to select
