generator-jhipster 8.2.1 → 8.3.0

package/dist/generators/server/resources/gradle/libs.versions.toml

@@ -1,18 +1,36 @@
+[libraries]
+spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.1' }
+
+springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.5.0' }
+
+feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', version = '4.0.3' }
+
+# Cucumber
+testng = { module = 'org.testng:testng', version = '7.10.0' }
+cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.16.1' }
+
+mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.1' }
+
+neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.0' }
+
+# Cassandra
+lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' }
+
 [plugins]
 gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.1' }
 
-node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.1' }
+node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.2' }
 
 gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.1' }
 
-gradle-sonarqube = { id = 'org.sonarqube', version = '4.4.1.3373' }
+gradle-sonarqube = { id = 'org.sonarqube', version = '5.0.0.4638' }
 
-spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.23.3' }
+spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' }
 
-gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.0' }
+gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.2' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.16.1' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17' }
 
-common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '1.12.1' }
+common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0' }
 
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.10.3' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.10.5.1' }

package/dist/generators/server/resources/pom.xml

@@ -11,24 +11,21 @@
         <archunit-junit5.version>1.2.1</archunit-junit5.version>
         <blockhound-junit-platform.version>1.0.8.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
-        <gatling.version>3.10.4</gatling.version>
-        <hazelcast-hibernate53.version>5.1.0</hazelcast-hibernate53.version>
-        <hazelcast-spring.version>5.3.6</hazelcast-spring.version>
+        <gatling.version>3.10.5</gatling.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <micrometer-context-propagation.version>1.1.1</micrometer-context-propagation.version>
         <picocli.version>4.7.5</picocli.version>
-        <typesafe.version>1.4.3</typesafe.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.14.2</checkstyle.version>
+        <checkstyle.version>10.15.0</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
         <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
         <gatling-maven-plugin.version>4.8.2</gatling-maven-plugin.version>
         <git-commit-id-maven-plugin.version>8.0.2</git-commit-id-maven-plugin.version>
-        <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
-        <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
@@ -56,26 +53,11 @@
               <artifactId>commons-beanutils</artifactId>
               <version>${commons-beanutils.version}</version>
             </dependency>
-            <dependency>
-              <groupId>com.hazelcast</groupId>
-              <artifactId>hazelcast-hibernate53</artifactId>
-              <version>${hazelcast-hibernate53.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>com.hazelcast</groupId>
-              <artifactId>hazelcast-spring</artifactId>
-              <version>${hazelcast-spring.version}</version>
-            </dependency>
             <dependency>
               <groupId>com.tngtech.archunit</groupId>
               <artifactId>archunit-junit5-api</artifactId>
               <version>${archunit-junit5.version}</version>
             </dependency>
-            <dependency>
-              <groupId>com.typesafe</groupId>
-              <artifactId>config</artifactId>
-              <version>${typesafe.version}</version>
-            </dependency>
             <dependency>
               <groupId>io.gatling.highcharts</groupId>
               <artifactId>gatling-charts-highcharts</artifactId>

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

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import * as _ from 'lodash-es';
+import { snakeCase, upperFirst } from 'lodash-es';
 import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../jdl/jhipster/index.js';
 import { getUXConstraintName } from './database.js';
 import { getJavaValueGeneratorForType } from './templates/field-values.js';
@@ -28,7 +28,6 @@ const { MYSQL, SQL } = databaseTypes;
 const { MapperTypes } = entityOptions;
 const { MAPSTRUCT } = MapperTypes;
 const { INTEGER, LONG, UUID } = CommonDBTypes;
-const { snakeCase, upperFirst } = _;
 export default function prepareField(entityWithConfig, field, generator) {
     if (field.mapstructExpression) {
         assert.equal(entityWithConfig.dto, MAPSTRUCT, `@MapstructExpression requires an Entity with mapstruct dto [${entityWithConfig.name}.${field.fieldName}].`);

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"
   <%_ } _%>

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