Update Spring Boot to v3.3.6 (#27959)

jhipster · Nov 21, 2024 · 790840a · 790840a
1 parent 8b8c35b
commit 790840a
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 100 deletions.
diff --git a/generators/java/generators/graalvm/__snapshots__/generator.spec.ts.snap b/generators/java/generators/graalvm/__snapshots__/generator.spec.ts.snap
@@ -12,6 +12,7 @@ exports[`generator - java:graalvm with default options should call source snapsh
             <classesDirectory>\${project.build.outputDirectory}</classesDirectory>
             <metadataRepository>
                 <enabled>true</enabled>
+                <version>GRAALVM_REACHABILITY_METADATA_VERSION</version>
             </metadataRepository>
             <imageName>\${native-image-name}</imageName>
             <verbose>true</verbose>

diff --git a/generators/java/generators/graalvm/generator.ts b/generators/java/generators/graalvm/generator.ts
@@ -24,6 +24,7 @@ import { createNeedleCallback } from '../../../base/support/needles.js';
 import { addJavaAnnotation, addJavaImport } from '../../../java/support/add-java-annotation.js';
 import { javaMainPackageTemplatesBlock } from '../../../java/support/files.js';
 import { mavenDefinition } from './internal/maven-definition.js';
+import { GRAALVM_REACHABILITY_METADATA } from './internal/constants.js';
 
 export default class GraalvmGenerator extends BaseApplicationGenerator {
   async beforeQueue() {
@@ -49,6 +50,20 @@ export default class GraalvmGenerator extends BaseApplicationGenerator {
     return this.delegateTasksToBlueprint(() => this.initializing);
   }
 
+  get loading() {
+    return this.asLoadingTaskGroup({
+      loading({ application }) {
+        application.graalvmReachabilityMetadata = this.useVersionPlaceholders
+          ? 'GRAALVM_REACHABILITY_METADATA_VERSION'
+          : GRAALVM_REACHABILITY_METADATA;
+      },
+    });
+  }
+
+  get [BaseApplicationGenerator.LOADING]() {
+    return this.delegateTasksToBlueprint(() => this.loading);
+  }
+
   get preparing() {
     return this.asPreparingTaskGroup({
       load({ application }) {
@@ -179,11 +194,20 @@ export default class GraalvmGenerator extends BaseApplicationGenerator {
       },
 
       async customizeMaven({ application, source }) {
-        const { buildToolMaven, reactive, databaseTypeSql, javaDependencies, nativeLanguageDefinition, languagesDefinition } = application;
+        const {
+          buildToolMaven,
+          reactive,
+          databaseTypeSql,
+          javaDependencies,
+          nativeLanguageDefinition,
+          languagesDefinition,
+          graalvmReachabilityMetadata,
+        } = application;
         if (!buildToolMaven) return;
 
         source.addMavenDefinition!(
           mavenDefinition({
+            graalvmReachabilityMetadata,
             reactive,
             nativeBuildToolsVersion: javaDependencies!.nativeBuildTools!,
             databaseTypeSql,

diff --git a/generators/java/generators/graalvm/internal/constants.ts b/generators/java/generators/graalvm/internal/constants.ts
@@ -0,0 +1 @@
+export const GRAALVM_REACHABILITY_METADATA = '0.3.14';
diff --git a/generators/java/generators/graalvm/internal/maven-definition.ts b/generators/java/generators/graalvm/internal/maven-definition.ts
@@ -2,12 +2,14 @@
 import type { MavenDefinition } from '../../../../maven/types.js';
 
 export const mavenDefinition = ({
+  graalvmReachabilityMetadata,
   reactive,
   nativeBuildToolsVersion,
   databaseTypeSql,
   userLanguage,
   languages,
 }: {
+  graalvmReachabilityMetadata: string;
   reactive?: boolean;
   nativeBuildToolsVersion?: string;
   databaseTypeSql?: boolean;
@@ -30,6 +32,7 @@ export const mavenDefinition = ({
             <classesDirectory>\${project.build.outputDirectory}</classesDirectory>
             <metadataRepository>
                 <enabled>true</enabled>
+                <version>${graalvmReachabilityMetadata}</version>
             </metadataRepository>
             <imageName>\${native-image-name}</imageName>
             <verbose>true</verbose>

diff --git a/generators/java/generators/graalvm/templates/gradle/native.gradle.ejs b/generators/java/generators/graalvm/templates/gradle/native.gradle.ejs
@@ -17,6 +17,10 @@ graalvmNative {
     jvmArgs.add('-Xms4g')
     jvmArgs.add('-Xmx10g')
   }
+  metadataRepository {
+    enabled = true
+    version = '<%- graalvmReachabilityMetadata %>'
+  }
 }
 
 processTestAot {

diff --git a/generators/java/types.d.ts b/generators/java/types.d.ts
@@ -75,6 +75,7 @@ export type JavaApplication = JavaBootstrapStorageProperties &
 
     addOpenapiGeneratorPlugin: boolean;
     useNpmWrapper: boolean;
+    graalvmReachabilityMetadata: string;
   };
 
 export type ConditionalJavaDefinition = JavaDefinition & { condition?: boolean };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const GRAALVM_REACHABILITY_METADATA = '0.3.14';