Skip to content

Commit 26de7b2

Browse files
authored
java: drop Java 17 support (#31903)
1 parent 7b7f39b commit 26de7b2

File tree

11 files changed

+82
-85
lines changed

11 files changed

+82
-85
lines changed

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

Lines changed: 60 additions & 60 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ We are honored by any contributions you may have small or large. Please refer to
1818

1919
The following Java and Node combinations are tested and verified by GitHub Actions:
2020

21-
| Java | Node | Status |
22-
| -------- | ----- | ------ |
23-
| 17/21/25 | 22/24 ||
21+
| Java | Node | Status |
22+
| ----- | ----- | ------ |
23+
| 21/25 | 22/24 ||
2424

2525
## Sponsors
2626

generators/ci-cd/__snapshots__/ci-cd.spec.ts.snap

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3214,10 +3214,10 @@ env:
32143214
- CYPRESS_ENABLE_RECORD: false
32153215
before_install:
32163216
- |
3217-
echo '*** Using OpenJDK 17 by default'
3217+
echo '*** Using OpenJDK JAVA_VERSION by default'
32183218
sudo apt-get update -q
3219-
sudo apt-get install -y openjdk-17-jdk
3220-
sudo update-java-alternatives -s java-1.17.0-openjdk-amd64
3219+
sudo apt-get install -y openjdk-JAVA_VERSION-jdk
3220+
sudo update-java-alternatives -s java-JAVA_VERSION-openjdk-amd64
32213221
java -version
32223222
- sudo /etc/init.d/mysql stop
32233223
- sudo /etc/init.d/postgresql stop
@@ -3290,10 +3290,10 @@ env:
32903290
- CYPRESS_ENABLE_RECORD: false
32913291
before_install:
32923292
- |
3293-
echo '*** Using OpenJDK 17 by default'
3293+
echo '*** Using OpenJDK JAVA_VERSION by default'
32943294
sudo apt-get update -q
3295-
sudo apt-get install -y openjdk-17-jdk
3296-
sudo update-java-alternatives -s java-1.17.0-openjdk-amd64
3295+
sudo apt-get install -y openjdk-JAVA_VERSION-jdk
3296+
sudo update-java-alternatives -s java-JAVA_VERSION-openjdk-amd64
32973297
java -version
32983298
- sudo /etc/init.d/mysql stop
32993299
- sudo /etc/init.d/postgresql stop
@@ -3366,10 +3366,10 @@ env:
33663366
- CYPRESS_ENABLE_RECORD: true
33673367
before_install:
33683368
- |
3369-
echo '*** Using OpenJDK 17 by default'
3369+
echo '*** Using OpenJDK JAVA_VERSION by default'
33703370
sudo apt-get update -q
3371-
sudo apt-get install -y openjdk-17-jdk
3372-
sudo update-java-alternatives -s java-1.17.0-openjdk-amd64
3371+
sudo apt-get install -y openjdk-JAVA_VERSION-jdk
3372+
sudo update-java-alternatives -s java-JAVA_VERSION-openjdk-amd64
33733373
java -version
33743374
- sudo /etc/init.d/mysql stop
33753375
- sudo /etc/init.d/postgresql stop

generators/ci-cd/__snapshots__/generator.spec.ts.snap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ exports[`generator - ci-cd cli with multiples values should match context snapsh
209209
"indent": "",
210210
"insideDocker": false,
211211
"javaCompatibleVersions": [
212-
"17",
213212
"21",
214213
"25",
215214
],

generators/ci-cd/templates/.travis.yml.ejs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ env:
4848
<%_ } _%>
4949
before_install:
5050
- |
51-
echo '*** Using OpenJDK 17 by default'
51+
echo '*** Using OpenJDK <%= javaVersion %> by default'
5252
sudo apt-get update -q
53-
sudo apt-get install -y openjdk-17-jdk
54-
sudo update-java-alternatives -s java-1.17.0-openjdk-amd64
53+
sudo apt-get install -y openjdk-<%= javaVersion %>-jdk
54+
sudo update-java-alternatives -s java-<%= javaVersion %>-openjdk-amd64
5555
java -version
5656
- sudo /etc/init.d/mysql stop
5757
- sudo /etc/init.d/postgresql stop

generators/generator-constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ export const BLUEPRINT_API_VERSION = 'jhipster-8';
2727
// jhipster-bom version
2828
export const JHIPSTER_DEPENDENCIES_VERSION = '9.0.0-beta.0';
2929
// Version of Java
30-
export const RECOMMENDED_JAVA_VERSION = '17';
30+
export const RECOMMENDED_JAVA_VERSION = '21';
3131
// Supported Java versions, https://www.oracle.com/java/technologies/java-se-support-roadmap.html
32-
export const JAVA_COMPATIBLE_VERSIONS = ['17', '21', '25'];
32+
export const JAVA_COMPATIBLE_VERSIONS = ['21', '25'];
3333
// Force spring milestone repository. Spring Boot milestones are detected.
3434
export const ADD_SPRING_MILESTONE_REPOSITORY = false;
3535

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@ exports[`generator - Heroku monolith application with existing app should match
15891589
"entities": [],
15901590
"herokuAppName": "jhipster-existing",
15911591
"herokuDeployType": "git",
1592-
"herokuJavaVersion": "17"
1592+
"herokuJavaVersion": "JAVA_VERSION"
15931593
}
15941594
}
15951595
",
@@ -1733,7 +1733,7 @@ server:
17331733
"stateCleared": "modified",
17341734
},
17351735
"system.properties": {
1736-
"contents": "java.runtime.version=17 ",
1736+
"contents": "java.runtime.version=JAVA_VERSION ",
17371737
"stateCleared": "modified",
17381738
},
17391739
}

generators/heroku/generator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export default class HerokuGenerator extends BaseApplicationGenerator<HerokuEnti
170170
name: 'herokuJavaVersion',
171171
message: 'Which Java version would you like to use to build and run your app?',
172172
choices: JAVA_COMPATIBLE_VERSIONS.map(version => ({ value: version })),
173-
default: RECOMMENDED_JAVA_VERSION,
173+
default: this.useVersionPlaceholders ? 'JAVA_VERSION' : RECOMMENDED_JAVA_VERSION,
174174
},
175175
],
176176
this.config,

generators/languages/support/languages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const languageToDayjsLanguage = (languageTag: string): string => {
7575
type specificLocales =
7676
/**
7777
* Locale id fallback for java.
78-
* Tags can be found at [Java 17 locales tags](https://www.oracle.com/java/technologies/javase/jdk17-suported-locales.html#modules)
78+
* Tags can be found at [Java 21 locales tags](https://www.oracle.com/java/technologies/javase/jdk21-suported-locales.html#modules)
7979
*/
8080
| 'javaLocaleMessageSourceSuffix'
8181
/**

generators/server/resources/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ LABEL ALIAS=grafana-watcher
7070
FROM jenkins/jenkins:lts-jdk11
7171
LABEL ALIAS=jenkins
7272

73-
FROM eclipse-temurin:17-jre-focal
73+
FROM eclipse-temurin:21-jre-noble
7474
LABEL ALIAS=java-jre
7575

7676
FROM swaggerapi/swagger-editor:latest

0 commit comments

Comments
 (0)