This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 2b6bfbe747 TOMEE-4200 - ActiveMQ 5.18.1 (Jakarta Client)
2b6bfbe747 is described below
commit 2b6bfbe747d8cabbb16f791316ec682a60eabf6b
Author: Richard Zowalla <[email protected]>
AuthorDate: Sat May 6 20:22:44 2023 +0200
TOMEE-4200 - ActiveMQ 5.18.1 (Jakarta Client)
---
boms/tomee-plume/pom.xml | 19 ++------
boms/tomee-plus/pom.xml | 19 ++------
deps/activemq-broker-shade/pom.xml | 4 +-
deps/activemq-client-shade/pom.xml | 99 --------------------------------------
deps/pom.xml | 1 -
pom.xml | 14 ++----
6 files changed, 14 insertions(+), 142 deletions(-)
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index e6aeb4e5c9..eb24bac681 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -542,8 +542,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
- <version>5.16.5</version>
+ <artifactId>activemq-client-jakarta</artifactId>
+ <version>5.18.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -553,8 +553,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- <version>5.16.5</version>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <version>5.18.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1119,17 +1119,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-client-shade</artifactId>
- <version>9.0.1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>activemq-kahadb-store-shade</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 2fbffeea17..b143a32a0b 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -553,8 +553,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
- <version>5.16.5</version>
+ <artifactId>activemq-client-jakarta</artifactId>
+ <version>5.18.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -564,8 +564,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- <version>5.16.5</version>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <version>5.18.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1152,17 +1152,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-client-shade</artifactId>
- <version>9.0.1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>activemq-kahadb-store-shade</artifactId>
diff --git a/deps/activemq-broker-shade/pom.xml
b/deps/activemq-broker-shade/pom.xml
index 9d9234139e..06cc6ff700 100644
--- a/deps/activemq-broker-shade/pom.xml
+++ b/deps/activemq-broker-shade/pom.xml
@@ -40,8 +40,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-client-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client-jakarta</artifactId>
</dependency>
</dependencies>
diff --git a/deps/activemq-client-shade/pom.xml
b/deps/activemq-client-shade/pom.xml
deleted file mode 100644
index 2d740c448f..0000000000
--- a/deps/activemq-client-shade/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>activemq-client-shade</artifactId>
- <name>TomEE :: Deps :: Apache ActiveMQ Client shade</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
- <version>${version.activemq}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.fusesource.hawtbuf</groupId>
- <artifactId>hawtbuf</artifactId>
- <version>1.11</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.activemq:activemq-client</include> <!--
only this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/pom.xml b/deps/pom.xml
index 187c1c2066..e3229803a2 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -33,7 +33,6 @@
<module>cxf-rt-rs-mp-client-shade</module>
<module>sxc-shade</module>
<module>activemq-broker-shade</module>
- <module>activemq-client-shade</module>
<module>activemq-kahadb-store-shade</module>
<module>activemq-ra-shade</module>
<module>commons-dbcp2-shade</module>
diff --git a/pom.xml b/pom.xml
index 06f388db13..fd4ae3137f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,7 @@
<!-- com.sun -->
<version.impl.saaj>2.0.1</version.impl.saaj>
<!-- org.apache -->
- <version.activemq>5.16.5</version.activemq>
+ <version.activemq>5.18.1</version.activemq>
<version.batchee>1.0.2</version.batchee>
<version.bval>2.0.6</version.bval>
<version.cxf>3.5.5</version.cxf>
@@ -1284,15 +1284,9 @@
<version>${version.commons-net}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-client-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client-jakarta</artifactId>
+ <version>${version.activemq}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
