diff --git a/.github/workflows/linux_maven.yml b/.github/workflows/linux_maven.yml
index 5d5d09d26..6d5fedda8 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..49c0cb6d7 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..bcb67cff5 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/pom.xml b/pom.xml
index 4ce7187f4..2babb09dd 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/
- sonatype-nexus-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
+ github
+ GitHub Snapshots
+ https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans
@@ -659,7 +660,7 @@
org.apache.maven.skins
maven-fluido-skin
- 2.0.1
+ 2.1.0
org.apache.maven.doxia
@@ -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)
diff --git a/src/site/site.xml b/src/site/site.xml
index 2c199362a..3b2c03644 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -10,13 +10,13 @@
-->
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 http://maven.apache.org/xsd/decoration-1.8.1.xsd">
org.apache.maven.skins
maven-fluido-skin
- 2.0.1
+ 2.1.0
@@ -30,32 +30,32 @@
- External Code Formatters for NetBeans
+ External Code Formatters for NetBeans
imgs/logos/externalcodeformatter.png
https://funfried.github.io/externalcodeformatter_for_netbeans/
- Apache NetBeans
+ Apache NetBeans
imgs/logos/netbeans.png
https://netbeans.apache.org/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+