generator-jhipster 7.7.0 → 7.9.0

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

@@ -40,7 +40,7 @@ plugins {
 <%_ if (!skipClient) { _%>
     id "com.github.node-gradle.node"
 <%_ } _%>
-<%_ if (databaseTypeSql && !reactive) { _%>
+<%_ if (databaseTypeSql) { _%>
     id "org.liquibase.gradle"
 <%_ } _%>
     id "org.sonarqube"
@@ -122,7 +122,7 @@ test {
     testLogging {
         events 'FAILED', 'SKIPPED'
     }
-    jvmArgs += '-Djava.security.egd=file:/dev/./urandom -Xmx256m'
+    jvmArgs += '-Djava.security.egd=file:/dev/./urandom -Xmx512m'
     // 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
@@ -142,45 +142,7 @@ modernizer {
     includeTestClasses = true
 }
 
-task integrationTest(type: Test) {
-<%_ if (databaseTypeCouchbase) { _%>
-    minHeapSize = "128m"
-    maxHeapSize = "512m"
-<%_ } _%>
-    useJUnitPlatform()
-    description = "Execute integration tests."
-    group = "verification"
-    include "**/*IT*", "**/*IntTest*"
-<%_ if (cucumberTests) { _%>
-    exclude "**/*CucumberIT*"
-<%_ } _%>
-    testLogging {
-        events 'FAILED', 'SKIPPED'
-    }
-    jvmArgs += '-Djava.security.egd=file:/dev/./urandom -Xmx256m'
-<%_ if (databaseTypeSql) { _%>
-    if (project.hasProperty('testcontainers')) {
-  <%_ if (reactive) { _%>
-        environment 'SPRING_PROFILES_ACTIVE', 'testcontainers'
-  <%_ } else { _%>
-        environment 'spring.profiles.active', 'testcontainers'
-  <%_ } _%>
-    }
-<%_ } _%>
-
-    // 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"
-        ]
-    }
-<%_ } _%>
-}
 <%_ if (cucumberTests) { _%>
 
 task consoleLauncherTest(type: JavaExec) {
@@ -288,6 +250,12 @@ configurations {
             // Inherited version from Spring Boot can't be used because of regressions:
             // To be removed as soon as spring-boot use the same version
             force 'org.liquibase:liquibase-core:<%= LIQUIBASE_VERSION %>'
+<%_ if (devDatabaseTypeH2Any && (prodDatabaseTypeMysql || reactive)) { _%>
+            force 'com.h2database:h2:<%= H2_VERSION %>'
+  <%_ if (reactive) { _%>
+            force 'io.r2dbc:r2dbc-h2:<%= H2_R2DBC_VERSION %>'
+  <%_ } _%>
+<%_ } _%>
         }
     }
 }
@@ -321,33 +289,29 @@ dependencies {
     implementation group: "tech.jhipster", name: "jhipster-framework"<% if (reactive) { %>, {
         exclude group: "org.springframework", module: "spring-webmvc"
     }<% } %>
+    implementation "javax.annotation:javax.annotation-api"
 <%_ // This is useful for major Spring Boot migration
 if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') > -1) { _%>
     runtimeOnly "org.springframework.boot:spring-boot-properties-migrator"
 <%_ } _%>
-    implementation "javax.annotation:javax.annotation-api"
 <%_ if (!cacheProviderNo) { _%>
     implementation "org.springframework.boot:spring-boot-starter-cache"
 <%_ } _%>
-    implementation "io.dropwizard.metrics:metrics-core"
-    implementation "io.micrometer:micrometer-registry-prometheus"
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc"
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
 <%_ if (databaseTypeSql) { _%>
     implementation "com.fasterxml.jackson.module:jackson-module-jaxb-annotations"
-  <%_ if (!reactive) { _%>
+  <%_ if (reactive) { _%>
+    implementation "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}"
+  <%_ } else { _%>
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5"
   <%_ } _%>
 <%_ } _%>
-    implementation "com.fasterxml.jackson.core:jackson-annotations"
-    implementation "com.fasterxml.jackson.core:jackson-databind"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
 <%_ if (cacheProviderHazelcast) { _%>
     implementation "com.hazelcast:hazelcast"
-<%_ } _%>
-<%_ if (cacheProviderHazelcast && enableHibernateCache) { _%>
+  <%_ if (enableHibernateCache) { _%>
     implementation "com.hazelcast:hazelcast-hibernate53"
-<%_ } _%>
-<%_ if (cacheProviderHazelcast) { _%>
+  <%_ } _%>
     implementation "com.hazelcast:hazelcast-spring"
 <%_ } _%>
 <%_ if (cacheProviderInfinispan) { _%>
@@ -367,15 +331,17 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation "org.hibernate:hibernate-jcache"
   <%_ } _%>
 <%_ } _%>
-<%_ if (cacheProviderEhCache || cacheProviderCaffeine || cacheProviderHazelcast || cacheProviderInfinispan || cacheProviderMemcached) { _%>
-    implementation "javax.cache:cache-api"
+<%_ if (cacheProviderRedis || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j || databaseTypeCassandra || searchEngineElasticsearch || messageBrokerKafka || databaseTypeSql) { _%>
+    testImplementation "org.testcontainers:junit-jupiter"
+    testImplementation "org.testcontainers:testcontainers"
+<%_ } _%>
+<%_ if (reactive) { _%>
+    implementation "org.springdoc:springdoc-openapi-webflux-core"
+<%_ } else { _%>
+    implementation "org.springdoc:springdoc-openapi-webmvc-core"
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
-    implementation "org.hibernate:hibernate-core"
     implementation "com.zaxxer:HikariCP"
-  <%_ if (reactive) { _%>
-    implementation "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}"
-  <%_ } _%>
 <%_ } _%>
     implementation "org.apache.commons:commons-lang3"
 <%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%>
@@ -384,9 +350,22 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
 <%_ if (enableSwaggerCodegen) { _%>
     implementation "org.openapitools:jackson-databind-nullable:${jacksonDatabindNullableVersion}"
 <%_ } _%>
-    implementation "javax.transaction:javax.transaction-api"
+<%_ if (databaseTypeCouchbase) { _%>
+    testImplementation "org.testcontainers:couchbase"
+    implementation "com.couchbase.client:java-client"
+<%_ } _%>
+<%_ if (databaseTypeNeo4j) { _%>
+    implementation "org.springframework.boot:spring-boot-starter-data-neo4j"
+    implementation "eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter"
+    testImplementation "org.testcontainers:neo4j"
+<%_ } _%>
+<%_ if (cacheProviderEhCache || cacheProviderCaffeine || cacheProviderHazelcast || cacheProviderInfinispan || cacheProviderMemcached) { _%>
+    implementation "javax.cache:cache-api"
+<%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
     implementation "org.lz4:lz4-java"
+    testImplementation "org.cassandraunit:cassandra-unit-spring"
+    testImplementation "org.testcontainers:cassandra"
 <%_ } _%>
 <%_ if (cacheProviderEhCache) { _%>
     implementation "org.ehcache:ehcache"
@@ -403,20 +382,34 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
   <%_ } _%>
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
-  <%_ if (!reactive) { _%>
-    implementation "org.hibernate:hibernate-entitymanager"
-  <%_ } _%>
+    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateVersion}"
+    implementation "org.hibernate:hibernate-core"
     implementation "org.hibernate.validator:hibernate-validator"
     implementation "org.liquibase:liquibase-core"
-  <%_ if (!reactive) { _%>
     liquibaseRuntime "org.liquibase:liquibase-core"
-    liquibaseRuntime "org.liquibase.ext:liquibase-hibernate5:${liquibaseHibernate5Version}"
-    liquibaseRuntime sourceSets.main.compileClasspath
+<%_ } _%>
+<%_ if (databaseTypeMongodb) { _%>
+    implementation "io.mongock:mongock-springboot"
+    implementation "io.mongock:mongodb-springdata-v3-driver"
+    testImplementation "org.testcontainers:mongodb"
+  <%_ if (reactive) { _%>
+    // Mongock doesn't support reactive yet, so this dependency is necessary.
+    // See https://github.com/jhipster/generator-jhipster/pull/12536#issuecomment-696683592 for more information.
+    implementation "org.springframework.boot:spring-boot-starter-data-mongodb"
+
+    // Mongo db driver was excluded from starter, adding manually
+    implementation "org.mongodb:mongodb-driver-reactivestreams"
   <%_ } _%>
+    // Mongo db driver was excluded from starter, adding manually
+    implementation "org.mongodb:mongodb-driver-sync"
 <%_ } _%>
+<%_ if (databaseTypeCouchbase) { _%>
+    implementation "com.github.differentway:couchmove"
+<%_ } _%>
+    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+    annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-loader-tools"
-    implementation "org.springframework.boot:spring-boot-starter-mail"
-    implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
 <%_ if (databaseTypeSql) { _%>
   <%_ if (reactive) { _%>
@@ -424,63 +417,64 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
   <%_ } else { _%>
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
   <%_ } _%>
+    testImplementation "org.testcontainers:jdbc"
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
+    testImplementation "org.apache.commons:commons-collections4"
+    testImplementation "org.awaitility:awaitility:${awaitilityVersion}"
+    testImplementation "org.testcontainers:elasticsearch"
     implementation "org.springframework.boot:spring-boot-starter-data-elasticsearch"
 <%_ } _%>
 <%_ if (databaseTypeMongodb || databaseTypeCassandra || databaseTypeCouchbase) { _%>
     implementation "org.springframework.boot:spring-boot-starter-data-<%= databaseType %><% if (reactive) { %>-reactive<% } %>"
 <%_ } _%>
-<%_ if (databaseTypeNeo4j) { _%>
-    implementation "org.springframework.boot:spring-boot-starter-data-neo4j"
-    implementation "eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter"
-    // This is done here explicitly as dependency resolution seems to have changed recently such that the validation starter
-    // and therefore hibernate validators is not included anymore
+<%_ if (reactive) { _%>
     implementation "org.springframework.boot:spring-boot-starter-validation"
-    testImplementation "org.testcontainers:neo4j"
-<%_ } _%>
-<%_ if (cacheProviderRedis || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j || databaseTypeCassandra || searchEngineElasticsearch || messageBrokerKafka) { _%>
-    testImplementation "org.testcontainers:junit-jupiter"
-    testImplementation "org.testcontainers:testcontainers"
+    implementation "org.springframework.data:spring-data-commons"
+    runtimeOnly "io.netty:netty-tcnative-boringssl-static"
 <%_ } _%>
-<%_ if (prodDatabaseTypeMysql) { _%>
-    testImplementation "org.testcontainers:mysql"
-<%_ } _%>
-<%_ if (prodDatabaseTypeMariadb) { _%>
-    testImplementation "org.testcontainers:mariadb"
-<%_ } _%>
-<%_ if (prodDatabaseTypePostgres) { _%>
-    testImplementation "org.testcontainers:postgresql"
-<%_ } _%>
-<%_ if (prodDatabaseTypeMssql) { _%>
-    testImplementation "org.testcontainers:mssqlserver"
+    implementation "org.springframework.boot:spring-boot-starter-logging"
+    implementation "org.springframework.boot:spring-boot-starter-mail"
+<%_ if (!authenticationTypeOauth2) { _%>
+    implementation "org.springframework.boot:spring-boot-starter-security"
 <%_ } _%>
-<%_ if (prodDatabaseTypeOracle && !reactive) { _%>
-    testImplementation "org.testcontainers:oracle-xe"
+    implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
+    implementation "org.springframework.boot:spring-boot-starter-web<% if (reactive) { %>flux<% } %>"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation "org.springframework.boot:spring-boot-test"
+    testImplementation "org.springframework.security:spring-security-test"
+<%_ if (reactive) { _%>
+    testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockhoundJunitPlatformVersion}"
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:${junitPlatformLauncherVersion}'
 <%_ } _%>
+    testImplementation "com.tngtech.archunit:archunit-junit5-api:${archunitJunit5Version}"
+    testRuntimeOnly "com.tngtech.archunit:archunit-junit5-engine:${archunitJunit5Version}"
 <%_ if (messageBrokerKafka) { _%>
-  <%_ if (reactive) { _%>
-    implementation "io.projectreactor.kafka:reactor-kafka"
-  <%_ } else { _%>
-    implementation "org.apache.kafka:kafka-clients"
-  <%_ } _%>
+    implementation "org.springframework.cloud:spring-cloud-stream"
+    implementation "org.springframework.cloud:spring-cloud-starter-stream-kafka"
+    testImplementation "org.springframework.cloud:spring-cloud-stream-test-support"
+    testImplementation "org.testcontainers:kafka"
 <%_ } _%>
-    implementation "org.springframework.boot:spring-boot-starter-security"
-    implementation ("org.springframework.boot:spring-boot-starter-web<% if (reactive) { %>flux<% } %>") {
-        exclude module: "spring-boot-starter-tomcat"
-    }
+    implementation "org.zalando:problem-spring-web<% if (reactive) { %>flux<% } %>"
 <%_ if (!reactive) { _%>
     implementation "org.springframework.boot:spring-boot-starter-undertow"
 <%_ } _%>
-<%_ if (reactive) { _%>
-    implementation "org.springframework.boot:spring-boot-starter-validation"
-    implementation "io.netty:netty-tcnative-boringssl-static"
-<%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
     implementation "org.springframework.boot:spring-boot-starter-websocket"
 <%_ } _%>
-    implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
-    implementation "org.zalando:problem-spring-web<% if (reactive) { %>flux<% } %>"
+<%_ if (authenticationTypeOauth2) { _%>
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
+<%_ } else if (authenticationTypeJwt) { _%>
+    implementation "io.jsonwebtoken:jjwt-api"
+    if (!project.hasProperty("gae")) {
+    runtimeOnly "io.jsonwebtoken:jjwt-impl"
+    <% if (reactive) { %>implementation<% } else { %>runtimeOnly<% } %> "io.jsonwebtoken:jjwt-jackson"
+    } else {
+    implementation "io.jsonwebtoken:jjwt-impl"
+    implementation "io.jsonwebtoken:jjwt-jackson"
+    }
+<%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
     implementation "com.datastax.oss:java-driver-mapper-runtime"
 <%_ } _%>
@@ -488,15 +482,22 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation "org.springframework.cloud:spring-cloud-starter-gateway"
     implementation "com.github.vladimir-bukhtoyarov:bucket4j-core"
     implementation "com.github.vladimir-bukhtoyarov:bucket4j-jcache"
+  <%_ if (authenticationTypeOauth2 && reactive) { _%>
+    implementation "org.springframework.cloud:spring-cloud-starter-security"
+  <%_ } _%>
 <%_ } _%>
 <%_ if (applicationTypeMicroservice || applicationTypeGateway) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter"
   <%_ if (reactive) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j"
+    implementation "com.playtika.reactivefeign:feign-reactor-webclient"
+    implementation "com.playtika.reactivefeign:feign-reactor-cloud"
+    implementation "com.playtika.reactivefeign:feign-reactor-spring-configuration"
   <%_ } else { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j"
   <%_ } _%>
     implementation "org.springframework.retry:spring-retry"
+    implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
 <%_ } _%>
 <%_ if (serviceDiscoveryType) { _%>
     implementation "org.springframework.cloud:spring-cloud-starter-bootstrap"
@@ -509,145 +510,41 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
     implementation "org.springframework.cloud:spring-cloud-starter-consul-config"
   <%_ } _%>
 <%_ } _%>
-<%_ if (applicationTypeGateway && authenticationTypeOauth2 && reactive) { _%>
-    implementation "org.springframework.cloud:spring-cloud-starter-security"
-<%_ } _%>
-<%_ if (applicationTypeMicroservice || applicationTypeGateway) { _%>
-    implementation "org.springframework.cloud:spring-cloud-starter-openfeign"
-<%_ } _%>
-<%_ if (applicationTypeGateway || (applicationTypeMicroservice && reactive)) { _%>
-    implementation "com.playtika.reactivefeign:feign-reactor-webclient"
-    implementation "com.playtika.reactivefeign:feign-reactor-cloud"
-    implementation "com.playtika.reactivefeign:feign-reactor-spring-configuration"
+<%_ if (!reactive && databaseTypeSql) { _%>
+    implementation "org.springframework.security:spring-security-data"
 <%_ } _%>
-    implementation "org.springframework.security:spring-security-config"
-    implementation "org.springframework.security:spring-security-web"
+    implementation "io.micrometer:micrometer-registry-prometheus"
+    implementation "io.dropwizard.metrics:metrics-core"
 <%_ if (communicationSpringWebsocket) { _%>
     implementation "org.springframework.security:spring-security-messaging"
 <%_ } _%>
-<%_ if (authenticationTypeOauth2) { _%>
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
-<%_ } _%>
-<%_ if (authenticationTypeJwt) { _%>
-    implementation "io.jsonwebtoken:jjwt-api"
-    if (!project.hasProperty("gae")) {
-        runtimeOnly "io.jsonwebtoken:jjwt-impl"
-        <% if (reactive) { %>implementation<% } else { %>runtimeOnly<% } %> "io.jsonwebtoken:jjwt-jackson"
-    } else {
-        implementation "io.jsonwebtoken:jjwt-impl"
-        implementation "io.jsonwebtoken:jjwt-jackson"
-    }
-<%_ } _%>
-<%_ if (databaseTypeMongodb) { _%>
-    implementation "io.mongock:mongock-springboot"
-    implementation "io.mongock:mongodb-springdata-v3-driver"
-    testImplementation "org.testcontainers:mongodb"
-  <%_ if (reactive) { _%>
-    // Mongock doesn't support reactive yet, so this dependency is necessary.
-    // See https://github.com/jhipster/generator-jhipster/pull/12536#issuecomment-696683592 for more information.
-    implementation "org.springframework.boot:spring-boot-starter-data-mongodb"
-
-    // Mongo db driver was excluded from starter, adding manually
-    implementation "org.mongodb:mongodb-driver-reactivestreams"
-  <%_ } _%>
-    // Mongo db driver was excluded from starter, adding manually
-    implementation "org.mongodb:mongodb-driver-sync"
-<%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-    implementation "com.github.differentway:couchmove"
-    implementation "com.couchbase.client:java-client"
-<%_ } _%>
-    implementation ("org.springdoc:springdoc-openapi-webmvc-core")
-<%_ if (prodDatabaseTypeMysql) { _%>
-    implementation "mysql:mysql-connector-java"
-  <%_ if (reactive) { _%>
-    implementation "dev.miku:r2dbc-mysql"
-  <%_ } else { _%>
-    liquibaseRuntime "mysql:mysql-connector-java"
-  <%_ } _%>
-<%_ } _%>
-<%_ if (prodDatabaseTypePostgres) { _%>
-    implementation "org.postgresql:postgresql"
-  <%_ if (reactive) { _%>
-    implementation "io.r2dbc:r2dbc-postgresql"
-  <%_ } else { _%>
-    liquibaseRuntime "org.postgresql:postgresql"
-  <%_ } _%>
-<%_ } _%>
-<%_ if (prodDatabaseTypeMariadb) { _%>
-    implementation "org.mariadb.jdbc:mariadb-java-client"
-  <%_ if (reactive) { _%>
-    implementation "org.mariadb:r2dbc-mariadb"
-  <%_ } else { _%>
-    liquibaseRuntime "org.mariadb.jdbc:mariadb-java-client"
-  <%_ } _%>
-<%_ } _%>
-<%_ if (prodDatabaseTypeMssql) { _%>
-    implementation "com.microsoft.sqlserver:mssql-jdbc"
-    implementation "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
-  <%_ if (reactive) { _%>
-    implementation "io.r2dbc:r2dbc-mssql"
-  <%_ } _%>
-    liquibaseRuntime "com.microsoft.sqlserver:mssql-jdbc"
-    liquibaseRuntime "org.liquibase.ext:liquibase-mssql:<%= LIQUIBASE_VERSION %>"
-<%_ } _%>
-    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
-    annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
-<%_ if (databaseTypeSql) { _%>
-    annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernateVersion}"
-    annotationProcessor "org.glassfish.jaxb:jaxb-runtime:${jaxbRuntimeVersion}"
-<%_ } _%>
-<%_ if (databaseTypeCassandra) { _%>
-    annotationProcessor "com.datastax.oss:java-driver-mapper-processor:${cassandraDriverVersion}"
-<%_ } _%>
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
-<%_ if (databaseTypeCassandra) { _%>
-    testImplementation ("org.cassandraunit:cassandra-unit-spring") {
-        exclude(group: "org.slf4j")
-    }
-    testImplementation "org.testcontainers:database-commons"
-<%_ } _%>
 <%_ if (cucumberTests) { _%>
-    testImplementation "org.junit.platform:junit-platform-console"
     testImplementation "io.cucumber:cucumber-junit-platform-engine"
     testImplementation "io.cucumber:cucumber-java"
     testImplementation "io.cucumber:cucumber-spring"
+    testImplementation "org.junit.platform:junit-platform-console"
     testImplementation "org.testng:testng"
-<%_ } _%>
-    testImplementation "org.springframework.boot:spring-boot-starter-test"
-    testImplementation "org.springframework.security:spring-security-test"
-    testImplementation "org.springframework.boot:spring-boot-test"
-<%_ if (reactive) { _%>
-    testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockhoundJunitPlatformVersion}"
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:${junitPlatformLauncherVersion}'
-<%_ } _%>
-    testImplementation "com.tngtech.archunit:archunit-junit5-api:${archunitJunit5Version}"
-    testRuntimeOnly "com.tngtech.archunit:archunit-junit5-engine:${archunitJunit5Version}"
-<%_ if (databaseTypeCouchbase) { _%>
-    testImplementation "org.testcontainers:couchbase"
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
-    testImplementation "com.h2database:h2"
-  <%_ if (reactive) { _%>
-    testImplementation "io.r2dbc:r2dbc-h2"
-  <%_ } _%>
-<%_ } _%>
-<%_ if (devDatabaseTypeH2Any) { _%>
-  <%_ if (reactive) { _%>
-    implementation "io.r2dbc:r2dbc-h2"
-  <%_ } else { _%>
-    liquibaseRuntime "com.h2database:h2"
+    liquibaseRuntime sourceSets.main.compileClasspath
+  <%_ if (!reactive) { _%>
+    liquibaseRuntime "org.liquibase.ext:liquibase-hibernate5:${liquibaseHibernate5Version}"
   <%_ } _%>
 <%_ } _%>
-<%_ if (prodDatabaseTypeOracle) { _%>
-    implementation "com.oracle.database.jdbc:ojdbc8"
-    liquibaseRuntime "com.oracle.database.jdbc:ojdbc8"
+<%_ if (databaseTypeCassandra) { _%>
+    annotationProcessor "com.datastax.oss:java-driver-mapper-processor:${cassandraDriverVersion}"
 <%_ } _%>
-<%_ if (messageBrokerKafka) { _%>
-    testImplementation "org.testcontainers:kafka"
+<%_ if (reactive) { _%>
+    OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem();
+    Architecture arch = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentArchitecture();
+    if (os.isMacOsX() && !arch.isAmd64()) {
+        implementation("io.netty:netty-resolver-dns-native-macos") {
+            artifact {
+                classifier = "osx-aarch_64"
+            }
+        }
+    }
 <%_ } _%>
-    developmentOnly "org.springframework.boot:spring-boot-devtools:${springBootVersion}"
     //jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 }
 

package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs

@@ -28,8 +28,10 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 <%_ } else { _%>
 import java.util.List;
-import java.util.stream.Collectors;
 <%_ } _%>
+import java.util.stream.Collectors;
+
+import static java.lang.String.format;
 
 /**
  * Couchbase specific {@link org.springframework.data.repository.Repository} interface that use KV first approach to optimize requests.
@@ -44,6 +46,27 @@ public interface JHipsterCouchbaseRepository<T, ID> extends <% if (reactive) { %
 
     String FIND_IDS_QUERY = "SELECT meta().id as __id, 0 as __cas FROM #{#n1ql.bucket} WHERE #{#n1ql.filter}";
 
+    static String pageableStatement(Pageable pageable, String prefix) {
+        Sort sort = Sort.by(
+            pageable.getSort().stream()
+                .map(order -> {
+                    String property = order.getProperty();
+                    if ("id".equals(property)) {
+                        return order.withProperty(format("meta(%s).id", prefix));
+                    }
+                    if (prefix.isEmpty()) {
+                        return order;
+                    }
+                    return order.withProperty(format("%s.%s", prefix, property));
+                })
+                .collect(Collectors.toList()));
+        return new org.springframework.data.couchbase.core.query.Query()
+            .limit(pageable.getPageSize())
+            .skip(pageable.getOffset())
+            .with(sort)
+            .export();
+    }
+
     default <%= listOrFlux %><T> findAll() {
         return findAllById(toIds(findAllIds()));
     }

package/generators/server/templates/couchbase/src/test/java/package/config/CouchbaseTestContainer.java.ejs

@@ -0,0 +1,67 @@
+<%#
+ Copyright 2013-2022 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>.config;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.couchbase.*;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+
+public class CouchbaseTestContainer implements InitializingBean, DisposableBean {
+
+    private CouchbaseContainer couchbaseContainer;
+    private static final Logger log = LoggerFactory.getLogger(CouchbaseTestContainer.class);
+
+    @Override
+    public void destroy() {
+//        if (null != couchbaseContainer && couchbaseContainer.isRunning()) {
+//            couchbaseContainer.stop();
+//        }
+    }
+
+    public String getBucketName() {
+        return "testBucket";
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        if (null == couchbaseContainer) {
+            DockerImageName dockerImage = DockerImageName.parse("<%= DOCKER_COUCHBASE %>").asCompatibleSubstituteFor("couchbase/server");
+            couchbaseContainer = new CouchbaseContainer(dockerImage)
+                .withBucket(new BucketDefinition(getBucketName()))
+                .withCredentials("user", "password")
+                .withServiceQuota(CouchbaseService.SEARCH, 1024)
+                .withLogConsumer(new Slf4jLogConsumer(log))
+                .withStartupTimeout(Duration.ofMinutes(15))
+                .withReuse(true);
+        }
+        if (!couchbaseContainer.isRunning()) {
+            couchbaseContainer.start();
+        }
+    }
+
+    public CouchbaseContainer getCouchbaseContainer() {
+        return couchbaseContainer;
+    }
+}

package/generators/server/templates/couchbase/src/test/java/package/config/EmbeddedCouchbase.java.ejs

@@ -0,0 +1,30 @@
+<%#
+ Copyright 2013-2022 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>.config;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EmbeddedCouchbase {
+}

package/generators/server/templates/devcontainer/Dockerfile.ejs

@@ -0,0 +1,25 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/java/.devcontainer/base.Dockerfile
+
+# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
+ARG VARIANT="11"
+FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
+
+# [Option] Install Maven
+ARG INSTALL_MAVEN="false"
+ARG MAVEN_VERSION=""
+# [Option] Install Gradle
+ARG INSTALL_GRADLE="false"
+ARG GRADLE_VERSION=""
+RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
+    && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
+
+# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+ARG NODE_VERSION="none"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1