You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/04/09 15:50:39 UTC
[activemq-artemis] branch master updated: ARTEMIS-3221 Migrating to
Jakarta EE 8 artifacts
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new b4789a8 ARTEMIS-3221 Migrating to Jakarta EE 8 artifacts
new e364961 This closes #3527
b4789a8 is described below
commit b4789a894fadbaf09e63cf16c83ff87cba7efd72
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Fri Apr 9 10:25:17 2021 +0200
ARTEMIS-3221 Migrating to Jakarta EE 8 artifacts
---
artemis-cdi-client/pom.xml | 22 +-
artemis-cli/pom.xml | 18 +-
artemis-commons/pom.xml | 4 +-
artemis-core-client/pom.xml | 4 +-
artemis-distribution/pom.xml | 38 +--
artemis-distribution/src/main/assembly/dep.xml | 17 +-
.../src/main/resources/licenses/bin/LICENSE | 38 ++-
.../resources/licenses/bin/licenses/EDL-1.0.txt | 11 +
.../resources/licenses/bin/licenses/EPL-2.0.txt | 277 +++++++++++++++++++++
artemis-dto/pom.xml | 26 +-
artemis-features/src/main/resources/features.xml | 16 +-
artemis-jakarta-client/pom.xml | 2 +
artemis-jms-client/pom.xml | 4 +-
artemis-jms-server/pom.xml | 12 +-
artemis-junit/pom.xml | 4 +-
artemis-maven-plugin/pom.xml | 4 +-
artemis-protocols/artemis-mqtt-protocol/pom.xml | 1 -
.../artemis-openwire-protocol/pom.xml | 12 +-
artemis-ra/pom.xml | 12 +-
artemis-rest/pom.xml | 16 +-
artemis-server/pom.xml | 5 +-
artemis-service-extensions/pom.xml | 4 +-
.../features/ha/multiple-failover-failback/pom.xml | 4 +-
examples/features/ha/multiple-failover/pom.xml | 4 +-
examples/features/ha/replicated-failback/pom.xml | 4 +-
examples/features/ha/transaction-failover/pom.xml | 4 +-
examples/features/perf/perf/pom.xml | 15 +-
.../features/standard/camel/camel-broker/pom.xml | 4 +-
examples/features/standard/cdi/pom.xml | 19 +-
examples/features/standard/core-bridge/pom.xml | 4 +-
examples/features/standard/rest/dup-send/pom.xml | 4 +-
.../features/standard/rest/javascript-chat/pom.xml | 4 +-
.../features/standard/rest/jms-to-rest/pom.xml | 4 +-
examples/features/standard/rest/push/pom.xml | 4 +-
.../features/standard/spring-integration/pom.xml | 4 +-
.../inter-broker-bridge/artemis-jms-bridge/pom.xml | 25 +-
.../protocols/amqp/proton-clustered-cpp/pom.xml | 4 +-
examples/protocols/amqp/proton-cpp/pom.xml | 4 +-
examples/protocols/openwire/chat/pom.xml | 21 +-
.../protocols/openwire/message-listener/pom.xml | 21 +-
.../protocols/openwire/message-recovery/pom.xml | 21 +-
examples/protocols/openwire/queue/pom.xml | 21 +-
.../openwire/virtual-topic-mapping/pom.xml | 21 +-
pom.xml | 143 +++--------
tests/artemis-test-support/pom.xml | 20 +-
tests/compatibility-tests/pom.xml | 30 ++-
tests/extra-tests/pom.xml | 12 +-
.../MDBMultipleHandlersServerDisconnectTest.java | 15 ++
tests/integration-tests/pom.xml | 26 +-
.../tests/integration/ra/ActiveMQRATestBase.java | 27 ++
tests/jms-tests/pom.xml | 8 +-
tests/joram-tests/pom.xml | 4 +-
tests/karaf-client-integration-tests/pom.xml | 15 +-
tests/performance-tests/pom.xml | 6 -
tests/pom.xml | 12 +
tests/smoke-tests/pom.xml | 21 +-
tests/soak-tests/pom.xml | 4 +-
tests/stress-tests/pom.xml | 4 +-
tests/timing-tests/pom.xml | 8 +-
tests/unit-tests/pom.xml | 12 +-
.../artemis/tests/unit/ra/BootstrapContext.java | 12 +
.../tests/unit/ra/MessageEndpointFactory.java | 15 ++
62 files changed, 817 insertions(+), 340 deletions(-)
diff --git a/artemis-cdi-client/pom.xml b/artemis-cdi-client/pom.xml
index 42d8fe0..4d9cfa9 100644
--- a/artemis-cdi-client/pom.xml
+++ b/artemis-cdi-client/pom.xml
@@ -29,7 +29,6 @@
<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
- <javax.annotation.version>1.3.2</javax.annotation.version>
</properties>
<artifactId>artemis-cdi-client</artifactId>
@@ -85,17 +84,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javax.annotation.version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
@@ -106,8 +104,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
@@ -156,8 +154,8 @@
<artifactId>owb-arquillian-standalone</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
index e79b32b..292d7e0 100644
--- a/artemis-cli/pom.xml
+++ b/artemis-cli/pom.xml
@@ -74,22 +74,28 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
</dependency>
<!-- artemis producer and consumer can use amqp as the protocol -->
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>${qpid.jms.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index 98de728..eea10ad 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -81,8 +81,8 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index df16dce..2d5465b 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -87,8 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index 274cb8b..40f857f 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -154,16 +154,20 @@
<groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId>
@@ -184,6 +188,12 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>${qpid.jms.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
@@ -226,16 +236,16 @@
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+ <groupId>jakarta.security.auth.message</groupId>
+ <artifactId>jakarta.security.auth.message-api</artifactId>
</dependency>
</dependencies>
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index 8298c20..d92d1a5 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -72,11 +72,8 @@
<include>io.micrometer:micrometer-core</include>
<!-- dependencies -->
- <include>org.apache.geronimo.specs:geronimo-jms_2.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-annotation_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
- <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>jakarta.jms:jakarta.jms-api</include>
+ <include>jakarta.transaction:jakarta.transaction-api</include>
<include>org.wildfly.common:wildfly-common</include>
<include>org.jboss.logmanager:jboss-logmanager</include>
<include>org.jboss.logging:jboss-logging</include>
@@ -91,7 +88,7 @@
<include>org.slf4j:slf4j-api</include>
<include>io.airlift:airline</include>
<include>com.google.guava:guava</include>
- <include>javax.inject:javax.inject</include>
+ <include>jakarta.inject:jakarta.inject-api</include>
<include>org.eclipse.jetty.aggregate:jetty-all:jar:uber</include>
<include>org.apache.tomcat:tomcat-servlet-api</include>
<include>commons-beanutils:commons-beanutils</include>
@@ -102,13 +99,13 @@
<include>org.apache.commons:commons-lang3</include>
<include>org.fusesource.hawtbuf:hawtbuf</include>
<include>org.jgroups:jgroups</include>
- <include>org.apache.geronimo.specs:geronimo-json_1.0_spec</include>
+ <include>jakarta.json:jakarta.json-api</include>
<include>org.apache.johnzon:johnzon-core</include>
- <include>javax.xml.bind:jaxb-api</include>
+ <include>jakarta.xml.bind:jakarta.xml.bind-api</include>
<include>com.sun.xml.bind:jaxb-impl</include>
<include>com.sun.xml.bind:jaxb-core</include>
- <include>javax.activation:activation</include>
- <include>org.apache.geronimo.specs:geronimo-jaspic_1.0_spec</include>
+ <include>jakarta.activation:jakarta.activation-api</include>
+ <include>jakarta.security.auth.message:jakarta.security.auth.message-api</include>
</includes>
<!--excludes>
<exclude>org.apache.activemq:artemis-website</exclude>
diff --git a/artemis-distribution/src/main/resources/licenses/bin/LICENSE b/artemis-distribution/src/main/resources/licenses/bin/LICENSE
index e7dff44..1a10aeb 100644
--- a/artemis-distribution/src/main/resources/licenses/bin/LICENSE
+++ b/artemis-distribution/src/main/resources/licenses/bin/LICENSE
@@ -243,6 +243,42 @@ Notice from author (Robert Harder, rob@iharder.net):
See: http://iharder.sourceforge.net/current/java/base64/
+==============================================================================
+For jakarta.activation-api:
+==============================================================================
+This product bundles jakarta.activation-api, which is available under the
+Eclipse Distribution License (EDL) 1.0. For details, see licenses/EDL-1.0.txt
+
+==============================================================================
+For jakarta.jms-api:
+==============================================================================
+This product bundles jakarta.jms-api, which is available under the
+Eclipse Public License (EPL) 2.0. For details, see licenses/EPL-2.0.txt
+
+==============================================================================
+For jakarta.json-api:
+==============================================================================
+This product bundles jakarta.json-api, which is available under the
+Eclipse Public License (EPL) 2.0. For details, see licenses/EPL-2.0.txt
+
+==============================================================================
+For jakarta.security.auth.message-api:
+==============================================================================
+This product bundles jakarta.security.auth.message-api, which is available
+under the Eclipse Public License (EPL) 2.0. For details, see
+licenses/EPL-2.0.txt
+
+==============================================================================
+For jakarta.transaction-api:
+==============================================================================
+This product bundles jakarta.transaction-api, which is available under the
+Eclipse Public License (EPL) 2.0. For details, see licenses/EPL-2.0.txt
+
+==============================================================================
+For jakarta.xml.bind-api:
+==============================================================================
+This product bundles jakarta.xml.bind-api, which is available under the
+Eclipse Distribution License (EDL) 1.0. For details, see licenses/EDL-1.0.txt
==============================================================================
Apache ActiveMQ Artemis Subcomponents:
@@ -432,4 +468,4 @@ For Underscore:
==============================================================================
This product bundles Underscore, which is available under a
"MIT" license. For details, see
-https://github.com/jashkenas/underscore/blob/master/LICENSE
\ No newline at end of file
+https://github.com/jashkenas/underscore/blob/master/LICENSE
diff --git a/artemis-distribution/src/main/resources/licenses/bin/licenses/EDL-1.0.txt b/artemis-distribution/src/main/resources/licenses/bin/licenses/EDL-1.0.txt
new file mode 100644
index 0000000..02319e9
--- /dev/null
+++ b/artemis-distribution/src/main/resources/licenses/bin/licenses/EDL-1.0.txt
@@ -0,0 +1,11 @@
+Eclipse Distribution License - v 1.0
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFI [...]
\ No newline at end of file
diff --git a/artemis-distribution/src/main/resources/licenses/bin/licenses/EPL-2.0.txt b/artemis-distribution/src/main/resources/licenses/bin/licenses/EPL-2.0.txt
new file mode 100644
index 0000000..e23ece2
--- /dev/null
+++ b/artemis-distribution/src/main/resources/licenses/bin/licenses/EPL-2.0.txt
@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+ OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+ a) in the case of the initial Contributor, the initial content
+ Distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+ i) changes to the Program, and
+ ii) additions to the Program;
+ where such changes and/or additions to the Program originate from
+ and are Distributed by that particular Contributor. A Contribution
+ "originates" from a Contributor if it was added to the Program by
+ such Contributor itself or anyone acting on such Contributor's behalf.
+ Contributions do not include changes or additions to the Program that
+ are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare Derivative Works of, publicly display,
+ publicly perform, Distribute and sublicense the Contribution of such
+ Contributor, if any, and such Derivative Works.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor,
+ if any, in Source Code or other form. This patent license shall
+ apply to the combination of the Contribution and the Program if, at
+ the time the Contribution is added by the Contributor, such addition
+ of the Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity.
+ Each Contributor disclaims any liability to Recipient for claims
+ brought by any other entity based on infringement of intellectual
+ property rights or otherwise. As a condition to exercising the
+ rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual
+ property rights needed, if any. For example, if a third party
+ patent license is required to allow Recipient to Distribute the
+ Program, it is Recipient's responsibility to acquire that license
+ before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has
+ sufficient copyright rights in its Contribution, if any, to grant
+ the copyright license set forth in this Agreement.
+
+ e) Notwithstanding the terms of any Secondary License, no
+ Contributor makes additional grants to any Recipient (other than
+ those set forth in this Agreement) as a result of such Recipient's
+ receipt of the Program under the terms of a Secondary License
+ (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+ a) the Program must also be made available as Source Code, in
+ accordance with section 3.2, and the Contributor must accompany
+ the Program with a statement that the Source Code for the Program
+ is available under this Agreement, and informs Recipients how to
+ obtain it in a reasonable manner on or through a medium customarily
+ used for software exchange; and
+
+ b) the Contributor may Distribute the Program under a license
+ different than this Agreement, provided that such license:
+ i) effectively disclaims on behalf of all other Contributors all
+ warranties and conditions, express and implied, including
+ warranties or conditions of title and non-infringement, and
+ implied warranties or conditions of merchantability and fitness
+ for a particular purpose;
+
+ ii) effectively excludes on behalf of all other Contributors all
+ liability for damages, including direct, indirect, special,
+ incidental and consequential damages, such as lost profits;
+
+ iii) does not attempt to limit or alter the recipients' rights
+ in the Source Code under section 3.2; and
+
+ iv) requires any subsequent distribution of the Program by any
+ party to be under a license that satisfies the requirements
+ of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+ a) it must be made available under this Agreement, or if the
+ Program (i) is combined with other material in a separate file or
+ files made available under a Secondary License, and (ii) the initial
+ Contributor attached to the Source Code the notice described in
+ Exhibit A of this Agreement, then the Program may be made available
+ under the terms of such Secondary Licenses, and
+
+ b) a copy of this Agreement must be included with each copy of
+ the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+ Simply including a copy of this Agreement, including this Exhibit A
+ is not sufficient to license the Source Code under Secondary Licenses.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to
+ look for such a notice.
+
+ You may add additional accurate notices of copyright ownership.
\ No newline at end of file
diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
index 481fcc9..6829828 100644
--- a/artemis-dto/pom.xml
+++ b/artemis-dto/pom.xml
@@ -28,8 +28,6 @@
<name>ActiveMQ Artemis DTO</name>
<properties>
- <version.activation>1.1.1</version.activation>
-
<activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties>
@@ -44,9 +42,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.jaxb.api}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -59,9 +57,9 @@
<version>${version.jaxb.runtime}</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${version.activation}</version>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>${jakarta.activation-api.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -123,9 +121,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.jaxb.api}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -138,9 +136,9 @@
<version>${version.jaxb.runtime}</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${version.activation}</version>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>${jakarta.activation-api.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index 8a3efb9..9b44c96 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -65,9 +65,10 @@
<!-- this is here because commons-configuration2 requires the package javax.mail.internet from version 2.7 -->
<bundle dependency="true">mvn:com.sun.activation/javax.activation/1.2.0</bundle>
- <bundle dependency="true">mvn:javax.mail/mail/1.4.7</bundle>
+ <bundle dependency="true">mvn:jakarta.mail/jakarta.mail-api/1.6.6</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/${geronimo.jms.2.spec.version}</bundle>
+ <bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/${jakarta.jms-api.version}</bundle>
+ <bundle dependency="true">mvn:jakarta.transaction/jakarta.transaction-api/${jakarta.transaction-api.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-configuration2/${commons.config.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-text/${commons.text.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons.lang.version}</bundle>
@@ -90,14 +91,14 @@
<feature name="artemis-jms-client" version="${pom.version}" description="ActiveMQ Artemis JMS Client libraries">
<feature>artemis-common</feature>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/${geronimo.jms.2.spec.version}</bundle>
+ <bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/${jakarta.jms-api.version}</bundle>
<bundle>mvn:org.apache.activemq/artemis-jms-client-osgi/${pom.version}</bundle>
</feature>
<feature name="artemis-amqp-client" version="${pom.version}" description="ActiveMQ Artemis AMQP Client libraries">
<feature>transaction</feature>
<feature>netty-core</feature>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/${geronimo.jms.2.spec.version}</bundle>
+ <bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/${jakarta.jms-api.version}</bundle>
<bundle>mvn:org.apache.qpid/proton-j/${proton.version}</bundle>
<bundle>mvn:org.apache.qpid/qpid-jms-client/${qpid.jms.version}</bundle>
</feature>
@@ -129,7 +130,8 @@
<feature name="artemis-openwire" version="${pom.version}" description="ActiveMQ Artemis Openwire protocol libraries">
<feature>artemis-core</feature>
<bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/1.11</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+ <bundle>mvn:jakarta.ejb/jakarta.ejb-api/${jakarta.ejb-api.version}</bundle>
+ <bundle>mvn:jakarta.management.j2ee/jakarta.management.j2ee-api/${jakarta.management.j2ee-api.version}</bundle>
<bundle>mvn:org.apache.activemq/artemis-openwire-protocol/${pom.version}</bundle>
</feature>
@@ -137,7 +139,9 @@
<feature>transaction</feature>
<bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuff.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+ <bundle>mvn:jakarta.ejb/jakarta.ejb-api/${jakarta.ejb-api.version}</bundle>
+ <bundle>mvn:jakarta.transaction/jakarta.transaction-api/${jakarta.transaction-api.version}</bundle>
+ <bundle>mvn:jakarta.management.j2ee/jakarta.management.j2ee-api/${jakarta.management.j2ee-api.version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-client/${activemq5-version}</bundle>
</feature>
diff --git a/artemis-jakarta-client/pom.xml b/artemis-jakarta-client/pom.xml
index 8c18ca1..996190b 100644
--- a/artemis-jakarta-client/pom.xml
+++ b/artemis-jakarta-client/pom.xml
@@ -29,6 +29,7 @@
<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
+ <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
</properties>
<dependencies>
@@ -60,6 +61,7 @@
<dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
</dependency>
</dependencies>
diff --git a/artemis-jms-client/pom.xml b/artemis-jms-client/pom.xml
index 1e4e122..5d3dfac 100644
--- a/artemis-jms-client/pom.xml
+++ b/artemis-jms-client/pom.xml
@@ -65,8 +65,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
diff --git a/artemis-jms-server/pom.xml b/artemis-jms-server/pom.xml
index 7c2d262..f0b4efd 100644
--- a/artemis-jms-server/pom.xml
+++ b/artemis-jms-server/pom.xml
@@ -83,16 +83,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
</dependency>
</dependencies>
diff --git a/artemis-junit/pom.xml b/artemis-junit/pom.xml
index eb21771..b80372a 100644
--- a/artemis-junit/pom.xml
+++ b/artemis-junit/pom.xml
@@ -80,8 +80,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
diff --git a/artemis-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml
index 8483e6b..e714b95 100644
--- a/artemis-maven-plugin/pom.xml
+++ b/artemis-maven-plugin/pom.xml
@@ -73,8 +73,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml
index 8d5dc90..cf78b64 100644
--- a/artemis-protocols/artemis-mqtt-protocol/pom.xml
+++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml
@@ -130,7 +130,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
<scope>test</scope>
<type>jar</type>
</dependency>
diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml
index b4ed0c3..f00b6a1 100644
--- a/artemis-protocols/artemis-openwire-protocol/pom.xml
+++ b/artemis-protocols/artemis-openwire-protocol/pom.xml
@@ -54,6 +54,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -97,14 +101,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
</dependency>
- <!-- The OpenWire protocol implementation should really only ever be used in conjuction with
- the broker which will have it's own JMS interface dependency so using "provided" scope here -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
diff --git a/artemis-ra/pom.xml b/artemis-ra/pom.xml
index a9e32dd..5e6c868 100644
--- a/artemis-ra/pom.xml
+++ b/artemis-ra/pom.xml
@@ -65,18 +65,18 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml
index 8195341..d23a697 100644
--- a/artemis-rest/pom.xml
+++ b/artemis-rest/pom.xml
@@ -131,18 +131,18 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_2.1_spec</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>${jakarta.ws.rs-api.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.jaxb.api}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind-api.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index d2386fe..b6e7220 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -153,9 +153,8 @@
<version>2.6</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/artemis-service-extensions/pom.xml b/artemis-service-extensions/pom.xml
index 01970d1..2aee6e7 100644
--- a/artemis-service-extensions/pom.xml
+++ b/artemis-service-extensions/pom.xml
@@ -78,8 +78,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/features/ha/multiple-failover-failback/pom.xml b/examples/features/ha/multiple-failover-failback/pom.xml
index a568533..26e1aae 100644
--- a/examples/features/ha/multiple-failover-failback/pom.xml
+++ b/examples/features/ha/multiple-failover-failback/pom.xml
@@ -42,8 +42,8 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
</dependencies>
diff --git a/examples/features/ha/multiple-failover/pom.xml b/examples/features/ha/multiple-failover/pom.xml
index 07aa2c3..1ed6bd2 100644
--- a/examples/features/ha/multiple-failover/pom.xml
+++ b/examples/features/ha/multiple-failover/pom.xml
@@ -42,8 +42,8 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
</dependencies>
diff --git a/examples/features/ha/replicated-failback/pom.xml b/examples/features/ha/replicated-failback/pom.xml
index e61abf5..bb1f805 100644
--- a/examples/features/ha/replicated-failback/pom.xml
+++ b/examples/features/ha/replicated-failback/pom.xml
@@ -42,8 +42,8 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
</dependencies>
diff --git a/examples/features/ha/transaction-failover/pom.xml b/examples/features/ha/transaction-failover/pom.xml
index d6337ca..cc3f9c1 100644
--- a/examples/features/ha/transaction-failover/pom.xml
+++ b/examples/features/ha/transaction-failover/pom.xml
@@ -42,8 +42,8 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
</dependencies>
diff --git a/examples/features/perf/perf/pom.xml b/examples/features/perf/perf/pom.xml
index 1d69fe2..2b4435f 100644
--- a/examples/features/perf/perf/pom.xml
+++ b/examples/features/perf/perf/pom.xml
@@ -37,9 +37,14 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.management.j2ee-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -50,6 +55,10 @@ under the License.
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/examples/features/standard/camel/camel-broker/pom.xml b/examples/features/standard/camel/camel-broker/pom.xml
index 4f5c246..53e03c4 100644
--- a/examples/features/standard/camel/camel-broker/pom.xml
+++ b/examples/features/standard/camel/camel-broker/pom.xml
@@ -48,8 +48,8 @@ under the License.
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
</dependencies>
diff --git a/examples/features/standard/cdi/pom.xml b/examples/features/standard/cdi/pom.xml
index 968a210..ac38438 100644
--- a/examples/features/standard/cdi/pom.xml
+++ b/examples/features/standard/cdi/pom.xml
@@ -58,8 +58,8 @@
<version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -72,8 +72,8 @@
<version>${deltaspike.version}</version>
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
@@ -225,9 +225,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api.version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta.enterprise.cdi-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
@@ -245,9 +245,8 @@
<version>${owb.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>${geronimo-annotation_1.2_spec.version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
diff --git a/examples/features/standard/core-bridge/pom.xml b/examples/features/standard/core-bridge/pom.xml
index 69a4e1d..417ca41 100644
--- a/examples/features/standard/core-bridge/pom.xml
+++ b/examples/features/standard/core-bridge/pom.xml
@@ -42,8 +42,8 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
</dependencies>
diff --git a/examples/features/standard/rest/dup-send/pom.xml b/examples/features/standard/rest/dup-send/pom.xml
index 4599d9b..91d2d8f 100644
--- a/examples/features/standard/rest/dup-send/pom.xml
+++ b/examples/features/standard/rest/dup-send/pom.xml
@@ -59,8 +59,8 @@ under the License.
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq.rest</groupId>
diff --git a/examples/features/standard/rest/javascript-chat/pom.xml b/examples/features/standard/rest/javascript-chat/pom.xml
index 23af74a..cee524f 100644
--- a/examples/features/standard/rest/javascript-chat/pom.xml
+++ b/examples/features/standard/rest/javascript-chat/pom.xml
@@ -59,8 +59,8 @@ under the License.
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq.rest</groupId>
diff --git a/examples/features/standard/rest/jms-to-rest/pom.xml b/examples/features/standard/rest/jms-to-rest/pom.xml
index 51e5b47..5aa3649 100644
--- a/examples/features/standard/rest/jms-to-rest/pom.xml
+++ b/examples/features/standard/rest/jms-to-rest/pom.xml
@@ -59,8 +59,8 @@ under the License.
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq.rest</groupId>
diff --git a/examples/features/standard/rest/push/pom.xml b/examples/features/standard/rest/push/pom.xml
index e78c1c7..020c120 100644
--- a/examples/features/standard/rest/push/pom.xml
+++ b/examples/features/standard/rest/push/pom.xml
@@ -59,8 +59,8 @@ under the License.
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq.rest</groupId>
diff --git a/examples/features/standard/spring-integration/pom.xml b/examples/features/standard/spring-integration/pom.xml
index 876d9eb..f1e86b7 100644
--- a/examples/features/standard/spring-integration/pom.xml
+++ b/examples/features/standard/spring-integration/pom.xml
@@ -42,8 +42,8 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml b/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
index 7b47b1a..3eedbb4 100644
--- a/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
+++ b/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
@@ -38,9 +38,29 @@ under the License.
<dependencies>
<dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.management.j2ee-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq5-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -71,11 +91,6 @@ under the License.
<version>${spring.version}</version>
</dependency>
<dependency>
- <groupId>javax.management.j2ee</groupId>
- <artifactId>javax.management.j2ee-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logging</artifactId>
<version>1.1.0.Final</version>
diff --git a/examples/protocols/amqp/proton-clustered-cpp/pom.xml b/examples/protocols/amqp/proton-clustered-cpp/pom.xml
index 43bb187..72ca75c 100644
--- a/examples/protocols/amqp/proton-clustered-cpp/pom.xml
+++ b/examples/protocols/amqp/proton-clustered-cpp/pom.xml
@@ -42,8 +42,8 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
diff --git a/examples/protocols/amqp/proton-cpp/pom.xml b/examples/protocols/amqp/proton-cpp/pom.xml
index 50a2293..88d7d33 100644
--- a/examples/protocols/amqp/proton-cpp/pom.xml
+++ b/examples/protocols/amqp/proton-cpp/pom.xml
@@ -42,8 +42,8 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
diff --git a/examples/protocols/openwire/chat/pom.xml b/examples/protocols/openwire/chat/pom.xml
index 2a558f8..56e7a81 100644
--- a/examples/protocols/openwire/chat/pom.xml
+++ b/examples/protocols/openwire/chat/pom.xml
@@ -42,14 +42,29 @@ under the License.
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.management.j2ee-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq5-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/examples/protocols/openwire/message-listener/pom.xml b/examples/protocols/openwire/message-listener/pom.xml
index 865f447..c810177 100644
--- a/examples/protocols/openwire/message-listener/pom.xml
+++ b/examples/protocols/openwire/message-listener/pom.xml
@@ -37,14 +37,29 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.management.j2ee-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq5-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/examples/protocols/openwire/message-recovery/pom.xml b/examples/protocols/openwire/message-recovery/pom.xml
index b0524bb..b3a2fac 100644
--- a/examples/protocols/openwire/message-recovery/pom.xml
+++ b/examples/protocols/openwire/message-recovery/pom.xml
@@ -37,14 +37,29 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.management.j2ee-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq5-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/examples/protocols/openwire/queue/pom.xml b/examples/protocols/openwire/queue/pom.xml
index 9b666fa..b684c83 100644
--- a/examples/protocols/openwire/queue/pom.xml
+++ b/examples/protocols/openwire/queue/pom.xml
@@ -37,14 +37,29 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.management.j2ee-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq5-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/examples/protocols/openwire/virtual-topic-mapping/pom.xml b/examples/protocols/openwire/virtual-topic-mapping/pom.xml
index c189903..56371ea 100644
--- a/examples/protocols/openwire/virtual-topic-mapping/pom.xml
+++ b/examples/protocols/openwire/virtual-topic-mapping/pom.xml
@@ -37,14 +37,29 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.management.j2ee-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>${activemq5-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/pom.xml b/pom.xml
index bc66357..6f6b698 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,23 +107,24 @@
<slf4j.version>1.7.21</slf4j.version>
<qpid.jms.version>0.56.0</qpid.jms.version>
<johnzon.version>0.9.5</johnzon.version>
- <json-p.spec.version>1.0-alpha-1</json-p.spec.version>
- <javax.inject.version>1</javax.inject.version>
<hawtbuff.version>1.11</hawtbuff.version>
<jb.logmanager.version>2.1.10.Final</jb.logmanager.version>
<jb.slf4j-jboss-logmanager.version>1.0.4.GA</jb.slf4j-jboss-logmanager.version>
<version.org.wildfly.common.wildfly-common>1.5.2.Final</version.org.wildfly.common.wildfly-common>
<airlift.version>0.8</airlift.version>
- <geronimo.annotation.1.1.spec.version>1.0.1</geronimo.annotation.1.1.spec.version>
- <geronimo.ejb.3.0.spec.version>1.0.1</geronimo.ejb.3.0.spec.version>
- <geronimo.jta.1.1.spec.version>1.1.1</geronimo.jta.1.1.spec.version>
- <geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
- <jakarta.json-api.version>2.0.0</jakarta.json-api.version>
- <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
- <jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
- <jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
- <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
- <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
+ <jakarta.activation-api.version>1.2.2</jakarta.activation-api.version>
+ <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
+ <jakarta.ejb-api.version>3.2.6</jakarta.ejb-api.version>
+ <jakarta.enterprise.cdi-api.version>2.0.2</jakarta.enterprise.cdi-api.version>
+ <jakarta.inject-api.version>1.0.3</jakarta.inject-api.version>
+ <jakarta.jms-api.version>2.0.3</jakarta.jms-api.version>
+ <jakarta.json-api.version>1.1.6</jakarta.json-api.version>
+ <jakarta.management.j2ee-api.version>1.1.4</jakarta.management.j2ee-api.version>
+ <jakarta.resource-api.version>1.7.4</jakarta.resource-api.version>
+ <jakarta.security.auth.message-api.version>1.1.3</jakarta.security.auth.message-api.version>
+ <jakarta.transaction-api.version>1.3.3</jakarta.transaction-api.version>
+ <jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
+ <jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
<weld.version>2.4.0.Final</weld.version>
<arquillian-weld-embedded.version>2.0.0.Beta3</arquillian-weld-embedded.version>
<owb.version>1.7.0</owb.version>
@@ -135,7 +136,6 @@
<version.micrometer>1.6.1</version.micrometer>
<hamcrest.version>2.1</hamcrest.version>
<surefire.version>2.22.2</surefire.version>
- <version.jaxb.api>2.3.1</version.jaxb.api>
<version.jaxb.runtime>2.3.3</version.jaxb.runtime>
<paho.client.mqttv3.version>1.2.5</paho.client.mqttv3.version>
<!-- for JakrtaEE -->
@@ -202,9 +202,6 @@
<directory-version>2.0.0-M15</directory-version>
<directory-jdbm2-version>2.0.0-M1</directory-jdbm2-version>
- <cdi-api.version>1.2</cdi-api.version>
- <geronimo-annotation_1.2_spec.version>1.0</geronimo-annotation_1.2_spec.version>
-
<netty-transport-native-epoll-classifier>linux-x86_64</netty-transport-native-epoll-classifier>
<netty-transport-native-kqueue-classifier>osx-x86_64</netty-transport-native-kqueue-classifier>
@@ -411,9 +408,10 @@
<!-- ### Run Time Dependencies: MUST NOT INCLUDE CAT X LICENSES ###-->
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.inject-api.version}</version>
+ <!-- License: EPL 2.0 -->
</dependency>
<dependency>
<groupId>org.fusesource.hawtbuf</groupId>
@@ -452,12 +450,6 @@
<!-- License: BSD -->
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- <version>${geronimo.jms.2.spec.version}</version>
- <!-- License: Apache 2.0 -->
- </dependency>
- <dependency>
<groupId>jakarta.jms</groupId>
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
@@ -516,18 +508,6 @@
<!-- ## Examples Dependencies ## -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>${geronimo.ejb.3.0.spec.version}</version>
- <!-- License: Apache 2.0 -->
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo.jta.1.1.spec.version}</version>
- <!-- License: Apache 2.0 -->
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
@@ -555,6 +535,12 @@
<groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
<version>${airlift.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </exclusion>
+ </exclusions>
<!-- License: Apache 2.0 -->
</dependency>
<!--needed to compile transport jar-->
@@ -647,6 +633,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
<!-- License: Apache 2.0 -->
</dependency>
@@ -664,11 +654,6 @@
</dependency>
<!-- json -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>${json-p.spec.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
<version>${johnzon.version}</version>
@@ -679,73 +664,24 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${resteasy.version}</version>
- <exclusions>
- <exclusion>
- <!-- We exclude this dep as it is GPL licensed. Instead we include the Geronimo annotations -->
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
<version>${resteasy.version}</version>
- <exclusions>
- <exclusion>
- <!-- We exclude this dep as it is GPL licensed. Instead we include the Geronimo annotations -->
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
<version>${resteasy.version}</version>
- <exclusions>
- <exclusion>
- <!-- We exclude this dep as it is GPL licensed. Instead we include the Geronimo annotations -->
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- <!-- License: Apache 2.0 -->
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-atom-provider</artifactId>
- <version>${resteasy.version}</version>
- <exclusions>
- <exclusion>
- <!-- We exclude this dep as it is GPL licensed. Instead we include the Geronimo annotations -->
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>tjws</artifactId>
<version>${resteasy.version}</version>
- <exclusions>
- <exclusion>
- <!-- We exclude this dep as it is GPL licensed. Instead we include the Geronimo annotations -->
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- <!-- License: Apache 2.0 -->
- </dependency>
-
- <!-- Replacement for jboss annotations -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>${geronimo.annotation.1.1.spec.version}</version>
<!-- License: Apache 2.0 -->
</dependency>
@@ -765,13 +701,6 @@
</dependency>
<!-- ## End Jetty Wed Dependencies ## -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>2.0.0</version>
- <!-- License: Apache 2.0 -->
- </dependency>
-
<!-- for URL reflection. Using Populate on URI Factory at activemq-commons -->
<dependency>
<groupId>commons-beanutils</groupId>
@@ -850,12 +779,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.2_spec</artifactId>
- <version>${geronimo-annotation_1.2_spec.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se</artifactId>
<version>${weld.version}</version>
@@ -892,9 +815,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api.version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta.enterprise.cdi-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- OSGi support -->
@@ -919,9 +842,9 @@
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <version>1.0</version>
+ <groupId>jakarta.security.auth.message</groupId>
+ <artifactId>jakarta.security.auth.message-api</artifactId>
+ <version>${jakarta.security.auth.message-api.version}</version>
</dependency>
</dependencies>
diff --git a/tests/artemis-test-support/pom.xml b/tests/artemis-test-support/pom.xml
index 0854fde..9991a70 100644
--- a/tests/artemis-test-support/pom.xml
+++ b/tests/artemis-test-support/pom.xml
@@ -64,6 +64,14 @@
<artifactId>netty-handler</artifactId>
</dependency>
<dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<exclusions>
@@ -71,6 +79,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -78,13 +90,9 @@
<artifactId>hawtbuf</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index e7e09e2..b25779b 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -187,6 +187,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -199,21 +203,25 @@
<artifactId>mqtt-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
@@ -352,12 +360,12 @@
<arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
- <arg>jakarta.json:jakarta.json-api:${jakarta.json-api.version}</arg>
- <arg>jakarta.transaction:jakarta.transaction-api:${jakarta.transaction-api.version}</arg>
+ <arg>jakarta.jms:jakarta.jms-api:3.0.0</arg>
+ <arg>jakarta.json:jakarta.json-api:2.0.0</arg>
+ <arg>jakarta.transaction:jakarta.transaction-api:2.0.0</arg>
<arg>org.apache.activemq:artemis-jakarta-server:${project.version}</arg>
<arg>org.apache.activemq:artemis-jakarta-client:${project.version}</arg>
<arg>org.apache.activemq:artemis-jakarta-service-extensions:${project.version}</arg>
- <arg>jakarta.jms:jakarta.jms-api:${jakarta.jms-api.version}</arg>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<variableName>ARTEMIS-JAKARTAEE</variableName>
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index e313cef..e92fa03 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -153,16 +153,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
index 66607fd..3aacc40 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/ra/MDBMultipleHandlersServerDisconnectTest.java
@@ -408,9 +408,24 @@ public class MDBMultipleHandlersServerDisconnectTest extends ActiveMQRATestBase
}
@Override
+ public MessageEndpoint createEndpoint(XAResource xaResource, long l) throws UnavailableException {
+ return null;
+ }
+
+ @Override
public boolean isDeliveryTransacted(Method method) throws NoSuchMethodException {
return isDeliveryTransacted;
}
+
+ @Override
+ public String getActivationName() {
+ return null;
+ }
+
+ @Override
+ public Class<?> getEndpointClass() {
+ return TestEndpoint.class;
+ }
}
public class TestEndpoint extends DummyMessageEndpoint {
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index db73ca3..65140fa 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -187,6 +187,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -203,21 +207,25 @@
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
@@ -347,11 +355,13 @@
<artifactId>apache-karaf</artifactId>
<version>${karaf.version}</version>
<type>tar.gz</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<version>${karaf.version}</version>
+ <scope>test</scope>
</dependency>
<!-- rest test -->
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
index 80f562d..81c59e5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQRATestBase.java
@@ -27,9 +27,11 @@ import javax.resource.spi.endpoint.MessageEndpoint;
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.resource.spi.work.ExecutionContext;
import javax.resource.spi.work.Work;
+import javax.resource.spi.work.WorkContext;
import javax.resource.spi.work.WorkException;
import javax.resource.spi.work.WorkListener;
import javax.resource.spi.work.WorkManager;
+import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAResource;
import java.lang.reflect.Method;
import java.util.Map;
@@ -102,9 +104,24 @@ public abstract class ActiveMQRATestBase extends JMSTestBase {
}
@Override
+ public MessageEndpoint createEndpoint(XAResource xaResource, long l) throws UnavailableException {
+ return null;
+ }
+
+ @Override
public boolean isDeliveryTransacted(Method method) throws NoSuchMethodException {
return isDeliveryTransacted;
}
+
+ @Override
+ public String getActivationName() {
+ return null;
+ }
+
+ @Override
+ public Class<?> getEndpointClass() {
+ return DummyMessageEndpoint.class;
+ }
}
protected class DummyMessageEndpoint implements MessageEndpoint, MessageListener {
@@ -165,6 +182,16 @@ public abstract class ActiveMQRATestBase extends JMSTestBase {
}
@Override
+ public boolean isContextSupported(Class<? extends WorkContext> aClass) {
+ return false;
+ }
+
+ @Override
+ public TransactionSynchronizationRegistry getTransactionSynchronizationRegistry() {
+ return null;
+ }
+
+ @Override
public WorkManager getWorkManager() {
return workManager;
}
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index eb2e67d..e221da3 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -81,12 +81,12 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index c7fff50..804a911 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -70,8 +70,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/tests/karaf-client-integration-tests/pom.xml b/tests/karaf-client-integration-tests/pom.xml
index e224143..d09628e 100644
--- a/tests/karaf-client-integration-tests/pom.xml
+++ b/tests/karaf-client-integration-tests/pom.xml
@@ -41,15 +41,28 @@
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
- <!--Let's compile against JMS 2-->
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index e98a0ff..380daa9 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -104,12 +104,6 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</dependency>
diff --git a/tests/pom.xml b/tests/pom.xml
index 9bb2ac0..748a6ac 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -50,8 +50,20 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>${qpid.jms.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_2.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
<!-- License: Apache: 2.0 -->
</dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <version>${jakarta.management.j2ee-api.version}</version>
+ <!-- License: EPL 2.0 -->
+ </dependency>
<!-- End JMS Dependencies -->
</dependencies>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 5511fd1..d9e93b4 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -81,10 +81,6 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<scope>provided</scope>
@@ -120,16 +116,29 @@
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
</dependency>
<dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.management.j2ee</groupId>
+ <artifactId>jakarta.management.j2ee-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>${activemq5-version}</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ </exclusion>
</exclusions>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index 9349c3e..27bcf91 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -88,8 +88,8 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index 5efc919..8402264 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -103,8 +103,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index 814ef8c..50dd660 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -88,12 +88,12 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 43fb477..3282727 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -94,16 +94,16 @@
<version>${activemq-artemis-native-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/BootstrapContext.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/BootstrapContext.java
index b69ec51..cd45d31 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/BootstrapContext.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/BootstrapContext.java
@@ -20,9 +20,11 @@ import javax.resource.spi.UnavailableException;
import javax.resource.spi.XATerminator;
import javax.resource.spi.work.ExecutionContext;
import javax.resource.spi.work.Work;
+import javax.resource.spi.work.WorkContext;
import javax.resource.spi.work.WorkException;
import javax.resource.spi.work.WorkListener;
import javax.resource.spi.work.WorkManager;
+import javax.transaction.TransactionSynchronizationRegistry;
import java.util.Timer;
public class BootstrapContext implements javax.resource.spi.BootstrapContext {
@@ -33,6 +35,16 @@ public class BootstrapContext implements javax.resource.spi.BootstrapContext {
}
@Override
+ public boolean isContextSupported(Class<? extends WorkContext> aClass) {
+ return false;
+ }
+
+ @Override
+ public TransactionSynchronizationRegistry getTransactionSynchronizationRegistry() {
+ return null;
+ }
+
+ @Override
public WorkManager getWorkManager() {
return new WorkManager() {
@Override
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/MessageEndpointFactory.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/MessageEndpointFactory.java
index 993af61..1f69320 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/MessageEndpointFactory.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/MessageEndpointFactory.java
@@ -29,8 +29,23 @@ public class MessageEndpointFactory implements javax.resource.spi.endpoint.Messa
}
@Override
+ public MessageEndpoint createEndpoint(XAResource xaResource, long l) throws UnavailableException {
+ return null;
+ }
+
+ @Override
public boolean isDeliveryTransacted(final Method arg0) throws NoSuchMethodException {
return false;
}
+ @Override
+ public String getActivationName() {
+ return null;
+ }
+
+ @Override
+ public Class<?> getEndpointClass() {
+ return null;
+ }
+
}
\ No newline at end of file