diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 853b8cea2..21ebf93f0 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -96,6 +96,9 @@ jobs: node-version: 20 java-version: 11 binary-dir: ${{ github.workspace }}/jhipster-kotlin/cli + - run: | + mkdir -p ~/.gradle + echo "org.gradle.warning.mode=all" >> ~/.gradle/gradle.properties - name: 'SETUP: environment' id: setup uses: ./jhipster-kotlin/.github/actions/setup diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index cb4c8790d..aff7bd8ea 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -96,6 +96,9 @@ jobs: node-version: 20 java-version: 11 binary-dir: ${{ github.workspace }}/jhipster-kotlin/cli + - run: | + mkdir -p ~/.gradle + echo "org.gradle.warning.mode=all" >> ~/.gradle/gradle.properties - name: 'SETUP: environment' id: setup uses: ./jhipster-kotlin/.github/actions/setup diff --git a/generators/detekt/__snapshots__/generator.spec.js.snap b/generators/detekt/__snapshots__/generator.spec.js.snap index 2f09818a0..fd90a813a 100644 --- a/generators/detekt/__snapshots__/generator.spec.js.snap +++ b/generators/detekt/__snapshots__/generator.spec.js.snap @@ -2,17 +2,12 @@ exports[`SubGenerator detekt of kotlin JHipster blueprint > gradle > should match source calls 1`] = ` { - "addGradlePluginToBuildScript": [ + "addGradleDependencyCatalogPlugin": [ { - "group": "io.gitlab.arturbosch.detekt", - "name": "detekt-gradle-plugin", - "version": "\${detekt_version}", - }, - ], - "addGradleProperty": [ - { - "property": "detekt_version", - "value": "'DETEKT-GRADLE-VERSION'", + "addToBuild": true, + "id": "io.gitlab.arturbosch.detekt", + "pluginName": "detekt", + "version": "'DETEKT-GRADLE-VERSION'", }, ], "applyFromGradle": [ diff --git a/generators/detekt/generator.js b/generators/detekt/generator.js index a6fee98b3..25c548a15 100644 --- a/generators/detekt/generator.js +++ b/generators/detekt/generator.js @@ -49,26 +49,12 @@ export default class extends BaseApplicationGenerator { if (application.buildToolGradle) { source.applyFromGradle({ script: 'gradle/detekt.gradle' }); - source.addGradleProperty({ property: 'detekt_version', value: application.javaDependencies['detekt-gradle'] }); - - source.addGradlePluginToBuildScript({ - group: 'io.gitlab.arturbosch.detekt', - name: 'detekt-gradle-plugin', - version: '${detekt_version}', + source.addGradleDependencyCatalogPlugin({ + pluginName: 'detekt', + id: 'io.gitlab.arturbosch.detekt', + version: application.javaDependencies['detekt-gradle'], + addToBuild: true, }); - - /* - // JHipster 8 based configuration - source.addJavaDefinition({ - versions: [ - { name: 'detekt', version: DETEKT_VERSION }, - ], - }); - - source.addGradleDependencyCatalogPlugins([ - { pluginName: 'detekt', id: 'io.gitlab.arturbosch.detekt', version: application.javaDependencies['detekt-gradle'], addToBuild: true }, - ]); - */ } }, diff --git a/generators/detekt/templates/gradle/detekt.gradle.ejs b/generators/detekt/templates/gradle/detekt.gradle.ejs index a98eb449c..909404741 100644 --- a/generators/detekt/templates/gradle/detekt.gradle.ejs +++ b/generators/detekt/templates/gradle/detekt.gradle.ejs @@ -16,8 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. -%> -apply plugin: "io.gitlab.arturbosch.detekt" - detekt { input = files("src/main/kotlin") config = files("<%= detektConfigFile %>") diff --git a/generators/kotlin/__snapshots__/generator.spec.js.snap b/generators/kotlin/__snapshots__/generator.spec.js.snap index 9920afdf9..16028c704 100644 --- a/generators/kotlin/__snapshots__/generator.spec.js.snap +++ b/generators/kotlin/__snapshots__/generator.spec.js.snap @@ -2,27 +2,55 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > gradle > should match source calls 1`] = ` { - "addGradlePluginToBuildScript": [ + "addGradleDependencyCatalogLibrary": [ { "group": "org.jetbrains.kotlin", - "name": "kotlin-gradle-plugin", - "version": "\${kotlin_version}", + "libraryName": "kotlin-bom", + "name": "kotlin-bom", + "scope": "implementation platform", + "version.ref": "kotlin", }, + ], + "addGradleDependencyCatalogPlugin": [ { - "group": "org.jetbrains.kotlin", - "name": "kotlin-allopen", - "version": "\${kotlin_version}", + "addToBuild": true, + "id": "org.jetbrains.kotlin.plugin.spring", + "pluginName": "kotlin-spring", + "version.ref": "kotlin", }, { - "group": "org.jetbrains.kotlin", - "name": "kotlin-noarg", - "version": "\${kotlin_version}", + "addToBuild": true, + "id": "org.jetbrains.kotlin.plugin.jpa", + "pluginName": "kotlin-jpa", + "version.ref": "kotlin", + }, + { + "addToBuild": true, + "id": "org.jetbrains.kotlin.plugin.allopen", + "pluginName": "kotlin-allopen", + "version.ref": "kotlin", }, ], - "addGradleProperty": [ + "addGradleDependencyCatalogPlugins": [ + [ + { + "addToBuild": true, + "id": "org.jetbrains.kotlin.jvm", + "pluginName": "kotlin", + "version.ref": "kotlin", + }, + { + "addToBuild": true, + "id": "org.jetbrains.kotlin.kapt", + "pluginName": "kotlin-kapt", + "version.ref": "kotlin", + }, + ], + ], + "addGradleDependencyCatalogVersion": [ { - "property": "kotlin_version", - "value": "'KOTLIN-VERSION'", + "name": "kotlin", + "version": "'KOTLIN-VERSION'", }, ], "applyFromGradle": [ diff --git a/generators/kotlin/generator.js b/generators/kotlin/generator.js index bb49a345c..9bcb796f7 100644 --- a/generators/kotlin/generator.js +++ b/generators/kotlin/generator.js @@ -77,64 +77,57 @@ export default class extends BaseApplicationGenerator { return this.asPostWritingTaskGroup({ async customizeGradle({ application, source }) { if (application.buildToolGradle) { + source.addGradleDependencyCatalogVersion({ name: 'kotlin', version: application.javaDependencies.kotlin }); + source.applyFromGradle({ script: 'gradle/kotlin.gradle', }); - source.addGradleProperty({ property: 'kotlin_version', value: application.javaDependencies.kotlin }); + source.addGradleDependencyCatalogPlugins([ + { + pluginName: 'kotlin', + id: 'org.jetbrains.kotlin.jvm', + 'version.ref': 'kotlin', + addToBuild: true, + }, + { + pluginName: 'kotlin-kapt', + id: 'org.jetbrains.kotlin.kapt', + 'version.ref': 'kotlin', + addToBuild: true, + }, + ]); - source.addGradlePluginToBuildScript({ + source.addGradleDependencyCatalogLibrary({ + libraryName: 'kotlin-bom', group: 'org.jetbrains.kotlin', - name: 'kotlin-gradle-plugin', - version: '${kotlin_version}', + name: 'kotlin-bom', + scope: 'implementation platform', + 'version.ref': 'kotlin', }); + if (application.backendTypeSpringBoot) { - // Required for Spring plugin - source.addGradlePluginToBuildScript({ - group: 'org.jetbrains.kotlin', - name: 'kotlin-allopen', - version: '${kotlin_version}', + source.addGradleDependencyCatalogPlugin({ + pluginName: 'kotlin-spring', + id: 'org.jetbrains.kotlin.plugin.spring', + 'version.ref': 'kotlin', + addToBuild: true, }); if (application.databaseTypeSql) { - // Required for JPA plugin - source.addGradlePluginToBuildScript({ - group: 'org.jetbrains.kotlin', - name: 'kotlin-noarg', - version: '${kotlin_version}', + source.addGradleDependencyCatalogPlugin({ + pluginName: 'kotlin-jpa', + id: 'org.jetbrains.kotlin.plugin.jpa', + 'version.ref': 'kotlin', + addToBuild: true, }); - } - } - - /* - // JHipster 8 based configuration - source.addJavaDefinition({ - versions: [ - { name: 'kotlin', version: KOTLIN_VERSION }, - ], - }); - - source.addGradleDependencyCatalogPlugins([ - { pluginName: 'kotlin-jvm', id: 'org.jetbrains.kotlin.jvm', 'version.ref': 'kotlin', addToBuild: true }, - // Required for Spring plugin - { - pluginName: 'kotlin-allopen', - id: 'org.jetbrains.kotlin.plugin.allopen', - 'version.ref': 'kotlin', - addToBuild: true, - }, - ]); - if (application.databaseTypeSql) { - // Required for JPA plugin - source.addGradleDependencyCatalogPlugins([ - { - pluginName: 'kotlin-noarg', - id: 'org.jetbrains.kotlin.plugin.noarg', + source.addGradleDependencyCatalogPlugin({ + pluginName: 'kotlin-allopen', + id: 'org.jetbrains.kotlin.plugin.allopen', 'version.ref': 'kotlin', addToBuild: true, - }, - ]); + }); + } } - */ } }, async customizeMaven({ application, source }) { diff --git a/generators/kotlin/templates/gradle/kotlin.gradle.ejs b/generators/kotlin/templates/gradle/kotlin.gradle.ejs index 46bfc376d..6b7168450 100644 --- a/generators/kotlin/templates/gradle/kotlin.gradle.ejs +++ b/generators/kotlin/templates/gradle/kotlin.gradle.ejs @@ -18,47 +18,41 @@ -%> import org.gradle.internal.os.OperatingSystem -apply plugin: "kotlin" // Required for Kotlin integration -apply plugin: "kotlin-kapt" // Required for annotations processing -apply plugin: "kotlin-spring" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#spring-support -<%_ if (databaseTypeSql) { _%> -apply plugin: "kotlin-allopen" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#using-in-gradle -apply plugin: "kotlin-jpa" // See https://kotlinlang.org/docs/reference/compiler-plugins.html#jpa-support -<%_ } _%> - -apply plugin: "org.jlleitschuh.gradle.ktlint" - dependencies { - implementation platform("org.jetbrains.kotlin:kotlin-bom:${kotlin_version}") implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "org.jetbrains.kotlin:kotlin-reflect" - <%_ if (reactive) { _%> +<%_ if (reactive) { _%> implementation "org.jetbrains.kotlinx:kotlinx-coroutines-debug" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactor" implementation "io.projectreactor.kotlin:reactor-kotlin-extensions" - <%_ } _%> +<%_ } _%> kapt "org.mapstruct:mapstruct-processor:${mapstructVersion}" - <%_ if (databaseTypeSql) { _%> +<%_ if (databaseTypeSql) { _%> kapt "org.hibernate:hibernate-jpamodelgen:${hibernateVersion}" kapt "org.glassfish.jaxb:jaxb-runtime:${jaxbRuntimeVersion}" - <%_ } _%> - <%_ if (databaseTypeCassandra) { _%> +<%_ } _%> +<%_ if (databaseTypeCassandra) { _%> kapt "com.datastax.oss:java-driver-mapper-processor:${cassandraDriverVersion}" - <%_ } _%> +<%_ } _%> testImplementation "org.jetbrains.kotlin:kotlin-test-junit" - testImplementation "org.mockito.kotlin:mockito-kotlin:<%= javaDependencies['mockito-kotlin'] %>" -}<%_ if (databaseTypeSql) { %> +} + +kapt { + correctErrorTypes true +} +<%_ if (databaseTypeSql) { _%> allOpen { annotation("javax.persistence.Entity") annotation("javax.persistence.MappedSuperclass") annotation("javax.persistence.Embeddable") -}<%_ } %> +} +<%_ } _%> [compileKotlin, compileTestKotlin]*.with { kotlinOptions { jvmTarget = "<%= javaVersion %>" @@ -70,7 +64,6 @@ allOpen { ktlint { //See more options: https://github.com/JLLeitschuh/ktlint-gradle#configuration ignoreFailures = true - disabledRules = ["no-wildcard-imports", "filename"] } if (OperatingSystem.current().isWindows()) { @@ -81,10 +74,9 @@ if (OperatingSystem.current().isWindows()) { } } -//Reformat code before compilation +// Reformat code before compilation compileKotlin.dependsOn ktlintFormat - jacocoTestReport { // Add Kotlin sources to Jacoco source dirs sourceDirectories.from += sourceSets.main.kotlin.srcDirs diff --git a/generators/ktlint/__snapshots__/generator.spec.js.snap b/generators/ktlint/__snapshots__/generator.spec.js.snap index 417427b44..705b1b6cc 100644 --- a/generators/ktlint/__snapshots__/generator.spec.js.snap +++ b/generators/ktlint/__snapshots__/generator.spec.js.snap @@ -2,12 +2,15 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > gradle > should match source calls 1`] = ` { - "addGradlePluginToBuildScript": [ - { - "group": "org.jlleitschuh.gradle", - "name": "ktlint-gradle", - "version": "'KTLINT-GRADLE-VERSION'", - }, + "addGradleDependencyCatalogPlugins": [ + [ + { + "addToBuild": true, + "id": "org.jlleitschuh.gradle.ktlint", + "pluginName": "ktlint", + "version": "'KTLINT-GRADLE-VERSION'", + }, + ], ], } `; diff --git a/generators/ktlint/generator.js b/generators/ktlint/generator.js index ac99a28a2..d57ed7676 100644 --- a/generators/ktlint/generator.js +++ b/generators/ktlint/generator.js @@ -122,15 +122,14 @@ export default class extends BaseApplicationGenerator { }, addDependencies({ application, source }) { if (application.buildToolGradle) { - source.addGradlePluginToBuildScript({ - group: 'org.jlleitschuh.gradle', - name: 'ktlint-gradle', - version: application.javaDependencies['ktlint-gradle'], - }); - - /* JHipster 8 based configuration - source.addGradleDependencyCatalogPlugins([{ pluginName: 'ktlint', id: 'org.jlleitschuh.gradle.ktlint', version: KTLINT_GRADLE_VERSION, addToBuild: true }]); - */ + source.addGradleDependencyCatalogPlugins([ + { + pluginName: 'ktlint', + id: 'org.jlleitschuh.gradle.ktlint', + version: application.javaDependencies['ktlint-gradle'], + addToBuild: true, + }, + ]); } else { source.addJavaDefinition({ versions: [{ name: 'ktlint-maven-plugin', version: application.javaDependencies['ktlint-maven'] }], diff --git a/generators/migration/__snapshots__/generator.spec.js.snap b/generators/migration/__snapshots__/generator.spec.js.snap index 7c2aa9afa..443629037 100644 --- a/generators/migration/__snapshots__/generator.spec.js.snap +++ b/generators/migration/__snapshots__/generator.spec.js.snap @@ -2,8 +2,32 @@ exports[`SubGenerator migration of kotlin JHipster blueprint > run > should succeed 1`] = ` { + ".mvn/jvm.config": { + "stateCleared": "modified", + }, + ".mvn/wrapper/maven-wrapper.jar": { + "stateCleared": "modified", + }, + ".mvn/wrapper/maven-wrapper.properties": { + "stateCleared": "modified", + }, ".yo-rc.json": { "stateCleared": "modified", }, + "mvnw": { + "stateCleared": "modified", + }, + "mvnw.cmd": { + "stateCleared": "modified", + }, + "pom.xml": { + "stateCleared": "modified", + }, + "src/main/java/com/mycompany/myapp/GeneratedByJHipster.java": { + "stateCleared": "modified", + }, + "src/main/java/com/mycompany/myapp/package-info.java": { + "stateCleared": "modified", + }, } `; diff --git a/generators/migration/generator.js b/generators/migration/generator.js index 1c30e60d6..552d51fcc 100644 --- a/generators/migration/generator.js +++ b/generators/migration/generator.js @@ -1,8 +1,23 @@ import BaseApplicationGenerator from 'generator-jhipster/generators/base-application'; -import { createNeedleCallback } from 'generator-jhipster/generators/base/support'; import { passthrough } from '@yeoman/transform'; export default class extends BaseApplicationGenerator { + async beforeQueue() { + await this.dependsOnJHipster('jhipster:java:build-tool'); + } + + get [BaseApplicationGenerator.PREPARING]() { + return this.asPreparingTaskGroup({ + async source({ application, source }) { + if (application.buildToolGradle) { + // Add a noop needles for spring-gateway generator + source.addJavaDefinition = () => {}; + source.addJavaDependencies = () => {}; + } + }, + }); + } + get [BaseApplicationGenerator.DEFAULT]() { return this.asDefaultTaskGroup({ async defaultTask({ application }) { @@ -17,6 +32,8 @@ export default class extends BaseApplicationGenerator { file.contents = Buffer.from( file.contents .toString() + .replaceAll(/reportOn (.*)/g, 'testResults.from($1)') + .replaceAll('destinationDir =', 'destinationDirectory =') .replaceAll('html.enabled =', 'html.required =') .replaceAll('xml.enabled =', 'xml.required =') .replaceAll('csv.enabled =', 'csv.required ='), @@ -28,29 +45,6 @@ export default class extends BaseApplicationGenerator { }); } - get [BaseApplicationGenerator.PREPARING]() { - return this.asPreparingTaskGroup({ - async source({ application, source }) { - if (application.buildToolGradle) { - // Add a noop needles for spring-gateway generator - source.addJavaDefinition = () => {}; - source.addJavaDependencies = () => {}; - - // JHipster 7 does not support buildScript add for migration - source.addGradlePluginToBuildScript = ({ group, name, version }) => { - this.editFile( - 'build.gradle', - createNeedleCallback({ - needle: 'gradle-buildscript-dependency', - contentToAdd: `classpath "${group}:${name}:${version}"`, - }), - ); - }; - } - }, - }); - } - get [BaseApplicationGenerator.POST_WRITING]() { return this.asPostWritingTaskGroup({ removeScripts({ application }) { @@ -65,6 +59,21 @@ export default class extends BaseApplicationGenerator { if (application.buildToolGradle) { // JHipster 8 have needles fixed this.editFile('build.gradle', contents => contents.replaceAll('//jhipster', '// jhipster')); + if (application.databaseTypeSql) { + const { javaDependencies } = application; + this.editFile('build.gradle', contents => + contents.replace( + '\nconfigurations {', + '\nconfigurations {\n liquibaseRuntime.extendsFrom sourceSets.main.compileClasspath\n', + ), + ); + this.editFile('gradle.properties', contents => + contents + .replace(/liquibasePluginVersion=(.*)/, 'liquibasePluginVersion=2.2.2') + .replace(/(checkstyleVersion)=(.*)/, `$1=${javaDependencies.checkstyle}`) + .replace(/(noHttpCheckstyleVersion)=(.*)/, `$1=${javaDependencies['nohttp-checkstyle']}`), + ); + } this.editFile('settings.gradle', contents => contents.replaceAll('//jhipster', '// jhipster')); } }, diff --git a/generators/spring-boot/__snapshots__/matrix.spec.js.snap b/generators/spring-boot/__snapshots__/matrix.spec.js.snap index d128cd07a..a231b070d 100644 --- a/generators/spring-boot/__snapshots__/matrix.spec.js.snap +++ b/generators/spring-boot/__snapshots__/matrix.spec.js.snap @@ -44,6 +44,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -56,6 +62,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -1538,6 +1547,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -1550,6 +1565,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -2155,6 +2173,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -2167,6 +2191,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -3308,6 +3335,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -3320,6 +3353,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -3904,6 +3940,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -3916,6 +3958,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > gatew "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -5988,6 +6033,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -6000,6 +6051,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -6928,6 +6982,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -6940,6 +7000,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -7874,6 +7937,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -7886,6 +7955,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -8769,6 +8841,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -8781,6 +8859,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -9703,6 +9784,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -9715,6 +9802,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -10769,6 +10859,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -10781,6 +10877,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -11829,6 +11928,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -11841,6 +11946,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -12874,6 +12982,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -12886,6 +13000,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -13886,6 +14003,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -13898,6 +14021,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -14743,6 +14869,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "src/main/resources/config/liquibase/changelog/20220129002000_added_entity_EntityWithCustomId.xml": { "stateCleared": "modified", }, + "src/main/resources/config/liquibase/data/authority.csv": { + "stateCleared": "modified", + }, "src/main/resources/config/liquibase/fake-data/another_simple.csv": { "stateCleared": "modified", }, @@ -14970,6 +15099,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -14982,6 +15117,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -15315,6 +15453,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > micro "src/main/resources/config/liquibase/changelog/20220129002000_added_entity_EntityWithCustomId.xml": { "stateCleared": "modified", }, + "src/main/resources/config/liquibase/data/authority.csv": { + "stateCleared": "modified", + }, "src/main/resources/config/liquibase/fake-data/another_simple.csv": { "stateCleared": "modified", }, @@ -16135,6 +16276,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -16147,6 +16294,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -17246,6 +17396,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -17258,6 +17414,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -18303,6 +18462,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -18315,6 +18480,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -19354,6 +19522,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -19366,6 +19540,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -20486,6 +20663,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -20498,6 +20681,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -21600,6 +21786,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -21612,6 +21804,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -22720,6 +22915,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -22732,6 +22933,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -23825,6 +24029,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -23837,6 +24047,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -24879,6 +25092,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -24891,6 +25110,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -25936,6 +26158,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -25948,6 +26176,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -27113,6 +27344,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -27125,6 +27362,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -28149,6 +28389,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -28161,6 +28407,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -29158,6 +29407,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -29170,6 +29425,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -30140,6 +30398,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -30152,6 +30416,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -31188,6 +31455,12 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -31200,6 +31473,9 @@ exports[`Matrix test of SubGenerator kotlin of kotlin JHipster blueprint > monol "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, diff --git a/generators/spring-boot/files-sql.js b/generators/spring-boot/files-sql.js index bf1177bf1..1f9844ac4 100644 --- a/generators/spring-boot/files-sql.js +++ b/generators/spring-boot/files-sql.js @@ -74,17 +74,6 @@ const sqlFiles = { ], }, ], - liquibase: [ - { - path: KOTLIN_MAIN_SRC_DIR, - templates: [ - { - file: 'package/config/LiquibaseConfiguration.kt', - renameTo: generator => `${generator.javaDir}config/LiquibaseConfiguration.kt`, - }, - ], - }, - ], hibernate: [ { condition: generator => !generator.reactive, diff --git a/generators/spring-boot/generator.js b/generators/spring-boot/generator.js index 0519b01fd..f87ed67f9 100644 --- a/generators/spring-boot/generator.js +++ b/generators/spring-boot/generator.js @@ -43,21 +43,6 @@ const convertToKotlinFile = file => .replace(SERVER_MAIN_SRC_DIR, SERVER_MAIN_SRC_KOTLIN_DIR) .replace(SERVER_TEST_SRC_DIR, SERVER_TEST_SRC_KOTLIN_DIR); -const customizeSpringBootFiles = file => { - const { destinationFile } = file; - // Ignore docker files, use updated docker files from v8 jhipster:docker generator - if ( - destinationFile.includes('src/main/docker') && - !destinationFile.includes('src/main/docker/jhipster-control-center.yml') && - !destinationFile.includes('src/main/docker/jib') && - !destinationFile.includes('src/main/docker/grafana') && - !destinationFile.includes('src/main/docker/monitoring.yml') - ) { - return undefined; - } - return file; -}; - const JAVA_VERSION = '11'; export default class extends BaseApplicationGenerator { @@ -72,10 +57,6 @@ export default class extends BaseApplicationGenerator { } async beforeQueue() { - await this.dependsOnJHipster('jhipster:java:build-tool', { - // We want to use v7 build-tool templates - generatorOptions: { skipPriorities: ['writing', 'postWriting'] }, - }); await this.dependsOnJHipster('jhipster-kotlin:migration'); await this.dependsOnJHipster('jhipster-kotlin:kotlin'); await this.dependsOnJHipster('server'); @@ -87,28 +68,18 @@ export default class extends BaseApplicationGenerator { async composingTemplateTask() { await this.composeCurrentJHipsterCommand(); }, - async liquibase() { - if ( - this.jhipsterConfigWithDefaults.databaseType === 'sql' || - this.jhipsterConfigWithDefaults.databaseMigration === 'liquibase' - ) { - await this.composeWithJHipster('liquibase', { - // We want to use v7 liquibase templates. - generatorOptions: { skipPriorities: ['writing', 'postWriting'] }, - }); - } - }, + ...super.composing, async composing() { const { applicationType, databaseType } = this.jhipsterConfigWithDefaults; await this.composeWithJHipster('docker'); - const generatorOptions = { skipPriorities: ['writing', 'postWriting', 'writingEntities', 'postWritingEntities'] }; if (applicationType === 'gateway') { // Use gateway package.json scripts. - await this.composeWithJHipster('jhipster:spring-cloud:gateway', { generatorOptions: { skipPriorities: ['writing'] } }); + await this.composeWithJHipster('jhipster:spring-cloud:gateway'); } + const generatorOptions = { skipPriorities: ['postWriting'] }; if (databaseType === 'sql') { await this.composeWithJHipster('jhipster:spring-data-relational', { generatorOptions }); } else if (databaseType === 'cassandra') { @@ -134,11 +105,72 @@ export default class extends BaseApplicationGenerator { }); application.customizeTemplatePaths.push(file => { - const { resolvedSourceFile, sourceFile, destinationFile } = file; - if (sourceFile.includes('package-info.java')) { + const { resolvedSourceFile, sourceFile, destinationFile, namespace } = file; + if ( + sourceFile.includes('package-info.java') || + [ + 'jhipster:java:domain', + 'jhipster:spring-cloud:gateway', + 'jhipster:spring-data-cassandra', + 'jhipster:spring-data-couchbase', + 'jhipster:spring-data-mongodb', + 'jhipster:spring-data-neo4j', + 'jhipster:spring-data-relational', + ].includes(namespace) + ) { return undefined; } - if (resolvedSourceFile.includes('.java')) { + + // Use master.xml from jhipster 7 templates + if (sourceFile.includes('master.xml')) { + return namespace === 'jhipster:liquibase' ? undefined : file; + } + + if (namespace === 'jhipster-kotlin:spring-boot') { + // Already resolved kotlin files + if (resolvedSourceFile.endsWith('.kt') || resolvedSourceFile.includes('.kt.')) { + return file; + } + + // Use docker-compose files from docker generator + if ( + sourceFile.includes('src/main/docker') && + !sourceFile.includes('src/main/docker/jhipster-control-center.yml') && + !sourceFile.includes('src/main/docker/jib') && + !sourceFile.includes('src/main/docker/grafana') && + !sourceFile.includes('src/main/docker/monitoring.yml') + ) { + return undefined; + } + + // Use wrappers scripts from maven/gradle generators + if ( + ['mvnw', 'mvnw.cmd', 'gradlew', 'gradlew.bat'].includes(sourceFile) || + sourceFile.includes('.mvnw') || + sourceFile.includes('gradle/wrapper/') + ) { + return undefined; + } + + // Use liquibase templates from liquibase generator + if (sourceFile.includes('src/main/resources/liquibase')) { + return undefined; + } + } + + // Don't use liquibase.gradle from liquibase generator + if (['gradle/liquibase.gradle'].includes(sourceFile)) { + return undefined; + } + + /* + // Ignore convention plugins + if (sourceFile.includes('buildSrc')) { + return undefined; + } + */ + + if (sourceFile.includes('.java')) { return { ...file, resolvedSourceFile: this.templatePath(convertToKotlinFile(sourceFile)), @@ -208,6 +240,16 @@ export default class extends BaseApplicationGenerator { // Kotlin templates uses devDatabaseType* without sql filtering. prepareSqlApplicationProperties({ application }); + applicationDefaults({ + __override__: true, + gradleVersion: '7.6.4', + }); + + Object.assign(application.javaDependencies, { + 'spring-boot': '2.7.3', + 'spring-boot-dependencies': '2.7.3', + }); + applicationDefaults({ __override__: true, // V7 templates expects prodDatabaseType to be set for non SQL databases @@ -265,7 +307,6 @@ export default class extends BaseApplicationGenerator { await this.writeFiles({ sections: serverFiles, context: application, - customizeTemplatePath: customizeSpringBootFiles, }); }, async writeSqlFiles({ application }) { @@ -305,6 +346,7 @@ export default class extends BaseApplicationGenerator { customizeTemplatePath: file => file.sourceFile.includes('.java') ? { + ...file, resolvedSourceFile: this.templatePath(`couchbase/${convertToKotlinFile(file.sourceFile)}`), destinationFile: convertToKotlinFile(file.destinationFile), } @@ -367,10 +409,18 @@ export default class extends BaseApplicationGenerator { get [BaseApplicationGenerator.POST_WRITING]() { return this.asPostWritingTaskGroup({ + ...super.postWriting, + addJHipsterBomDependencies: undefined, + addSpringdoc: undefined, + addSpringBootPlugin: undefined, + addFeignReactor: undefined, async customizeMaven({ application, source }) { if (application.buildToolMaven) { source.addMavenDefinition({ - properties: [{ property: 'modernizer.failOnViolations', value: 'false' }], + properties: [ + { property: 'modernizer-maven-plugin.version', value: application.javaDependencies['modernizer-maven-plugin'] }, + { property: 'modernizer.failOnViolations', value: 'false' }, + ], }); } }, diff --git a/generators/spring-boot/templates/sql/common/src/main/kotlin/package/config/LiquibaseConfiguration.kt.ejs b/generators/spring-boot/templates/src/main/kotlin/_package_/config/LiquibaseConfiguration.kt.ejs similarity index 100% rename from generators/spring-boot/templates/sql/common/src/main/kotlin/package/config/LiquibaseConfiguration.kt.ejs rename to generators/spring-boot/templates/src/main/kotlin/_package_/config/LiquibaseConfiguration.kt.ejs diff --git a/test/__snapshots__/app.spec.js.snap b/test/__snapshots__/app.spec.js.snap index b1241ae7e..89cc7413c 100644 --- a/test/__snapshots__/app.spec.js.snap +++ b/test/__snapshots__/app.spec.js.snap @@ -38,6 +38,12 @@ exports[`JHipster generator for App generator > App with skip client > Gradle > "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -56,6 +62,9 @@ exports[`JHipster generator for App generator > App with skip client > Gradle > "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -3525,6 +3534,12 @@ exports[`JHipster generator for App generator > Default configuration with > Gra "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -3543,6 +3558,9 @@ exports[`JHipster generator for App generator > Default configuration with > Gra "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", }, @@ -4013,6 +4031,12 @@ exports[`JHipster generator for App generator > Default configuration with > Gra "build.gradle": { "stateCleared": "modified", }, + "buildSrc/build.gradle": { + "stateCleared": "modified", + }, + "buildSrc/gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "checkstyle.xml": { "stateCleared": "modified", }, @@ -4031,6 +4055,9 @@ exports[`JHipster generator for App generator > Default configuration with > Gra "gradle/kotlin.gradle": { "stateCleared": "modified", }, + "gradle/libs.versions.toml": { + "stateCleared": "modified", + }, "gradle/profile_dev.gradle": { "stateCleared": "modified", },