8000 Merge pull request #60 from JakubVanek/feature/jdk14-ga · ev3dev-lang-java/openjdk-ev3@211216c · GitHub
[go: up one dir, main page]
Skip to content

Commit 211216c

Browse files
jabrenajabrena
authored
Merge pull request #60 from JakubVanek/feature/jdk14-ga
JDK14-related enhancements
2 parents 4fb8aa5 + 271747d commit 211216c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Builds for older boards should work on newer boards, the performance might just
3838
[16]: https://ci.adoptopenjdk.net/view/ev3dev/job/eljbuild/job/buster-bleeding/
3939

4040
[17]: https://ci.adoptopenjdk.net/view/ev3dev/job/eljbuild/job/stretch-14/badge/icon
41-
[17]: https://ci.adoptopenjdk.net/view/ev3dev/job/eljbuild/job/stretch-14/
41+
[18]: https://ci.adoptopenjdk.net/view/ev3dev/job/eljbuild/job/stretch-14/
4242
[19]: https://ci.adoptopenjdk.net/view/ev3dev/job/eljbuild/job/buster-14/badge/icon
4343
[20]: https://ci.adoptopenjdk.net/view/ev3dev/job/eljbuild/job/buster-14/
4444

‎scripts/config.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,10 @@ elif [ "$JDKVER" == "13" ]; then
262262
HOTSPOT_ABI=arm-sflt
263263
JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
264264

265-
# OpenJDK 14 ea
265+
# OpenJDK 14
266266
elif [ "$JDKVER" == "14" ]; then
267-
VERSION_POLICY="latest_tag"
268-
JAVA_REPO="https://github.com/openjdk/jdk14.git"
267+
VERSION_POLICY="latest_general_availability"
268+
JAVA_REPO="https://github.com/openjdk/jdk14u.git"
269269
JAVA_SCM="git"
270270
PATCHVER="jdk14"
271271
AUTOGEN_STYLE="v2"

0 commit comments

Comments
 (0)
0