update to generator-jhipster 8.3.0 (#334)

jhipster · Apr 17, 2024 · 08a6bac · 08a6bac
1 parent 9fb9e93
commit 08a6bac
Show file tree

Hide file tree

Showing 153 changed files with 2,128 additions and 2,283 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -20,7 +20,7 @@
 version: 2
 updates:
   - package-ecosystem: 'gradle'
-    directory: '/generators/server/resources'
+    directory: '/generators/micronaut/resources'
     schedule:
       interval: 'daily'
       time: '08:00'

diff --git a/.yo-rc.json b/.yo-rc.json
@@ -68,30 +68,8 @@
       },
       "server": {
         "command": false,
-        "priorities": [
-          "initializing",
-          "prompting",
-          "configuring",
-          "composing",
-          "loading",
-          "preparing",
-          "configuringEachEntity",
-          "loadingEntities",
-          "preparingEachEntity",
-          "preparingEachEntityField",
-          "preparingEachEntityRelationship",
-          "postPreparingEachEntity",
-          "default",
-          "writing",
-          "writingEntities",
-          "postWriting",
-          "postWritingEntities",
-          "loadingTranslations",
-          "install",
-          "postInstall",
-          "end"
-        ],
-        "sbs": false,
+        "priorities": ["composing"],
+        "sbs": true,
         "written": true
       }
     },

diff --git a/cli/cli.cjs b/cli/cli.cjs
@@ -26,7 +26,7 @@ const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packa
     printLogo: () => {
       console.log(getLogo());
     },
-    lookups: [{ packagePaths: [packagePath], lookups: ['generators'] }],
+    lookups: [{ packagePaths: [packagePath] }],
   }).catch(done);
 
   process.on('unhandledRejection', up => {

diff --git a/generators/constants.cjs b/generators/constants.cjs
@@ -64,8 +64,6 @@ module.exports = {
     javassist: '3.27.0-GA', // Should match Hibernate deps
     javaxMail: '2.0.1',
     jbcrypt: '0.4',
-    liquibase: '4.27.0',
-    liquibaseHibernate6: '4.27.0',
     logback: '1.5.3',
     mapstruct: '1.5.5.Final',
     swaggerAnnotations: '2.2.19',

diff --git a/generators/liquibase/generator.js b/generators/liquibase/generator.js
@@ -1,5 +1,4 @@
 import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
-import constants from '../constants.cjs';
 
 export default class extends BaseApplicationGenerator {
   constructor(args, opts, features) {
@@ -11,7 +10,7 @@ export default class extends BaseApplicationGenerator {
       micronautLiquibase({ application, source }) {
         if (application.buildToolMaven) {
           source.addMavenDefinition?.({
-            properties: [{ property: 'liquibase-hibernate6.version', value: constants.versions.liquibaseHibernate6 }],
+            properties: [{ property: 'liquibase.version', value: application.javaDependencies.liquibase }],
             dependencies: [
               {
                 groupId: 'io.micronaut.liquibase',
@@ -21,7 +20,6 @@ export default class extends BaseApplicationGenerator {
               {
                 groupId: 'org.liquibase.ext',
                 artifactId: 'liquibase-hibernate6',
-                version: '${liquibase-hibernate6.version}',
                 scope: 'runtime',
                 exclusions: {
                   exclusion: {
@@ -31,6 +29,13 @@ export default class extends BaseApplicationGenerator {
                 },
               },
             ],
+            dependencyManagement: [
+              {
+                groupId: 'org.liquibase.ext',
+                artifactId: 'liquibase-hibernate6',
+                version: '${liquibase.version}',
+              },
+            ],
             plugins: [
               {
                 groupId: 'org.liquibase',

diff --git a/generators/micronaut-cache/internal/dependencies.mjs b/generators/micronaut-cache/internal/dependencies.mjs
@@ -62,13 +62,36 @@ export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies)
     },
     ehcache: {
       base: {
+        properties: [
+          { property: 'ehcache.version', value: javaDependencies.ehcache },
+          { property: 'jaxb-runtime.version', value: javaDependencies['jaxb-runtime'] },
+        ],
         dependencies: [
           javaxCacheApi,
           {
             groupId: 'org.ehcache',
             artifactId: 'ehcache',
             classifier: 'jakarta',
           },
+          {
+            groupId: 'org.glassfish.jaxb',
+            artifactId: 'jaxb-runtime',
+          },
+        ],
+        dependencyManagement: [
+          {
+            groupId: 'org.ehcache',
+            artifactId: 'ehcache',
+            classifier: 'jakarta',
+            // eslint-disable-next-line no-template-curly-in-string
+            version: '${ehcache.version}',
+          },
+          {
+            groupId: 'org.glassfish.jaxb',
+            artifactId: 'jaxb-runtime',
+            // eslint-disable-next-line no-template-curly-in-string
+            version: '${jaxb-runtime.version}',
+          },
         ],
       },
       hibernateCache: {