(tomee) branch main updated: Fixes bom generation for quartz change

[rzo1]

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 909d10db13 Fixes bom generation for quartz change
909d10db13 is described below

commit 909d10db13a078608b0cd2bd046dbc733d081c08
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Tue Feb 4 13:11:27 2025 +0100

    Fixes bom generation for quartz change
---
 boms/tomee-microprofile/pom.xml                                   | 4 ++--
 boms/tomee-plume/pom.xml                                          | 4 ++--
 boms/tomee-plus/pom.xml                                           | 4 ++--
 boms/tomee-webprofile/pom.xml                                     | 4 ++--
 .../src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java    | 8 ++++++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index f3d918830b..bb139987d9 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1818,8 +1818,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-quartz-shade-2.5.0.jar</artifactId>
-      <version>${project.version}</version>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>${version.tomee-quartz-shade}</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index cb77c8b8f4..8180f2dec6 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1884,8 +1884,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-quartz-shade-2.5.0.jar</artifactId>
-      <version>${project.version}</version>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>${version.tomee-quartz-shade}</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 85a02f1d21..b252719896 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1906,8 +1906,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-quartz-shade-2.5.0.jar</artifactId>
-      <version>${project.version}</version>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>${version.tomee-quartz-shade}</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index bdd9b31aa3..3ad65e7285 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -1191,8 +1191,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomee</groupId>
-      <artifactId>tomee-quartz-shade-2.5.0.jar</artifactId>
-      <version>${project.version}</version>
+      <artifactId>tomee-quartz-shade</artifactId>
+      <version>${version.tomee-quartz-shade}</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git 
a/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java 
b/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
index beec1304aa..0c122be2f0 100644
--- 
a/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
+++ 
b/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
@@ -530,11 +530,15 @@ public class GenerateBoms {
                 return new Artifact("org.apache.tomee", "openejb-javaagent", 
"${project.version}", null);
             }
 
-            if (jar.getName().startsWith("openejb-") ||
+            if (jar.getName().startsWith("tomee-quartz-shade")) {
+                return new Artifact("org.apache.tomee", "tomee-quartz-shade", 
"${version.tomee-quartz-shade}", null);
+            }
+
+            if ((jar.getName().startsWith("openejb-") ||
                     jar.getName().startsWith("tomee-") ||
                     jar.getName().startsWith("mp-common-") ||
                     jar.getName().startsWith("mp-jwt-") ||
-                    jar.getName().startsWith("mbean-annotation-")) {
+                    jar.getName().startsWith("mbean-annotation-"))) {
                 final String artifact = 
jar.getName().replaceAll("-\\d\\d?.0.*", "");
                 return new Artifact("org.apache.tomee", artifact, 
"${project.version}", null);
             }