Merge branch 'master' of github.com:neph1/sdk

.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

@@ -1,114 +0,0 @@
-language: java
-jdk: openjdk11
-dist: bionic
-
-before_cache:
- - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-cache:
-  directories:
-   - $HOME/.gradle/caches/
-   - $HOME/.gradle/wrapper/
-   - jdks/local/*/compiled
-
-addons:
-  #ssh_known_hosts: updates.jmonkeyengine.org
-  apt:
-    packages:
-    - p7zip-full
-    - cabextract
-    - maven
-    - patch
-
-# branches:
-#   only:
-#   - master
-
-env:
-  - BUILD_X64=true
-  - BUILD_X86=true
-  - BUILD_OTHER=true
-
-notifications:
-  slack:
-    on_success: change
-    on_failure: always
-    rooms:
-      secure: cOYkCWyBNtM4QiqNbGvhCE2lFxHSnmLfRl1wLJzeDBYEDbg1nOXayRwyH1dQzWCvhDhqv2qWHHASgddE14JwnVB7p56DcaQWAJ5yn/OyY9GzaHuz59Xm6LbFbz5JfabHY7LczuBlRtISlyfz4eHD5BOvfCzx7D3GI44kQX99BCFr1mqDjQEUyTPwhLolFPL5+zx7J669ud2Ba0TywtaWsXeOUvORAXAdlQv1RRAmQvUK9DIYyq0Z3fzr/uXEBaPAz50JFXkMs00Z8Dutdiu9jd/SsRnEv0O+ns75outu6WK2UwS1xHhcdW7bkMuTmRpGoec7XbbjSaz6oYsHSp8kyuPhLEzS2ba2QIxDmOkF/erejeAMdDlsIKwRMpizRCh/8gMZR2nNEzdHQ0gbgEk83PFYgQw+amtlOk61l6THopwLtVpDiiE1Elz5ev7KqSr//qWQgoHBFabQOgE5KjfxmLDmuUNWaZyuJi6JTwsxB04NGAa3zpQ6RKQ7dgGBZF7QIQ+f648oxVlLIK+T3VAdK47s94XKTRJ0CqRoA6nI2MCaLbU9zvS8uAWoLOIKw6ec2qexPaVCE+TO0780+x6tBFSYexwH8fwmEl1nPqBldipYCLIRZV7XbJh3bhfPksXuz2B6poJ/wL5gLtWNAXnBoWyI7Vu/PHbFsn+VhLUkYSU=
-
-install:
-  - chmod u+x build_engine.sh fix_engine.sh
-  - ./build_engine.sh
-  # Now we have to patch the engine
-  - ./fix_engine.sh
-  # Can't do that currently was we now use engine/ as subproject...
-  # Remove Engine Source and built class files since travis is low on disk space
-  # - rm -rf engine/
-  - ./gradlew buildSdk
-  #- '[ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ant -Dstorepass="$NBM_SIGN_PASS" hudson-nightly | awk "{printf(\".\"); fflush(stdout)}" || :'
-  #- '[ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && scp -rp -i nbproject/private/www-updater.key build/updates/* [email protected]:/var/www/updates/nightly/3.1/plugins || :'
-  
-#script:
-#  - ./gradlew check
-#  - ./gradlew createZipDistribution
-
-before_deploy:
-  # In case of STABLE (see hudson-stable target)
-  # the above gradlew already sets the correct ant properties to build
-  # Include suite.nbms again, when we upload nbms again.
-  
-  # Build the JDKs we package
-  - cd jdks
-  - ./download-jdks.sh
-  # Reduce Diskspace by 3G
-  - rm -rf jdks/local/*/{downloads,linux-i586,linux-x64,windows-i586,windows-x64}
-  - cd ../
-  
-  # Force Freeing Space.
-  - rm -rf build/
-  - ./gradlew overrideHarness # This will patch the launcher exes to have our custom icon
-  - set -o pipefail # Allow failing in ant to be up-propagated
-  - ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=true set-spec-version build-installers unset-spec-version | awk '{printf("."); fflush(stdout)}'
-  
-  # Has to be done before deploy (due to the rm command)
-  #- scp -rp -i nbproject/private/www-updater.key build/updates/* [email protected]:/var/www/updates/stable/3.1/plugins
-  - '[ "$BUILD_OTHER" != "true" ] && rm -rf dist/jmonkeyplatform.zip || :'
-  - '[ "$BUILD_OTHER" == "true" ] && ./gradlew fixPlatformIndependent || :'
-  - rm -rf build/
-
-deploy:
-  provider: releases
-  api_key:
-    secure: IoGNk8dOmBIB/lXqgd7we7UjyFULww6y43F/Dwx2KZZ6NqC4tvDfBpqEyYhhLC0Ltgpm6vO/+0EepnqmBO5CkDYBECcwpIQX+ndgIOZQLMonXQ3glcjM5yoNtoUbFEn7xvI2ntAKbUkKmWnjNVquHF7t7jT8QfUPymUdV+f1eHapQFtcx2VuDoGF4/1fZuygS5pNPgkw7bduQo8foxlDdzSicNJ8smV0QBUZE/dVlbK1ycitZZrGkkRW/uKvsN/FX+lkl6ANb4y8AE2kcn0EarY6FH5NrQgGp5QNbGdQw1/4voFsR8Bji2UHUYuhjCuV14cgenfSQXrW4rVV/YMGaxxR/BbFB5XfZPCBfIsqfVAGH+Rkvy8/ZTBot+v9L1Pp99RZSCCtJoGPYBQagjzEOOAJplnqNHJ1D8bQo+1XElcuki/qxlO3XvXGQwTs2HMyqrnmlfdRjD5JClxx06Wke4y+KjLWtiQfjihCaQK68ixkCF4U8B2lg8nsuFNmUxUMfPCkKir4XfjuZ27y9ZNBnZQNTKOjW1cjU2GhvGyDWfK5xgfSMP/uKpAopSkWYOMaQVeUlFvMI2NtKdkb7lko6bRizEj/EWlUjhTP7TzvVGE76PJh+XeUkcNQmoFBRYOY2L+TYVs9LlKl+DQbcAHOeMYlxfq/zN7OIAh7T5AsgZk=
-    # Use travis setup releases --force (gem install travis) and then anyone with push access can create the token
-  file_glob: true
-  file: "dist/jmonkeyplatform*.*"
-  # - dist/jmonkeyplatform-linux-x64.sh
-  # - dist/jmonkeyplatform-linux-x86.sh
-  # - dist/jmonkeyplatform-windows-x64.exe
-  # - dist/jmonkeyplatform-windows-x86.exe
-  # - dist/jmonkeyplatform.zip
-  # - dist/jmonkeyplatform-macosx.tgz
-  skip_cleanup: true
-  on:
-    repo: jMonkeyEngine/sdk
-    tags: true
-
-before_install:
-  - git fetch --unshallow -q
-  - "[ $TRAVIS_PULL_REQUEST == 'false' ] && openssl aes-256-cbc -K $encrypted_ab3650240afa_key -iv $encrypted_ab3650240afa_iv -in nbproject/private/www-updater.key.enc -out nbproject/private/www-updater.key -d || :"
-  - "[ $TRAVIS_PULL_REQUEST == 'false' ] && chmod 600 nbproject/private/www-updater.key || :"
-  #- "[ $TRAVIS_PULL_REQUEST == 'false' ] && openssl aes-256-cbc -K $encrypted_a1949b55824a_key -iv $encrypted_a1949b55824a_iv -in private/www-updater.key.enc -out private/www-updater.key -d || :"
-
-# before_install:
-  # required libs for android build tools
-  # sudo apt-get update
-  # sudo apt-get install -qq p7zip-full
-  # sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch
-  # newest Android NDK
-  # wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin -O ndk.bin
-  # 7z x ndk.bin -y > /dev/null
-  # export ANDROID_NDK=`pwd`/android-ndk-r10c
-
-#after_success:
-#  - '[ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ./gradlew uploadArchives || :'
-#  - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ./gradlew uploadArchives bintrayUpload || :'

JME3TestsTemplate/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}

branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.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/

build.gradle

@@ -57,7 +57,7 @@ dependencies {
     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.1-stable", false, false)
-    examplelibs dep("org.jmonkeyengine:jme3-examples: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) {

harness-override/override.properties

@@ -1,6 +1,6 @@
-app.exe.hashBefore=fe6b4a2d7aaddb9c0a84c94e1553b43bd11fa468b1079cabdca82e7dea731755
-app.exe.hashAfter=08568a9ece42e67685df6f20a0383e70248bb0e41c1ab2ec45883bbe001b6326
-app64.exe.hashBefore=f60bc962278fb5b407a7cbe86281185117b76a84e00576496d2559175843bd50
-app64.exe.hashAfter=ee790adfcf8436d7b128ddb43d6f6df1a8404df7612972b2bef7022b4f27bf69
+app.exe.hashBefore=08568a9ece42e67685df6f20a0383e70248bb0e41c1ab2ec45883bbe001b6326
+app.exe.hashAfter=c399d6eb732faadb7c2850451fd569e4854f5ae7250c66051043aca9f47b22ca
+app64.exe.hashBefore=ee790adfcf8436d7b128ddb43d6f6df1a8404df7612972b2bef7022b4f27bf69
+app64.exe.hashAfter=b50451b5b264504cb61998a8363cc7fbefe6db4d7df55c2b490cc293ede3bfe2
 pre7_app.exe.hashBefore=f4ea42a1ec2572b2a65a6d9baef0dd1f7293980c44c5d031c5b2ea5752352e49
-pre7_app.exe.hashAfter=fa8ae6457dad70a65cecb623ef0f60a86c92e856705eaeb2f22e43310fa9226f
+pre7_app.exe.hashAfter=fa8ae6457dad70a65cecb623ef0f60a86c92e856705eaeb2f22e43310fa9226f

nbi/antlib/version

@@ -1 +1 @@
-NB-11.2.0-custom-patch-MeFisto94-bypass-NETBEANS-3342
+NB-14

nbproject/platform.properties

@@ -39,19 +39,16 @@ disabled.modules=\
     org.netbeans.modules.bugtracking.commons,\
     org.netbeans.modules.bugzilla,\
     org.netbeans.modules.bugzilla.exceptionreporter,\
-    org.netbeans.modules.db,\
     org.netbeans.modules.db.core,\
     org.netbeans.modules.db.dataview,\
     org.netbeans.modules.db.drivers,\
     org.netbeans.modules.db.kit,\
-    org.netbeans.modules.db.metadata.model,\
     org.netbeans.modules.db.mysql,\
     org.netbeans.modules.db.sql.editor,\
     org.netbeans.modules.db.sql.visualeditor,\
     org.netbeans.modules.dbapi,\
     org.netbeans.modules.dbschema,\
     org.netbeans.modules.deadlock.detector,\
-    org.netbeans.modules.debugger.jpda.truffle,\
     org.netbeans.modules.debugger.jpda.trufflenode,\
     org.netbeans.modules.derby,\
     org.netbeans.modules.form,\
@@ -59,9 +56,11 @@ disabled.modules=\
     org.netbeans.modules.form.nb,\
     org.netbeans.modules.form.refactoring,\
     org.netbeans.modules.gradle.htmlui,\
+    org.netbeans.modules.gradle.javaee,\
     org.netbeans.modules.gradle.persistence,\
     org.netbeans.modules.gradle.spring,\
     org.netbeans.modules.gradle.test,\
+    org.netbeans.modules.groovy.and.gradle.kit,\
     org.netbeans.modules.hudson,\
     org.netbeans.modules.hudson.ant,\
     org.netbeans.modules.hudson.git,\
@@ -80,7 +79,6 @@ disabled.modules=\
     org.netbeans.modules.j2ee.jpa.verification,\
     org.netbeans.modules.j2ee.persistence,\
     org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.java.lsp.server,\
     org.netbeans.modules.javaee.injection,\
     org.netbeans.modules.jellytools.ide,\
     org.netbeans.modules.jellytools.java,\
@@ -103,6 +101,7 @@ disabled.modules=\
     org.netbeans.modules.maven.spring,\
     org.netbeans.modules.mercurial,\
     org.netbeans.modules.mylyn.util,\
+    org.netbeans.modules.performance,\
     org.netbeans.modules.projectimport.eclipse.j2se,\
     org.netbeans.modules.schema2beans,\
     org.netbeans.modules.server,\
@@ -122,6 +121,7 @@ disabled.modules=\
     org.netbeans.upgrader,\
     org.openide.compat,\
     org.openide.options,\
+    org.openide.util.enumerations,\
     org.openidex.util
 nbjdk.active=default
 nbplatform.active=default

nbproject/project.properties

@@ -7,9 +7,9 @@ app.description=A complete 3D game development suite written purely in Java.
 app.categories=Development,Graphics,IDE,3DGraphics,Java
 app.icon.icns=jmonkeyplatform.icns
 #version name used for application and settings folder, no spaces!
-app.version=3.3.0-SNAPSHOT
+app.version=3.4.1-SNAPSHOT
 #version number used for plugins, only 3 numbers (e.g. 3.1.3)
-plugins.version=3.3.0
+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

version.gradle

@@ -137,8 +137,8 @@ task configureVersionInfo {
         jmeShortGitHash = head.abbreviatedId
         jmeBranchName = grgit.branch.current.name
         
-        if (System.env.TRAVIS_TAG != null) {
-            jmeGitTag = System.env.TRAVIS_TAG
+        if (project.hasProperty("tag_name")) {
+            jmeGitTag = project.getProperty("tag_name")
         } else {
             jmeGitTag = grgit.tag.list().find { it.commit == head }
         }