Merge pull request #572 from tonihele/feature/issue-557

tonihele · web-flow · commit dc07c3444c04 · 2024-03-02T23:04:36.000+02:00
Java 21
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v1
       with:
-        java-version: 17
+        java-version: 21
 
     - name: Grant execute permission for gradle
       run: chmod +x gradlew
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
     - name: Grant execute permission for gradle
       run: chmod +x gradlew
     - name: Build the SDK
diff --git a/BasicGameTemplate/nbproject/project.properties b/BasicGameTemplate/nbproject/project.properties
@@ -49,8 +49,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=17
-javac.target=17
+javac.source=21
+javac.target=21
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/JME3TestsTemplate/nbproject/project.properties b/JME3TestsTemplate/nbproject/project.properties
@@ -41,8 +41,8 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=17
-javac.target=17
+javac.source=21
+javac.target=21
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/jdks/download-jdks.sh b/jdks/download-jdks.sh
@@ -10,22 +10,16 @@
 
 set -e # Quit on Error
 
-jdk_major_version="17"
-jdk_version="0.9"
-jdk_build_version="9"
-# JDK 17.0.9 seems to have botched up release causing download URL to vary and platform versions not on the same step
-jdk_build_tmp_version="9.1"
+jdk_major_version="21"
+jdk_version="0.2"
+jdk_build_version="13"
 
 function download_jdk {
     echo ">>> Downloading the JDK for $1"
 
     if [ -f downloads/jdk-$1$2 ];
     then
         echo "<<< Already existing, SKIPPING."
-    elif [[ "$1" == *windows ]];
-    then
-        curl -# -o downloads/jdk-$1$2 -L https://github.com/adoptium/temurin$jdk_major_version-binaries/releases/download/jdk-$jdk_major_version.$jdk_version+$jdk_build_tmp_version/OpenJDK${jdk_major_version}U-jdk_$1_hotspot_$jdk_major_version.${jdk_version}_$jdk_build_version$2
-        echo "<<< OK!"
     else
         curl -# -o downloads/jdk-$1$2 -L https://github.com/adoptium/temurin$jdk_major_version-binaries/releases/download/jdk-$jdk_major_version.$jdk_version+$jdk_build_version/OpenJDK${jdk_major_version}U-jdk_$1_hotspot_$jdk_major_version.${jdk_version}_$jdk_build_version$2
         echo "<<< OK!"
diff --git a/jme3-android/nbproject/project.properties b/jme3-android/nbproject/project.properties
@@ -1,6 +1,6 @@
 #Updated by build script
 #Thu, 25 Aug 2011 21:00:54 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-angelfont/nbproject/project.properties b/jme3-angelfont/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
diff --git a/jme3-assetbrowser/nbproject/project.properties b/jme3-assetbrowser/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-assetpack-support/nbproject/project.properties b/jme3-assetpack-support/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-blender/nbproject/project.properties b/jme3-blender/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-cinematics/nbproject/project.properties b/jme3-cinematics/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-code-check/nbproject/project.properties b/jme3-code-check/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-codepalette/nbproject/project.properties b/jme3-codepalette/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-core-baselibs/nbproject/project.properties b/jme3-core-baselibs/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-core-libraries/nbproject/project.properties b/jme3-core-libraries/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-core-updatecenters/nbproject/project.properties b/jme3-core-updatecenters/nbproject/project.properties
@@ -1,4 +1,4 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 spec.version.base=3.5.2
diff --git a/jme3-core/nbproject/project.properties b/jme3-core/nbproject/project.properties
@@ -1,7 +1,7 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
 file.reference.DDSUtils.jar=release/modules/ext/DDSUtils.jar
 #Thu, 25 Aug 2011 19:32:54 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-dark-laf/nbproject/project.properties b/jme3-dark-laf/nbproject/project.properties
@@ -1,5 +1,5 @@
 file.reference.nimrodlf.jar=release/modules/ext/nimrodlf.jar
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-desktop-executables/nbproject/project.properties b/jme3-desktop-executables/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-documentation/nbproject/project.properties b/jme3-documentation/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-glsl-highlighter/nbproject/project.properties b/jme3-glsl-highlighter/nbproject/project.properties
@@ -1,3 +1,3 @@
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 project.license=jme license
diff --git a/jme3-gui/nbproject/project.properties b/jme3-gui/nbproject/project.properties
@@ -9,7 +9,7 @@ file.reference.slf4j-simple-1.7.7.jar=release/modules/ext/slf4j-simple-1.7.7.jar
 file.reference.swingtonifty.jar=release/modules/ext/swingtonifty.jar
 file.reference.xsom-20110101-SNAPSHOT.jar=release/modules/ext/xsom-20110101-SNAPSHOT.jar
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-lwjgl-applet/nbproject/project.properties b/jme3-lwjgl-applet/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-materialeditor/nbproject/project.properties b/jme3-materialeditor/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-model-importer/nbproject/project.properties b/jme3-model-importer/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-navmesh-gen/nbproject/project.properties b/jme3-navmesh-gen/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-obfuscate/nbproject/project.properties b/jme3-obfuscate/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https\://proguard.sourceforge.net/
diff --git a/jme3-project-baselibs/nbproject/project.properties b/jme3-project-baselibs/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-project-libraries/nbproject/project.properties b/jme3-project-libraries/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-project-testdata/nbproject/project.properties b/jme3-project-testdata/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-scenecomposer/nbproject/project.properties b/jme3-scenecomposer/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-templates/nbproject/project.properties b/jme3-templates/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-terrain-editor/nbproject/project.properties b/jme3-terrain-editor/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-tests-template/nbproject/project.properties b/jme3-tests-template/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-texture-editor/nbproject/project.properties b/jme3-texture-editor/nbproject/project.properties
@@ -1,5 +1,5 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/jme3-vehicle-creator/nbproject/project.properties b/jme3-vehicle-creator/nbproject/project.properties
@@ -1,4 +1,4 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 spec.version.base=3.5.2
diff --git a/jme3-wavefront/nbproject/project.properties b/jme3-wavefront/nbproject/project.properties
@@ -1,4 +1,4 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint\:-serial
 spec.version.base=3.5.2
diff --git a/jme3-welcome-screen/nbproject/project.properties b/jme3-welcome-screen/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=17
+javac.source=21
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
diff --git a/license-jme.txt b/license-jme.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2023 jMonkeyEngine
+Copyright (c) 2003-2024 jMonkeyEngine
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/licenses-sdk.txt b/licenses-sdk.txt
diff --git a/nbi/stub/ext/components/products/helloworld/nbproject/project.properties b/nbi/stub/ext/components/products/helloworld/nbproject/project.properties
diff --git a/nbi/stub/ext/components/products/jdk/nbproject/project.properties b/nbi/stub/ext/components/products/jdk/nbproject/project.properties
diff --git a/nbproject/platform.properties b/nbproject/platform.properties

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-javac.source=17`
	`1`	`+javac.source=21`
`2`	`2`	`javac.compilerargs=-Xlint -Xlint\:-serial`
`3`	`3`	`license.file=../license-jme.txt`
`4`	`4`	`nbm.homepage=https://www.jmonkeyengine.org`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2003-2023 jMonkeyEngine`
	`1`	`+Copyright (c) 2003-2024 jMonkeyEngine`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without`