[tomee] branch main updated: TOMEE-4138 GenerateBoms does not support 2 digits version

[jl...@apache.org]

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

jlmonteiro 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 8bf1c40b70 TOMEE-4138 GenerateBoms does not support 2 digits version
8bf1c40b70 is described below

commit 8bf1c40b707cfd8491156166a4f442709b062387
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Jan 3 12:16:48 2023 +0100

    TOMEE-4138 GenerateBoms does not support 2 digits version
---
 .../src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java          | 2 +-
 1 file changed, 1 insertion(+), 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 e0afbc5e73..43bade3f65 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
@@ -528,7 +528,7 @@ public class GenerateBoms {
                     jar.getName().startsWith("mp-common-") ||
                     jar.getName().startsWith("mp-jwt-") ||
                     jar.getName().startsWith("mbean-annotation-")) {
-                final String artifact = jar.getName().replaceAll("-9.0.*", "");
+                final String artifact = jar.getName().replaceAll("-\\d\\d?.0.*", "");
                 return new Artifact("org.apache.tomee", artifact, "${project.version}", null);
             }