From f3a22b61cfb6a1e3fdf62a1d5eee10043521aa7f Mon Sep 17 00:00:00 2001 From: fbahle Date: Tue, 28 Oct 2025 08:40:57 +0100 Subject: [PATCH 1/3] Switched back to release version (as the release was not done yet) --- pom.xml | 17 +++++++---------- src/changes/changes.xml | 5 +---- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 4ce7187f4..7fa60dfee 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ de.funfried.netbeans.plugins externalcodeformatter - 1.15.7-SNAPSHOT + 1.15.6 nbm @@ -100,13 +100,14 @@ scm:git:https://github.com/funfried/externalcodeformatter_for_netbeans.git - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + maven-central + Maven Central + https://central.sonatype.com/artifact/de.funfried.netbeans.plugins/externalcodeformatter - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots + github + GitHub Snapshots + https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans @@ -1166,10 +1167,6 @@ GitHub funfried Apache Maven Packages https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans - - github - https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans - diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a63c7cd88..17aa0cb0b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -9,10 +9,7 @@ - - - - + Updated to latest dependency and plugin versions (and due to the Google Formatter also increased the minimum Java version to 21) From 0d04f218204e4cfc09119a205fa8a20226ef7597 Mon Sep 17 00:00:00 2001 From: fbahle Date: Tue, 28 Oct 2025 10:08:11 +0100 Subject: [PATCH 2/3] - Improved Maven site descriptor - Improved GitHub pipelines --- .github/workflows/linux_maven.yml | 9 +++- .github/workflows/release_maven.yml | 9 +++- .github/workflows/windows_maven.yml | 9 +++- src/site/site.xml | 72 ++++++++++++++++++++--------- 4 files changed, 73 insertions(+), 26 deletions(-) diff --git a/.github/workflows/linux_maven.yml b/.github/workflows/linux_maven.yml index 5d5d09d26..8eb0b99bc 100644 --- a/.github/workflows/linux_maven.yml +++ b/.github/workflows/linux_maven.yml @@ -22,8 +22,15 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven + - name: Cache Dependency-Check DB + uses: actions/cache@v4 + with: + path: ~/.m2/repository/org/owasp/dependency-check-data + key: ${{ runner.os }}-dc-data-v12 + restore-keys: | + ${{ runner.os }}-dc-data- - name: Build with Maven 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: -Xms128m -Xmx512m --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_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 nvd_api_key: ${{ secrets.NVD_API_KEY }} diff --git a/.github/workflows/release_maven.yml b/.github/workflows/release_maven.yml index aaa1fea69..0408b54cd 100644 --- a/.github/workflows/release_maven.yml +++ b/.github/workflows/release_maven.yml @@ -19,6 +19,13 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven + - name: Cache Dependency-Check DB + uses: actions/cache@v4 + with: + path: ~/.m2/repository/org/owasp/dependency-check-data + key: ${{ runner.os }}-dc-data-v12 + restore-keys: | + ${{ runner.os }}-dc-data- - name: Build and Deploy with Maven run: | git config --global user.email "info@funfried.de" @@ -31,7 +38,7 @@ jobs: bash <(curl -s https://codecov.io/bash) env: GPG_TTY: $(tty) - MAVEN_OPTS: -Xms128m -Xmx512m --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_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 }} diff --git a/.github/workflows/windows_maven.yml b/.github/workflows/windows_maven.yml index 37c00a765..d458dc25c 100644 --- a/.github/workflows/windows_maven.yml +++ b/.github/workflows/windows_maven.yml @@ -23,8 +23,15 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven + - name: Cache Dependency-Check DB + uses: actions/cache@v4 + with: + path: ~/.m2/repository/org/owasp/dependency-check-data + key: ${{ runner.os }}-dc-data-v12 + restore-keys: | + ${{ runner.os }}-dc-data- - name: Build with Maven run: mvn -s .ci.settings.xml --no-transfer-progress clean package env: - MAVEN_OPTS: -Xms128m -Xmx512m --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_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 nvd_api_key: ${{ secrets.NVD_API_KEY }} diff --git a/src/site/site.xml b/src/site/site.xml index 2c199362a..cb193bd53 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -9,10 +9,10 @@ http://www.eclipse.org/legal/epl-v20.html --> - + org.apache.maven.skins maven-fluido-skin @@ -30,32 +30,58 @@ - External Code Formatters for NetBeans - imgs/logos/externalcodeformatter.png https://funfried.github.io/externalcodeformatter_for_netbeans/ + External Code Formatters for NetBeans - Apache NetBeans - imgs/logos/netbeans.png https://netbeans.apache.org/ + Apache NetBeans - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,4 +105,4 @@ - + From a65211194966d7fb7c7617624888bdf8d864e22b Mon Sep 17 00:00:00 2001 From: fbahle Date: Tue, 28 Oct 2025 10:35:59 +0100 Subject: [PATCH 3/3] - Improved Maven site descriptor - Fixed GitHub pipelines --- .github/workflows/linux_maven.yml | 14 +++--- .github/workflows/release_maven.yml | 14 +++--- .github/workflows/windows_maven.yml | 14 +++--- pom.xml | 4 +- src/site/site.xml | 74 ++++++++++------------------- 5 files changed, 47 insertions(+), 73 deletions(-) diff --git a/.github/workflows/linux_maven.yml b/.github/workflows/linux_maven.yml index 8eb0b99bc..6d5fedda8 100644 --- a/.github/workflows/linux_maven.yml +++ b/.github/workflows/linux_maven.yml @@ -22,13 +22,13 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven - - name: Cache Dependency-Check DB - uses: actions/cache@v4 - with: - path: ~/.m2/repository/org/owasp/dependency-check-data - key: ${{ runner.os }}-dc-data-v12 - restore-keys: | - ${{ runner.os }}-dc-data- + - name: Cache Dependency-Check DB + uses: actions/cache@v4 + with: + path: ~/.m2/repository/org/owasp/dependency-check-data + key: ${{ runner.os }}-dc-data-v12 + restore-keys: | + ${{ runner.os }}-dc-data- - name: Build with Maven 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: diff --git a/.github/workflows/release_maven.yml b/.github/workflows/release_maven.yml index 0408b54cd..49c0cb6d7 100644 --- a/.github/workflows/release_maven.yml +++ b/.github/workflows/release_maven.yml @@ -19,13 +19,13 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven - - name: Cache Dependency-Check DB - uses: actions/cache@v4 - with: - path: ~/.m2/repository/org/owasp/dependency-check-data - key: ${{ runner.os }}-dc-data-v12 - restore-keys: | - ${{ runner.os }}-dc-data- + - name: Cache Dependency-Check DB + uses: actions/cache@v4 + with: + path: ~/.m2/repository/org/owasp/dependency-check-data + key: ${{ runner.os }}-dc-data-v12 + restore-keys: | + ${{ runner.os }}-dc-data- - name: Build and Deploy with Maven run: | git config --global user.email "info@funfried.de" diff --git a/.github/workflows/windows_maven.yml b/.github/workflows/windows_maven.yml index d458dc25c..bcb67cff5 100644 --- a/.github/workflows/windows_maven.yml +++ b/.github/workflows/windows_maven.yml @@ -23,13 +23,13 @@ jobs: java-version: '21' distribution: 'adopt' cache: maven - - name: Cache Dependency-Check DB - uses: actions/cache@v4 - with: - path: ~/.m2/repository/org/owasp/dependency-check-data - key: ${{ runner.os }}-dc-data-v12 - restore-keys: | - ${{ runner.os }}-dc-data- + - name: Cache Dependency-Check DB + uses: actions/cache@v4 + with: + path: ~/.m2/repository/org/owasp/dependency-check-data + key: ${{ runner.os }}-dc-data-v12 + restore-keys: | + ${{ runner.os }}-dc-data- - name: Build with Maven run: mvn -s .ci.settings.xml --no-transfer-progress clean package env: diff --git a/pom.xml b/pom.xml index 7fa60dfee..2babb09dd 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ maven-central Maven Central - https://central.sonatype.com/artifact/de.funfried.netbeans.plugins/externalcodeformatter + https://central.sonatype.com/artifact/ github @@ -660,7 +660,7 @@ org.apache.maven.skins maven-fluido-skin - 2.0.1 + 2.1.0 org.apache.maven.doxia diff --git a/src/site/site.xml b/src/site/site.xml index cb193bd53..3b2c03644 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -9,14 +9,14 @@ http://www.eclipse.org/legal/epl-v20.html --> - + org.apache.maven.skins maven-fluido-skin - 2.0.1 + 2.1.0 @@ -30,58 +30,32 @@ + External Code Formatters for NetBeans + imgs/logos/externalcodeformatter.png https://funfried.github.io/externalcodeformatter_for_netbeans/ - External Code Formatters for NetBeans + Apache NetBeans + imgs/logos/netbeans.png https://netbeans.apache.org/ - Apache NetBeans - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -105,4 +79,4 @@ - +