generator-jhipster 7.8.0 → 7.9.1

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

@@ -16,12 +16,76 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+<%_ if (devDatabaseType !== prodDatabaseType && (prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypeMysql || prodDatabaseTypePostgres)) { _%>
+sourceSets {
+    test {
+        java {
+            exclude '<%= packageFolder %>/config/<% if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer.java'
+        }
+    }
+}
+<%_ } _%>
+<%_ if (databaseTypeSql) { _%>
 dependencies {
     developmentOnly "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
-<%_ if (devDatabaseTypeH2Disk || devDatabaseTypeH2Memory) { _%>
+<%_ if (devDatabaseTypeH2Any) { _%>
+    <%_ if (reactive) { _%>
+    implementation "io.r2dbc:r2dbc-h2"
+    <%_ } else { _%>
     implementation "com.h2database:h2"
-<%_ } _%>
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (devDatabaseTypeMysql) { _%>
+    <%_ if (reactive) { _%>
+    implementation ("org.mariadb:r2dbc-mariadb")
+    <%_ } _%>
+    implementation "mysql:mysql-connector-java"
+    liquibaseRuntime "mysql:mysql-connector-java"
+  <%_ } _%>
+  <%_ if (devDatabaseTypePostgres) { _%>
+    <%_ if (reactive) { _%>
+    implementation "org.postgresql:r2dbc-postgresql"
+    <%_ } _%>
+    implementation "org.postgresql:postgresql"
+    liquibaseRuntime "org.postgresql:postgresql"
+  <%_ } _%>
+  <%_ if (devDatabaseTypeMariadb) { _%>
+    <%_ if (reactive) { _%>
+    implementation "org.mariadb:r2dbc-mariadb"
+    <%_ } _%>
+    implementation "org.mariadb.jdbc:mariadb-java-client"
+    liquibaseRuntime "org.mariadb.jdbc:mariadb-java-client"
+  <%_ } _%>
+  <%_ if (devDatabaseTypeMssql) { _%>
+    <%_ if (reactive) { _%>
+    implementation "io.r2dbc:r2dbc-mssql"
+    <%_ } _%>
+    implementation "com.microsoft.sqlserver:mssql-jdbc"
+    implementation "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
+    liquibaseRuntime "com.microsoft.sqlserver:mssql-jdbc"
+    liquibaseRuntime "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
+  <%_ } _%>
+  <%_ if (devDatabaseTypeOracle) { _%>
+    implementation "com.oracle.database.jdbc:ojdbc8"
+    liquibaseRuntime "com.oracle.database.jdbc:ojdbc8"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMysql) { _%>
+    testImplementation "org.testcontainers:mysql"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMariadb) { _%>
+    testImplementation "org.testcontainers:mariadb"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypePostgres) { _%>
+    testImplementation "org.testcontainers:postgresql"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMssql) { _%>
+    testImplementation "org.testcontainers:mssqlserver"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeOracle) { _%>
+    testImplementation "org.testcontainers:oracle-xe"
+  <%_ } _%>
 }
+<%_ } _%>
 
 def profiles = "dev"
 if (project.hasProperty("no-liquibase")) {
@@ -40,7 +104,7 @@ springBoot {
 }
 
 bootRun {
-    args = []
+    args = ["--spring.profiles.active=${profiles}"]
 <%_ if (cacheProviderInfinispan) { _%>
     jvmArgs = ["-Djgroups.tcp.address=NON_LOOPBACK", "-Djava.net.preferIPv4Stack=true"]
 <%_ } _%>
@@ -117,6 +181,34 @@ processResources {
 <%_ } _%>
 }
 
+task integrationTest(type: Test) {
+    maxHeapSize = "1G"
+    useJUnitPlatform()
+    description = "Execute integration tests."
+    group = "verification"
+    include "**/*IT*", "**/*IntTest*"
+<%_ if (cucumberTests) { _%>
+    exclude "**/*CucumberIT*"
+<%_ } _%>
+    testLogging {
+        events 'FAILED', 'SKIPPED'
+    }
+    systemProperty('spring.profiles.active', 'testdev')
+    systemProperty('java.security.egd', 'file:/dev/./urandom')
+    // uncomment if the tests reports are not generated
+    // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
+    // ignoreFailures true
+    reports.html.enabled = false
+<%_ if (reactive) { _%>
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
+        jvmArgs += [
+            "-XX:+AllowRedefinitionToAddDeleteMethods"
+        ]
+    }
+<%_ } _%>
+}
+integrationTest.dependsOn test
+
 <%_ if (!skipClient) { _%>
 processResources.dependsOn webapp
 bootJar.dependsOn processResources

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

@@ -16,11 +16,58 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-dependencies {
-<%_ if (databaseTypeSql) { _%>
-    testImplementation "com.h2database:h2"
+<%_ if (devDatabaseType !== prodDatabaseType && (devDatabaseTypeMariadb || devDatabaseTypeMssql || devDatabaseTypeMysql || devDatabaseTypePostgres)) { _%>
+sourceSets {
+    test {
+        java {
+            exclude '<%= packageFolder %>/config/<% if (devDatabaseTypeMariadb) { %>Mariadb<% } else if (devDatabaseTypeMssql) { %>MsSql<% } else if (devDatabaseTypeMysql) { %>Mysql<% } else if (devDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer.java'
+        }
+    }
+}
 <%_ } _%>
+<%_ if (databaseTypeSql) { _%>
+dependencies {
+  <%_ if (prodDatabaseTypeMysql) { _%>
+    <%_ if (reactive) { _%>
+    implementation ("org.mariadb:r2dbc-mariadb")
+    <%_ } _%>
+    implementation "mysql:mysql-connector-java"
+    liquibaseRuntime "mysql:mysql-connector-java"
+    testImplementation "org.testcontainers:mysql"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypePostgres) { _%>
+    <%_ if (reactive) { _%>
+    implementation "org.postgresql:r2dbc-postgresql"
+    <%_ } _%>
+    implementation "org.postgresql:postgresql"
+    liquibaseRuntime "org.postgresql:postgresql"
+    testImplementation "org.testcontainers:postgresql"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMariadb) { _%>
+    <%_ if (reactive) { _%>
+    implementation "org.mariadb:r2dbc-mariadb"
+    <%_ } _%>
+    implementation "org.mariadb.jdbc:mariadb-java-client"
+    liquibaseRuntime "org.mariadb.jdbc:mariadb-java-client"
+    testImplementation "org.testcontainers:mariadb"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMssql) { _%>
+    <%_ if (reactive) { _%>
+    implementation "io.r2dbc:r2dbc-mssql"
+    <%_ } _%>
+    implementation "com.microsoft.sqlserver:mssql-jdbc"
+    testImplementation "org.testcontainers:mssqlserver"
+    implementation "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
+    liquibaseRuntime "com.microsoft.sqlserver:mssql-jdbc"
+    liquibaseRuntime "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeOracle) { _%>
+    implementation "com.oracle.database.jdbc:ojdbc8"
+    liquibaseRuntime "com.oracle.database.jdbc:ojdbc8"
+    testImplementation "org.testcontainers:oracle-xe"
+  <%_ } _%>
 }
+<%_ } _%>
 
 def profiles = "prod"
 if (project.hasProperty("no-liquibase")) {
@@ -40,7 +87,7 @@ springBoot {
 }
 
 bootRun {
-    args = []
+    args = ["--spring.profiles.active=${profiles}"]
 <%_ if (cacheProviderInfinispan) { _%>
     jvmArgs = ["-Djgroups.tcp.address=NON_LOOPBACK", "-Djava.net.preferIPv4Stack=true"]
 <%_ } _%>
@@ -75,6 +122,35 @@ processResources {
 <%_ } _%>
 }
 
+task integrationTest(type: Test) {
+    maxHeapSize = "1G"
+    useJUnitPlatform()
+    description = "Execute integration tests."
+    group = "verification"
+    include "**/*IT*", "**/*IntTest*"
+<%_ if (cucumberTests) { _%>
+    exclude "**/*CucumberIT*"
+<%_ } _%>
+    testLogging {
+        events 'FAILED', 'SKIPPED'
+    }
+    systemProperty('spring.profiles.active', 'testprod')
+    systemProperty('java.security.egd', 'file:/dev/./urandom')
+    // uncomment if the tests reports are not generated
+    // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
+    // ignoreFailures true
+    reports.html.enabled = false
+<%_ if (reactive) { _%>
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
+        jvmArgs += [
+            "-XX:+AllowRedefinitionToAddDeleteMethods"
+        ]
+    }
+<%_ } _%>
+}
+integrationTest.dependsOn test
+
+
 <%_ if (!skipClient) { _%>
 processResources.dependsOn webapp
 bootJar.dependsOn processResources

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

@@ -27,13 +27,13 @@ springBootVersion=<%= SPRING_BOOT_VERSION %>
 # The hibernate version should match the one managed by
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/<%= SPRING_BOOT_VERSION %> -->
 hibernateVersion=<%= HIBERNATE_VERSION %>
-mapstructVersion=1.4.2.Final
+mapstructVersion=1.5.2.Final
 archunitJunit5Version=0.22.0
 <%_ if (enableSwaggerCodegen) { _%>
 jacksonDatabindNullableVersion=<%= JACKSON_DATABIND_NULLABLE_VERSION %>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-caffeineVersion=3.0.6
+caffeineVersion=3.1.1
 typesafeConfigVersion=1.4.2
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
@@ -47,38 +47,42 @@ commonsBeanutilsVersion=1.9.4
 
 <%_ if (reactive) { _%>
 blockhoundJunitPlatformVersion=1.0.6.RELEASE
-junitPlatformLauncherVersion=1.8.2
+junitPlatformLauncherVersion=1.9.0
 <%_ } _%>
 
 <%_ if (databaseTypeSql) { _%>
-jaxbRuntimeVersion=2.3.3
+jaxbRuntimeVersion=4.0.0
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
 # The cassandra driver version should match the one managed by
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/<%= SPRING_BOOT_VERSION %>
-cassandraDriverVersion=4.13.0
+cassandraDriverVersion=4.14.1
 <%_ } _%>
 
 # gradle plugin version
 jibPluginVersion=<%= JIB_VERSION %>
-gitPropertiesPluginVersion=2.4.0
+gitPropertiesPluginVersion=2.4.1
 <%_ if (!skipClient) { _%>
-gradleNodePluginVersion=3.2.1
+gradleNodePluginVersion=3.4.0
 <%_ } _%>
-<%_ if (databaseTypeSql && !reactive) { _%>
+<%_ if (databaseTypeSql) { _%>
 liquibasePluginVersion=2.1.1
 <%_ } _%>
-sonarqubePluginVersion=3.3
+sonarqubePluginVersion=3.4.0.2513
 <%_ if (enableSwaggerCodegen) { _%>
-openapiPluginVersion=5.4.0
+openapiPluginVersion=6.0.1
 <%_ } _%>
 noHttpCheckstyleVersion=0.0.10
-checkstyleVersion=10.1
+checkstyleVersion=10.3.1
 modernizerPluginVersion=1.6.2
 <%_ if (enableGradleEnterprise) { _%>
-gradleEnterprisePluginVersion=3.9
-gradleCommonCustomUserDataPluginVersion=1.6.5
+gradleEnterprisePluginVersion=3.10.3
+gradleCommonCustomUserDataPluginVersion=1.7.2
 <%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+awaitilityVersion=4.2.0
+<%_ } _%>
+
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 
 ## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default