generator-jhipster 7.8.1 → 7.9.0

package/generators/server/templates/pom.xml.ejs

@@ -64,7 +64,7 @@
 
     <properties>
         <!-- Build properties -->
-        <maven.version>3.8.5</maven.version>
+        <maven.version>3.2.5</maven.version>
         <java.version><%= JAVA_VERSION %></java.version>
 <%_ if (!skipClient) { _%>
         <node.version>v<%= NODE_VERSION %></node.version>
@@ -77,7 +77,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <start-class><%= packageName %>.<%= mainClass %></start-class>
-        <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx512m</argLine>
+        <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx1G</argLine>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
         <run.addResources>false</run.addResources>
         <!-- These remain empty unless the corresponding profile is active -->
@@ -103,8 +103,11 @@
   <%_ if (!reactive) { _%>
         <liquibase-hibernate5.version><%= LIQUIBASE_VERSION %></liquibase-hibernate5.version>
   <%_ } _%>
-  <%_ if (devDatabaseTypeH2Disk) { _%>
-        <h2.version>1.4.200</h2.version>
+  <%_ if (devDatabaseTypeH2Any && (prodDatabaseTypeMysql || reactive)) { _%>
+        <h2.version><%= H2_VERSION %></h2.version>
+    <%_ if (reactive) { _%>
+        <h2-r2dbc.version><%= H2_R2DBC_VERSION %></h2-r2dbc.version>
+    <%_ } _%>
   <%_ } _%>
         <validation-api.version>2.0.1.Final</validation-api.version>
   <%_ if (reactive) { _%>
@@ -115,42 +118,42 @@
         <blockhound-junit-platform.version>1.0.6.RELEASE</blockhound-junit-platform.version>
 <%_ } _%>
 <%_ if (databaseTypeSql) { _%>
-        <jaxb-runtime.version>2.3.3</jaxb-runtime.version>
+        <jaxb-runtime.version>4.0.0</jaxb-runtime.version>
 <%_ } _%>
 <%_ 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} -->
-        <cassandra-driver.version>4.13.0</cassandra-driver.version>
+        <cassandra-driver.version>4.14.1</cassandra-driver.version>
 <%_ } _%>
         <archunit-junit5.version>0.22.0</archunit-junit5.version>
-        <mapstruct.version>1.4.2.Final</mapstruct.version>
+        <mapstruct.version>1.5.2.Final</mapstruct.version>
 <%_ if (enableSwaggerCodegen) { _%>
         <jackson-databind-nullable.version><%= JACKSON_DATABIND_NULLABLE_VERSION %></jackson-databind-nullable.version>
 <%_ } _%>
 <%_ if (cacheProviderCaffeine) { _%>
-        <caffeine.version>3.0.6</caffeine.version>
+        <caffeine.version>3.1.1</caffeine.version>
         <typesafe.version>1.4.2</typesafe.version>
 <%_ } _%>
         <!-- Plugin versions -->
-        <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
-        <maven-site-plugin.version>3.11.0</maven-site-plugin.version>
+        <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
+        <maven-site-plugin.version>3.12.0</maven-site-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-        <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
         <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
-        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <checkstyle.version>10.1</checkstyle.version>
+        <checkstyle.version>10.3.1</checkstyle.version>
         <nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
 <%_ if (!skipClient) { _%>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
-        <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
+        <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
 <%_ } _%>
         <git-commit-id-plugin.version>5.0.0</git-commit-id-plugin.version>
         <modernizer-maven-plugin.version>2.4.0</modernizer-maven-plugin.version>
@@ -160,10 +163,14 @@
         <jib-maven-plugin.architecture>amd64</jib-maven-plugin.architecture>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
 <%_ if (enableSwaggerCodegen) { _%>
-        <openapi-generator-maven-plugin.version>5.4.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>6.0.1</openapi-generator-maven-plugin.version>
 <%_ } _%>
         <properties-maven-plugin.version>1.1.0</properties-maven-plugin.version>
         <sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
+<%_ if (searchEngineElasticsearch) { _%>
+        <awaitility.version>4.2.0</awaitility.version>
+<%_ } _%>
+
         <!-- jhipster-needle-maven-property -->
     </properties>
 
@@ -243,14 +250,12 @@
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
         </dependency>
-<%_ } _%>
-<%_ if (cacheProviderHazelcast && enableHibernateCache) { _%>
+  <%_ if (enableHibernateCache) { _%>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast-hibernate53</artifactId>
         </dependency>
-<%_ } _%>
-<%_ if (cacheProviderHazelcast) { _%>
+  <%_ } _%>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast-spring</artifactId>
@@ -288,17 +293,17 @@
             <artifactId>xmemcached</artifactId>
         </dependency>
 <%_ } _%>
-<%_ if (cacheProviderRedis && enableHibernateCache) { _%>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-jcache</artifactId>
-        </dependency>
-<%_ } _%>
 <%_ if (cacheProviderRedis) { _%>
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
         </dependency>
+  <%_ if (enableHibernateCache) { _%>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-jcache</artifactId>
+        </dependency>
+  <%_ } _%>
 <%_ } _%>
 <%_ if (cacheProviderRedis || databaseTypeMongodb || databaseTypeCouchbase || databaseTypeNeo4j || databaseTypeCassandra || searchEngineElasticsearch || messageBrokerKafka) { _%>
         <dependency>
@@ -320,12 +325,6 @@
             <artifactId>springdoc-openapi-webmvc-core</artifactId>
 <%_ } _%>
         </dependency>
-<%_ if (!reactive) { _%>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-        </dependency>
-<%_ } _%>
 <%_ if (databaseTypeSql) { _%>
         <dependency>
             <groupId>com.zaxxer</groupId>
@@ -529,12 +528,33 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
   <%_ } _%>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>jdbc</artifactId>
+            <scope>test</scope>
+        </dependency>
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
 <%_ } _%>
 <%_ if (databaseTypeMongodb || databaseTypeCassandra || databaseTypeCouchbase) { _%>
         <dependency>
@@ -554,6 +574,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
+            <scope>runtime</scope>
         </dependency>
 <%_ } _%>
         <dependency>
@@ -815,116 +836,6 @@
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
-<%_ } _%>
-<%_ if (databaseTypeSql && !devDatabaseTypeH2Any) { _%>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-  <%_ if (devDatabaseTypeMysql) { _%>
-            <artifactId>mysql</artifactId>
-  <%_ } else if (devDatabaseTypeMariadb) { _%>
-            <artifactId>mariadb</artifactId>
-  <%_ } else if (devDatabaseTypePostgres) { _%>
-            <artifactId>postgresql</artifactId>
-  <%_ } else if (devDatabaseTypeMssql) { _%>
-            <artifactId>mssqlserver</artifactId>
-  <%_ } else if (devDatabaseTypeOracle) { _%>
-            <artifactId>oracle-xe</artifactId>
-  <%_ } _%>
-            <scope>provided</scope>
-        </dependency>
-<%_ } _%>
-<%_ if (databaseTypeSql && devDatabaseType !== prodDatabaseType) { _%>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-  <%_ if (prodDatabaseTypeMysql) { _%>
-            <artifactId>mysql</artifactId>
-  <%_ } else if (prodDatabaseTypeMariadb) { _%>
-            <artifactId>mariadb</artifactId>
-  <%_ } else if (prodDatabaseTypePostgres) { _%>
-            <artifactId>postgresql</artifactId>
-  <%_ } else if (prodDatabaseTypeMssql) { _%>
-            <artifactId>mssqlserver</artifactId>
-  <%_ } else if (prodDatabaseTypeOracle) { _%>
-            <artifactId>oracle-xe</artifactId>
-  <%_ } _%>
-            <scope>provided</scope>
-        </dependency>
-<%_ } _%>
-<%_ if (reactive) { _%>
-        <dependency>
-            <groupId>io.r2dbc</groupId>
-            <artifactId>r2dbc-h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-<%_ } else { _%>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-<%_ } _%>
-<%_ if (devDatabaseTypeMysql || prodDatabaseTypeMysql) { _%>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  <%_ if (reactive) { _%>
-        <dependency>
-            <groupId>dev.miku</groupId>
-            <artifactId>r2dbc-mysql</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  <%_ } _%>
-<%_ } _%>
-<%_ if (devDatabaseTypeMariadb || prodDatabaseTypeMariadb) { _%>
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  <%_ if (reactive) { _%>
-        <dependency>
-            <groupId>org.mariadb</groupId>
-            <artifactId>r2dbc-mariadb</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  <%_ } _%>
-<%_ } _%>
-<%_ if (devDatabaseTypeOracle || prodDatabaseTypeOracle) { _%>
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <scope>provided</scope>
-        </dependency>
-<%_ } _%>
-<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  <%_ if (reactive) { _%>
-        <dependency>
-            <groupId>io.r2dbc</groupId>
-            <artifactId>r2dbc-mssql</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  <%_ } _%>
-<%_ } _%>
-<%_ if (devDatabaseTypePostgres || prodDatabaseTypePostgres) { _%>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  <%_ if (reactive) { _%>
-        <dependency>
-            <groupId>io.r2dbc</groupId>
-            <artifactId>r2dbc-postgresql</artifactId>
-            <scope>provided</scope>
-        </dependency>
-  <%_ } _%>
 <%_ } _%>
         <!-- jhipster-needle-maven-add-dependency -->
     </dependencies>
@@ -1001,7 +912,7 @@
 <%_ if (enableSwaggerCodegen) { _%>
             <plugin>
                 <!--
-                    Plugin that provides API-first development using openapi-generator to
+                    Plugin that provides API-first development using openapi-generator-cli to
                     generate Spring-MVC endpoint stubs at compile time from an OpenAPI definition file
                 -->
                 <groupId>org.openapitools</groupId>
@@ -1181,7 +1092,6 @@
                         </execution>
                     </executions>
                 </plugin>
-
                 <plugin>
                     <groupId>io.github.git-commit-id</groupId>
                     <artifactId>git-commit-id-maven-plugin</artifactId>
@@ -1418,43 +1328,9 @@
                         </excludes>
 <%_ if (reactive) { _%>
                         <!-- Fix tests at java 13+ https://github.com/reactor/BlockHound/issues/33 -->
-                        <argLine>${argLine} -XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
-<%_ } _%>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>${maven-failsafe-plugin.version}</version>
-                    <configuration>
-                        <!-- Due to spring-boot repackage, without adding this property test classes are not found
-                             See https://github.com/spring-projects/spring-boot/issues/6254 -->
-                        <classesDirectory>${project.build.outputDirectory}</classesDirectory>
-                        <!-- Force alphabetical order to have a reproducible build -->
-                        <runOrder>alphabetical</runOrder>
-                        <includes>
-                            <include>**/*IT*</include>
-                            <include>**/*IntTest*</include>
-                        </includes>
-<%_ if (reactive) { _%>
-                        <!-- Fix tests at java 13+ https://github.com/reactor/BlockHound/issues/33 -->
-                        <argLine>${argLine} -XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
+                        <argLine>@{argLine} -XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods</argLine>
 <%_ } _%>
                     </configuration>
-                    <executions>
-                        <execution>
-                            <id>integration-test</id>
-                            <goals>
-                                <goal>integration-test</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>verify</id>
-                            <goals>
-                                <goal>verify</goal>
-                            </goals>
-                        </execution>
-                    </executions>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1464,7 +1340,7 @@
 <%_ if (enableSwaggerCodegen) { _%>
                 <plugin>
                     <!--
-                        Plugin that provides API-first development using openapi-generator to
+                        Plugin that provides API-first development using openapi-generator-cli to
                         generate Spring-MVC endpoint stubs at compile time from an OpenAPI definition file
                     -->
                     <groupId>org.openapitools</groupId>
@@ -1558,20 +1434,6 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <dependencies>
-  <%_ if (devDatabaseTypeH2Any) { _%>
-                <dependency>
-                    <groupId>com.h2database</groupId>
-                    <artifactId>h2</artifactId>
-                </dependency>
-    <%_ if (reactive) { _%>
-                <dependency>
-                    <groupId>io.r2dbc</groupId>
-                    <artifactId>r2dbc-h2</artifactId>
-                </dependency>
-    <%_ } _%>
-  <%_ } _%>
-            </dependencies>
             <build>
                 <plugins>
                     <plugin>
@@ -1719,11 +1581,17 @@
                 <dependency>
                     <groupId>com.h2database</groupId>
                     <artifactId>h2</artifactId>
+  <%_ if (prodDatabaseTypeMysql || reactive) { _%>
+                    <version>${h2.version}</version>
+  <%_ } _%>
                 </dependency>
   <%_ if (reactive) { _%>
                 <dependency>
                     <groupId>io.r2dbc</groupId>
                     <artifactId>r2dbc-h2</artifactId>
+    <%_ if (prodDatabaseTypeMysql) { _%>
+                    <version>${h2-r2dbc.version}</version>
+    <%_ } _%>
                 </dependency>
   <%_ } _%>
 <%_ } _%>
@@ -1734,8 +1602,8 @@
                 </dependency>
   <%_ if (reactive) { _%>
                 <dependency>
-                    <groupId>dev.miku</groupId>
-                    <artifactId>r2dbc-mysql</artifactId>
+                    <groupId>org.mariadb</groupId>
+                    <artifactId>r2dbc-mariadb</artifactId>
                 </dependency>
   <%_ } _%>
 <%_ } _%>
@@ -1781,22 +1649,85 @@
                 </dependency>
   <%_ if (reactive) { _%>
                 <dependency>
-                    <groupId>io.r2dbc</groupId>
+                    <groupId>org.postgresql</groupId>
                     <artifactId>r2dbc-postgresql</artifactId>
                 </dependency>
   <%_ } _%>
+<%_ } _%>
+<%_ if (databaseTypeSql && !devDatabaseTypeH2Any) { _%>
+                <dependency>
+                    <groupId>org.testcontainers</groupId>
+  <%_ if (devDatabaseTypeMysql) { _%>
+                    <artifactId>mysql</artifactId>
+  <%_ } else if (devDatabaseTypeMariadb) { _%>
+                    <artifactId>mariadb</artifactId>
+  <%_ } else if (devDatabaseTypePostgres) { _%>
+                    <artifactId>postgresql</artifactId>
+  <%_ } else if (devDatabaseTypeMssql) { _%>
+                    <artifactId>mssqlserver</artifactId>
+  <%_ } else if (devDatabaseTypeOracle) { _%>
+                    <artifactId>oracle-xe</artifactId>
+  <%_ } _%>
+                    <scope>test</scope>
+                </dependency>
 <%_ } _%>
             </dependencies>
-<%_ if (databaseTypeSql && !reactive) { _%>
             <build>
+<%_ if (databaseTypeSql) { _%>
                 <plugins>
+  <%_ if (devDatabaseType !== prodDatabaseType && (prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypeMysql || prodDatabaseTypePostgres)) { _%>
                     <plugin>
-                        <groupId>org.liquibase</groupId>
-                        <artifactId>liquibase-maven-plugin</artifactId>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <testExcludes>
+                                <testExclude><%= packageFolder %>/config/<% if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer.java</testExclude>
+                            </testExcludes>
+                        </configuration>
                     </plugin>
+  <%_ } _%>
+
                 </plugins>
+<%_ } _%>
                 <pluginManagement>
                     <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <version>${maven-failsafe-plugin.version}</version>
+                            <configuration>
+                                <!-- Due to spring-boot repackage, without adding this property test classes are not found
+                                     See https://github.com/spring-projects/spring-boot/issues/6254 -->
+                                <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+                                <!-- Force alphabetical order to have a reproducible build -->
+                                <runOrder>alphabetical</runOrder>
+                                <includes>
+                                    <include>**/*IT*</include>
+                                    <include>**/*IntTest*</include>
+                                </includes>
+  <%_ if (reactive) { _%>
+                                <!-- Fix tests at java 13+ https://github.com/reactor/BlockHound/issues/33 -->
+                                <argLine>@{argLine} -XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods -Dspring.profiles.active=testdev</argLine>
+  <%_ } else { _%>
+                                <argLine>@{argLine} -Dspring.profiles.active=testdev</argLine>
+  <%_ } _%>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <id>integration-test</id>
+                                    <goals>
+                                        <goal>integration-test</goal>
+                                    </goals>
+                                </execution>
+                                <execution>
+                                    <id>verify</id>
+                                    <goals>
+                                        <goal>verify</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+<%_ if (databaseTypeSql) { _%>
                         <plugin>
                             <groupId>org.liquibase</groupId>
                             <artifactId>liquibase-maven-plugin</artifactId>
@@ -1849,15 +1780,17 @@
                                 <dependency>
                                     <groupId>com.h2database</groupId>
                                     <artifactId>h2</artifactId>
+    <%_ if (prodDatabaseTypeMysql || reactive) { _%>
                                     <version>${h2.version}</version>
+    <%_ } _%>
                                 </dependency>
   <%_ } _%>
                             </dependencies>
                         </plugin>
+<%_ } _%>
                     </plugins>
                 </pluginManagement>
             </build>
-<%_ } _%>
             <properties>
                 <!-- default Spring profiles -->
                 <spring.profiles.active>dev${profile.tls}<%_ if (databaseTypeSql) { _%>${profile.no-liquibase}<%_ } _%></spring.profiles.active>
@@ -1865,10 +1798,8 @@
         </profile>
         <profile>
             <id>prod</id>
-<%_ if (databaseTypeSql || !reactive) { _%>
-            <dependencies>
-<%_ } _%>
 <%_ if (databaseTypeSql) { _%>
+            <dependencies>
                 <dependency>
                     <groupId>org.testcontainers</groupId>
   <%_ if (prodDatabaseTypeMysql) { _%>
@@ -1884,38 +1815,37 @@
   <%_ } _%>
                     <scope>test</scope>
                 </dependency>
-<%_ } _%>
-<%_ if (prodDatabaseTypeMysql) { _%>
+  <%_ if (prodDatabaseTypeMysql) { _%>
                 <dependency>
                     <groupId>mysql</groupId>
                     <artifactId>mysql-connector-java</artifactId>
                 </dependency>
-  <%_ if (reactive) { _%>
+    <%_ if (reactive) { _%>
                 <dependency>
-                    <groupId>dev.miku</groupId>
-                    <artifactId>r2dbc-mysql</artifactId>
+                    <groupId>org.mariadb</groupId>
+                    <artifactId>r2dbc-mariadb</artifactId>
                 </dependency>
+    <%_ } _%>
   <%_ } _%>
-<%_ } _%>
-<%_ if (prodDatabaseTypeMariadb) { _%>
+  <%_ if (prodDatabaseTypeMariadb) { _%>
                 <dependency>
                     <groupId>org.mariadb.jdbc</groupId>
                     <artifactId>mariadb-java-client</artifactId>
                 </dependency>
-  <%_ if (reactive) { _%>
+    <%_ if (reactive) { _%>
                 <dependency>
                     <groupId>org.mariadb</groupId>
                     <artifactId>r2dbc-mariadb</artifactId>
                 </dependency>
+    <%_ } _%>
   <%_ } _%>
-<%_ } _%>
-<%_ if (prodDatabaseTypeOracle) { _%>
+  <%_ if (prodDatabaseTypeOracle) { _%>
                 <dependency>
                     <groupId>com.oracle.database.jdbc</groupId>
                     <artifactId>ojdbc8</artifactId>
                 </dependency>
-<%_ } _%>
-<%_ if (prodDatabaseTypeMssql) { _%>
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMssql) { _%>
                 <dependency>
                     <groupId>com.microsoft.sqlserver</groupId>
                     <artifactId>mssql-jdbc</artifactId>
@@ -1925,29 +1855,120 @@
                     <artifactId>liquibase-mssql</artifactId>
                     <version>${liquibase.version}</version>
                 </dependency>
-  <%_ if (reactive) { _%>
+    <%_ if (reactive) { _%>
                 <dependency>
                     <groupId>io.r2dbc</groupId>
                     <artifactId>r2dbc-mssql</artifactId>
                 </dependency>
+    <%_ } _%>
   <%_ } _%>
-<%_ } _%>
-<%_ if (prodDatabaseTypePostgres) { _%>
+  <%_ if (prodDatabaseTypePostgres) { _%>
                 <dependency>
                     <groupId>org.postgresql</groupId>
                     <artifactId>postgresql</artifactId>
                 </dependency>
-  <%_ if (reactive) { _%>
+    <%_ if (reactive) { _%>
                 <dependency>
-                    <groupId>io.r2dbc</groupId>
+                    <groupId>org.postgresql</groupId>
                     <artifactId>r2dbc-postgresql</artifactId>
                 </dependency>
+    <%_ } _%>
   <%_ } _%>
-<%_ } _%>
-<%_ if (databaseTypeSql || !reactive) { _%>
             </dependencies>
 <%_ } _%>
             <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <version>${maven-failsafe-plugin.version}</version>
+                            <configuration>
+                                <!-- Due to spring-boot repackage, without adding this property test classes are not found
+                                     See https://github.com/spring-projects/spring-boot/issues/6254 -->
+                                <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+                                <!-- Force alphabetical order to have a reproducible build -->
+                                <runOrder>alphabetical</runOrder>
+                                <includes>
+                                    <include>**/*IT*</include>
+                                    <include>**/*IntTest*</include>
+                                </includes>
+<%_ if (reactive) { _%>
+                                <!-- Fix tests at java 13+ https://github.com/reactor/BlockHound/issues/33 -->
+                                <argLine>@{argLine} -XX:+IgnoreUnrecognizedVMOptions -XX:+AllowRedefinitionToAddDeleteMethods -Dspring.profiles.active=testprod</argLine>
+<%_ } else { _%>
+                                <argLine>@{argLine} -Dspring.profiles.active=testprod</argLine>
+<%_ } _%>
+                            </configuration>
+                            <executions>
+                                <execution>
+                                    <id>integration-test</id>
+                                    <goals>
+                                        <goal>integration-test</goal>
+                                    </goals>
+                                </execution>
+                                <execution>
+                                    <id>verify</id>
+                                    <goals>
+                                        <goal>verify</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                        </plugin>
+<%_ if (databaseTypeSql) { _%>
+                        <plugin>
+                            <groupId>org.liquibase</groupId>
+                            <artifactId>liquibase-maven-plugin</artifactId>
+                            <version>${liquibase.version}</version>
+                            <configuration>
+                                <changeLogFile>${project.basedir}/<%= SERVER_MAIN_RES_DIR %>config/liquibase/master.xml</changeLogFile>
+                                <diffChangeLogFile>${project.basedir}/<%= SERVER_MAIN_RES_DIR %>config/liquibase/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
+                                <driver><% if (prodDatabaseTypeMysql) { %>com.mysql.cj.jdbc.Driver<% } else if (prodDatabaseTypeMariadb) { %>org.mariadb.jdbc.Driver<% } else if (prodDatabaseTypePostgres) { %>org.postgresql.Driver<% } else if (prodDatabaseTypeOracle) { %>oracle.jdbc.OracleDriver<% } %></driver>
+                                <url><% if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb || prodDatabaseTypePostgres || prodDatabaseTypeMssql) { %><%- getJDBCUrl(prodDatabaseType, { hostname: 'localhost', databaseName: baseName, skipExtraOptions: true }) %><% } else if (prodDatabaseTypeOracle) { %><%- getJDBCUrl(prodDatabaseType, { hostname: 'localhost', databaseName: 'xe', skipExtraOptions: true}) %><% } %></url>
+                                <defaultSchemaName><% if (prodDatabaseTypeMysql) { %><%= baseName %><% } else if (prodDatabaseTypePostgres) { %><% } %></defaultSchemaName>
+                                <username><% if (prodDatabaseTypeMysql) { %>root<% } else if (prodDatabaseTypePostgres) { %><%= baseName %><% } else if (prodDatabaseTypeMssql) { %>SA<% } %></username>
+                                <password><% if (prodDatabaseTypeMssql) { %>yourStrong(!)Password<% } %></password>
+                                <referenceUrl>hibernate:spring:<%= packageName %>.domain?dialect=<% if (prodDatabaseTypeMysql) { %>org.hibernate.dialect.MySQL8Dialect<% } else if (prodDatabaseTypeMariadb) { %>org.hibernate.dialect.MariaDB103Dialect<% } else if (prodDatabaseTypePostgres) { %>tech.jhipster.domain.util.FixedPostgreSQL10Dialect<% } else if (prodDatabaseTypeOracle) { %>org.hibernate.dialect.Oracle12cDialect<% } else if (prodDatabaseTypeMssql) { %>org.hibernate.dialect.SQLServer2012Dialect<% } %>&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                                <verbose>true</verbose>
+                                <logging>debug</logging>
+                                <contexts>!test</contexts>
+  <%_ if (authenticationTypeOauth2) { _%>
+                                <diffExcludeObjects>oauth_access_token, oauth_approvals, oauth_client_details, oauth_client_token, oauth_code, oauth_refresh_token</diffExcludeObjects>
+  <%_ } _%>
+                            </configuration>
+                            <dependencies>
+                                <dependency>
+                                    <groupId>org.liquibase</groupId>
+                                    <artifactId>liquibase-core</artifactId>
+                                    <version>${liquibase.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>org.liquibase.ext</groupId>
+                                    <artifactId>liquibase-hibernate5</artifactId>
+                                    <version>${liquibase-hibernate5.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>org.springframework.boot</groupId>
+                                    <artifactId>spring-boot-starter-data-jpa</artifactId>
+                                    <version>${spring-boot.version}</version>
+                                </dependency>
+                                <dependency>
+                                    <groupId>javax.validation</groupId>
+                                    <artifactId>validation-api</artifactId>
+                                    <version>${validation-api.version}</version>
+                                </dependency>
+  <%_ if (prodDatabaseTypePostgres) { _%>
+                                <dependency>
+                                    <groupId>tech.jhipster</groupId>
+                                    <artifactId>jhipster-framework</artifactId>
+                                    <version>${jhipster-dependencies.version}</version>
+                                </dependency>
+  <%_ } _%>
+                            </dependencies>
+                        </plugin>
+<%_ } _%>
+                    </plugins>
+                </pluginManagement>
                 <plugins>
                     <plugin>
                         <artifactId>maven-clean-plugin</artifactId>
@@ -1959,6 +1980,17 @@
                             </filesets>
                         </configuration>
                     </plugin>
+<%_ if (devDatabaseType !== prodDatabaseType && (devDatabaseTypeMariadb || devDatabaseTypeMssql || devDatabaseTypeMysql || devDatabaseTypePostgres)) { _%>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <testExcludes>
+                                <testExclude><%= packageFolder %>/config/<% if (devDatabaseTypeMariadb) { %>Mariadb<% } else if (devDatabaseTypeMssql) { %>MsSql<% } else if (devDatabaseTypeMysql) { %>Mysql<% } else if (devDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer.java</testExclude>
+                            </testExcludes>
+                        </configuration>
+                    </plugin>
+<%_ } _%>
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
@@ -2192,6 +2224,23 @@
                 </pluginManagement>
             </build>
         </profile>
+<%_ } _%>
+<%_ if (reactive) { _%>
+        <profile>
+            <activation>
+                <os>
+                    <family>mac</family>
+                    <arch>aarch64</arch>
+                </os>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-resolver-dns-native-macos</artifactId>
+                    <classifier>osx-aarch_64</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
 <%_ } _%>
         <!-- jhipster-needle-maven-add-profile -->
     </profiles>