update to java 17

jhipster · Jul 31, 2024 · e9a815d · e9a815d
1 parent 1ab2443
commit e9a815d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -94,7 +94,7 @@ jobs:
             - uses: jhipster/actions/setup-runner@v0
               with:
                   node-version: 20
-                  java-version: 11
+                  java-version: 17
                   binary-dir: ${{ github.workspace }}/jhipster-kotlin/cli
             - run: |
                   mkdir -p ~/.gradle

diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml
@@ -94,7 +94,7 @@ jobs:
             - uses: jhipster/actions/setup-runner@v0
               with:
                   node-version: 20
-                  java-version: 11
+                  java-version: 17
                   binary-dir: ${{ github.workspace }}/jhipster-kotlin/cli
             - run: |
                   mkdir -p ~/.gradle

diff --git a/generators/spring-boot/generator.js b/generators/spring-boot/generator.js
@@ -19,7 +19,6 @@ const {
     JACOCO_VERSION,
     JIB_VERSION,
     GRADLE_VERSION,
-    JAVA_COMPATIBLE_VERSIONS,
     JHIPSTER_DEPENDENCIES_VERSION,
     JACKSON_DATABIND_NULLABLE_VERSION,
     DOCKER_ELASTICSEARCH_CONTAINER,
@@ -31,7 +30,8 @@ const jhipster7TemplatesPackage = dirname(fileURLToPath(import.meta.resolve('jhi
 
 const SERVER_MAIN_SRC_KOTLIN_DIR = `${MAIN_DIR}kotlin/`;
 
-const JAVA_VERSION = '11';
+const JAVA_VERSION = '17';
+const JAVA_COMPATIBLE_VERSIONS = ['17'];
 
 export default class extends BaseApplicationGenerator {
     constructor(args, options, features) {
@@ -269,8 +269,8 @@ export default class extends BaseApplicationGenerator {
                 });
 
                 Object.assign(application.javaDependencies, {
-                    'spring-boot': '2.7.3',
-                    'spring-boot-dependencies': '2.7.3',
+                    'spring-boot': SPRING_BOOT_VERSION,
+                    'spring-boot-dependencies': SPRING_BOOT_VERSION,
                 });
 
                 applicationDefaults({