Skip to content

Commit 45c1a2b

Browse files
funfriedfunfried
authored
Merge pull request #268 from funfried/release/1.15.x
Switched back to release version (as the release was not done yet)
2 parents 69ed046 + a652111 commit 45c1a2b

File tree

6 files changed

+52
-37
lines changed

6 files changed

+52
-37
lines changed

‎.github/workflows/linux_maven.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,15 @@ jobs:
2222
java-version: '21'
2323
distribution: 'adopt'
2424
cache: maven
25+
- name: Cache Dependency-Check DB
26+
uses: actions/cache@v4
27+
with:
28+
path: ~/.m2/repository/org/owasp/dependency-check-data
29+
key: ${{ runner.os }}-dc-data-v12
30+
restore-keys: |
31+
${{ runner.os }}-dc-data-
2532
- name: Build with Maven
2633
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
2734
env:
28-
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
35+
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
2936
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎.github/workflows/release_maven.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ jobs:
1919
java-version: '21'
2020
distribution: 'adopt'
2121
cache: maven
22+
- name: Cache Dependency-Check DB
23+
uses: actions/cache@v4
24+
with:
25+
path: ~/.m2/repository/org/owasp/dependency-check-data
26+
key: ${{ runner.os }}-dc-data-v12
27+
restore-keys: |
28+
${{ runner.os }}-dc-data-
2229
- name: Build and Deploy with Maven
2330
run: |
2431
git config --global user.email "[email protected]"
@@ -31,7 +38,7 @@ jobs:
3138
bash <(curl -s https://codecov.io/bash)
3239
env:
3340
GPG_TTY: $(tty)
34-
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
41+
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
3542
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
3643
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
3744
gh_username: ${{ secrets.GH_USERNAME }}

‎.github/workflows/windows_maven.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@ jobs:
2323
java-version: '21'
2424
distribution: 'adopt'
2525
cache: maven
26+
- name: Cache Dependency-Check DB
27+
uses: actions/cache@v4
28+
with:
29+
path: ~/.m2/repository/org/owasp/dependency-check-data
30+
key: ${{ runner.os }}-dc-data-v12
31+
restore-keys: |
32+
${{ runner.os }}-dc-data-
2633
- name: Build with Maven
2734
run: mvn -s .ci.settings.xml --no-transfer-progress clean package
2835
env:
29-
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
36+
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
3037
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎pom.xml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<groupId>de.funfried.netbeans.plugins</groupId>
1919
<artifactId>externalcodeformatter</artifactId>
20-
<version>1.15.7-SNAPSHOT</version>
20+
<version>1.15.6</version>
2121
<packaging>nbm</packaging>
2222

2323
<developers>
@@ -100,13 +100,14 @@
100100
<url>scm:git:https://github.com/funfried/externalcodeformatter_for_netbeans.git</url>
101101
</site>
102102
<repository>
103-
<id>sonatype-nexus-staging</id>
104-
<name>Nexus Release Repository</name>
105-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
103+
<id>maven-central</id>
104+
<name>Maven Central</name>
105+
<url>https://central.sonatype.com/artifact/</url>
106106
</repository>
107107
<snapshotRepository>
108-
<id>sonatype-nexus-snapshots</id>
109-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
108+
<id>github</id>
109+
<name>GitHub Snapshots</name>
110+
<url>https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans</url>
110111
</snapshotRepository>
111112
</distributionManagement>
112113

@@ -659,7 +660,7 @@
659660
<dependency>
660661
<groupId>org.apache.maven.skins</groupId>
661662
<artifactId>maven-fluido-skin</artifactId>
662-
<version>2.0.1</version>
663+
<version>2.1.0</version>
663664
</dependency>
664665
<dependency>
665666
<groupId>org.apache.maven.doxia</groupId>
@@ -1166,10 +1167,6 @@
11661167
<name>GitHub funfried Apache Maven Packages</name>
11671168
<url>https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans</url>
11681169
</repository>
1169-
<snapshotRepository>
1170-
<id>github</id>
1171-
<url>https://maven.pkg.github.com/funfried/externalcodeformatter_for_netbeans</url>
1172-
</snapshotRepository>
11731170
</distributionManagement>
11741171
</profile>
11751172
<profile>

‎src/changes/changes.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
</properties>
1010

1111
<body>
12-
<release version="1.15.7-SNAPSHOT" date="N/A" description="N/A">
13-
</release>
14-
15-
<release version="1.15.6" date="2025-10-27" description="Maintenance release">
12+
<release version="1.15.6" date="2025-10-28" description="Maintenance release">
1613
<action dev="bahlef" type="change">
1714
Updated to latest dependency and plugin versions (and due to the Google Formatter also increased the minimum Java version to 21)
1815
</action>

‎src/site/site.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
1111
-->
1212
<project name="${project.name}"
13-
xmlns="http://maven.apache.org/DECORATION/1.8.0"
13+
xmlns="http://maven.apache.org/DECORATION/1.8.1"
1414
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
15+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 http://maven.apache.org/xsd/decoration-1.8.1.xsd">
1616
<skin>
1717
<groupId>org.apache.maven.skins</groupId>
1818
<artifactId>maven-fluido-skin</artifactId>
19-
<version>2.0.1</version>
19+
<version>2.1.0</version>
2020
</skin>
2121

2222
<custom>
@@ -30,32 +30,32 @@
3030
<publishDate position="right" />
3131

3232
<bannerLeft>
33-
<name>External Code Formatters for NetBeans</name>
33+
<alt>External Code Formatters for NetBeans</alt>
3434
<src>imgs/logos/externalcodeformatter.png</src>
3535
<href>https://funfried.github.io/externalcodeformatter_for_netbeans/</href>
3636
</bannerLeft>
3737

3838
<bannerRight>
39-
<name>Apache NetBeans</name>
39+
<alt>Apache NetBeans</alt>
4040
<src>imgs/logos/netbeans.png</src>
4141
<href>https://netbeans.apache.org/</href>
4242
</bannerRight>
4343

4444
<poweredBy>
45-
<logo name="Apache NetBeans" href="https://netbeans.apache.org/" img="imgs/logos/netbeans_small.png" />
46-
<logo name="Maven" href="https://maven.apache.org/" img="https://maven.apache.org/images/logos/maven-feather.png" />
47-
<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" />
48-
<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" />
49-
<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" />
50-
<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" />
51-
<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" />
52-
<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" />
53-
<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" />
54-
<logo name="Follow Me On Twitter" href="https://twitter.com/funfried84" img="https://img.shields.io/twitter/follow/funfried84?style=social" />
55-
<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" />
56-
<logo name="Become a Patron!" href="https://www.patreon.com/funfried" img="imgs/logos/become_a_patron_button.png" />
57-
<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" />
58-
<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" />
45+
<logo alt="Apache NetBeans" href="https://netbeans.apache.org/" img="imgs/logos/netbeans_small.png" />
46+
<logo alt="Maven" href="https://maven.apache.org/" img="https://maven.apache.org/images/logos/maven-feather.png" />
47+
<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" />
48+
<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" />
49+
<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" />
50+
<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" />
51+
<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" />
52+
<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" />
53+
<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" />
54+
<logo alt="Follow Me On Twitter" href="https://twitter.com/funfried84" img="https://img.shields.io/twitter/follow/funfried84?style=social" />
55+
<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" />
56+
<logo alt="Become a Patron!" href="https://www.patreon.com/funfried" img="imgs/logos/become_a_patron_button.png" />
57+
<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" />
58+
<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" />
5959
</poweredBy>
6060

6161
<body>

0 commit comments

Comments
 (0)