Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #392 from coheigea/AMQ-7295 

AMQ-7295 - Update JTA spec
This commit is contained in:
Jean-Baptiste Onofré 2019-11-02 07:14:15 +01:00 committed by GitHub
parent 8a469aaf5e 892c9e2a2d
commit 8a6ef9d83d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-all/pom.xml
View File

@ -115,7 +115,7 @@
<include>org.fusesource.hawtbuf:hawtbuf</include> <include>org.fusesource.hawtbuf:hawtbuf</include>
<include>org.jasypt:jasypt</include> <include>org.jasypt:jasypt</include>
<include>org.apache.geronimo.specs:geronimo-jms_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>org.apache.geronimo.specs:geronimo-j2ee-management_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.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
<include>org.slf4j:slf4j-api</include> <include>org.slf4j:slf4j-api</include>

2
activemq-jms-pool/pom.xml
View File

@ -62,7 +62,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

2
activemq-kahadb-store/pom.xml
View File

@ -67,7 +67,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>

2
activemq-mqtt/pom.xml
View File

@ -77,7 +77,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>

4
activemq-osgi/pom.xml
View File

@ -502,8 +502,8 @@
</dependency> </dependency>
<!-- <dependency> <!-- <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.0.1</version> <version>1.1.1</version>
<classifier>sources</classifier> <classifier>sources</classifier>
<optional>true</optional> <optional>true</optional>
</dependency> --> </dependency> -->

2
activemq-pool/pom.xml
View File

@ -67,7 +67,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

4
activemq-rar/pom.xml
View File

@ -55,7 +55,7 @@
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
@ -189,7 +189,7 @@
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

2
activemq-spring/pom.xml
View File

@ -146,7 +146,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

2
activemq-unit-tests/pom.xml
View File

@ -108,7 +108,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>

2
activemq-web-console/pom.xml
View File

@ -188,7 +188,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

2
activemq-web-demo/pom.xml
View File

@ -147,7 +147,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

2
assembly/pom.xml
View File

@ -282,7 +282,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>

2
assembly/src/main/descriptors/common-bin.xml
View File

@ -143,7 +143,7 @@
<include>org.apache.activemq.protobuf:activemq-protobuf</include> <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-j2ee-management_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_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>${pom.groupId}:activemq-web</include>
<include>org.fusesource.hawtbuf:hawtbuf</include> <include>org.fusesource.hawtbuf:hawtbuf</include>
</includes> </includes>

2
assembly/src/release/NOTICE
View File

@ -1,6 +1,6 @@
Apache ActiveMQ Apache ActiveMQ
Copyright 2005-2017 The Apache Software Foundation Copyright 2005-2019 The Apache Software Foundation
This product includes software developed by This product includes software developed by
The Apache Software Foundation (http://www.apache.org/). The Apache Software Foundation (http://www.apache.org/).

4
pom.xml
View File

@ -519,8 +519,8 @@
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.0.1</version> <version>1.1.1</version>
</dependency> </dependency>
<dependency> <dependency>