Remove override of H2 and H2 R2DBC version

jhipster · Jul 27, 2022 · ac13bda · ac13bda
1 parent 47a1649
commit ac13bda
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 29 deletions.
diff --git a/generators/generator-constants.js b/generators/generator-constants.js
@@ -43,10 +43,6 @@ const HIBERNATE_VERSION = '5.6.10.Final';
 const JACOCO_VERSION = '0.8.8';
 const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.2';
 const JIB_VERSION = '3.2.1';
-// TODO upgrade to h2 v2 once liquibase issues has been addressed
-const H2_VERSION = '2.1.214';
-// Version 0.9.x is not compatible with h2 v1
-const H2_R2DBC_VERSION = '0.9.1.RELEASE';
 
 // Version of docker images
 const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
@@ -416,8 +412,6 @@ const constants = {
   JIB_VERSION,
   JACOCO_VERSION,
   JACKSON_DATABIND_NULLABLE_VERSION,
-  H2_VERSION,
-  H2_R2DBC_VERSION,
 
   // Docker
   DOCKER_COMPOSE_FORMAT_VERSION,

diff --git a/generators/server/index.js b/generators/server/index.js
@@ -201,8 +201,6 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
         this.JACKSON_DATABIND_NULLABLE_VERSION = constants.JACKSON_DATABIND_NULLABLE_VERSION;
         this.JACOCO_VERSION = constants.JACOCO_VERSION;
         this.JIB_VERSION = constants.JIB_VERSION;
-        this.H2_VERSION = constants.H2_VERSION;
-        this.H2_R2DBC_VERSION = constants.H2_R2DBC_VERSION;
 
         this.ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
         this.VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;

diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs
@@ -250,12 +250,6 @@ 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 %>'
-  <%_ } _%>
-<%_ } _%>
         }
     }
 }

diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs
@@ -102,12 +102,6 @@
         <liquibase.version><%= LIQUIBASE_VERSION %></liquibase.version>
   <%_ if (!reactive) { _%>
         <liquibase-hibernate5.version><%= LIQUIBASE_VERSION %></liquibase-hibernate5.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) { _%>
@@ -1581,17 +1575,11 @@
                 <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>
   <%_ } _%>
 <%_ } _%>
@@ -1780,9 +1768,6 @@
                                 <dependency>
                                     <groupId>com.h2database</groupId>
                                     <artifactId>h2</artifactId>
-    <%_ if (prodDatabaseTypeMysql || reactive) { _%>
-                                    <version>${h2.version}</version>
-    <%_ } _%>
                                 </dependency>
   <%_ } _%>
                             </dependencies>