use hibernate version from micronaut-platform pom.

jhipster · May 14, 2024 · 5123a14 · 5123a14
1 parent d4308df
commit 5123a14
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/generators/constants.cjs b/generators/constants.cjs
@@ -50,7 +50,6 @@ module.exports = {
     },
   },
   versions: {
-    hibernate: '6.4.4.Final',
     logback: '1.5.3',
   },
 };
diff --git a/generators/micronaut/generator.js b/generators/micronaut/generator.js
@@ -4,6 +4,7 @@ import BaseApplicationGenerator from 'generator-jhipster/generators/server';
 import { GENERATOR_DOCKER, GENERATOR_LANGUAGES, GENERATOR_LIQUIBASE, GENERATOR_SERVER } from 'generator-jhipster/generators';
 import { createNeedleCallback, createBase64Secret } from 'generator-jhipster/generators/base/support';
 import { addJavaAnnotation } from 'generator-jhipster/generators/java/support';
+import { parseMavenPom } from 'generator-jhipster/generators/maven/support';
 import mnConstants from '../constants.cjs';
 import { writeFiles } from './files.js';
 
@@ -109,6 +110,11 @@ export default class extends BaseApplicationGenerator {
       async loading({ application }) {
         await this.loadCurrentJHipsterCommandConfig(application);
       },
+      loadMicronautPlatformPom({ application }) {
+        const pomFile = this.readTemplate(this.templatePath('../resources/micronaut-platform.pom')).toString();
+        const pom = parseMavenPom(pomFile);
+        Object.assign(application.javaManagedProperties, pom.project.properties);
+      },
     });
   }
 
@@ -250,7 +256,9 @@ export default class extends BaseApplicationGenerator {
       },
       sqlDependencies({ application, source }) {
         if (application.databaseTypeSql) {
-          source.addMavenDefinition?.(getImperativeMavenDefinition({ javaDependencies: { hibernate: constants.versions.hibernate } }));
+          source.addMavenDefinition?.(
+            getImperativeMavenDefinition({ javaDependencies: { hibernate: application.javaManagedProperties['hibernate.version'] } }),
+          );
           source.addMavenDefinition?.(getCommonMavenDefinition());
           source.addMavenDependency?.(getDatabaseDriverForDatabase(application.prodDatabaseType).jdbc);
         }

diff --git a/generators/micronaut/templates/gradle.properties.ejs b/generators/micronaut/templates/gradle.properties.ejs
@@ -27,9 +27,7 @@ profile=dev
 # Dependency versions
 micronautVersion=<%= javaDependencies['micronaut-platform'] %>
 
-# The hibernate version should match the one managed by Micronaut data
-# https://mvnrepository.com/artifact/io.micronaut.data/micronaut-data-hibernate-jpa/1.0.1
-hibernate_version=<%=versions.hibernate%>
+hibernate_version=<%= javaManagedProperties['hibernate.version'] %>
 mapstruct_version=<%=javaDependencies.mapstruct%>
 archunit_junit5_version=<%= javaDependencies['archunit-junit5'] %>
 logback_version=<%=versions.logback%>

diff --git a/generators/micronaut/templates/pom.xml.ejs b/generators/micronaut/templates/pom.xml.ejs
@@ -84,7 +84,6 @@ _%>
 
         <!-- Dependency versions -->
         <micronaut.version><%= javaDependencies['micronaut-platform'] %></micronaut.version>
-        <hibernate.version><%= versions.hibernate %></hibernate.version>
         <logback.version><%= versions.logback %></logback.version>
         <mapstruct.version><%- javaDependencies.mapstruct %></mapstruct.version>
         <archunit-junit5.version><%- javaDependencies['archunit-junit5'] %></archunit-junit5.version>