Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/linux_maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
9 changes: 8 additions & 1 deletion .github/workflows/release_maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 }}
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/windows_maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
19 changes: 8 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>de.funfried.netbeans.plugins</groupId>
<artifactId>externalcodeformatter</artifactId>
<version>1.15.7-SNAPSHOT</version>
<version>1.15.6</version>
<packaging>nbm</packaging>

<developers>
Expand Down Expand Up @@ -100,13 +100,14 @@
<url>scm:git:https://github.com/funfried/externalcodeformatter_for_netbeans.git</url>
</site>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>maven-central</id>
<name>Maven Central</name>
<url>https://central.sonatype.com/artifact/</url>
</repository>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>github</id>
<name>GitHub Snapshots</name>
<url>https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans</url>
</snapshotRepository>
</distributionManagement>

Expand Down Expand Up @@ -659,7 +660,7 @@
<dependency>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
Expand Down Expand Up @@ -1166,10 +1167,6 @@
<name>GitHub funfried Apache Maven Packages</name>
<url>https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans</url>
</repository>
<snapshotRepository>
<id>github</id>
<url>https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans</url>
</snapshotRepository>
</distributionManagement>
</profile>
<profile>
Expand Down
5 changes: 1 addition & 4 deletions src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
</properties>

<body>
<release version="1.15.7-SNAPSHOT" date="N/A" description="N/A">
</release>

<release version="1.15.6" date="2025-10-27" description="Maintenance release">
<release version="1.15.6" date="2025-10-28" description="Maintenance release">
<action dev="bahlef" type="change">
Updated to latest dependency and plugin versions (and due to the Google Formatter also increased the minimum Java version to 21)
</action>
Expand Down
38 changes: 19 additions & 19 deletions src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

-->
<project name="${project.name}"
xmlns="http://maven.apache.org/DECORATION/1.8.0"
xmlns="http://maven.apache.org/DECORATION/1.8.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 http://maven.apache.org/xsd/decoration-1.8.1.xsd">
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
</skin>

<custom>
Expand All @@ -30,32 +30,32 @@
<publishDate position="right" />

<bannerLeft>
<name>External Code Formatters for NetBeans</name>
<alt>External Code Formatters for NetBeans</alt>
<src>imgs/logos/externalcodeformatter.png</src>
<href>https://funfried.github.io/externalcodeformatter_for_netbeans/</href>
</bannerLeft>

<bannerRight>
<name>Apache NetBeans</name>
<alt>Apache NetBeans</alt>
<src>imgs/logos/netbeans.png</src>
<href>https://netbeans.apache.org/</href>
</bannerRight>

<poweredBy>
<logo name="Apache NetBeans" href="https://netbeans.apache.org/" img="imgs/logos/netbeans_small.png" />
<logo name="Maven" href="https://maven.apache.org/" img="https://maven.apache.org/images/logos/maven-feather.png" />
<logo name="Maven Central" href="https://maven-badges.herokuapp.com/maven-central/de.funfried.netbeans.plugins/externalcodeformatter/" img="https://maven-badges.herokuapp.com/maven-central/de.funfried.netbeans.plugins/externalcodeformatter/badge.svg" />
<logo name="Release Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/release_maven.yml" img="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/release_maven.yml/badge.svg" />
<logo name="Linux Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/linux_maven.yml" img="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/linux_maven.yml/badge.svg" />
<logo name="Windows Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/windows_maven.yml" img="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/windows_maven.yml/badge.svg" />
<logo name="Coverage Status" href="https://coveralls.io/github/funfried/externalcodeformatter_for_netbeans?branch=master" img="https://coveralls.io/repos/github/funfried/externalcodeformatter_for_netbeans/badge.svg?branch=master" />
<logo name="Code Coverage" href="https://codecov.io/gh/funfried/externalcodeformatter_for_netbeans" img="https://codecov.io/gh/funfried/externalcodeformatter_for_netbeans/branch/master/graph/badge.svg" />
<logo name="Codacy Badge" href="https://www.codacy.com/manual/funfried/externalcodeformatter_for_netbeans?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=funfried/externalcodeformatter_for_netbeans&amp;utm_campaign=Badge_Grade" img="https://api.codacy.com/project/badge/Grade/7d825731274a4f4783e4203eb7cbf811" />
<logo name="Follow Me On Twitter" href="https://twitter.com/funfried84" img="https://img.shields.io/twitter/follow/funfried84?style=social" />
<logo name="Donate via PayPal" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=926F5XBCTK2LQ&amp;source=url" img="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" />
<logo name="Become a Patron!" href="https://www.patreon.com/funfried" img="imgs/logos/become_a_patron_button.png" />
<logo name="Buy me a drink" href="https://www.buymeacoffee.com/funfried" img="https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20drink&amp;emoji=%F0%9F%A5%83&amp;slug=funfried&amp;button_colour=5F7FFF&amp;font_colour=ffffff&amp;font_family=Cookie&amp;outline_colour=000000&amp;coffee_colour=FFDD00" />
<logo name="Say Thanks" href="https://saythanks.io/to/funfried" img="https://img.shields.io/static/v1?label=say&amp;message=thanks&amp;color=green&amp;style=for-the-badge&amp;logo=handshake" />
<logo alt="Apache NetBeans" href="https://netbeans.apache.org/" img="imgs/logos/netbeans_small.png" />
<logo alt="Maven" href="https://maven.apache.org/" img="https://maven.apache.org/images/logos/maven-feather.png" />
<logo alt="Maven Central" href="https://maven-badges.herokuapp.com/maven-central/de.funfried.netbeans.plugins/externalcodeformatter/" img="https://maven-badges.herokuapp.com/maven-central/de.funfried.netbeans.plugins/externalcodeformatter/badge.svg" />
<logo alt="Release Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/release_maven.yml" img="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/release_maven.yml/badge.svg" />
<logo alt="Linux Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/linux_maven.yml" img="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/linux_maven.yml/badge.svg" />
<logo alt="Windows Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/windows_maven.yml" img="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/windows_maven.yml/badge.svg" />
<logo alt="Coverage Status" href="https://coveralls.io/github/funfried/externalcodeformatter_for_netbeans?branch=master" img="https://coveralls.io/repos/github/funfried/externalcodeformatter_for_netbeans/badge.svg?branch=master" />
<logo alt="Code Coverage" href="https://codecov.io/gh/funfried/externalcodeformatter_for_netbeans" img="https://codecov.io/gh/funfried/externalcodeformatter_for_netbeans/branch/master/graph/badge.svg" />
<logo alt="Codacy Badge" href="https://www.codacy.com/manual/funfried/externalcodeformatter_for_netbeans?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=funfried/externalcodeformatter_for_netbeans&amp;utm_campaign=Badge_Grade" img="https://api.codacy.com/project/badge/Grade/7d825731274a4f4783e4203eb7cbf811" />
<logo alt="Follow Me On Twitter" href="https://twitter.com/funfried84" img="https://img.shields.io/twitter/follow/funfried84?style=social" />
<logo alt="Donate via PayPal" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=926F5XBCTK2LQ&amp;source=url" img="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" />
<logo alt="Become a Patron!" href="https://www.patreon.com/funfried" img="imgs/logos/become_a_patron_button.png" />
<logo alt="Buy me a drink" href="https://www.buymeacoffee.com/funfried" img="https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20drink&amp;emoji=%F0%9F%A5%83&amp;slug=funfried&amp;button_colour=5F7FFF&amp;font_colour=ffffff&amp;font_family=Cookie&amp;outline_colour=000000&amp;coffee_colour=FFDD00" />
<logo alt="Say Thanks" href="https://saythanks.io/to/funfried" img="https://img.shields.io/static/v1?label=say&amp;message=thanks&amp;color=green&amp;style=for-the-badge&amp;logo=handshake" />
</poweredBy>

<body>
Expand Down