Skip to content

Commit 4c08863

Browse files
committed
WW-5376 Fix BOM leaking unrelated dependencies
1 parent 077e985 commit 4c08863

File tree

9 files changed

+334
-454
lines changed

9 files changed

+334
-454
lines changed

apps/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
2727
<version>7.0.4-SNAPSHOT</version>
28+
<relativePath>../parent/pom.xml</relativePath>
2829
</parent>
2930
<artifactId>struts2-apps</artifactId>
3031
<packaging>pom</packaging>
@@ -93,9 +94,7 @@
9394
<dependency>
9495
<groupId>org.apache.struts</groupId>
9596
<artifactId>struts2-core</artifactId>
96-
<version>${project.version}</version>
9797
</dependency>
98-
9998
<dependency>
10099
<groupId>org.springframework</groupId>
101100
<artifactId>spring-test</artifactId>

assembly/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
2727
<version>7.0.4-SNAPSHOT</version>
28+
<relativePath>../parent/pom.xml</relativePath>
2829
</parent>
2930

3031
<artifactId>struts2-assembly</artifactId>

bom/README.md

-20
This file was deleted.

bom/pom.xml

-168
This file was deleted.

core/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
2727
<version>7.0.4-SNAPSHOT</version>
28+
<relativePath>../parent/pom.xml</relativePath>
2829
</parent>
2930
<artifactId>struts2-core</artifactId>
3031
<packaging>jar</packaging>

jakarta/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
2727
<version>7.0.4-SNAPSHOT</version>
28+
<relativePath>../parent/pom.xml</relativePath>
2829
</parent>
2930
<artifactId>struts2-jakarta</artifactId>
3031
<packaging>pom</packaging>

0 commit comments

Comments
 (0)