This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5376-bom-fix
in repository https://gitbox.apache.org/repos/asf/struts.git
commit acd0211f582cc7ee04abf126ebddeec3b582a334
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Tue Feb 25 12:57:47 2025 +1100
WW-5376 Fix BOM leaking unrelated dependencies
---
bom/pom.xml | 65 +++++++++++++++++++++++-----------------------
pom.xml | 85 +++----------------------------------------------------------
2 files changed, 35 insertions(+), 115 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 2a8b5394a..4130aeb65 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -24,27 +24,26 @@
<parent>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-parent</artifactId>
- <version>7.0.4-SNAPSHOT</version>
+ <artifactId>struts-master</artifactId>
+ <version>15</version>
</parent>
<artifactId>struts2-bom</artifactId>
<version>7.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Struts 2 Bill of Materials</name>
- <description>Struts 2 Bill of Materials</description>
+ <name>Struts BOM</name>
+ <description>Struts Bill of Materials (BOM)</description>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<properties>
- <struts-version.version>7.0.4-SNAPSHOT</struts-version.version>
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
</properties>
@@ -54,115 +53,115 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-async-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-bean-validation-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-cdi-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-config-browser-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-gxp-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jasperreports-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-javatemplates-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jfreechart-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-json-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plexus-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-rest-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-testng-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-velocity-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-xslt-plugin</artifactId>
- <version>${struts-version.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
- <scm>
- <tag>HEAD</tag>
-
<connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
-
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
- <url>https://github.com/apache/struts/</url>
- </scm>
+ <scm>
+ <tag>HEAD</tag>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
+ <url>https://github.com/apache/struts/</url>
+ </scm>
</project>
diff --git a/pom.xml b/pom.xml
index cad560f8e..14d27cf75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -474,7 +474,6 @@
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
@@ -483,88 +482,10 @@
<dependency>
<groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-spring-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-bean-validation-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-cdi-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-junit-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-convention-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-tiles-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-javatemplates-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-config-browser-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-jasperreports-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-jfreechart-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-rest-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-testng-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-json-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-async-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-velocity-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-xslt-plugin</artifactId>
+ <artifactId>struts2-bom</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
