From df1cb49ab2b8cb20bcf3553a519a1534aef379d8 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Mon, 14 Mar 2022 22:58:20 +0530 Subject: [PATCH 1/3] JAVA-10358 changes done to include maven-multi-module changes --- .../maven-simple/parent-project/core/pom.xml | 9 ++++++++- .../maven-simple/parent-project/pom.xml | 10 ++++++++++ .../maven-simple/parent-project/service/pom.xml | 2 +- .../maven-simple/parent-project/webapp/pom.xml | 16 +++++++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/maven-modules/maven-simple/parent-project/core/pom.xml b/maven-modules/maven-simple/parent-project/core/pom.xml index a403a59e84..287a331123 100644 --- a/maven-modules/maven-simple/parent-project/core/pom.xml +++ b/maven-modules/maven-simple/parent-project/core/pom.xml @@ -10,7 +10,14 @@ parent-project com.baeldung - 1.0.0-SNAPSHOT + 1.0-SNAPSHOT + + + org.springframework + spring-core + 4.3.30.RELEASE + + \ No newline at end of file diff --git a/maven-modules/maven-simple/parent-project/pom.xml b/maven-modules/maven-simple/parent-project/pom.xml index 7193b61ad7..3bae12e052 100644 --- a/maven-modules/maven-simple/parent-project/pom.xml +++ b/maven-modules/maven-simple/parent-project/pom.xml @@ -4,6 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 parent-project + 1.0-SNAPSHOT parent-project pom @@ -19,4 +20,13 @@ webapp + + + + org.springframework + spring-core + 5.3.16 + + + \ No newline at end of file diff --git a/maven-modules/maven-simple/parent-project/service/pom.xml b/maven-modules/maven-simple/parent-project/service/pom.xml index ee51b51d1b..04cb1151e1 100644 --- a/maven-modules/maven-simple/parent-project/service/pom.xml +++ b/maven-modules/maven-simple/parent-project/service/pom.xml @@ -10,7 +10,7 @@ parent-project com.baeldung - 1.0.0-SNAPSHOT + 1.0-SNAPSHOT \ No newline at end of file diff --git a/maven-modules/maven-simple/parent-project/webapp/pom.xml b/maven-modules/maven-simple/parent-project/webapp/pom.xml index d034d4e7d1..daaeca9394 100644 --- a/maven-modules/maven-simple/parent-project/webapp/pom.xml +++ b/maven-modules/maven-simple/parent-project/webapp/pom.xml @@ -7,10 +7,24 @@ webapp webapp + war + parent-project com.baeldung - 1.0.0-SNAPSHOT + 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + false + + + + \ No newline at end of file From 405f0d03751bc4b9418e5710ceaaa0ce2ddcaa74 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Tue, 15 Mar 2022 17:15:19 +0530 Subject: [PATCH 2/3] JAVA-10358 Extracted versions to properties --- maven-modules/maven-simple/parent-project/core/pom.xml | 6 +++++- maven-modules/maven-simple/parent-project/pom.xml | 6 +++++- maven-modules/maven-simple/parent-project/webapp/pom.xml | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/maven-modules/maven-simple/parent-project/core/pom.xml b/maven-modules/maven-simple/parent-project/core/pom.xml index 287a331123..c21addfff8 100644 --- a/maven-modules/maven-simple/parent-project/core/pom.xml +++ b/maven-modules/maven-simple/parent-project/core/pom.xml @@ -17,7 +17,11 @@ org.springframework spring-core - 4.3.30.RELEASE + ${spring-core.version} + + + 4.3.30.RELEASE + \ No newline at end of file diff --git a/maven-modules/maven-simple/parent-project/pom.xml b/maven-modules/maven-simple/parent-project/pom.xml index 3bae12e052..bde903b1b5 100644 --- a/maven-modules/maven-simple/parent-project/pom.xml +++ b/maven-modules/maven-simple/parent-project/pom.xml @@ -25,8 +25,12 @@ org.springframework spring-core - 5.3.16 + ${spring-core.version} + + + 5.3.16 + \ No newline at end of file diff --git a/maven-modules/maven-simple/parent-project/webapp/pom.xml b/maven-modules/maven-simple/parent-project/webapp/pom.xml index daaeca9394..e3b6697758 100644 --- a/maven-modules/maven-simple/parent-project/webapp/pom.xml +++ b/maven-modules/maven-simple/parent-project/webapp/pom.xml @@ -20,11 +20,15 @@ org.apache.maven.plugins maven-war-plugin - 3.3.2 + ${maven-war-plugin.version} false + + + 3.3.2 + \ No newline at end of file From edc11ea4f82cfcaa837e695c496b5d67e4ef51da Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Tue, 15 Mar 2022 19:49:00 +0530 Subject: [PATCH 3/3] JAVA-10358 Removed explicit groupId declaration from submodules --- maven-modules/maven-simple/parent-project/core/pom.xml | 1 - maven-modules/maven-simple/parent-project/service/pom.xml | 1 - maven-modules/maven-simple/parent-project/webapp/pom.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/maven-modules/maven-simple/parent-project/core/pom.xml b/maven-modules/maven-simple/parent-project/core/pom.xml index c21addfff8..6553889c24 100644 --- a/maven-modules/maven-simple/parent-project/core/pom.xml +++ b/maven-modules/maven-simple/parent-project/core/pom.xml @@ -3,7 +3,6 @@ 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"> 4.0.0 - org.baeldung core core diff --git a/maven-modules/maven-simple/parent-project/service/pom.xml b/maven-modules/maven-simple/parent-project/service/pom.xml index 04cb1151e1..78d458c55a 100644 --- a/maven-modules/maven-simple/parent-project/service/pom.xml +++ b/maven-modules/maven-simple/parent-project/service/pom.xml @@ -3,7 +3,6 @@ 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"> 4.0.0 - org.baeldung service service diff --git a/maven-modules/maven-simple/parent-project/webapp/pom.xml b/maven-modules/maven-simple/parent-project/webapp/pom.xml index e3b6697758..f6cee60cbf 100644 --- a/maven-modules/maven-simple/parent-project/webapp/pom.xml +++ b/maven-modules/maven-simple/parent-project/webapp/pom.xml @@ -3,7 +3,6 @@ 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"> 4.0.0 - org.baeldung webapp webapp