Merge pull request #1733 from jnizet

* pr/1733:
  Polish "Fix Jackson module groupId added to dependencies"
  Fix Jackson module groupId added to dependencies

Closes gh-1733

Author: mhalbritter

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJacksonBuildCustomizer.java

@@ -22,6 +22,8 @@
 import io.spring.initializr.generator.project.ProjectDescription;
 import io.spring.initializr.generator.spring.build.BuildCustomizer;
 import io.spring.initializr.generator.spring.build.BuildMetadataResolver;
+import io.spring.initializr.generator.version.VersionParser;
+import io.spring.initializr.generator.version.VersionRange;
 import io.spring.initializr.metadata.InitializrMetadata;
 
 import org.springframework.util.ClassUtils;
@@ -35,6 +37,8 @@
  */
 public class KotlinJacksonBuildCustomizer implements BuildCustomizer<Build> {
 
+	private static final VersionRange SPRING_BOOT_4_OR_LATER = VersionParser.DEFAULT.parseRange("4.0.0");
+
 	private final BuildMetadataResolver buildMetadataResolver;
 
 	private final ProjectDescription description;
@@ -48,10 +52,14 @@ public KotlinJacksonBuildCustomizer(InitializrMetadata metadata, ProjectDescript
 	public void customize(Build build) {
 		boolean isKotlin = ClassUtils.isAssignableValue(KotlinLanguage.class, this.description.getLanguage());
 		if (this.buildMetadataResolver.hasFacet(build, "json") && isKotlin) {
+			String groupId = isBoot4OrLater() ? "tools.jackson.module" : "com.fasterxml.jackson.module";
 			build.dependencies()
-				.add("jackson-module-kotlin", "com.fasterxml.jackson.module", "jackson-module-kotlin",
-						DependencyScope.COMPILE);
+				.add("jackson-module-kotlin", groupId, "jackson-module-kotlin", DependencyScope.COMPILE);
 		}
 	}
 
+	private boolean isBoot4OrLater() {
+		return SPRING_BOOT_4_OR_LATER.match(this.description.getPlatformVersion());
+	}
+
 }

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJacksonBuildCustomizerTests.java

@@ -41,18 +41,33 @@
 class KotlinJacksonBuildCustomizerTests {
 
 	@Test
-	void customizeWhenJsonFacetPresentShouldAddJacksonKotlinModule() {
+	void customizeWhenJsonFacetPresentShouldAddJackson2KotlinModuleBeforeSpringBoot4() {
 		Dependency dependency = Dependency.withId("foo");
 		dependency.setFacets(Collections.singletonList("json"));
 		MutableProjectDescription description = new MutableProjectDescription();
 		description.setLanguage(new KotlinLanguage());
+		description.setPlatformVersion(Version.parse("3.5.2"));
 		MavenBuild build = getCustomizedBuild(dependency, description);
 		io.spring.initializr.generator.buildsystem.Dependency jacksonKotlin = build.dependencies()
 			.get("jackson-module-kotlin");
 		assertThat(jacksonKotlin.getArtifactId()).isEqualTo("jackson-module-kotlin");
 		assertThat(jacksonKotlin.getGroupId()).isEqualTo("com.fasterxml.jackson.module");
 	}
 
+	@Test
+	void customizeWhenJsonFacetPresentShouldAddJackson3KotlinModuleStrtingAtSpringBoot4() {
+		Dependency dependency = Dependency.withId("foo");
+		dependency.setFacets(Collections.singletonList("json"));
+		MutableProjectDescription description = new MutableProjectDescription();
+		description.setLanguage(new KotlinLanguage());
+		description.setPlatformVersion(Version.parse("4.0.0"));
+		MavenBuild build = getCustomizedBuild(dependency, description);
+		io.spring.initializr.generator.buildsystem.Dependency jacksonKotlin = build.dependencies()
+			.get("jackson-module-kotlin");
+		assertThat(jacksonKotlin.getArtifactId()).isEqualTo("jackson-module-kotlin");
+		assertThat(jacksonKotlin.getGroupId()).isEqualTo("tools.jackson.module");
+	}
+
 	@Test
 	void jacksonModuleKotlinIsNotAddedWithoutKotlin() {
 		Dependency dependency = Dependency.withId("foo");

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationConfigurationTests.java

@@ -122,15 +122,27 @@ void servletInitializerIsContributedWhenGeneratingProjectThatUsesWarPackaging()
 	}
 
 	@Test
-	void jacksonKotlinModuleShouldBeAddedWhenJsonFacetPresent() {
+	void jackson2KotlinModuleShouldBeAddedWhenJsonFacetPresentBeforeSpringBoot4() {
 		MutableProjectDescription description = new MutableProjectDescription();
+		description.setPlatformVersion(Version.parse("3.5.2"));
 		description.addDependency("foo", Dependency.withCoordinates("com.example", "foo"));
 		ProjectStructure project = this.projectTester.generate(description);
 		assertThat(project).textFile("pom.xml")
 			.contains("        <dependency>", "            <groupId>com.fasterxml.jackson.module</groupId>",
 					"            <artifactId>jackson-module-kotlin</artifactId>", "        </dependency>");
 	}
 
+	@Test
+	void jackson3KotlinModuleShouldBeAddedWhenJsonFacetPresentStartingAtSpringBoot4() {
+		MutableProjectDescription description = new MutableProjectDescription();
+		description.setPlatformVersion(Version.parse("4.0.0"));
+		description.addDependency("foo", Dependency.withCoordinates("com.example", "foo"));
+		ProjectStructure project = this.projectTester.generate(description);
+		assertThat(project).textFile("pom.xml")
+			.contains("        <dependency>", "            <groupId>tools.jackson.module</groupId>",
+					"            <artifactId>jackson-module-kotlin</artifactId>", "        </dependency>");
+	}
+
 	@Test
 	void addsKotlinGradlePluginGitIgnoreEntry() {
 		MutableProjectDescription description = new MutableProjectDescription();