From 21679556d4b8b0058e24171012e8cef22b63dda0 Mon Sep 17 00:00:00 2001 From: fbahle Date: Thu, 30 Oct 2025 12:02:14 +0100 Subject: [PATCH 1/2] - Switched to minimum NetBeans 17 - Fixed ossindex plugin --- .ci.settings.xml | 2 ++ .github/workflows/linux_maven.yml | 6 ++++ .github/workflows/release_maven.yml | 6 ++++ .github/workflows/windows_maven.yml | 6 ++++ README.md | 2 +- pom.xml | 52 ++++++++++++++++++++++++++++- src/site/xdoc/index.xml | 2 +- 7 files changed, 73 insertions(+), 3 deletions(-) diff --git a/.ci.settings.xml b/.ci.settings.xml index b042e4879..9e6374f38 100644 --- a/.ci.settings.xml +++ b/.ci.settings.xml @@ -54,6 +54,8 @@ ${env.repoToken} ${env.signing_keypass} + ${env.ossindex_username} + ${env.ossindex_password} ${env.skipRemoteStaging} diff --git a/.github/workflows/linux_maven.yml b/.github/workflows/linux_maven.yml index 6d5fedda8..852339714 100644 --- a/.github/workflows/linux_maven.yml +++ b/.github/workflows/linux_maven.yml @@ -22,6 +22,10 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven + - name: Set up Maven 3.9.11 + uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.11 - name: Cache Dependency-Check DB uses: actions/cache@v4 with: @@ -33,4 +37,6 @@ jobs: run: mvn -s .ci.settings.xml --no-transfer-progress -Dgh_username=${{ secrets.GH_USERNAME }} -Dgh_token=${{ secrets.GH_TOKEN }} -Prelease-commons,sonatype-oss-release package site env: MAVEN_OPTS: -Xms256m -Xmx2g --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED + ossindex_username: ${{ secrets.OSSINDEX_USERNAME }} + ossindex_password: ${{ secrets.OSSINDEX_TOKEN }} nvd_api_key: ${{ secrets.NVD_API_KEY }} diff --git a/.github/workflows/release_maven.yml b/.github/workflows/release_maven.yml index 49c0cb6d7..e52c692b5 100644 --- a/.github/workflows/release_maven.yml +++ b/.github/workflows/release_maven.yml @@ -19,6 +19,10 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven + - name: Set up Maven 3.9.11 + uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.11 - name: Cache Dependency-Check DB uses: actions/cache@v4 with: @@ -47,4 +51,6 @@ jobs: sonatype_password: ${{ secrets.SONATYPE_PASSWORD }} repoToken: ${{ secrets.COVERALLS_REPOTOKEN }} skipRemoteStaging: ${{ secrets.SKIP_REMOTE_STAGING }} + ossindex_username: ${{ secrets.OSSINDEX_USERNAME }} + ossindex_password: ${{ secrets.OSSINDEX_TOKEN }} nvd_api_key: ${{ secrets.NVD_API_KEY }} diff --git a/.github/workflows/windows_maven.yml b/.github/workflows/windows_maven.yml index bcb67cff5..61894cf72 100644 --- a/.github/workflows/windows_maven.yml +++ b/.github/workflows/windows_maven.yml @@ -23,6 +23,10 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven + - name: Set up Maven 3.9.11 + uses: stCarolas/setup-maven@v5 + with: + maven-version: 3.9.11 - name: Cache Dependency-Check DB uses: actions/cache@v4 with: @@ -34,4 +38,6 @@ jobs: run: mvn -s .ci.settings.xml --no-transfer-progress clean package env: MAVEN_OPTS: -Xms256m -Xmx2g --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED + ossindex_username: ${{ secrets.OSSINDEX_USERNAME }} + ossindex_password: ${{ secrets.OSSINDEX_TOKEN }} nvd_api_key: ${{ secrets.NVD_API_KEY }} diff --git a/README.md b/README.md index acc3634d5..d2fe762de 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ the same way as e.g. your co-workers do with their Eclipse IDE. Compatibility ------------- -Compatible with NetBeans 12.0+ and JDK 21+. +Compatible with NetBeans 17.0+ and JDK 21+. Downloads --------- diff --git a/pom.xml b/pom.xml index 316fee83b..857cb6abf 100644 --- a/pom.xml +++ b/pom.xml @@ -123,13 +123,50 @@ 2.81.0 0.4.0 3.19.0 - RELEASE120 + RELEASE170 1.21.2 7.17.0 + 2.16.0 2.2.1 + + + + + org.apache.sshd + sshd-core + ${sshd.version} + + + + org.apache.sshd + sshd-common + ${sshd.version} + + + + org.apache.sshd + sshd-sftp + ${sshd.version} + + + + org.apache.sshd + sshd-osgi + ${sshd.version} + + + + + org.eclipse.jgit + org.eclipse.jgit + 7.4.0.202509020913-r + + + + @@ -534,6 +571,12 @@ org.apache.maven.scm maven-scm-provider-jgit ${scm.version} + + + net.i2p.crypto + eddsa + + @@ -813,6 +856,12 @@ ossindex-maven-plugin 3.2.0 + + + ${ossindex.username} + ${ossindex.password} + + 3 @@ -1030,6 +1079,7 @@ org.apache.maven.scm:maven-scm-provider-jgit org.apache.maven.scm:maven-scm-provider-gitexe org.apache.maven.scm:maven-scm-provider-git-commons + org.apache.sshd:ssh-common diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index e8efa18df..60d0d39c0 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -93,7 +93,7 @@

- Compatible with NetBeans 12.0+ and JDK 21+. + Compatible with NetBeans 17.0+ and JDK 21+.

From b88cc2404bf155e2088e729b3a1af6308d314989 Mon Sep 17 00:00:00 2001 From: fbahle Date: Thu, 30 Oct 2025 14:02:08 +0100 Subject: [PATCH 2/2] Improved build --- .ci.settings.xml | 88 ----------------------------- .github/workflows/linux_maven.yml | 1 + .github/workflows/release_maven.yml | 2 +- .github/workflows/windows_maven.yml | 1 + pom.xml | 8 ++- 5 files changed, 10 insertions(+), 90 deletions(-) diff --git a/.ci.settings.xml b/.ci.settings.xml index 9e6374f38..45d2e7271 100644 --- a/.ci.settings.xml +++ b/.ci.settings.xml @@ -103,50 +103,6 @@ false - - sonatype-nexus-staging - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - true - - - false - - - - sonatype-nexus-snapshots - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - sonatype-nexus-s01-staging - sonatype-nexus-s01-staging - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - true - - - false - - - - sonatype-nexus-s01-snapshots - sonatype-nexus-s01-snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - false - - - true - - @@ -193,50 +149,6 @@ false - - sonatype-nexus-staging - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - true - - - false - - - - sonatype-nexus-snapshots - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - sonatype-nexus-s01-staging - sonatype-nexus-s01-staging - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - true - - - false - - - - sonatype-nexus-s01-snapshots - sonatype-nexus-s01-snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - false - - - true - - diff --git a/.github/workflows/linux_maven.yml b/.github/workflows/linux_maven.yml index 852339714..ea3fac30c 100644 --- a/.github/workflows/linux_maven.yml +++ b/.github/workflows/linux_maven.yml @@ -37,6 +37,7 @@ jobs: run: mvn -s .ci.settings.xml --no-transfer-progress -Dgh_username=${{ secrets.GH_USERNAME }} -Dgh_token=${{ secrets.GH_TOKEN }} -Prelease-commons,sonatype-oss-release package site env: MAVEN_OPTS: -Xms256m -Xmx2g --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED + signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }} ossindex_username: ${{ secrets.OSSINDEX_USERNAME }} ossindex_password: ${{ secrets.OSSINDEX_TOKEN }} nvd_api_key: ${{ secrets.NVD_API_KEY }} diff --git a/.github/workflows/release_maven.yml b/.github/workflows/release_maven.yml index e52c692b5..10dba98bd 100644 --- a/.github/workflows/release_maven.yml +++ b/.github/workflows/release_maven.yml @@ -44,13 +44,13 @@ jobs: GPG_TTY: $(tty) MAVEN_OPTS: -Xms256m -Xmx2g --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }} gh_username: ${{ secrets.GH_USERNAME }} gh_token: ${{ secrets.GH_TOKEN }} sonatype_username: ${{ secrets.SONATYPE_USERNAME }} sonatype_password: ${{ secrets.SONATYPE_PASSWORD }} repoToken: ${{ secrets.COVERALLS_REPOTOKEN }} skipRemoteStaging: ${{ secrets.SKIP_REMOTE_STAGING }} + signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }} ossindex_username: ${{ secrets.OSSINDEX_USERNAME }} ossindex_password: ${{ secrets.OSSINDEX_TOKEN }} nvd_api_key: ${{ secrets.NVD_API_KEY }} diff --git a/.github/workflows/windows_maven.yml b/.github/workflows/windows_maven.yml index 61894cf72..1ed3cd716 100644 --- a/.github/workflows/windows_maven.yml +++ b/.github/workflows/windows_maven.yml @@ -38,6 +38,7 @@ jobs: run: mvn -s .ci.settings.xml --no-transfer-progress clean package env: MAVEN_OPTS: -Xms256m -Xmx2g --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED + signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }} ossindex_username: ${{ secrets.OSSINDEX_USERNAME }} ossindex_password: ${{ secrets.OSSINDEX_TOKEN }} nvd_api_key: ${{ secrets.NVD_API_KEY }} diff --git a/pom.xml b/pom.xml index 857cb6abf..5975ccea8 100644 --- a/pom.xml +++ b/pom.xml @@ -164,6 +164,12 @@ org.eclipse.jgit 7.4.0.202509020913-r + + + org.eclipse.jgit + org.eclipse.jgit.ssh.apache + 7.4.0.202509020913-r + @@ -913,7 +919,7 @@ maven-compiler-plugin ${java.version} - true + true true full