Merge branch 'master' into 278-raceway

Author: neph1

.github/workflows/release.yml

@@ -0,0 +1,41 @@
+# This Action will build the SDK and if this succeeds, create a github release
+name: Release Builds
+on:
+  push:
+    tags:
+      - "*"
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+    - name: Grant execute permission for gradle
+      run: chmod +x gradlew
+    - name: Build the SDK
+      run: ./gradlew buildSdk -Ptag_name=${{ github.ref_name }}
+    - name: Build the JDKs
+      run: bash download-jdks.sh
+      working-directory: jdks
+    - 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
+      env:
+        BUILD_X86: true
+        BUILD_X64: true
+        BUILD_OTHER: true
+    - name: Fix Platform Independent Build
+      run: ./gradlew fixPlatformIndependent -Ptag_name=${{ github.ref_name }}
+    - name: Create Release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: dist/jmonkeyplatform*.*
+        tag_name:  ${{ github.ref }}
+        name: Release ${{ github.ref }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

@@ -42,15 +42,14 @@ javac.classpath=\
     ${libs.jme3-lwjgl.classpath}:\
     ${libs.jme3-effects.classpath}:\
     ${libs.jme3-terrain.classpath}:\
-    ${libs.jme3-bullet.classpath}:\
-    ${libs.jme3-bullet-native.classpath}
+    ${libs.jme3-jbullet.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
+javac.source=11
+javac.target=11
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -66,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.1
+jme.project.version=3.4.1
 jnlp.codebase.type=local
 jnlp.descriptor=application
 jnlp.enabled=false

BasicGameTemplate/nbproject/project.properties

@@ -35,14 +35,13 @@ javac.classpath=\
     ${libs.jme3-niftygui.classpath}:\
     ${libs.jme3-effects.classpath}:\
     ${libs.jme3-terrain.classpath}:\
-    ${libs.jme3-bullet.classpath}:\
-    ${libs.jme3-bullet-native.classpath}:\
+    ${libs.jme3-jbullet.classpath}:\
     ${libs.jme3-test-data.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=1.7
-javac.target=1.7
+javac.source=11
+javac.target=11
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

JME3TestsTemplate/nbproject/project.properties

@@ -1,3 +1,3 @@
-LBL_Copyright=<p><em>Copyright &copy; 2020 jMonkeyEngine.\n<br>Please visit <a style="color: #f3c802;" href="http://jmonkeyengine.org">http://jmonkeyengine.org</a> for more information.</em></p><p>Icons sets : <ul><li><a style="color: #f3c802;" href="http://brankic1979.com/icons/">Brankic1979</a></li><li><a style="color: #f3c802;" href="http://www.entypo.com/index.php">Entypo+</a></li><li><a style="color: #f3c802;" href="https://hub.jmonkeyengine.org/u/ogli">Ogli</a> (edited by <a style="color: #f3c802;" href="https://hub.jmonkeyengine.org/u/grizeldi">grizeldi</a>)</li><ul> </p>
+LBL_Copyright=<p><em>Copyright &copy; 2022 jMonkeyEngine.\n<br>Please visit <a style="color: #f3c802;" href="http://jmonkeyengine.org">http://jmonkeyengine.org</a> for more information.</em></p><p>Icons sets : <ul><li><a style="color: #f3c802;" href="http://brankic1979.com/icons/">Brankic1979</a></li><li><a style="color: #f3c802;" href="http://www.entypo.com/index.php">Entypo+</a></li><li><a style="color: #f3c802;" href="https://hub.jmonkeyengine.org/u/ogli">Ogli</a> (edited by <a style="color: #f3c802;" href="https://hub.jmonkeyengine.org/u/grizeldi">grizeldi</a>)</li><ul> </p>
 updates_not_found=<p style="margin: 0"><b>Updates:</b> jMonkeyEngine SDK is updated to version {0}</p>\n 
 URL_ON_IMG=http://jmonkeyengine.org/

branding/core/core.jar/org/netbeans/core/startup/about.png

@@ -3,7 +3,7 @@ import groovy.xml.MarkupBuilder
 import java.util.zip.ZipFile
 
 plugins {
-    id "de.undercouch.download" version "3.4.3"
+    id "de.undercouch.download" version "5.1.0"
 }
 
 apply from: 'gradle/libs/digest.gradle'
@@ -14,9 +14,6 @@ if (!hasProperty('mainClass')) {
 }
 
 repositories {
-    maven {
-        url "http://nifty-gui.sourceforge.net/nifty-maven-repo/"
-    }
     maven { url "https://jitpack.io" }
     maven {
         url "https://maven.google.com/"
@@ -38,29 +35,29 @@ dependencies {
     corelibs dep("com.badlogicgames.gdx:gdx-ai:1.8.1", true, true)
     corelibs dep("javax.help:javahelp:2.0.05", false, false)
 
-    corelibs dep("org.jmonkeyengine:jme3-core:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-desktop:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-lwjgl:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-effects:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-core:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-desktop:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-lwjgl:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-effects:3.4.1-stable", false, false)
     corelibs dep("org.jmonkeyengine:jme3-blender:3.3.2-stable", false, false) // Pin Pointed until jme3-blender has a dedicated release or support is phased out.
     optlibs dep("com.github.stephengold:Minie:4.6.0", false, false) // replacement for bullet-native
     corelibs dep(fileTree("lib"), false, false)
-    corelibs dep("org.jmonkeyengine:jme3-jogg:3.4.0-stable", true, true)
-
-    corelibs dep("org.jmonkeyengine:jme3-networking:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-niftygui:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-plugins:3.4.0-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-terrain:3.4.0-stable", false, false)
-
-    optlibs dep("org.jmonkeyengine:jme3-jbullet:3.4.0-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-android:3.4.0-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-ios:3.4.0-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-android-native:3.4.0-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-lwjgl3:3.4.0-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-jogg:3.4.1-stable", true, true)
+
+    corelibs dep("org.jmonkeyengine:jme3-networking:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-niftygui:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-plugins:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-terrain:3.4.1-stable", false, false)
+
+    optlibs dep("org.jmonkeyengine:jme3-jbullet:3.4.1-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-android:3.4.1-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-ios:3.4.1-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-android-native:3.4.1-stable", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-lwjgl3:3.4.1-stable", false, false)
     optlibs dep("com.github.stephengold:Heart:7.1.0", false, false)
     optlibs dep("com.github.stephengold:Wes:0.6.7", false, false)
-    testdatalibs dep("org.jmonkeyengine:jme3-testdata:3.4.0-stable", false, false)
-    examplelibs dep("org.jmonkeyengine:jme3-examples:3.4.0-stable", false, false)
+    testdatalibs dep("org.jmonkeyengine:jme3-testdata:3.4.1-stable", false, false)
+    examplelibs dep("org.jmonkeyengine:jme3-examples:3.4.1-stable", false, true)
 }
 
 def dep(coords, javadoc = false, sources = false) {
@@ -85,7 +82,7 @@ task checkPlatformConfig {
              * def f = file("netbeans.zip")
              * new URL(netbeansUrl).withInputStream{ i -> f.withOutputStream{ it << i }}
              */
-            download {
+            download.run {
                 src netbeansUrl
                 dest "netbeans.zip"
                 overwrite false // however if overwrite matters the build failed anyway
@@ -631,16 +628,16 @@ task fixPlatformIndependent(dependsOn: patchPlatformIndependent, type: Zip) {
     description = "We compile our installers with the bundled jdk, but the platform independent zip doesn't have the jdk. For this we need to change the jmonkeyplatform.zip after building the installers to not have a jdk bundled"
 
     from 'dist/temp'
-    archiveName = 'jmonkeyplatform.zip'
-    destinationDir = file('dist')
+    archiveFileName = 'jmonkeyplatform.zip'
+    destinationDirectory = file('dist')
 
     doLast {
         delete("dist/temp")
     }
 }
 
 wrapper {
-    gradleVersion = '5.6.4'
+    gradleVersion = '6.9.2'
 }
 
 //jar.dependsOn(buildSdk)

branding/core/core.jar/org/netbeans/core/startup/splash.gif

@@ -1,5 +1,5 @@
 # Version number used for plugins, only 3 numbers (e.g. 3.1.3)
-jmeVersion = 3.4.0
+jmeVersion = 3.4.1
 # Version used for application and settings folder, no spaces!
 jmeMainVersion = 3.4
 # Version addition pre-alpha-svn, Stable, Beta
@@ -14,4 +14,4 @@ buildJavaDoc = true
 buildSdkProject = true
 
 # Path for downloading NetBeans Base
-netbeansUrl = https://downloads.apache.org/netbeans/netbeans/12.6/netbeans-12.6-bin.zip
+netbeansUrl = https://dlcdn.apache.org/netbeans/netbeans/14/netbeans-14-bin.zip