This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/master by this push:
new 892c9e2 AMQ-7295 - Update JTA spec
new 8a6ef9d Merge pull request #392 from coheigea/AMQ-7295
892c9e2 is described below
commit 892c9e2a2d3962232a3a17a0a321e09d5d0df615
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Aug 29 09:26:25 2019 +0100
AMQ-7295 - Update JTA spec
---
activemq-all/pom.xml | 2 +-
activemq-jms-pool/pom.xml | 2 +-
activemq-kahadb-store/pom.xml | 2 +-
activemq-mqtt/pom.xml | 2 +-
activemq-osgi/pom.xml | 4 ++--
activemq-pool/pom.xml | 2 +-
activemq-rar/pom.xml | 4 ++--
activemq-spring/pom.xml | 2 +-
activemq-unit-tests/pom.xml | 2 +-
activemq-web-console/pom.xml | 2 +-
activemq-web-demo/pom.xml | 2 +-
assembly/pom.xml | 2 +-
assembly/src/main/descriptors/common-bin.xml | 2 +-
assembly/src/release/NOTICE | 2 +-
pom.xml | 4 ++--
15 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 11a04d7..910663e 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -115,7 +115,7 @@
<include>org.fusesource.hawtbuf:hawtbuf</include>
<include>org.jasypt:jasypt</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
<include>org.slf4j:slf4j-api</include>
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index 582b8c7..9de4c42 100644
--- a/activemq-jms-pool/pom.xml
+++ b/activemq-jms-pool/pom.xml
@@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 8e050fb..af1a3e5 100644
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index d8ac05c..5f8a74a 100644
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index cfffe38..8e57902 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -502,8 +502,8 @@
</dependency>
<!-- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0.1</version>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency> -->
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index 6fe8605..d54d9f8 100644
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 6e7db91..73e322a 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -55,7 +55,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -189,7 +189,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 789c2d3..f37c469 100644
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -146,7 +146,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index c83a0a7..9c71c33 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -108,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index cfc3639..0102781 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -188,7 +188,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 51ceb82..053ea99 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -147,7 +147,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 485a93e..69f1bc7 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -282,7 +282,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
diff --git a/assembly/src/main/descriptors/common-bin.xml
b/assembly/src/main/descriptors/common-bin.xml
index aee0108..77f4753 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -143,7 +143,7 @@
<include>org.apache.activemq.protobuf:activemq-protobuf</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>${pom.groupId}:activemq-web</include>
<include>org.fusesource.hawtbuf:hawtbuf</include>
</includes>
diff --git a/assembly/src/release/NOTICE b/assembly/src/release/NOTICE
index 56acfa3..1bf2c90 100644
--- a/assembly/src/release/NOTICE
+++ b/assembly/src/release/NOTICE
@@ -1,6 +1,6 @@
Apache ActiveMQ
-Copyright 2005-2017 The Apache Software Foundation
+Copyright 2005-2019 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index 33aa7b1..3b1b190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -519,8 +519,8 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0.1</version>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
