diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7dd374cc8..043f9d937 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -6,25 +6,37 @@ name: Nightly NBM Deployment on: push: branches: [ master ] + pull_request: + jobs: - build: + BuildSDK: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - name: Set up JDK 21 + uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 21 + distribution: 'temurin' + + - name: Validate the Gradle wrapper + uses: gradle/wrapper-validation-action@v2 - name: Grant execute permission for gradle run: chmod +x gradlew - name: Build the SDK run: ./gradlew buildSdk + + NBMDeployment: + needs: [BuildSDK] + runs-on: ubuntu-latest + if: github.event_name == 'push' + steps: - name: Checkout the nightly-trigger repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: 'jMonkeyEngine/sdk-update-center' ref: nightly diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d259ef70..83d222d5a 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 21 uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 21 - name: Grant execute permission for gradle run: chmod +x gradlew - name: Build the SDK @@ -24,9 +24,9 @@ jobs: - name: Override Harness (custom icon) run: ./gradlew overrideHarness -Ptag_name=${{ github.ref_name }} - name: Build Installers - run: ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=true set-spec-version build-installers unset-spec-version + run: ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=false set-spec-version build-installers unset-spec-version env: - BUILD_X86: true + BUILD_X86: false BUILD_X64: true BUILD_OTHER: true - name: Fix Platform Independent Build diff --git a/BasicGameTemplate/nbproject/project.properties b/BasicGameTemplate/nbproject/project.properties index a88c96dfc..f3c44b70d 100644 --- a/BasicGameTemplate/nbproject/project.properties +++ b/BasicGameTemplate/nbproject/project.properties @@ -42,14 +42,17 @@ javac.classpath=\ ${libs.jme3-lwjgl.classpath}:\ ${libs.jme3-effects.classpath}:\ ${libs.jme3-terrain.classpath}:\ - ${libs.jme3-jbullet.classpath} + ${libs.jme3-jbullet.classpath}:\ + ${libs.jme3-awt-dialogs.classpath}:\ + ${libs.jme3-plugins-json.classpath}:\ + ${libs.jme3-plugins-json-gson.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false javac.processorpath=\ ${javac.classpath} -javac.source=11 -javac.target=11 +javac.source=21 +javac.target=21 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} @@ -65,7 +68,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..9c88d6ff3 100644 --- a/JME3TestsTemplate/nbproject/project.properties +++ b/JME3TestsTemplate/nbproject/project.properties @@ -26,7 +26,8 @@ includes=** jar.compress=false javac.classpath=\ ${libs.jme3-jogg.classpath}:\ - ${libs.jme3-blender.classpath}:\ + ${libs.jme3-plugins-json.classpath}:\ + ${libs.jme3-plugins-json-gson.classpath}:\ ${libs.jme3-networking.classpath}:\ ${libs.jme3-plugins.classpath}:\ ${libs.jme3-core.classpath}:\ @@ -36,12 +37,13 @@ javac.classpath=\ ${libs.jme3-effects.classpath}:\ ${libs.jme3-terrain.classpath}:\ ${libs.jme3-jbullet.classpath}:\ - ${libs.jme3-test-data.classpath} + ${libs.jme3-test-data.classpath}:\ + ${libs.jme3-awt-dialogs.classpath} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false -javac.source=11 -javac.target=11 +javac.source=21 +javac.target=21 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/ant-jme/src/com/jme/ant/LoadWikiImages.java b/ant-jme/src/com/jme/ant/LoadWikiImages.java index 12f824bbc..5691c4d43 100644 --- a/ant-jme/src/com/jme/ant/LoadWikiImages.java +++ b/ant-jme/src/com/jme/ant/LoadWikiImages.java @@ -9,6 +9,7 @@ import java.io.FileOutputStream; import java.io.FileReader; import java.io.InputStream; +import java.net.URI; import java.net.URL; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; @@ -48,7 +49,7 @@ public void execute() throws BuildException { name = name.substring(0, markIdx); } name = name.replaceAll(":", "/"); - URL url = new URL(host + link); + URL url = URI.create(host + link).toURL(); InputStream in = null; FileOutputStream out = null; try { @@ -83,7 +84,7 @@ public void execute() throws BuildException { } //make external folder and clean filename name = "external/" + name.replaceAll("[_[^\\w\\däüöÄÜÖ\\/\\+\\-\\. ]]", "_"); - URL url = new URL(host + link); + URL url = URI.create((host + link)).toURL(); InputStream in = url.openStream(); File file = new File(getLocation().getFileName().replaceAll("build.xml", "") + File.separator + targetFolder + File.separator + name.replaceAll("/", File.separator)); log("Getting external image: " + host + link); diff --git a/branding/core/core.jar/org/netbeans/core/startup/about.png b/branding/core/core.jar/org/netbeans/core/startup/about.png index 72f3dbee8..2ea64d99b 100644 Binary files a/branding/core/core.jar/org/netbeans/core/startup/about.png and b/branding/core/core.jar/org/netbeans/core/startup/about.png differ diff --git a/branding/core/core.jar/org/netbeans/core/startup/splash.gif b/branding/core/core.jar/org/netbeans/core/startup/splash.gif index 11632803e..18f1772a4 100644 Binary files a/branding/core/core.jar/org/netbeans/core/startup/splash.gif and b/branding/core/core.jar/org/netbeans/core/startup/splash.gif differ diff --git a/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties b/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties index 10d40a8ea..7003bebeb 100644 --- a/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties @@ -1,3 +1,3 @@ -LBL_Copyright=

Copyright © 2022 jMonkeyEngine.\n
Please visit http://jmonkeyengine.org for more information.

Icons sets :