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 480b6dfb72 TOMEE-4454 - Missing artifacts in BOM generated files due
to webapp removal
480b6dfb72 is described below
commit 480b6dfb7246a7f5fa57ef7063dfe37bdc16f77e
Author: Richard Zowalla <[email protected]>
AuthorDate: Mon Feb 10 15:54:08 2025 +0100
TOMEE-4454 - Missing artifacts in BOM generated files due to webapp removal
---
boms/tomee-microprofile/pom.xml | 11 -----------
boms/tomee-plume/pom.xml | 11 -----------
boms/tomee-plus/pom.xml | 11 -----------
boms/tomee-webprofile/pom.xml | 11 -----------
.../test/java/org/apache/tomee/bootstrap/GenerateBoms.java | 9 +++++++++
5 files changed, 9 insertions(+), 44 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index ac92636a97..a9cdcacbcf 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1794,17 +1794,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-microprofile-webapp</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-mojarra</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 653dda65e1..859752ddd6 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1882,17 +1882,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-plume-webapp</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-security</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index e50f9c3b28..89e331b44a 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1904,17 +1904,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-plus-webapp</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-security</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index a8ab520c8a..304ed46b7c 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -1211,17 +1211,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>tomee-webapp</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</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 ee6ead06e1..3de94214c3 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
@@ -362,6 +362,15 @@ public class GenerateBoms {
.filter(jar -> !jar.getName().equals("catalina-ant.jar"))
.filter(jar -> !jar.getName().startsWith("tomcat-i18n"))
.filter(jar ->
!jar.getName().startsWith("jakartaee-migration"))
+ /*
+ Webapp distributions removed from BOM generation per:
+ - https://issues.apache.org/jira/browse/TOMEE-3724
+ -
https://lists.apache.org/thread/31w7336d5ycqhmoy4pngbsjg3odm0yqx
+ */
+ .filter(jar -> !jar.getName().startsWith("tomee-plume-webapp"))
+ .filter(jar -> !jar.getName().startsWith("tomee-plus-webapp"))
+ .filter(jar ->
!jar.getName().startsWith("tomee-microprofile-webapp"))
+ .filter(jar -> !jar.getName().startsWith("tomee-webapp"))
.map(from)
.filter(Objects::nonNull)
.sorted()
