diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7dd374cc8..ffc9f62b1 100644 --- a/.github/workflows/gradle.yml +++ b/.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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d259ef70..e557a91a2 100644 --- 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 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 diff --git a/BasicGameTemplate/nbproject/project.properties b/BasicGameTemplate/nbproject/project.properties index a88c96dfc..e5b8156e7 100644 --- a/BasicGameTemplate/nbproject/project.properties +++ b/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 diff --git a/JME3TestsTemplate/nbproject/project.properties b/JME3TestsTemplate/nbproject/project.properties index d7a635056..4c9ee2028 100644 --- a/JME3TestsTemplate/nbproject/project.properties +++ b/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} diff --git a/build.xml b/build.xml index 348de2df0..d78c7013e 100644 --- a/build.xml +++ b/build.xml @@ -37,9 +37,7 @@ - - - + @@ -222,7 +220,7 @@ - + diff --git a/jdks/download-jdks.sh b/jdks/download-jdks.sh index c743e4a18..7132d432b 100755 --- a/jdks/download-jdks.sh +++ b/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) diff --git a/jme3-android/nbproject/project.properties b/jme3-android/nbproject/project.properties index e1dd3e7c3..f695274e2 100644 --- a/jme3-android/nbproject/project.properties +++ b/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 diff --git a/jme3-angelfont/nbproject/project.properties b/jme3-angelfont/nbproject/project.properties index 232e235c4..fa89ee901 100644 --- a/jme3-angelfont/nbproject/project.properties +++ b/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 diff --git a/jme3-assetpack-support/nbproject/project.properties b/jme3-assetpack-support/nbproject/project.properties index e31907cf5..2a7627c4d 100644 --- a/jme3-assetpack-support/nbproject/project.properties +++ b/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 diff --git a/jme3-blender/nbproject/project.properties b/jme3-blender/nbproject/project.properties index 021777a3d..08444c7df 100644 --- a/jme3-blender/nbproject/project.properties +++ b/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 diff --git a/jme3-cinematics/nbproject/project.properties b/jme3-cinematics/nbproject/project.properties index 367498e84..dd5697249 100644 --- a/jme3-cinematics/nbproject/project.properties +++ b/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 diff --git a/jme3-code-check/nbproject/project.properties b/jme3-code-check/nbproject/project.properties index 03d68d9bc..28b3b557d 100644 --- a/jme3-code-check/nbproject/project.properties +++ b/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 diff --git a/jme3-codepalette/nbproject/project.properties b/jme3-codepalette/nbproject/project.properties index e31907cf5..2a7627c4d 100644 --- a/jme3-codepalette/nbproject/project.properties +++ b/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 diff --git a/jme3-core-baselibs/nbproject/project.properties b/jme3-core-baselibs/nbproject/project.properties index e44708c85..326cd559f 100644 --- a/jme3-core-baselibs/nbproject/project.properties +++ b/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 diff --git a/jme3-core-libraries/nbproject/project.properties b/jme3-core-libraries/nbproject/project.properties index 3853357b7..1e509ffbc 100644 --- a/jme3-core-libraries/nbproject/project.properties +++ b/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 diff --git a/jme3-core-updatecenters/nbproject/project.properties b/jme3-core-updatecenters/nbproject/project.properties index b21c84d98..96c186062 100644 --- 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=11 +javac.source=17 javac.compilerargs=-Xlint -Xlint\:-serial -spec.version.base=3.4.0 +spec.version.base=3.5.2 diff --git a/jme3-core/nbproject/project.properties b/jme3-core/nbproject/project.properties index 59d517804..49a3d0b4a 100644 --- a/jme3-core/nbproject/project.properties +++ b/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 diff --git a/jme3-dark-laf/nbproject/project.properties b/jme3-dark-laf/nbproject/project.properties index 57b9ba90e..f4cb7c690 100644 --- a/jme3-dark-laf/nbproject/project.properties +++ b/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 diff --git a/jme3-desktop-executables/nbproject/project.properties b/jme3-desktop-executables/nbproject/project.properties index e31907cf5..2a7627c4d 100644 --- a/jme3-desktop-executables/nbproject/project.properties +++ b/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 diff --git a/jme3-documentation/nbproject/project.properties b/jme3-documentation/nbproject/project.properties index 3f6d1cc85..da232c2b4 100644 --- a/jme3-documentation/nbproject/project.properties +++ b/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 diff --git a/jme3-glsl-highlighter/nbproject/project.properties b/jme3-glsl-highlighter/nbproject/project.properties index 0a02cb705..e2f681ea2 100644 --- a/jme3-glsl-highlighter/nbproject/project.properties +++ b/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 diff --git a/jme3-gui/nbproject/project.properties b/jme3-gui/nbproject/project.properties index 8a41996db..f2218a083 100644 --- a/jme3-gui/nbproject/project.properties +++ b/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 diff --git a/jme3-lwjgl-applet/nbproject/project.properties b/jme3-lwjgl-applet/nbproject/project.properties index e31907cf5..2a7627c4d 100644 --- a/jme3-lwjgl-applet/nbproject/project.properties +++ b/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 diff --git a/jme3-materialeditor/nbproject/project.properties b/jme3-materialeditor/nbproject/project.properties index e31907cf5..2a7627c4d 100644 --- a/jme3-materialeditor/nbproject/project.properties +++ b/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 diff --git a/jme3-model-importer/nbproject/project.properties b/jme3-model-importer/nbproject/project.properties index e31907cf5..2a7627c4d 100644 --- a/jme3-model-importer/nbproject/project.properties +++ b/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 diff --git a/jme3-navmesh-gen/nbproject/project.properties b/jme3-navmesh-gen/nbproject/project.properties index 741bf705e..c5b8f9a24 100644 --- a/jme3-navmesh-gen/nbproject/project.properties +++ b/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 diff --git a/jme3-obfuscate/nbproject/project.properties b/jme3-obfuscate/nbproject/project.properties index 47fabff39..8b1165269 100644 --- a/jme3-obfuscate/nbproject/project.properties +++ b/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 diff --git a/jme3-project-baselibs/nbproject/project.properties b/jme3-project-baselibs/nbproject/project.properties index 3853357b7..1e509ffbc 100644 --- a/jme3-project-baselibs/nbproject/project.properties +++ b/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 diff --git a/jme3-project-libraries/nbproject/project.properties b/jme3-project-libraries/nbproject/project.properties index 3853357b7..1e509ffbc 100644 --- a/jme3-project-libraries/nbproject/project.properties +++ b/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 diff --git a/jme3-project-testdata/nbproject/project.properties b/jme3-project-testdata/nbproject/project.properties index 3853357b7..1e509ffbc 100644 --- a/jme3-project-testdata/nbproject/project.properties +++ b/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 diff --git a/jme3-scenecomposer/nbproject/project.properties b/jme3-scenecomposer/nbproject/project.properties index e31907cf5..2a7627c4d 100644 --- a/jme3-scenecomposer/nbproject/project.properties +++ b/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 diff --git a/jme3-templates/nbproject/project.properties b/jme3-templates/nbproject/project.properties index 3853357b7..1e509ffbc 100644 --- a/jme3-templates/nbproject/project.properties +++ b/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 diff --git a/jme3-templates/src/com/jme3/gde/templates/GradleDesktopGameProject.zip b/jme3-templates/src/com/jme3/gde/templates/GradleDesktopGameProject.zip index f8d047bb4..58044a5dc 100644 Binary files a/jme3-templates/src/com/jme3/gde/templates/GradleDesktopGameProject.zip and b/jme3-templates/src/com/jme3/gde/templates/GradleDesktopGameProject.zip differ diff --git a/jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl b/jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl index a88a9e198..b3fd1ca99 100644 --- a/jme3-templates/src/com/jme3/gde/templates/files/freemarker/build.gradle.ftl +++ b/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' } \ No newline at end of file diff --git a/jme3-terrain-editor/nbproject/project.properties b/jme3-terrain-editor/nbproject/project.properties index 9bd72e80f..529654098 100644 --- a/jme3-terrain-editor/nbproject/project.properties +++ b/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 diff --git a/jme3-tests-template/nbproject/project.properties b/jme3-tests-template/nbproject/project.properties index 3853357b7..1e509ffbc 100644 --- a/jme3-tests-template/nbproject/project.properties +++ b/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 diff --git a/jme3-texture-editor/nbproject/project.properties b/jme3-texture-editor/nbproject/project.properties index dd714f7f9..feb9321d1 100644 --- a/jme3-texture-editor/nbproject/project.properties +++ b/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 diff --git a/jme3-vehicle-creator/nbproject/project.properties b/jme3-vehicle-creator/nbproject/project.properties index dcb4fde89..292220869 100644 --- 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=11 +javac.source=17 javac.compilerargs=-Xlint -Xlint\:-serial -spec.version.base=3.4.0 +spec.version.base=3.5.2 diff --git a/jme3-wavefront/nbproject/project.properties b/jme3-wavefront/nbproject/project.properties index b21c84d98..96c186062 100644 --- 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=11 +javac.source=17 javac.compilerargs=-Xlint -Xlint\:-serial -spec.version.base=3.4.0 +spec.version.base=3.5.2 diff --git a/jme3-welcome-screen/nbproject/project.properties b/jme3-welcome-screen/nbproject/project.properties index b6773d7c1..4f7d4e063 100644 --- a/jme3-welcome-screen/nbproject/project.properties +++ b/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 diff --git a/nbi/stub/ext/infra/build/products/blender-linux-x64/build.properties b/nbi/stub/ext/infra/build/products/blender-linux-x64/build.properties index d9e931b40..85e24472e 100644 --- a/nbi/stub/ext/infra/build/products/blender-linux-x64/build.properties +++ b/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 diff --git a/nbi/stub/ext/infra/build/products/blender-macosx/build.properties b/nbi/stub/ext/infra/build/products/blender-macosx/build.properties index f47800516..1542ec358 100644 --- a/nbi/stub/ext/infra/build/products/blender-macosx/build.properties +++ b/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 diff --git a/nbi/stub/ext/infra/build/products/blender-windows-x64/build.properties b/nbi/stub/ext/infra/build/products/blender-windows-x64/build.properties index 43fb93c90..d4ab052d6 100644 --- a/nbi/stub/ext/infra/build/products/blender-windows-x64/build.properties +++ b/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 diff --git a/nbi/stub/ext/infra/build/products/blender-windows-x86/build.properties b/nbi/stub/ext/infra/build/products/blender-windows-x86/build.properties index 5814fd6d5..9bda31129 100644 --- a/nbi/stub/ext/infra/build/products/blender-windows-x86/build.properties +++ b/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 diff --git a/nbproject/platform.properties b/nbproject/platform.properties index 836773e8d..79842f7a6 100644 --- a/nbproject/platform.properties +++ b/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= diff --git a/nbproject/project.properties b/nbproject/project.properties index 8075fcb2b..e5e8dde42 100644 --- a/nbproject/project.properties +++ b/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