From 4145dbba7bf52f2d00e17e66cf416078ff9b9070 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Tue, 28 May 2024 22:22:48 +0200 Subject: [PATCH] Revert optimizations in Spring Modulith dependency setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The removal of the core dependency causes the BOM not being added as that's contained in the dependency declaration. Manually adding the BOM (build.boms().add(…)) adds the BOM segment but does not declare the version property that's needed to resolve it properly. See gh-1490 --- .../springmodulith/SpringModulithBuildCustomizer.java | 5 +---- .../SpringModulithBuildCustomizerTests.java | 11 +---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/start-site/src/main/java/io/spring/start/site/extension/dependency/springmodulith/SpringModulithBuildCustomizer.java b/start-site/src/main/java/io/spring/start/site/extension/dependency/springmodulith/SpringModulithBuildCustomizer.java index ac717639f2..a979040ff7 100644 --- a/start-site/src/main/java/io/spring/start/site/extension/dependency/springmodulith/SpringModulithBuildCustomizer.java +++ b/start-site/src/main/java/io/spring/start/site/extension/dependency/springmodulith/SpringModulithBuildCustomizer.java @@ -51,10 +51,7 @@ public void customize(Build build) { dependencies.add("modulith-observability", modulithDependency("observability").scope(DependencyScope.RUNTIME)); } - boolean persistenceBackendAdded = addEventPublicationRegistryBackend(build); - if (persistenceBackendAdded) { - dependencies.remove("modulith"); - } + addEventPublicationRegistryBackend(build); dependencies.add("modulith-starter-test", modulithDependency("starter-test").scope(DependencyScope.TEST_COMPILE)); } diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springmodulith/SpringModulithBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springmodulith/SpringModulithBuildCustomizerTests.java index 6e039726bc..957b56547b 100644 --- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springmodulith/SpringModulithBuildCustomizerTests.java +++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springmodulith/SpringModulithBuildCustomizerTests.java @@ -71,16 +71,7 @@ void presenceOfSpringDataModuleAddsModuleEventStarter(String store) { build.dependencies().add("data-" + store); this.customizer.customize(build); assertThat(build.dependencies().ids()).contains("modulith-starter-" + store); - assertThat(build.dependencies().ids()).doesNotContain("modulith"); - } - - @ParameterizedTest - @ValueSource(strings = { "jdbc", "jpa", "mongodb" }) - void presenceOfSpringDataModuleRemovesCoreStarter(String store) { - Build build = createBuild("modulith"); - build.dependencies().add("data-" + store); - this.customizer.customize(build); - assertThat(build.dependencies().ids()).doesNotContain("modulith"); + assertThat(build.dependencies().ids()).doesNotContain("modulith-starter-core"); } private Build createBuild(String... dependencies) {