Skip to content

Commit 5e596ab

Browse files
author
Dave Syer
committed
Ignore maven-wrapper.jar by default
Fixes #1643 Signed-off-by: Dave Syer <[email protected]>
1 parent 74a74b6 commit 5e596ab

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
!.mvn/wrapper/maven-wrapper.jar
1+
.mvn/wrapper/maven-wrapper.jar
22
.flattened-pom.xml
33
.gradle
44
*.sw?

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ GitAttributes gitAttributes(ObjectProvider<GitAttributesCustomizer> gitAttribute
6363
public GitIgnoreCustomizer mavenGitIgnoreCustomizer() {
6464
return (gitIgnore) -> {
6565
gitIgnore.getGeneral()
66-
.add("target/", "!.mvn/wrapper/maven-wrapper.jar", "!**/src/main/**/target/",
67-
"!**/src/test/**/target/");
66+
.add("target/", ".mvn/wrapper/maven-wrapper.jar", "!**/src/main/**/target/", "!**/src/test/**/target/");
6867
gitIgnore.getNetBeans().add("build/", "!**/src/main/**/build/", "!**/src/test/**/build/");
6968
};
7069
}

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void gitIgnoreGradle() {
7272
.contains(".gradle", "build/", "!gradle/wrapper/gradle-wrapper.jar", "out/", "!**/src/main/**/build/",
7373
"!**/src/test/**/build/", "!**/src/main/**/out/", "!**/src/test/**/out/", "bin/",
7474
"!**/src/main/**/bin/", "!**/src/test/**/bin/")
75-
.doesNotContain("/target/", "!.mvn/wrapper/maven-wrapper.jar");
75+
.doesNotContain("/target/", ".mvn/wrapper/maven-wrapper.jar");
7676
}
7777

7878
@Test
@@ -81,8 +81,7 @@ void gitIgnoreMaven() {
8181
description.setBuildSystem(new MavenBuildSystem());
8282
description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
8383
assertThat(generateGitIgnore(description))
84-
.contains("target/", "!.mvn/wrapper/maven-wrapper.jar", "!**/src/main/**/target/",
85-
"!**/src/test/**/target/")
84+
.contains("target/", ".mvn/wrapper/maven-wrapper.jar", "!**/src/main/**/target/", "!**/src/test/**/target/")
8685
.doesNotContain(".gradle", "!gradle/wrapper/gradle-wrapper.jar", "/out/");
8786
}
8887

initializr-generator-spring/src/test/resources/project/maven/gitignore.gen

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/target/
2-
!.mvn/wrapper/maven-wrapper.jar
2+
.mvn/wrapper/maven-wrapper.jar
33

44
### STS ###
55
.apt_generated

0 commit comments

Comments
 (0)