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 97fff952..8e9e622e 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 @@ -49,8 +49,9 @@ public class GitProjectGenerationConfiguration { @ConditionalOnBuildSystem(MavenBuildSystem.ID) public GitIgnoreCustomizer mavenGitIgnoreCustomizer() { return (gitIgnore) -> { - gitIgnore.getGeneral().add("/target/", "!.mvn/wrapper/maven-wrapper.jar"); - gitIgnore.getNetBeans().add("/build/"); + gitIgnore.getGeneral().add("target/", "!.mvn/wrapper/maven-wrapper.jar", "!**/src/main/**", + "!**/src/test/**"); + gitIgnore.getNetBeans().add("build/"); }; } @@ -58,8 +59,9 @@ public class GitProjectGenerationConfiguration { @ConditionalOnBuildSystem(GradleBuildSystem.ID) public GitIgnoreCustomizer gradleGitIgnoreCustomizer() { return (gitIgnore) -> { - gitIgnore.getGeneral().add(".gradle", "/build/", "!gradle/wrapper/gradle-wrapper.jar"); - gitIgnore.getIntellijIdea().add("/out/"); + gitIgnore.getGeneral().add(".gradle", "build/", "!gradle/wrapper/gradle-wrapper.jar", "!**/src/main/**", + "!**/src/test/**"); + gitIgnore.getIntellijIdea().add("out/"); }; } 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 30b8b775..f50d9adb 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 @@ -67,8 +67,8 @@ class GitProjectGenerationConfigurationTests { ProjectDescription description = new ProjectDescription(); description.setBuildSystem(new GradleBuildSystem()); description.setPlatformVersion(Version.parse("2.1.0.RELEASE")); - assertThat(generateGitIgnore(description)) - .contains(".gradle", "/build/", "!gradle/wrapper/gradle-wrapper.jar", "/out/") + assertThat(generateGitIgnore(description)).contains(".gradle", "build/", "!gradle/wrapper/gradle-wrapper.jar", + "out/", "!**/src/main/**", "!**/src/test/**") .doesNotContain("/target/", "!.mvn/wrapper/maven-wrapper.jar"); } @@ -77,7 +77,8 @@ class GitProjectGenerationConfigurationTests { ProjectDescription description = new ProjectDescription(); description.setBuildSystem(new MavenBuildSystem()); description.setPlatformVersion(Version.parse("2.1.0.RELEASE")); - assertThat(generateGitIgnore(description)).contains("/target/", "!.mvn/wrapper/maven-wrapper.jar") + assertThat(generateGitIgnore(description)) + .contains("target/", "!.mvn/wrapper/maven-wrapper.jar", "!**/src/main/**", "!**/src/test/**") .doesNotContain(".gradle", "!gradle/wrapper/gradle-wrapper.jar", "/out/"); }