generator-jhipster 8.2.1 → 8.4.0

package/dist/generators/server/support/prepare-relationship.js

@@ -1,7 +1,12 @@
+import { mutateData } from '../../base/support/config.js';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
 export function prepareRelationship({ relationship }) {
     if (relationship.documentation) {
-        relationship.relationshipJavadoc = formatDocAsJavaDoc(relationship.documentation, 4);
-        relationship.relationshipApiDescription = formatDocAsApiDescription(relationship.documentation);
+        mutateData(relationship, {
+            __override__: false,
+            relationshipJavadoc: formatDocAsJavaDoc(relationship.documentation, 4),
+            relationshipApiDescription: formatDocAsApiDescription(relationship.documentation),
+            propertyApiDescription: ({ relationshipApiDescription }) => relationshipApiDescription,
+        });
     }
 }

package/dist/generators/server/templates/build.gradle.ejs

@@ -24,9 +24,6 @@ plugins {
     id "com.gorylenko.gradle-git-properties"
 <%_ if (enableSwaggerCodegen) { _%>
     id "org.openapi.generator"
-<%_ } _%>
-<%_ if (!skipClient) { _%>
-    id "com.github.node-gradle.node"
 <%_ } _%>
     // jhipster-needle-gradle-plugins - JHipster will add additional gradle plugins here
 }
@@ -50,6 +47,29 @@ ext {
     }
 }
 
+repositories {
+    // Local maven repository is required for libraries built locally with maven like development jhipster-bom.
+    <%= !jhipsterDependenciesVersion.includes('-SNAPSHOT') && !jhipsterDependenciesVersion.includes('-CICD') ? '// ' : '' %>mavenLocal()
+    mavenCentral()
+    <%_ if (addSpringMilestoneRepository) { _%>
+    maven { url 'https://repo.spring.io/milestone' }
+    <%_ } _%>
+    <%_ if (jhipsterDependenciesVersion.endsWith('-SNAPSHOT')) { _%>
+    maven {
+        url "https://oss.sonatype.org/content/repositories/snapshots/"
+        mavenContent {
+            snapshotsOnly()
+        }
+    }
+    <%_ } _%>
+    <%_ if (serviceDiscoveryEureka) { _%>
+    maven { url 'https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates' }
+    <%_ } _%>
+    // jhipster-needle-gradle-repositories - JHipster will add additional repositories
+}
+
+apply plugin: 'io.spring.dependency-management'
+
 <%_ if (enableSwaggerCodegen) { _%>
 apply from: "gradle/swagger.gradle"
 <%_ } _%>
@@ -140,45 +160,11 @@ configurations {
     implementation.exclude module: "spring-boot-starter-tomcat"
 }
 
-
-repositories {
-    // Local maven repository is required for libraries built locally with maven like development jhipster-bom.
-    <%= !jhipsterDependenciesVersion.includes('-SNAPSHOT') && !jhipsterDependenciesVersion.includes('-CICD') ? '// ' : '' %>mavenLocal()
-    mavenCentral()
-    <%_ if (addSpringMilestoneRepository) { _%>
-    maven { url 'https://repo.spring.io/milestone' }
-    <%_ } _%>
-    <%_ if (jhipsterDependenciesVersion.endsWith('-SNAPSHOT')) { _%>
-    maven {
-        url "https://oss.sonatype.org/content/repositories/snapshots/"
-        mavenContent {
-            snapshotsOnly()
-        }
-    }
-    <%_ } _%>
-    <%_ if (serviceDiscoveryEureka) { _%>
-    maven { url 'https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates' }
-    <%_ } _%>
-    // jhipster-needle-gradle-repositories - JHipster will add additional repositories
-}
-
 dependencies {
-    // Allows unversioned annotationProcessor
-    annotationProcessor platform(libs.jhipster.dependencies)
-
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
 <%_ if (authenticationTypeOauth2) { _%>
     implementation "com.github.ben-manes.caffeine:caffeine"
-<%_ } _%>
-<%_ if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) { _%>
-    implementation "com.playtika.reactivefeign:feign-reactor-cloud"
-<%_ } _%>
-<%_ if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) { _%>
-    implementation "com.playtika.reactivefeign:feign-reactor-spring-configuration"
-<%_ } _%>
-<%_ if ((applicationTypeMicroservice || applicationTypeGateway) && reactive) { _%>
-    implementation "com.playtika.reactivefeign:feign-reactor-webclient"
 <%_ } _%>
     testImplementation("com.tngtech.archunit:archunit-junit5-api:${archunitJunit5Version}") {
         exclude group: "org.slf4j", module: "slf4j-api"
@@ -211,6 +197,7 @@ if (addSpringMilestoneRepository) { _%>
     runtimeOnly "org.springframework.boot:spring-boot-properties-migrator"
 <%_ } _%>
     implementation "org.springframework.boot:spring-boot-starter-actuator"
+    implementation "org.springframework.boot:spring-boot-starter-aop"
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-starter-mail"
 <%_ if (authenticationTypeOauth2) { _%>
@@ -226,10 +213,13 @@ if (addSpringMilestoneRepository) { _%>
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
 <%_ if (!reactive) { _%>
     implementation "org.springframework.boot:spring-boot-starter-undertow"
+    modules {
+        module("org.springframework.boot:spring-boot-starter-tomcat") {
+            replacedBy("org.springframework.boot:spring-boot-starter-undertow", "Use Undertow instead of Tomcat")
+        }
+    }
 <%_ } _%>
-<%_ if (reactive) { _%>
     implementation "org.springframework.boot:spring-boot-starter-validation"
-<%_ } _%>
     implementation "org.springframework.boot:spring-boot-starter-web<% if (reactive) { %>flux<% } %>"
     testImplementation "org.springframework.boot:spring-boot-test"
 <%_ if (applicationTypeMicroservice || applicationTypeGateway) { _%>
@@ -253,9 +243,6 @@ if (addSpringMilestoneRepository) { _%>
 <%_ if (serviceDiscoveryAny && serviceDiscoveryConsul) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-consul-discovery"
 <%_ } _%>
-<%_ if (applicationTypeGateway) { _%>
-    implementation "org.springframework.cloud:spring-cloud-starter-gateway"
-<%_ } _%>
 <%_ if (serviceDiscoveryAny && serviceDiscoveryEureka) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-netflix-eureka-client"
 <%_ } _%>
@@ -284,104 +271,6 @@ task cleanResources(type: Delete) {
     delete "build/resources"
 }
 
-wrapper {
-    gradleVersion = "<%= gradleVersion %>"
-}
-
-<%_ if (!skipClient) { _%>
-task webapp_test(type: NpmTask) {
-    inputs.property('appVersion', project.version)
-    inputs.files("package-lock.json")
-        .withPropertyName('package-lock')
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    inputs.files("build.gradle")
-        .withPropertyName('build.gradle')
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ if (clientFrameworkAngular) { _%>
-    inputs.files("angular.json")
-        .withPropertyName('angular.json')
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    inputs.files("tsconfig.json", "tsconfig.app.json")
-        .withPropertyName("tsconfig")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    inputs.dir("<%= CLIENT_WEBPACK_DIR %>")
-        .withPropertyName("<%= CLIENT_WEBPACK_DIR %>")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ } _%>
-    inputs.dir("<%= clientSrcDir %>")
-        .withPropertyName("webapp-source-dir")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ if (clientFrameworkReact) { _%>
-    inputs.files("tsconfig.json")
-        .withPropertyName("tsconfig")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-
-    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
-    webpackDevFiles.exclude("webpack.prod.js")
-    inputs.files(webpackDevFiles)
-        .withPropertyName("webpack-dir")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ } _%>
-  <%_ if (clientFrameworkVue) { _%>
-
-    inputs.files("tsconfig.json", "tsconfig.app.json")
-        .withPropertyName("tsconfig")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    <%_ if (microfrontend) { _%>
-
-    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
-    webpackDevFiles.exclude("webpack.prod.js")
-    inputs.files(webpackDevFiles)
-        .withPropertyName("webpack-dir")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    <%_ } else { _%>
-
-    inputs.files("vite.config.ts")
-        .withPropertyName("vite")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-    <%_ } _%>
-
-    inputs.files(".postcssrc")
-        .withPropertyName("postcssrc")
-        .withPathSensitivity(PathSensitivity.RELATIVE)
-  <%_ } _%>
-
-    outputs.dir("build/test-results/jest/")
-        .withPropertyName("jest-result-dir")
-    outputs.file("build/test-results/TESTS-results-jest.xml")
-        .withPropertyName("jest-result")
-        outputs.file("build/test-results/clover.xml")
-        .withPropertyName("clover-result")
-
-    dependsOn npmInstall,compileTestJava
-    args = ["run", "webapp:test"]
-}
-
-if (project.hasProperty("nodeInstall")) {
-    node {
-        version = "<%= nodeVersion %>"
-        npmVersion = "<%= nodeDependencies.npm %>"
-        download = true
-    }
-
-    // Copy local node and npm to a fixed location for npmw
-    def deleteOldNpm = tasks.register("deleteOldNpm", Delete) {
-        delete '<%= temporaryDir %>node/lib/node_modules/npm'
-    }
-    def fixedNode = tasks.register("fixedNode", Copy) {
-        from nodeSetup
-        into '<%= temporaryDir %>node'
-        finalizedBy deleteOldNpm
-    }
-    tasks.named("nodeSetup").configure { finalizedBy fixedNode }
-
-    def fixedNpm = tasks.register("fixedNpm", Copy) {
-        from npmSetup
-        into '<%= temporaryDir %>node'
-    }
-    tasks.named("npmSetup").configure { finalizedBy fixedNpm }
-}
-<%_ } _%>
 <%_ if (embeddableLaunchScript) { _%>
 
 bootJar {
@@ -389,8 +278,5 @@ bootJar {
 }
 <%_ } _%>
 
-<%_ if (!skipClient) { _%>
-test.dependsOn webapp_test
-<%_ } _%>
 compileJava.dependsOn processResources
 processResources.dependsOn bootBuildInfo

package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs

@@ -41,7 +41,7 @@ configurations {
 }
 
 dependencies {
-    compileOnly "org.springframework.boot:spring-boot-devtools"
+    developmentOnly "org.springframework.boot:spring-boot-devtools"
   <%_ if (devDatabaseTypeH2Any && !reactive) { _%>
     implementation "com.h2database:h2"
   <%_ } _%>
@@ -167,14 +167,14 @@ processResources {
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
 <%_ } _%>
     }
 <%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul) { _%>
     filesMatching("**/bootstrap.yml") {
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
     }
 <%_ } _%>

package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs

@@ -102,14 +102,14 @@ processResources {
         }
 <%_ if (!serviceDiscoveryAny) { _%>
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
 <%_ } _%>
     }
 <%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul) { _%>
     filesMatching("**/bootstrap.yml") {
         filter {
-            it.replace("#spring.profiles.active#", springProfiles)
+            it.replace("@spring.profiles.active@", springProfiles)
         }
     }
 <%_ } _%>

package/dist/generators/server/templates/gradle.properties.ejs

@@ -30,11 +30,7 @@ blockhoundJunitPlatformVersion=<%- javaDependencies['blockhound-junit-platform']
 <%_ } _%>
 
 # gradle plugin version
-jibPluginVersion=<%- javaDependencies['jib-maven-plugin'] %>
 gitPropertiesPluginVersion=<%- javaDependencies['gradle-git-properties'] %>
-<%_ if (!skipClient) { _%>
-gradleNodePluginVersion=<%- javaDependencies['node-gradle'] %>
-<%_ } _%>
 <%_ if (enableSwaggerCodegen) { _%>
 openapiPluginVersion=<%- javaDependencies['openapi-generator-maven-plugin'] %>
 <%_ } _%>
@@ -74,6 +70,3 @@ gradleCommonCustomUserDataPluginVersion=<%- javaDependencies['common-custom-user
 ## uncomment the below line to enable the selective mode
 
 #org.gradle.configureondemand=true
-
-## Install and use a local version of node and npm.
-nodeInstall