Skip to content

Commit ed54ae6

Browse files
tianontianon
committed
Switch "latest" variants from OpenJDK to Temurin
This is in preparation of the OpenJDK image deprecation -- see https://snyk.io/jvm-ecosystem-report-2021/ for a reasonable justification for Temurin being the new default (the OpenJDK image is being deprecated largely because Temurin already *is* roughly vanilla OpenJDK builds, but with proper community support).
1 parent 5c5963e commit ed54ae6

File tree

3 files changed

+46
-42
lines changed

3 files changed

+46
-42
lines changed

‎generate-stackbrew-library.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,6 @@ for version; do
8686
${aliases[$version]:-}
8787
)
8888

89-
latestVariant="$(jq -r '
90-
.[env.version].variants
91-
| map(
92-
select(
93-
(
94-
# LTS Java releases
95-
# TODO add jdk17 once the longevity of vanilla builds from http://jdk.java.net/17/ are determined (or alternative vanilla builds are made available)
96-
startswith("jdk11")
97-
or startswith("jdk8")
98-
) and (
99-
split("/")[1]
100-
| test("^openjdk-(?!slim-)")
101-
)
102-
)
103-
)[0]
104-
' versions.json)"
105-
10689
defaultOpenjdkVariant="$(jq -r '
10790
.[env.version].variants
10891
| map(
@@ -130,6 +113,23 @@ for version; do
130113
["$defaultTemurinVariant"]='temurin'
131114
)
132115

116+
export defaultTemurinVariant
117+
latestVariant="$(jq -r '
118+
.[env.version].variants
119+
| map(
120+
select(
121+
(
122+
# LTS Java releases
123+
startswith("jdk17")
124+
or startswith("jdk11")
125+
or startswith("jdk8")
126+
) and (
127+
split("/")[1] == env.defaultTemurinVariant
128+
)
129+
)
130+
)[0]
131+
' versions.json)"
132+
133133
for variantDir in "${variants[@]}"; do
134134
javaVariant="$(dirname "$variantDir")" # "jdk8", "jre11", etc
135135
vendorVariant="$(basename "$variantDir")" # "openjdk-slim-buster", "corretto", etc.
@@ -150,7 +150,7 @@ for version; do
150150
done
151151

152152
# "jdk8"
153-
if [ "$vendorVariant" = "$defaultOpenjdkVariant" ]; then
153+
if [ "$vendorVariant" = "$defaultTemurinVariant" ]; then
154154
javaAliases=( "${versionAliases[@]/%/-$javaVariant}" )
155155
javaAliases=( "${javaAliases[@]//latest-/}" )
156156
variantAliases+=( "${javaAliases[@]}" )

‎versions.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
"10.0": {
33
"sha512": "fe46db8794f066882b30e7a94bd8d3dbcf29e8e8ffaf67c1355846755745a7c9eafd124819283f218bcf410921a485b44b57b56fd6251fb99d67d95f3dd36826",
44
"variants": [
5-
"jdk17/corretto",
65
"jdk17/temurin-focal",
76
"jre17/temurin-focal",
7+
"jdk17/corretto",
8+
"jdk11/temurin-focal",
9+
"jre11/temurin-focal",
810
"jdk11/openjdk-bullseye",
911
"jre11/openjdk-bullseye",
1012
"jdk11/openjdk-buster",
@@ -14,8 +16,8 @@
1416
"jdk11/openjdk-slim-buster",
1517
"jre11/openjdk-slim-buster",
1618
"jdk11/corretto",
17-
"jdk11/temurin-focal",
18-
"jre11/temurin-focal",
19+
"jdk8/temurin-focal",
20+
"jre8/temurin-focal",
1921
"jdk8/openjdk-bullseye",
2022
"jre8/openjdk-bullseye",
2123
"jdk8/openjdk-buster",
@@ -24,18 +26,18 @@
2426
"jre8/openjdk-slim-bullseye",
2527
"jdk8/openjdk-slim-buster",
2628
"jre8/openjdk-slim-buster",
27-
"jdk8/corretto",
28-
"jdk8/temurin-focal",
29-
"jre8/temurin-focal"
29+
"jdk8/corretto"
3030
],
3131
"version": "10.0.22"
3232
},
3333
"10.1": {
3434
"sha512": "ad25f3393324ce42619d6aeeb685186322776b5ba4583453c5e16957fa71cd64fa9f30e379985d57a701be43e9475991312893ee87979e69dd2b51de06510060",
3535
"variants": [
36-
"jdk17/corretto",
3736
"jdk17/temurin-focal",
3837
"jre17/temurin-focal",
38+
"jdk17/corretto",
39+
"jdk11/temurin-focal",
40+
"jre11/temurin-focal",
3941
"jdk11/openjdk-bullseye",
4042
"jre11/openjdk-bullseye",
4143
"jdk11/openjdk-buster",
@@ -44,18 +46,18 @@
4446
"jre11/openjdk-slim-bullseye",
4547
"jdk11/openjdk-slim-buster",
4648
"jre11/openjdk-slim-buster",
47-
"jdk11/corretto",
48-
"jdk11/temurin-focal",
49-
"jre11/temurin-focal"
49+
"jdk11/corretto"
5050
],
5151
"version": "10.1.0-M16"
5252
},
5353
"8.5": {
5454
"sha512": "729387275cce4a0900289722f6c70ebcf7aee924af671b110b8ea8577fd6d045d47f17d526c8db5fd41c8590102e7f5100e95e89f7fd511b941565812ecbed35",
5555
"variants": [
56-
"jdk17/corretto",
5756
"jdk17/temurin-focal",
5857
"jre17/temurin-focal",
58+
"jdk17/corretto",
59+
"jdk11/temurin-focal",
60+
"jre11/temurin-focal",
5961
"jdk11/openjdk-bullseye",
6062
"jre11/openjdk-bullseye",
6163
"jdk11/openjdk-buster",
@@ -65,8 +67,8 @@
6567
"jdk11/openjdk-slim-buster",
6668
"jre11/openjdk-slim-buster",
6769
"jdk11/corretto",
68-
"jdk11/temurin-focal",
69-
"jre11/temurin-focal",
70+
"jdk8/temurin-focal",
71+
"jre8/temurin-focal",
7072
"jdk8/openjdk-bullseye",
7173
"jre8/openjdk-bullseye",
7274
"jdk8/openjdk-buster",
@@ -75,18 +77,18 @@
7577
"jre8/openjdk-slim-bullseye",
7678
"jdk8/openjdk-slim-buster",
7779
"jre8/openjdk-slim-buster",
78-
"jdk8/corretto",
79-
"jdk8/temurin-focal",
80-
"jre8/temurin-focal"
80+
"jdk8/corretto"
8181
],
8282
"version": "8.5.81"
8383
},
8484
"9.0": {
8585
"sha512": "38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a",
8686
"variants": [
87-
"jdk17/corretto",
8887
"jdk17/temurin-focal",
8988
"jre17/temurin-focal",
89+
"jdk17/corretto",
90+
"jdk11/temurin-focal",
91+
"jre11/temurin-focal",
9092
"jdk11/openjdk-bullseye",
9193
"jre11/openjdk-bullseye",
9294
"jdk11/openjdk-buster",
@@ -96,8 +98,8 @@
9698
"jdk11/openjdk-slim-buster",
9799
"jre11/openjdk-slim-buster",
98100
"jdk11/corretto",
99-
"jdk11/temurin-focal",
100-
"jre11/temurin-focal",
101+
"jdk8/temurin-focal",
102+
"jre8/temurin-focal",
101103
"jdk8/openjdk-bullseye",
102104
"jre8/openjdk-bullseye",
103105
"jdk8/openjdk-buster",
@@ -106,9 +108,7 @@
106108
"jre8/openjdk-slim-bullseye",
107109
"jdk8/openjdk-slim-buster",
108110
"jre8/openjdk-slim-buster",
109-
"jdk8/corretto",
110-
"jdk8/temurin-focal",
111-
"jre8/temurin-focal"
111+
"jdk8/corretto"
112112
],
113113
"version": "9.0.64"
114114
}

‎versions.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ _bashbrew_list() {
2727

2828
allVariants='[]'
2929
for javaVersion in 17 11 8; do
30-
# OpenJDK, followed by all other variants alphabetically
31-
for vendorVariant in openjdk{,-slim}-{bullseye,buster} corretto temurin-focal; do
30+
# Eclipse Temurin, followed by OpenJDK, and then all other variants alphabetically
31+
for vendorVariant in \
32+
temurin-focal \
33+
openjdk{,-slim}-{bullseye,buster} \
34+
corretto \
35+
; do
3236
for javaVariant in {jdk,jre}"$javaVersion"; do
3337
export variant="$javaVariant/$vendorVariant"
3438
if image="$(jq -nr '

0 commit comments

Comments
 (0)