diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactory.java index ec619c38510..f728f583868 100644 --- a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactory.java @@ -25,6 +25,8 @@ public JHipsterModule buildGradleModule(JHipsterModuleProperties properties) { .comment("Gradle") .pattern("/.gradle/") .pattern("/build/") + .pattern("./buildSrc/.gradle/") + .pattern("./buildSrc/build/") .and() .files() .batch(SOURCE, to(".")) diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/localeprofile/domain/LocalProfileModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/localeprofile/domain/LocalProfileModuleFactory.java index fd0852ee357..05ab75ee54f 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/localeprofile/domain/LocalProfileModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/localeprofile/domain/LocalProfileModuleFactory.java @@ -1,7 +1,7 @@ package tech.jhipster.lite.generator.server.springboot.localeprofile.domain; import static tech.jhipster.lite.module.domain.JHipsterModule.*; -import static tech.jhipster.lite.module.domain.replacement.ReplacementCondition.*; +import static tech.jhipster.lite.module.domain.replacement.ReplacementCondition.notContainingReplacement; import tech.jhipster.lite.module.domain.JHipsterModule; import tech.jhipster.lite.module.domain.buildproperties.PropertyKey; @@ -21,11 +21,6 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) { //@formatter:off return moduleBuilder(properties) - .gitIgnore() - .comment("Gradle") - .pattern("./buildSrc/.gradle/") - .pattern("./buildSrc/build/") - .and() .javaBuildProperties() .set(new PropertyKey(SPRING_PROFILES_ACTIVE), new PropertyValue("")) .and() diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactoryTest.java index eb60c9c2a6a..03b534f1b23 100644 --- a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactoryTest.java @@ -1,6 +1,7 @@ package tech.jhipster.lite.generator.buildtool.gradle.domain; -import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.assertThatModule; +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.assertThatModuleWithFiles; import org.junit.jupiter.api.Test; import tech.jhipster.lite.TestFileUtils; @@ -29,7 +30,9 @@ void shouldBuildModule() { """ # Gradle /.gradle/ - /build/\ + /build/ + ./buildSrc/.gradle/ + ./buildSrc/build/\ """ ) .and() diff --git a/src/test/java/tech/jhipster/lite/generator/server/springboot/localeprofile/domain/LocalProfileModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/server/springboot/localeprofile/domain/LocalProfileModuleFactoryTest.java index b5f64dfa2d3..75299e54984 100644 --- a/src/test/java/tech/jhipster/lite/generator/server/springboot/localeprofile/domain/LocalProfileModuleFactoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/server/springboot/localeprofile/domain/LocalProfileModuleFactoryTest.java @@ -109,15 +109,6 @@ void shouldBuildModule() { JHipsterModule module = factory.buildModule(properties); assertThatModuleWithFiles(module, gradleBuildFile(), gradleLibsVersionFile()) - .hasFile(".gitignore") - .containing( - """ - # Gradle - ./buildSrc/.gradle/ - ./buildSrc/build/\ - """ - ) - .and() .hasFile("build.gradle.kts") .containing( """