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/01/09 14:06:21 UTC

(tomee) 01/01: 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 quartz-2.5.0
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit b567316f717a1d30ff5cb1df7c3d32b40935d815
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   |  8 ++++----
 pom.xml                          | 12 ++++--------
 server/openejb-server/pom.xml    |  4 ++--
 tomee/tomee-plume-webapp/pom.xml |  6 +++---
 tomee/tomee-plus-webapp/pom.xml  |  6 +++---
 tomee/tomee-webapp/pom.xml       |  6 +++---
 10 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 143934a04d..d8fb4a8227 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -937,9 +937,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 b39fd0aac3..959a6fc6f0 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1003,9 +1003,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 3739066892..c75785cb35 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1025,9 +1025,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 2af9bab69c..df1a42710b 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 0099001567..45cd1c98ef 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -210,8 +210,8 @@
       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.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 e251f5bb1c..9bc8e87583 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-SNAPSHOT</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 5bb921a41d..aca7fac5e5 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -277,8 +277,8 @@
       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.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 03fb773f8b..09ae9c9712 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 5b1fa96766..246c19734f 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 71f0b72b63..dd5feb52b0 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>