(tomee) branch tomee-10.x updated: Make GenerateBoms version-agnostic so it strips any minor version (10.2.x etc)

[rz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-10.x by this push:
     new f6210b8ba6 Make GenerateBoms version-agnostic so it strips any minor version (10.2.x etc)
f6210b8ba6 is described below

commit f6210b8ba6458251025893234acb934149154971
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Fri Jun 26 14:57:13 2026 +0200

    Make GenerateBoms version-agnostic so it strips any minor version (10.2.x etc)
---
 .../src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 b1c32c73f0..defa1a8122 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
@@ -564,7 +564,10 @@ public class GenerateBoms {
                     jar.getName().startsWith("mp-common-") ||
                     jar.getName().startsWith("mp-jwt-") ||
                     jar.getName().startsWith("mbean-annotation-"))) {
-                final String artifact = jar.getName().replaceAll("-\\d\\d?.1.*", "");
+                // Strip the version suffix (e.g. "-10.2.0-SNAPSHOT.jar") to get the artifactId.
+                // Match from the first dash that is followed by a digit so this stays
+                // version-agnostic and no longer needs editing for every minor release.
+                final String artifact = jar.getName().replaceAll("-\\d.*", "");
                 return new Artifact("org.apache.tomee", artifact, "${project.version}", null);
             }