Skip to content

Commit 730d5ae

Browse files
kusalkkusalk
committed
WW-5376 Fix BOM leaking unrelated dependencies
1 parent 077e985 commit 730d5ae

File tree

8 files changed

+340
-403
lines changed

8 files changed

+340
-403
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/pom.xml

+27-49
Original file line numberDiff line numberDiff line change
@@ -19,150 +19,128 @@
1919
* under the License.
2020
*/
2121
-->
22-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<project xmlns="http://maven.apache.org/POM/4.0.0"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2325
<modelVersion>4.0.0</modelVersion>
24-
2526
<parent>
2627
<groupId>org.apache.struts</groupId>
27-
<artifactId>struts2-parent</artifactId>
28+
<artifactId>struts2-project</artifactId>
2829
<version>7.0.4-SNAPSHOT</version>
2930
</parent>
3031

3132
<artifactId>struts2-bom</artifactId>
32-
<version>7.0.4-SNAPSHOT</version>
3333
<packaging>pom</packaging>
34-
35-
<name>Struts 2 Bill of Materials</name>
36-
<description>Struts 2 Bill of Materials</description>
37-
38-
<licenses>
39-
<license>
40-
<name>The Apache Software License, Version 2.0</name>
41-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
42-
<distribution>repo</distribution>
43-
</license>
44-
</licenses>
45-
46-
<properties>
47-
<struts-version.version>7.0.4-SNAPSHOT</struts-version.version>
48-
<maven.site.skip>true</maven.site.skip>
49-
<maven.site.deploy.skip>true</maven.site.deploy.skip>
50-
</properties>
34+
<name>Struts BOM</name>
35+
<description>Struts Bill of Materials (BOM)</description>
5136

5237
<dependencyManagement>
5338
<dependencies>
5439
<dependency>
5540
<groupId>org.apache.struts</groupId>
5641
<artifactId>struts2-core</artifactId>
57-
<version>${struts-version.version}</version>
42+
<version>${project.version}</version>
5843
</dependency>
5944
<dependency>
6045
<groupId>org.apache.struts</groupId>
6146
<artifactId>struts2-async-plugin</artifactId>
62-
<version>${struts-version.version}</version>
47+
<version>${project.version}</version>
6348
</dependency>
6449
<dependency>
6550
<groupId>org.apache.struts</groupId>
6651
<artifactId>struts2-bean-validation-plugin</artifactId>
67-
<version>${struts-version.version}</version>
52+
<version>${project.version}</version>
6853
</dependency>
6954
<dependency>
7055
<groupId>org.apache.struts</groupId>
7156
<artifactId>struts2-cdi-plugin</artifactId>
72-
<version>${struts-version.version}</version>
57+
<version>${project.version}</version>
7358
</dependency>
7459
<dependency>
7560
<groupId>org.apache.struts</groupId>
7661
<artifactId>struts2-convention-plugin</artifactId>
77-
<version>${struts-version.version}</version>
62+
<version>${project.version}</version>
7863
</dependency>
7964
<dependency>
8065
<groupId>org.apache.struts</groupId>
8166
<artifactId>struts2-config-browser-plugin</artifactId>
82-
<version>${struts-version.version}</version>
67+
<version>${project.version}</version>
8368
</dependency>
8469
<dependency>
8570
<groupId>org.apache.struts</groupId>
8671
<artifactId>struts2-embeddedjsp-plugin</artifactId>
87-
<version>${struts-version.version}</version>
72+
<version>${project.version}</version>
8873
</dependency>
8974
<dependency>
9075
<groupId>org.apache.struts</groupId>
9176
<artifactId>struts2-gxp-plugin</artifactId>
92-
<version>${struts-version.version}</version>
77+
<version>${project.version}</version>
9378
</dependency>
9479
<dependency>
9580
<groupId>org.apache.struts</groupId>
9681
<artifactId>struts2-jasperreports-plugin</artifactId>
97-
<version>${struts-version.version}</version>
82+
<version>${project.version}</version>
9883
</dependency>
9984
<dependency>
10085
<groupId>org.apache.struts</groupId>
10186
<artifactId>struts2-javatemplates-plugin</artifactId>
102-
<version>${struts-version.version}</version>
87+
<version>${project.version}</version>
10388
</dependency>
10489
<dependency>
10590
<groupId>org.apache.struts</groupId>
10691
<artifactId>struts2-jfreechart-plugin</artifactId>
107-
<version>${struts-version.version}</version>
92+
<version>${project.version}</version>
10893
</dependency>
10994
<dependency>
11095
<groupId>org.apache.struts</groupId>
11196
<artifactId>struts2-json-plugin</artifactId>
112-
<version>${struts-version.version}</version>
97+
<version>${project.version}</version>
11398
</dependency>
11499
<dependency>
115100
<groupId>org.apache.struts</groupId>
116101
<artifactId>struts2-junit-plugin</artifactId>
117-
<version>${struts-version.version}</version>
102+
<version>${project.version}</version>
118103
</dependency>
119104
<dependency>
120105
<groupId>org.apache.struts</groupId>
121106
<artifactId>struts2-osgi-plugin</artifactId>
122-
<version>${struts-version.version}</version>
107+
<version>${project.version}</version>
123108
</dependency>
124109
<dependency>
125110
<groupId>org.apache.struts</groupId>
126111
<artifactId>struts2-plexus-plugin</artifactId>
127-
<version>${struts-version.version}</version>
112+
<version>${project.version}</version>
128113
</dependency>
129114
<dependency>
130115
<groupId>org.apache.struts</groupId>
131116
<artifactId>struts2-rest-plugin</artifactId>
132-
<version>${struts-version.version}</version>
117+
<version>${project.version}</version>
133118
</dependency>
134119
<dependency>
135120
<groupId>org.apache.struts</groupId>
136121
<artifactId>struts2-spring-plugin</artifactId>
137-
<version>${struts-version.version}</version>
122+
<version>${project.version}</version>
138123
</dependency>
139124
<dependency>
140125
<groupId>org.apache.struts</groupId>
141126
<artifactId>struts2-testng-plugin</artifactId>
142-
<version>${struts-version.version}</version>
127+
<version>${project.version}</version>
143128
</dependency>
144129
<dependency>
145130
<groupId>org.apache.struts</groupId>
146131
<artifactId>struts2-tiles-plugin</artifactId>
147-
<version>${struts-version.version}</version>
132+
<version>${project.version}</version>
148133
</dependency>
149134
<dependency>
150135
<groupId>org.apache.struts</groupId>
151136
<artifactId>struts2-velocity-plugin</artifactId>
152-
<version>${struts-version.version}</version>
137+
<version>${project.version}</version>
153138
</dependency>
154139
<dependency>
155140
<groupId>org.apache.struts</groupId>
156141
<artifactId>struts2-xslt-plugin</artifactId>
157-
<version>${struts-version.version}</version>
142+
<version>${project.version}</version>
158143
</dependency>
159144
</dependencies>
160145
</dependencyManagement>
161-
162-
<scm>
163-
<tag>HEAD</tag>
164-
<connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
165-
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
166-
<url>https://github.com/apache/struts/</url>
167-
</scm>
168146
</project>

‎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)