[tomee] branch main updated: Fix GenerateBoms to support new websocket-client-api.jar

[jlmonteiro]

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 b65735e168 Fix GenerateBoms to support new websocket-client-api.jar
b65735e168 is described below

commit b65735e1681e6cca8ff43c3060ae4941eb1b51fb
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Wed Jan 4 19:16:30 2023 +0100

    Fix GenerateBoms to support new websocket-client-api.jar
---
 .../src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java        | 4 ++++
 1 file changed, 4 insertions(+)

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 43bade3f65..edc329864a 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
@@ -220,6 +220,7 @@ public class GenerateBoms {
                     .or(startsWith("jakarta.").and(endsWith("-api")))
                     .or(startsWith("microprofile-").and(endsWith("-api")))
                     
.or(startsWith("microprofile-").and(endsWith("-api-shade")))
+                    .or(startsWith("websocket-").and(endsWith("-api"))) // 
websocket-client-api.jar in Tomcat 10.1+
                     .or(startsWith("tomcat-").and(endsWith("-api")));
 
             final List<Artifact> apiArtifacts = 
distribution.getArtifacts().stream()
@@ -487,6 +488,9 @@ public class GenerateBoms {
             if (jar.getName().equals("websocket-api.jar")) {
                 return new Artifact("org.apache.tomcat", 
"tomcat-websocket-api", "${tomcat.version}", null);
             }
+            if (jar.getName().equals("websocket-client-api.jar")) {
+                return new Artifact("org.apache.tomcat", 
"websocket-client-api", "${tomcat.version}", null);
+            }
             if (jar.getName().equals("tomcat-coyote.jar")) {
                 return new Artifact("org.apache.tomcat", "tomcat-coyote", 
"${tomcat.version}", null);
             }