From fadc7b76de0a75debf55887b3346b0321ed5beba Mon Sep 17 00:00:00 2001 From: mikr Date: Sat, 22 Feb 2020 20:08:14 +0100 Subject: [PATCH 1/2] Java-125 Move Spring Boot Parent to Spring Boot Modules --- pom.xml | 2 -- spring-boot-modules/pom.xml | 1 + .../spring-boot-parent}/README.md | 0 .../spring-boot-parent}/pom.xml | 2 +- .../spring-boot-parent}/spring-boot-with-custom-parent/pom.xml | 0 .../customparent/SpringBootStarterCustomParentApplication.java | 0 .../spring-boot-parent}/spring-boot-with-starter-parent/pom.xml | 0 .../starterparent/SpringBootStarterParentApplication.java | 0 8 files changed, 2 insertions(+), 3 deletions(-) rename {spring-boot-parent => spring-boot-modules/spring-boot-parent}/README.md (100%) rename {spring-boot-parent => spring-boot-modules/spring-boot-parent}/pom.xml (93%) rename {spring-boot-parent => spring-boot-modules/spring-boot-parent}/spring-boot-with-custom-parent/pom.xml (100%) rename {spring-boot-parent => spring-boot-modules/spring-boot-parent}/spring-boot-with-custom-parent/src/main/java/com/baeldung/customparent/SpringBootStarterCustomParentApplication.java (100%) rename {spring-boot-parent => spring-boot-modules/spring-boot-parent}/spring-boot-with-starter-parent/pom.xml (100%) rename {spring-boot-parent => spring-boot-modules/spring-boot-parent}/spring-boot-with-starter-parent/src/main/java/com/baeldung/starterparent/SpringBootStarterParentApplication.java (100%) diff --git a/pom.xml b/pom.xml index ca5331b287..bfc2d27e1e 100644 --- a/pom.xml +++ b/pom.xml @@ -639,7 +639,6 @@ spring-batch spring-bom spring-boot-modules - spring-boot-parent spring-boot-rest spring-caching @@ -1141,7 +1140,6 @@ spring-batch spring-bom spring-boot-modules - spring-boot-parent spring-boot-rest spring-caching diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 4c6560e5fd..1b11d51366 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -43,6 +43,7 @@ spring-boot-mvc-2 spring-boot-mvc-birt spring-boot-nashorn + spring-boot-parent spring-boot-performance spring-boot-properties spring-boot-property-exp diff --git a/spring-boot-parent/README.md b/spring-boot-modules/spring-boot-parent/README.md similarity index 100% rename from spring-boot-parent/README.md rename to spring-boot-modules/spring-boot-parent/README.md diff --git a/spring-boot-parent/pom.xml b/spring-boot-modules/spring-boot-parent/pom.xml similarity index 93% rename from spring-boot-parent/pom.xml rename to spring-boot-modules/spring-boot-parent/pom.xml index 7ce5bdc428..9ac654c1d5 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-modules/spring-boot-parent/pom.xml @@ -13,7 +13,7 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - .. + ../../parent-boot-2 diff --git a/spring-boot-parent/spring-boot-with-custom-parent/pom.xml b/spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/pom.xml similarity index 100% rename from spring-boot-parent/spring-boot-with-custom-parent/pom.xml rename to spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/pom.xml diff --git a/spring-boot-parent/spring-boot-with-custom-parent/src/main/java/com/baeldung/customparent/SpringBootStarterCustomParentApplication.java b/spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/src/main/java/com/baeldung/customparent/SpringBootStarterCustomParentApplication.java similarity index 100% rename from spring-boot-parent/spring-boot-with-custom-parent/src/main/java/com/baeldung/customparent/SpringBootStarterCustomParentApplication.java rename to spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/src/main/java/com/baeldung/customparent/SpringBootStarterCustomParentApplication.java diff --git a/spring-boot-parent/spring-boot-with-starter-parent/pom.xml b/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml similarity index 100% rename from spring-boot-parent/spring-boot-with-starter-parent/pom.xml rename to spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml diff --git a/spring-boot-parent/spring-boot-with-starter-parent/src/main/java/com/baeldung/starterparent/SpringBootStarterParentApplication.java b/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/src/main/java/com/baeldung/starterparent/SpringBootStarterParentApplication.java similarity index 100% rename from spring-boot-parent/spring-boot-with-starter-parent/src/main/java/com/baeldung/starterparent/SpringBootStarterParentApplication.java rename to spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/src/main/java/com/baeldung/starterparent/SpringBootStarterParentApplication.java From ae3c0777b5c59285c01b4e7bff0f4bf8a6972927 Mon Sep 17 00:00:00 2001 From: mikr Date: Mon, 24 Feb 2020 09:22:14 +0100 Subject: [PATCH 2/2] Java-125 Move Spring Boot Parent to Spring Boot Modules --- spring-boot-modules/spring-boot-parent/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-modules/spring-boot-parent/pom.xml b/spring-boot-modules/spring-boot-parent/pom.xml index 9ac654c1d5..cf0a6702ea 100644 --- a/spring-boot-modules/spring-boot-parent/pom.xml +++ b/spring-boot-modules/spring-boot-parent/pom.xml @@ -10,10 +10,9 @@ spring-boot-parent - com.baeldung - parent-modules + com.baeldung.spring-boot-modules + spring-boot-modules 1.0.0-SNAPSHOT - ../../parent-boot-2