From b7d64ac33a3dabb9a1159f7db173ee556b647b6d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 21 May 2025 10:38:03 +0000 Subject: [PATCH] Ignore maven-wrapper.jar by default Fixes #1643 Signed-off-by: Dave Syer --- .gitignore | 2 +- .../spring/scm/git/GitProjectGenerationConfiguration.java | 3 +-- .../scm/git/GitProjectGenerationConfigurationTests.java | 5 ++--- .../src/test/resources/project/maven/gitignore.gen | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f0d3e23c69..98609f32a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -!.mvn/wrapper/maven-wrapper.jar +.mvn/wrapper/maven-wrapper.jar .flattened-pom.xml .gradle *.sw? diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java index d7b8e19b82..7f3ae9e9a1 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java @@ -63,8 +63,7 @@ GitAttributes gitAttributes(ObjectProvider gitAttribute public GitIgnoreCustomizer mavenGitIgnoreCustomizer() { return (gitIgnore) -> { gitIgnore.getGeneral() - .add("target/", "!.mvn/wrapper/maven-wrapper.jar", "!**/src/main/**/target/", - "!**/src/test/**/target/"); + .add("target/", ".mvn/wrapper/maven-wrapper.jar", "!**/src/main/**/target/", "!**/src/test/**/target/"); gitIgnore.getNetBeans().add("build/", "!**/src/main/**/build/", "!**/src/test/**/build/"); }; } diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java index 14a4856721..39259836ae 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java @@ -72,7 +72,7 @@ void gitIgnoreGradle() { .contains(".gradle", "build/", "!gradle/wrapper/gradle-wrapper.jar", "out/", "!**/src/main/**/build/", "!**/src/test/**/build/", "!**/src/main/**/out/", "!**/src/test/**/out/", "bin/", "!**/src/main/**/bin/", "!**/src/test/**/bin/") - .doesNotContain("/target/", "!.mvn/wrapper/maven-wrapper.jar"); + .doesNotContain("/target/", ".mvn/wrapper/maven-wrapper.jar"); } @Test @@ -81,8 +81,7 @@ void gitIgnoreMaven() { description.setBuildSystem(new MavenBuildSystem()); description.setPlatformVersion(Version.parse("2.1.0.RELEASE")); assertThat(generateGitIgnore(description)) - .contains("target/", "!.mvn/wrapper/maven-wrapper.jar", "!**/src/main/**/target/", - "!**/src/test/**/target/") + .contains("target/", ".mvn/wrapper/maven-wrapper.jar", "!**/src/main/**/target/", "!**/src/test/**/target/") .doesNotContain(".gradle", "!gradle/wrapper/gradle-wrapper.jar", "/out/"); } diff --git a/initializr-generator-spring/src/test/resources/project/maven/gitignore.gen b/initializr-generator-spring/src/test/resources/project/maven/gitignore.gen index c456c4a3ad..0d5ecc8b1d 100644 --- a/initializr-generator-spring/src/test/resources/project/maven/gitignore.gen +++ b/initializr-generator-spring/src/test/resources/project/maven/gitignore.gen @@ -1,5 +1,5 @@ /target/ -!.mvn/wrapper/maven-wrapper.jar +.mvn/wrapper/maven-wrapper.jar ### STS ### .apt_generated