From d2cb444bcf3268265e720fabf9c3bb2c4968c06a Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Tue, 25 Feb 2025 12:57:47 +1100 Subject: [PATCH] WW-5376 Fix BOM leaking unrelated dependencies --- apps/pom.xml | 3 +- assembly/pom.xml | 1 + bom/pom.xml | 71 ++++------ core/pom.xml | 1 + jakarta/pom.xml | 1 + parent/pom.xml | 305 ++++++++++++++++++++++++++++++++++++++++ plugins/pom.xml | 1 + pom.xml | 355 +---------------------------------------------- 8 files changed, 340 insertions(+), 398 deletions(-) create mode 100644 parent/pom.xml diff --git a/apps/pom.xml b/apps/pom.xml index 161b1c66be..e156f1d6c8 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -25,6 +25,7 @@ org.apache.struts struts2-parent 7.0.4-SNAPSHOT + ../parent/pom.xml struts2-apps pom @@ -93,9 +94,7 @@ org.apache.struts struts2-core - ${project.version} - org.springframework spring-test diff --git a/assembly/pom.xml b/assembly/pom.xml index 9dc155d190..750e7b1c3c 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -25,6 +25,7 @@ org.apache.struts struts2-parent 7.0.4-SNAPSHOT + ../parent/pom.xml struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 2a8b5394af..83e1a5a80c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -19,32 +19,22 @@ * under the License. */ --> - + 4.0.0 - org.apache.struts - struts2-parent + struts2-project 7.0.4-SNAPSHOT struts2-bom - 7.0.4-SNAPSHOT pom - - Struts 2 Bill of Materials - Struts 2 Bill of Materials - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + Struts BOM + Struts Bill of Materials (BOM) - 7.0.4-SNAPSHOT true true @@ -54,115 +44,108 @@ org.apache.struts struts2-core - ${struts-version.version} + ${project.version} org.apache.struts struts2-async-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-bean-validation-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-cdi-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-convention-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-config-browser-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-embeddedjsp-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-gxp-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-jasperreports-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-javatemplates-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-jfreechart-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-json-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-junit-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-osgi-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-plexus-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-rest-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-spring-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-testng-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-tiles-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-velocity-plugin - ${struts-version.version} + ${project.version} org.apache.struts struts2-xslt-plugin - ${struts-version.version} + ${project.version} - - - HEAD - scm:git:https://gitbox.apache.org/repos/asf/struts.git - scm:git:https://gitbox.apache.org/repos/asf/struts.git - https://github.com/apache/struts/ - diff --git a/core/pom.xml b/core/pom.xml index 0862a0182b..2e10aafccd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -25,6 +25,7 @@ org.apache.struts struts2-parent 7.0.4-SNAPSHOT + ../parent/pom.xml struts2-core jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 14811e8ea2..a360c73ce9 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -25,6 +25,7 @@ org.apache.struts struts2-parent 7.0.4-SNAPSHOT + ../parent/pom.xml struts2-jakarta pom diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 0000000000..8df5ff7be6 --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,305 @@ + + + + 4.0.0 + + + org.apache.struts + struts2-bom + 7.0.4-SNAPSHOT + ../bom/pom.xml + + + struts2-parent + pom + Struts Parent POM + Apache Struts + + + true + true + + + + + + org.apache.struts + struts-annotations + 1.0.8 + + + + org.freemarker + freemarker + ${freemarker.version} + + + + com.github.ben-manes.caffeine + caffeine + 3.1.8 + + + + + org.apache.velocity + velocity-engine-core + 2.4.1 + + + org.apache.velocity.tools + velocity-tools-generic + ${velocity-tools.version} + + + org.apache.struts + struts2-velocity-tools-view-jakarta + ${project.version} + + + org.apache.struts + struts2-velocity-tools-jsp-jakarta + ${project.version} + + + + ognl + ognl + ${ognl.version} + + + org.ow2.asm + asm + ${asm.version} + + + org.ow2.asm + asm-commons + ${asm.version} + + + + jakarta.platform + jakarta.jakartaee-bom + ${jakarta-ee.version} + pom + import + + + org.glassfish.jaxb + jaxb-bom + ${jaxb-impl.version} + pom + import + + + + org.glassfish + jakarta.el + 5.0.0-M1 + test + + + + + commons-logging + commons-logging + 1.3.4 + + + org.apache.commons + commons-collections4 + 4.4 + + + org.apache.commons + commons-fileupload2-jakarta-servlet6 + 2.0.0-M2 + + + commons-io + commons-io + 2.18.0 + + + org.apache.commons + commons-lang3 + 3.17.0 + + + org.apache.commons + commons-text + 1.13.0 + + + org.apache.commons + commons-jci-fam + 1.1 + true + + + commons-beanutils + commons-beanutils + 1.9.4 + + + commons-validator + commons-validator + 1.9.0 + + + org.apache.commons + commons-compress + 1.27.1 + + + org.apache.commons + commons-digester3 + 3.2 + + + commons-logging + commons-logging + + + asm + asm + + + + + + org.springframework + spring-framework-bom + ${spring.version} + pom + import + + + + junit + junit + 4.13.2 + test + + + org.easymock + easymock + 5.4.0 + test + + + org.awaitility + awaitility + 4.2.2 + test + + + mockobjects + mockobjects-core + 0.09 + test + + + org.htmlunit + htmlunit + 4.9.0 + test + + + jmock + jmock + 1.2.0 + test + + + org.assertj + assertj-core + 3.27.3 + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + test + + + net.bytebuddy + byte-buddy-agent + ${byte-buddy.version} + test + + + org.testng + testng + 7.11.0 + test + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + + org.apache.logging.log4j + log4j-bom + ${log4j2.version} + pom + import + + + + com.thoughtworks.xstream + xstream + 1.4.21 + + + io.github.x-stream + mxparser + + + + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + + diff --git a/plugins/pom.xml b/plugins/pom.xml index 702eeee3b2..9a6c3d7621 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -25,6 +25,7 @@ org.apache.struts struts2-parent 7.0.4-SNAPSHOT + ../parent/pom.xml struts2-plugins diff --git a/pom.xml b/pom.xml index cad560f8e9..5cbe15d481 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,11 @@ org.apache.struts struts-master 15 + 4.0.0 - struts2-parent + struts2-project 7.0.4-SNAPSHOT pom Struts 2 @@ -82,6 +83,7 @@ bom + parent jakarta core plugins @@ -472,355 +474,4 @@ - - - - - org.apache.struts - struts-annotations - 1.0.8 - - - - org.apache.struts - struts2-core - ${project.version} - - - org.apache.struts - struts2-spring-plugin - ${project.version} - - - org.apache.struts - struts2-bean-validation-plugin - ${project.version} - - - org.apache.struts - struts2-cdi-plugin - ${project.version} - - - org.apache.struts - struts2-junit-plugin - ${project.version} - - - org.apache.struts - struts2-convention-plugin - ${project.version} - - - org.apache.struts - struts2-tiles-plugin - ${project.version} - - - org.apache.struts - struts2-javatemplates-plugin - ${project.version} - - - org.apache.struts - struts2-config-browser-plugin - ${project.version} - - - org.apache.struts - struts2-jasperreports-plugin - ${project.version} - - - org.apache.struts - struts2-jfreechart-plugin - ${project.version} - - - org.apache.struts - struts2-rest-plugin - ${project.version} - - - org.apache.struts - struts2-testng-plugin - ${project.version} - - - org.apache.struts - struts2-json-plugin - ${project.version} - - - org.apache.struts - struts2-async-plugin - ${project.version} - - - org.apache.struts - struts2-velocity-plugin - ${project.version} - - - org.apache.struts - struts2-xslt-plugin - ${project.version} - - - - org.freemarker - freemarker - ${freemarker.version} - - - - com.github.ben-manes.caffeine - caffeine - 3.1.8 - - - - - org.apache.velocity - velocity-engine-core - 2.4.1 - - - org.apache.velocity.tools - velocity-tools-generic - ${velocity-tools.version} - - - org.apache.struts - struts2-velocity-tools-view-jakarta - ${project.version} - - - org.apache.struts - struts2-velocity-tools-jsp-jakarta - ${project.version} - - - - ognl - ognl - ${ognl.version} - - - org.ow2.asm - asm - ${asm.version} - - - org.ow2.asm - asm-commons - ${asm.version} - - - - jakarta.platform - jakarta.jakartaee-bom - ${jakarta-ee.version} - pom - import - - - org.glassfish.jaxb - jaxb-bom - ${jaxb-impl.version} - pom - import - - - - org.glassfish - jakarta.el - 5.0.0-M1 - test - - - - - commons-logging - commons-logging - 1.3.4 - - - org.apache.commons - commons-collections4 - 4.4 - - - org.apache.commons - commons-fileupload2-jakarta-servlet6 - 2.0.0-M2 - - - commons-io - commons-io - 2.18.0 - - - org.apache.commons - commons-lang3 - 3.17.0 - - - org.apache.commons - commons-text - 1.13.0 - - - org.apache.commons - commons-jci-fam - 1.1 - true - - - commons-beanutils - commons-beanutils - 1.9.4 - - - commons-validator - commons-validator - 1.9.0 - - - org.apache.commons - commons-compress - 1.27.1 - - - org.apache.commons - commons-digester3 - 3.2 - - - commons-logging - commons-logging - - - asm - asm - - - - - - org.springframework - spring-framework-bom - ${spring.version} - pom - import - - - - junit - junit - 4.13.2 - test - - - org.easymock - easymock - 5.4.0 - test - - - org.awaitility - awaitility - 4.2.2 - test - - - mockobjects - mockobjects-core - 0.09 - test - - - org.htmlunit - htmlunit - 4.9.0 - test - - - jmock - jmock - 1.2.0 - test - - - org.assertj - assertj-core - 3.27.3 - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - net.bytebuddy - byte-buddy - ${byte-buddy.version} - test - - - net.bytebuddy - byte-buddy-agent - ${byte-buddy.version} - test - - - org.testng - testng - 7.11.0 - test - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - - org.apache.logging.log4j - log4j-bom - ${log4j2.version} - pom - import - - - - com.thoughtworks.xstream - xstream - 1.4.21 - - - io.github.x-stream - mxparser - - - - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - - -