Update to Spring Boot 4

.blueprint/generate-sample/templates/test-integration/workflow-samples/angular.json

@@ -25,6 +25,7 @@
     },
     {
       "name": "ng-mongodb-kafka-cucumber",
+      "disabled": "mongock doesn't support sb4",
       "app-sample": "ng-mongodb-kafka-cucumber",
       "entity": "mongodb",
       "generatorOptions": {
@@ -42,11 +43,13 @@
     },
     {
       "name": "ng-couchbase",
+      "disabled": "needs adjusts for sb4",
       "app-sample": "ng-couchbase",
       "entity": "couchbase"
     },
     {
       "name": "ng-gradle-couchbase-search",
+      "disabled": "needs adjusts for sb4",
       "app-sample": "ng-gradle-couchbase-search",
       "entity": "couchbase"
     },
@@ -74,11 +77,13 @@
     },
     {
       "name": "ng-webflux-mongodb",
+      "disabled": "mongock doesn't support sb4",
       "app-sample": "webflux-mongodb",
       "entity": "mongodb"
     },
     {
       "name": "ng-webflux-gradle-mongodb-oauth2",
+      "disabled": "mongock doesn't support sb4",
       "job-name": "ng-webflux-gradle-mongodb-oauth2-webpack",
       "app-sample": "webflux-mongodb-oauth2",
       "entity": "mongodb"
@@ -104,11 +109,13 @@
     },
     {
       "name": "ng-webflux-couchbase",
+      "disabled": "needs adjusts for sb4",
       "app-sample": "webflux-couchbase",
       "entity": "couchbase"
     },
     {
       "name": "ms-ng-oauth2-mongodb-caffeine",
+      "disabled": "mongock doesn't support sb4",
       "jdl-samples": "ms-ng-oauth2-mongodb-caffeine",
       "generatorOptions": {
         "workspaces": true,

.blueprint/generate-sample/templates/test-integration/workflow-samples/vue.json

@@ -47,6 +47,7 @@
     },
     {
       "name": "ms-vue-eureka-jwt-couchbase-hazelcast",
+      "disabled": "needs adjusts for sb4",
       "jdl-samples": "ms-vue-eureka-jwt-couchbase-hazelcast",
       "generatorOptions": {
         "workspaces": true,

.blueprint/github-build-matrix/__snapshots__/generator.spec.ts.snap

@@ -728,7 +728,7 @@ exports[`generator - github-build-matrix with graalvm should match matrix value
       "sample": "maven",
       "os": "ubuntu-latest",
       "node-version": "NODE-VERSION",
-      "java-version": "21",
+      "java-version": "25",
       "npm-version": "NPM-VERSION",
       "default-environment": "prod",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
@@ -743,7 +743,7 @@ exports[`generator - github-build-matrix with graalvm should match matrix value
       "sample": "maven-reactive(true)",
       "os": "ubuntu-latest",
       "node-version": "NODE-VERSION",
-      "java-version": "21",
+      "java-version": "25",
       "npm-version": "NPM-VERSION",
       "default-environment": "prod",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
@@ -758,7 +758,7 @@ exports[`generator - github-build-matrix with graalvm should match matrix value
       "sample": "gradle",
       "os": "ubuntu-latest",
       "node-version": "NODE-VERSION",
-      "java-version": "21",
+      "java-version": "25",
       "npm-version": "NPM-VERSION",
       "default-environment": "prod",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
@@ -773,7 +773,7 @@ exports[`generator - github-build-matrix with graalvm should match matrix value
       "sample": "gradle-reactive(true)",
       "os": "ubuntu-latest",
       "node-version": "NODE-VERSION",
-      "java-version": "21",
+      "java-version": "25",
       "npm-version": "NPM-VERSION",
       "default-environment": "prod",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",

.blueprint/github-build-matrix/samples/graalvm.ts

@@ -16,7 +16,7 @@ export default Object.fromEntries(
   ].map(([key, value]) => [
     key,
     {
-      'java-version': '21',
+      'java-version': '25',
       jdl: convertOptionsToJDL({ ...value, graalvmSupport: true }),
     },
   ]),

.blueprint/github-build-matrix/support/integration-test-constants.ts

@@ -4,7 +4,7 @@ import { JHIPSTER_DEPENDENCIES_VERSION } from '../../../generators/generator-con
 import { getPackageRoot } from '../../../lib/index.ts';
 
 const FORCE_BUILD_JHIPSTER_BOM = true;
-export const JHIPSTER_BOM_BRANCH = 'main';
+export const JHIPSTER_BOM_BRANCH = 'spring-boot-v4';
 export const JHIPSTER_BOM_CICD_VERSION = '0.0.0-CICD';
 export const BUILD_JHIPSTER_BOM = FORCE_BUILD_JHIPSTER_BOM || JHIPSTER_DEPENDENCIES_VERSION.includes('-SNAPSHOT');
 

generators/heroku/__snapshots__/heroku.spec.ts.snap

@@ -72,7 +72,7 @@ exports[`generator - Heroku microservice application with JAR deployment should
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
@@ -288,7 +288,7 @@ exports[`generator - Heroku monolith application in the EU should match files sn
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
@@ -502,7 +502,7 @@ exports[`generator - Heroku monolith application in the US should match files sn
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
@@ -771,7 +771,7 @@ exports[`generator - Heroku monolith application with Git deployment should matc
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
@@ -987,7 +987,7 @@ exports[`generator - Heroku monolith application with PostgreSQL should match fi
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
@@ -1225,7 +1225,7 @@ exports[`generator - Heroku monolith application with an unavailable app name sh
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
@@ -1452,7 +1452,7 @@ exports[`generator - Heroku monolith application with elasticsearch should match
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
@@ -1657,7 +1657,7 @@ exports[`generator - Heroku monolith application with existing app should match
                             <defaultSchemaName/>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:com.mycompany.myapp.domain?dialect=org.hibernate.dialect.PostgreSQLDialect&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>

generators/heroku/templates.ts

@@ -42,9 +42,8 @@ export const mavenProfileContent = (data: any) => {
                             <defaultSchemaName></defaultSchemaName>
                             <username>\${env.JDBC_DATABASE_USERNAME}</username>
                             <password>\${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:${data.packageName}.domain?dialect=${data.prodHibernateDialect}&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:${data.packageName}.domain?dialect=${data.prodHibernateDialect}&amp;hibernate.physical_naming_strategy=org.springframework.boot.hibernateSpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
-                            <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
                         </configuration>
                     </plugin>

generators/java-simple-application/generators/build-tool/generator.ts

@@ -20,7 +20,7 @@ import { buildToolTypes } from '../../../../lib/jhipster/index.ts';
 import { JavaApplicationGenerator } from '../../../java/generator.ts';
 import { javaScopeToGradleScope } from '../../../java/support/index.ts';
 import type { ConditionalJavaDefinition, JavaDependency, JavaNeedleOptions } from '../../../java/types.ts';
-import type { MavenDependency } from '../maven/types.ts';
+import type { MavenDependency, MavenProperty } from '../maven/types.ts';
 
 const { GRADLE, MAVEN } = buildToolTypes;
 
@@ -66,6 +66,9 @@ export default class BuildToolGenerator extends JavaApplicationGenerator {
           }
         };
         source.addJavaDependencies = (dependencies, options) => {
+          if (options?.profile) {
+            options.gradleFile ??= `gradle/profile_${options.profile}.gradle`;
+          }
           if (application.buildToolMaven) {
             const convertVersionToMavenDependency = ({ versionRef, version, exclusions, ...artifact }: JavaDependency): MavenDependency => {
               // If a version is provided, convert to version ref using artifactId
@@ -87,7 +90,7 @@ export default class BuildToolGenerator extends JavaApplicationGenerator {
             };
             const removeScope = ({ scope: _scope, ...artifact }: JavaDependency) => artifact;
 
-            const properties = dependencies
+            const properties: MavenProperty[] = dependencies
               .filter(dep => dep.version)
               .map(({ artifactId, version }) => ({ property: `${artifactId}.version`, value: version }));
             const annotationProcessors = dependencies
@@ -99,6 +102,21 @@ export default class BuildToolGenerator extends JavaApplicationGenerator {
               .filter(dep => !['annotationProcessor', 'import'].includes(dep.scope!))
               .map(convertVersionToMavenDependency);
 
+            if (options?.profile) {
+              properties.forEach(prop => {
+                prop.inProfile = options.profile;
+              });
+              commonDependencies.forEach(dep => {
+                dep.inProfile = options.profile;
+              });
+              dependencyManagement.forEach(dep => {
+                dep.inProfile = options.profile;
+              });
+              annotationProcessors.forEach(dep => {
+                dep.inProfile = options.profile;
+              });
+            }
+
             source.addMavenDefinition?.({
               properties,
               dependencies: [
@@ -143,7 +161,11 @@ export default class BuildToolGenerator extends JavaApplicationGenerator {
         };
 
         source.addJavaDefinition = (definition, options) => {
+          if (options?.profile) {
+            options.gradleFile ??= `gradle/profile_${options.profile}.gradle`;
+          }
           const { dependencies, versions, mavenDefinition } = definition;
+          const { profile: inProfile } = options ?? {};
           if (dependencies) {
             source.addJavaDependencies!(
               dependencies.filter(dep => {
@@ -158,7 +180,9 @@ export default class BuildToolGenerator extends JavaApplicationGenerator {
           if (versions) {
             if (application.buildToolMaven) {
               source.addMavenDefinition!({
-                properties: versions.filter(v => v.version).map(({ name, version }) => ({ property: `${name}.version`, value: version })),
+                properties: versions
+                  .filter(v => v.version)
+                  .map(({ name, version }) => ({ property: `${name}.version`, value: version, inProfile })),
               });
             }
             if (application.buildToolGradle) {
@@ -170,12 +194,13 @@ export default class BuildToolGenerator extends JavaApplicationGenerator {
           }
         };
 
-        source.addJavaDefinitions = (
-          optionsOrDefinition: JavaNeedleOptions | ConditionalJavaDefinition,
-          ...definitions: ConditionalJavaDefinition[]
-        ) => {
+        source.addJavaDefinitions = (optionsOrDefinition, ...definitions) => {
           let options: JavaNeedleOptions | undefined = undefined;
-          if ('gradleFile' in optionsOrDefinition || 'gradleVersionCatalogFile' in optionsOrDefinition) {
+          if (
+            'gradleFile' in optionsOrDefinition ||
+            'gradleVersionCatalogFile' in optionsOrDefinition ||
+            'profile' in optionsOrDefinition
+          ) {
             options = optionsOrDefinition;
           } else {
             definitions.unshift(optionsOrDefinition as ConditionalJavaDefinition);