From 892c9e2a2d3962232a3a17a0a321e09d5d0df615 Mon Sep 17 00:00:00 2001 From: Colm O hEigeartaigh Date: Thu, 29 Aug 2019 09:26:25 +0100 Subject: [PATCH] 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 11a04d7438..910663ea6b 100644 --- a/activemq-all/pom.xml +++ b/activemq-all/pom.xml @@ -115,7 +115,7 @@ org.fusesource.hawtbuf:hawtbuf org.jasypt:jasypt org.apache.geronimo.specs:geronimo-jms_1.1_spec - org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec + org.apache.geronimo.specs:geronimo-jta_1.1_spec org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec org.apache.geronimo.specs:geronimo-annotation_1.0_spec org.slf4j:slf4j-api diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml index 582b8c745d..9de4c42f35 100644 --- a/activemq-jms-pool/pom.xml +++ b/activemq-jms-pool/pom.xml @@ -62,7 +62,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec org.apache.geronimo.specs diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml index 8e050fb920..af1a3e57ff 100644 --- a/activemq-kahadb-store/pom.xml +++ b/activemq-kahadb-store/pom.xml @@ -67,7 +67,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec true diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index d8ac05c5f5..5f8a74aff2 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -77,7 +77,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec true diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index cfffe38221..8e57902f11 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -502,8 +502,8 @@ diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml index 6fe86054c5..d54d9f8f15 100644 --- a/activemq-pool/pom.xml +++ b/activemq-pool/pom.xml @@ -67,7 +67,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec org.apache.geronimo.specs diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml index 6e7db91329..73e322aff6 100644 --- a/activemq-rar/pom.xml +++ b/activemq-rar/pom.xml @@ -55,7 +55,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec org.apache.geronimo.specs @@ -189,7 +189,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec org.apache.geronimo.specs diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml index 789c2d3300..f37c469287 100644 --- a/activemq-spring/pom.xml +++ b/activemq-spring/pom.xml @@ -146,7 +146,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec org.apache.geronimo.specs diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml index c83a0a7452..9c71c3369b 100644 --- a/activemq-unit-tests/pom.xml +++ b/activemq-unit-tests/pom.xml @@ -108,7 +108,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec true diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index cfc36398e0..0102781a4e 100644 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -188,7 +188,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec org.apache.geronimo.specs diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml index 51ceb82b76..053ea9969f 100644 --- a/activemq-web-demo/pom.xml +++ b/activemq-web-demo/pom.xml @@ -147,7 +147,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec org.apache.geronimo.specs diff --git a/assembly/pom.xml b/assembly/pom.xml index 485a93e4e6..69f1bc71d0 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -282,7 +282,7 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec + geronimo-jta_1.1_spec org.apache.shiro diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml index aee0108111..77f4753a60 100644 --- a/assembly/src/main/descriptors/common-bin.xml +++ b/assembly/src/main/descriptors/common-bin.xml @@ -143,7 +143,7 @@ org.apache.activemq.protobuf:activemq-protobuf org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec org.apache.geronimo.specs:geronimo-jms_1.1_spec - org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec + org.apache.geronimo.specs:geronimo-jta_1.1_spec ${pom.groupId}:activemq-web org.fusesource.hawtbuf:hawtbuf diff --git a/assembly/src/release/NOTICE b/assembly/src/release/NOTICE index 56acfa3bd3..1bf2c90f2e 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 33aa7b1e69..3b1b1903d7 100644 --- a/pom.xml +++ b/pom.xml @@ -519,8 +519,8 @@ org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec - 1.0.1 + geronimo-jta_1.1_spec + 1.1.1