You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2025/02/04 11:48:36 UTC
(tomee) branch main updated: TOMEE-4442 - Quartz Shade 2.5.0
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 59881435f4 TOMEE-4442 - Quartz Shade 2.5.0
59881435f4 is described below
commit 59881435f48189b9e76d92138fa3c63d27dcd778
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Thu Jan 9 15:05:50 2025 +0100
TOMEE-4442 - Quartz Shade 2.5.0
---
boms/tomee-microprofile/pom.xml | 6 +++---
boms/tomee-plume/pom.xml | 6 +++---
boms/tomee-plus/pom.xml | 6 +++---
boms/tomee-webprofile/pom.xml | 6 +++---
container/openejb-core/pom.xml | 10 +++++-----
pom.xml | 12 ++++--------
server/openejb-server/pom.xml | 6 +++---
tomee/tomee-plume-webapp/pom.xml | 6 +++---
tomee/tomee-plus-webapp/pom.xml | 6 +++---
tomee/tomee-webapp/pom.xml | 6 +++---
10 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 0dbfa41e08..2d87c4445b 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1102,9 +1102,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
- <version>2.2.4</version>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
+ <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 5dd19e30d7..a645490e53 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1168,9 +1168,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
- <version>2.2.4</version>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
+ <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 54407a8981..e561855549 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1190,9 +1190,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
- <version>2.2.4</version>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
+ <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index e0b620eb1c..6c0dd36fa4 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -508,9 +508,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
- <version>2.2.4</version>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
+ <version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 2cc9321e7e..e3538c8001 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -209,9 +209,9 @@
org.junit.runners.model;resolution:=optional,
org.testng;resolution:=optional,
org.osgi.framework,
- org.apache.openejb.quartz;resolution:=optional,
- org.apache.openejb.quartz.impl;resolution:=optional,
- org.apache.openejb.quartz.spi;resolution:=optional,
+ org.apache.tomee.quartz;resolution:=optional,
+ org.apache.tomee.quartz.impl;resolution:=optional,
+ org.apache.tomee.quartz.spi;resolution:=optional,
org.slf4j;resolution:=optional;version="[1.6,4)",
org.w3c.dom,
org.w3c.dom.ls,
@@ -611,8 +611,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
</dependency>
<!-- Dependency of Quartz -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 7adc3161ff..d1bfb36f90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
<version.shrinkwrap.resolver.bom>3.1.4</version.shrinkwrap.resolver.bom>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
- <version.quartz-openejb-shade>2.2.4</version.quartz-openejb-shade>
+ <version.tomee-quartz-shade>2.5.0</version.tomee-quartz-shade>
<version.axiom>1.4.0</version.axiom>
<version.xbean>4.26</version.xbean>
<version.groovy>2.4.21</version.groovy>
@@ -1548,18 +1548,14 @@
<version>${tomcat.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
- <version>${version.quartz-openejb-shade}</version>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
+ <version>${version.tomee-quartz-shade}</version>
<exclusions>
<exclusion>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.tomitribe.quartz</groupId>
- <artifactId>quartz</artifactId>
- </exclusion>
<exclusion>
<groupId>jakarta.transaction</groupId>
<artifactId>jta</artifactId>
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index e9f509fb6e..9c9120a8d8 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -276,9 +276,9 @@
org.hibernate.transaction;resolution:=optional,
org.osgi.framework;version="[1.5,2)",
org.osgi.util.tracker;version="[1.4,2)",
- org.apache.openejb.quartz;resolution:=optional,
- org.apache.openejb.quartz.impl;resolution:=optional,
- org.apache.openejb.quartz.spi;resolution:=optional,
+ org.apache.tomee.quartz;resolution:=optional,
+ org.apache.tomee.quartz.impl;resolution:=optional,
+ org.apache.tomee.quartz.spi;resolution:=optional,
org.slf4j;version="[1.6,4)",
org.w3c.dom,
org.w3c.dom.ls,
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 6505cddc08..13d461b09c 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -504,9 +504,9 @@
<artifactId>openjpa</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
- <version>${version.quartz-openejb-shade}</version>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
+ <version>${version.tomee-quartz-shade}</version>
<exclusions>
<exclusion>
<groupId>org.quartz-scheduler</groupId>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 62ea42e5e3..d5626a6f57 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -530,9 +530,9 @@
<artifactId>openjpa</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
- <version>${version.quartz-openejb-shade}</version>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
+ <version>${version.tomee-quartz-shade}</version>
<exclusions>
<exclusion>
<groupId>org.quartz-scheduler</groupId>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index be3b0e0cdb..7fbd580700 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -565,9 +565,9 @@
<artifactId>geronimo-connector</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>quartz-openejb-shade</artifactId>
- <version>${version.quartz-openejb-shade}</version>
+ <groupId>org.apache.tomee.shade</groupId>
+ <artifactId>tomee-quartz-shade</artifactId>
+ <version>${version.tomee-quartz-shade}</version>
<exclusions>
<exclusion>
<groupId>org.quartz-scheduler</groupId>