Merge pull request #473 from tonihele/feature/issue-471

SDK to use and bundle JDK 17

.github/workflows/gradle.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
 
     - name: Grant execute permission for gradle
       run: chmod +x gradlew

.github/workflows/release.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: 11
+        java-version: 17
     - name: Grant execute permission for gradle
       run: chmod +x gradlew
     - name: Build the SDK

BasicGameTemplate/nbproject/project.properties

@@ -48,8 +48,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=11
-javac.target=11
+javac.source=17
+javac.target=17
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -65,7 +65,7 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-jme.project.version=3.4.1
+jme.project.version=3.5.2
 jnlp.codebase.type=local
 jnlp.descriptor=application
 jnlp.enabled=false

JME3TestsTemplate/nbproject/project.properties

@@ -40,8 +40,8 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=11
-javac.target=11
+javac.source=17
+javac.target=17
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

build.xml

@@ -37,9 +37,7 @@
         <property name="jdkhome.string" value='#jdkhome="/path/to/jdk"'/>
         <copy file="${harness.dir}/etc/app.conf" tofile="build/launcher/etc/${app.name}.conf" overwrite="true">
             <filterchain>
-                <replacestring from="$${branding.token}" to="${branding.token}"/>
-                <replacestring from="$${APPNAME}/dev" to="$${APPNAME}/${app.version}"/>
-                <replacestring from="-J-Xmx64m" to="${run.args.extra}"/>
+                <replacestring from="$${branding.token}" to="${branding.token} ${run.args.extra}"/>
                 <replacestring from='#jdkhome="/path/to/jdk"' to ='${jdkhome.string}'/>
             </filterchain>
         </copy>
@@ -222,7 +220,7 @@
             </and>
             <then>
                 <echo message="No platform specified, building all platforms"/>
-                <property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x86 linux-x64 macosx"/>
+                <property name="generate.installer.for.platforms" value="windows-x86 windows-x64 linux-x64 macosx"/>
             </then>
             <else>
                 <if>

jdks/download-jdks.sh

@@ -10,9 +10,9 @@
 
 set -e # Quit on Error
 
-jdk_major_version="11"
-jdk_version="0.17"
-jdk_build_version="8"
+jdk_major_version="17"
+jdk_version="0.6"
+jdk_build_version="10"
 platforms=( "x64_linux" "x86-32_windows" "x64_windows" "x64_mac" )
 
 # DEPRECATED (not required anymore)

jme3-android/nbproject/project.properties

@@ -1,9 +1,9 @@
 #Updated by build script
 #Thu, 25 Aug 2011 21:00:54 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-angelfont/nbproject/project.properties

@@ -1,6 +1,6 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-assetpack-support/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-blender/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Kaelthas
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-cinematics/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=R\u00e9my Bouquet
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-code-check/nbproject/project.properties

@@ -1,7 +1,7 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-codepalette/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-core-baselibs/nbproject/project.properties

@@ -1,7 +1,7 @@
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-core-libraries/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-core-updatecenters/nbproject/project.properties

@@ -1,4 +1,4 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-core/nbproject/project.properties

@@ -1,11 +1,11 @@
 #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=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
 project.license=jme
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-dark-laf/nbproject/project.properties

@@ -1,8 +1,8 @@
 file.reference.nimrodlf.jar=release/modules/ext/nimrodlf.jar
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Charles Anderson, R\u00e9my Bouquet
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-desktop-executables/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-documentation/nbproject/project.properties

@@ -1,6 +1,6 @@
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen, Ruth Kusterer, many others
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-glsl-highlighter/nbproject/project.properties

@@ -1,3 +1,3 @@
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 project.license=jme license

jme3-gui/nbproject/project.properties

@@ -9,10 +9,10 @@ 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=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Relucri
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-lwjgl-applet/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-materialeditor/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-model-importer/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-navmesh-gen/nbproject/project.properties

@@ -1,6 +1,6 @@
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Brent Owens
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-obfuscate/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https\://proguard.sourceforge.net/
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-project-baselibs/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-project-libraries/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-project-testdata/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-scenecomposer/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-templates/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl

@@ -31,6 +31,12 @@ project(":assets") {
             }
         }
     }
+
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+    }
 }
 
 dependencies {
@@ -92,4 +98,14 @@ jar {
     manifest {
         attributes 'Main-Class': "$mainClassName"
     }
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+wrapper {
+    gradleVersion = '7.6'
 }

jme3-terrain-editor/nbproject/project.properties

@@ -1,7 +1,7 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Brent Owens, Normen Hansen
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-tests-template/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=jMonkeyEngine
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-texture-editor/nbproject/project.properties

@@ -1,8 +1,8 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=pgi
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-vehicle-creator/nbproject/project.properties

@@ -1,4 +1,4 @@
 #Thu, 25 Aug 2011 20:26:50 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-wavefront/nbproject/project.properties

@@ -1,4 +1,4 @@
 #Thu, 25 Aug 2011 20:26:49 +0200
-javac.source=11
+javac.source=17
 javac.compilerargs=-Xlint -Xlint\:-serial
-spec.version.base=3.4.0
+spec.version.base=3.5.2

jme3-welcome-screen/nbproject/project.properties

@@ -1,7 +1,7 @@
-javac.source=11
-javac.compilerargs=-Xlint -Xlint\:-serial
+javac.source=17
+javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../license-jme.txt
 nbm.homepage=https://www.jmonkeyengine.org
 nbm.module.author=Normen Hansen, jiyarza
 nbm.needs.restart=true
-spec.version.base=3.4.0
+spec.version.base=3.5.2

nbi/stub/ext/infra/build/products/blender-linux-x64/build.properties

@@ -103,7 +103,7 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name}
 # * indices should start with 1
 product.data.length=1
 product.data.1.zip=false
-product.data.1.uri=http://download.blender.org/release/Blender2.79/blender-2.79-linux-glibc219-x86_64.tar.bz2
+product.data.1.uri=https://download.blender.org/release/Blender2.79/blender-2.79-linux-glibc219-x86_64.tar.bz2
 product.data.tar=blender-2.79-linux-glibc219-x86_64.tar.bz2
 product.data.sub.dir=blender-2.79-linux-glibc219-x86_64
 

nbi/stub/ext/infra/build/products/blender-macosx/build.properties

@@ -104,7 +104,7 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name}
 product.data.length=1
 product.data.1.zip=false
 #normen
-product.data.1.uri=http://download.blender.org/release/Blender2.79/blender-2.79-macOS-10.6.tar.gz
+product.data.1.uri=https://download.blender.org/release/Blender2.79/blender-2.79-macOS-10.6.tar.gz
 product.data.tar=blender-2.79-macOS-10.6.tar.gz
 product.data.sub.dir=blender-2.79-macOS-10.6
 

nbi/stub/ext/infra/build/products/blender-windows-x64/build.properties

@@ -103,7 +103,7 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name}
 # * indices should start with 1
 product.data.length=1
 product.data.1.zip=true
-product.data.1.uri=http://download.blender.org/release/Blender2.79/blender-2.79-windows64.zip
+product.data.1.uri=https://download.blender.org/release/Blender2.79/blender-2.79-windows64.zip
 product.data.sub.dir=blender-2.79-windows64
 
 # modificator for the required disk space parameter; the core value will be the

nbi/stub/ext/infra/build/products/blender-windows-x86/build.properties

@@ -104,7 +104,7 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name}
 product.data.length=1
 product.data.1.zip=true
 #normen
-product.data.1.uri=http://download.blender.org/release/Blender2.79/blender-2.79-windows32.zip
+product.data.1.uri=https://download.blender.org/release/Blender2.79/blender-2.79-windows32.zip
 product.data.sub.dir=blender-2.79-windows32
 
 # modificator for the required disk space parameter; the core value will be the

nbproject/platform.properties

@@ -129,8 +129,8 @@ nbplatform.active=default
 #need these in the file for all dependencies to resolve when using command line
 #ant and a download of the platform, same as those generated by netbeans platform
 #under ${user.properties.file} (defined in platform-private.properties)
-default.javac.source=11
-default.javac.target=11
+default.javac.source=17
+default.javac.target=17
 libs.absolutelayout.classpath=${nbplatform.default.netbeans.dest.dir}/java/modules/ext/AbsoluteLayout.jar
 libs.absolutelayout.javadoc=
 libs.absolutelayout.maven-pom=

nbproject/project.properties

@@ -12,7 +12,7 @@ app.version=3.4.1-SNAPSHOT
 plugins.version=3.4.1
 nbm.revision=2026
 #command line args
-run.args.extra=-J-Dsun.java2d.dpiaware\=true -J-Dapple.laf.useScreenMenuBar\=true -J-Dawt.useSystemAAFontSettings\=lcd -J-Dswing.aatext\=true -J-Xmx512m -J-XX\:MaxDirectMemorySize\=2048m -J-Dsun.zip.disableMemoryMapping\=true -J-Dapple.awt.graphics.UseQuartz\=true -J-Dsun.java2d.noddraw\=true
+run.args.extra=-J-Dsun.java2d.noddraw\=true -J--add-opens\=java.base/java.net\=ALL-UNNAMED -J--add-exports\=java.desktop/sun.awt\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing.text\=ALL-UNNAMED -J--add-opens\=java.desktop/javax.swing\=ALL-UNNAMED -J--add-opens\=java.prefs/java.util.prefs\=ALL-UNNAMED -J--add-opens\=java.base/java.security\=ALL-UNNAMED -J--add-exports\=java.base/sun.reflect.annotation\=ALL-UNNAMED
 auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt
 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
 auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true