adjusts

jhipster · Aug 8, 2024 · c2d16b2 · c2d16b2
1 parent 0b3a74c
commit c2d16b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/generators/spring-boot-v2/generator.js b/generators/spring-boot-v2/generator.js
@@ -2,16 +2,10 @@ import { basename, dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { existsSync } from 'fs';
 import BaseApplicationGenerator from 'generator-jhipster/generators/spring-boot';
-import { getEnumInfo } from 'generator-jhipster/generators/base-application/support';
 import { files as entityServerFiles } from 'jhipster-7-templates/esm/generators/entity-server';
 import { files as serverFiles } from 'jhipster-7-templates/esm/generators/server';
 import { convertToKotlinFile } from '../kotlin/support/files.js';
 import { migrateApplicationTask } from './preparing-migration.js';
-import migration from './migration.cjs';
-
-const { jhipsterConstants } = migration;
-const { MAIN_DIR } = jhipsterConstants;
-const SERVER_MAIN_SRC_KOTLIN_DIR = `${MAIN_DIR}kotlin/`;
 
 const jhipster7TemplatesPackage = dirname(fileURLToPath(import.meta.resolve('jhipster-7-templates/package.json')));
 
@@ -395,8 +389,14 @@ export default class extends BaseApplicationGenerator {
                     source.addGradleProperty({ property: 'mapstructVersion', value: application.javaDependencies.mapstruct });
                     source.addGradleProperty({ property: 'springBootVersion', value: application.javaDependencies['spring-boot'] });
                     if (application.databaseTypeSql) {
-                        source.addGradleProperty({ property: 'liquibase.version', value: application.javaDependencies.liquibase });
-                        source.addGradleProperty({ property: 'hibernateVersion', value: application.javaDependencies.hibernate });
+                        source.addGradleProperty({
+                            property: 'liquibase.version',
+                            value: application.javaManagedProperties['liquibase.version'],
+                        });
+                        source.addGradleProperty({
+                            property: 'hibernateVersion',
+                            value: application.javaManagedProperties['hibernate.version'],
+                        });
                         source.addGradleProperty({ property: 'jaxbRuntimeVersion', value: '4.0.0' });
                     }
                     if (application.databaseTypeCassandra) {

diff --git a/generators/spring-boot/generator.js b/generators/spring-boot/generator.js
@@ -3,8 +3,10 @@ import { existsSync } from 'fs';
 // Use spring-boot as parent due to this context in generators
 import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
 import { createNeedleCallback } from 'generator-jhipster/generators/base/support';
+import { getEnumInfo } from 'generator-jhipster/generators/base-application/support';
 
 import { convertToKotlinFile } from '../kotlin/support/files.js';
+import { SERVER_MAIN_SRC_KOTLIN_DIR } from '../kotlin/support/constants.js';
 import { KOTLIN_TEST_SRC_DIR } from './kotlin-constants.js';
 
 export default class extends BaseApplicationGenerator {