Skip to content

Commit a652111

Browse files
funfriedfunfried
committed
- Improved Maven site descriptor
- Fixed GitHub pipelines
1 parent 0d04f21 commit a652111

File tree

5 files changed

+47
-73
lines changed

5 files changed

+47
-73
lines changed

‎.github/workflows/linux_maven.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ 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-
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-
3232
- name: Build with Maven
3333
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
3434
env:

‎.github/workflows/release_maven.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +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-
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-
2929
- name: Build and Deploy with Maven
3030
run: |
3131
git config --global user.email "[email protected]"

‎.github/workflows/windows_maven.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ 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-
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-
3333
- name: Build with Maven
3434
run: mvn -s .ci.settings.xml --no-transfer-progress clean package
3535
env:

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<repository>
103103
<id>maven-central</id>
104104
<name>Maven Central</name>
105-
<url>https://central.sonatype.com/artifact/de.funfried.netbeans.plugins/externalcodeformatter</url>
105+
<url>https://central.sonatype.com/artifact/</url>
106106
</repository>
107107
<snapshotRepository>
108108
<id>github</id>
@@ -660,7 +660,7 @@
660660
<dependency>
661661
<groupId>org.apache.maven.skins</groupId>
662662
<artifactId>maven-fluido-skin</artifactId>
663-
<version>2.0.1</version>
663+
<version>2.1.0</version>
664664
</dependency>
665665
<dependency>
666666
<groupId>org.apache.maven.doxia</groupId>

‎src/site/site.xml‎

Lines changed: 24 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
http://www.eclipse.org/legal/epl-v20.html
1010
1111
-->
12-
<site name="${project.name}"
13-
xmlns="http://maven.apache.org/SITE/2.0.0"
14-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15-
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
12+
<project name="${project.name}"
13+
xmlns="http://maven.apache.org/DECORATION/1.8.1"
14+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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,58 +30,32 @@
3030
<publishDate position="right" />
3131

3232
<bannerLeft>
33+
<alt>External Code Formatters for NetBeans</alt>
34+
<src>imgs/logos/externalcodeformatter.png</src>
3335
<href>https://funfried.github.io/externalcodeformatter_for_netbeans/</href>
34-
<image src="imgs/logos/externalcodeformatter.png" alt="External Code Formatters for NetBeans" />
3536
</bannerLeft>
3637

3738
<bannerRight>
39+
<alt>Apache NetBeans</alt>
40+
<src>imgs/logos/netbeans.png</src>
3841
<href>https://netbeans.apache.org/</href>
39-
<image src="imgs/logos/netbeans.png" alt="Apache NetBeans" />
4042
</bannerRight>
4143

4244
<poweredBy>
43-
<logo name="Apache NetBeans" href="https://netbeans.apache.org/">
44-
<image src="imgs/logos/netbeans_small.png" />
45-
</logo>
46-
<logo name="Maven" href="https://maven.apache.org/">
47-
<image src="https://maven.apache.org/images/logos/maven-feather.png" />
48-
</logo>
49-
<logo name="Maven Central" href="https://maven-badges.herokuapp.com/maven-central/de.funfried.netbeans.plugins/externalcodeformatter/">
50-
<image src="https://maven-badges.herokuapp.com/maven-central/de.funfried.netbeans.plugins/externalcodeformatter/badge.svg" />
51-
</logo>
52-
<logo name="Release Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/release_maven.yml">
53-
<image src="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/release_maven.yml/badge.svg" />
54-
</logo>
55-
<logo name="Linux Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/linux_maven.yml">
56-
<image src="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/linux_maven.yml/badge.svg" />
57-
</logo>
58-
<logo name="Windows Build Status" href="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/windows_maven.yml">
59-
<image src="https://github.com/funfried/externalcodeformatter_for_netbeans/actions/workflows/windows_maven.yml/badge.svg" />
60-
</logo>
61-
<logo name="Coverage Status" href="https://coveralls.io/github/funfried/externalcodeformatter_for_netbeans?branch=master">
62-
<image src="https://coveralls.io/repos/github/funfried/externalcodeformatter_for_netbeans/badge.svg?branch=master" />
63-
</logo>
64-
<logo name="Code Coverage" href="https://codecov.io/gh/funfried/externalcodeformatter_for_netbeans">
65-
<image src="https://codecov.io/gh/funfried/externalcodeformatter_for_netbeans/branch/master/graph/badge.svg" />
66-
</logo>
67-
<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">
68-
<image src="https://api.codacy.com/project/badge/Grade/7d825731274a4f4783e4203eb7cbf811" />
69-
</logo>
70-
<logo name="Follow Me On Twitter" href="https://twitter.com/funfried84">
71-
<image src="https://img.shields.io/twitter/follow/funfried84?style=social" />
72-
</logo>
73-
<logo name="Donate via PayPal" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=926F5XBCTK2LQ&amp;source=url">
74-
<image src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" />
75-
</logo>
76-
<logo name="Become a Patron!" href="https://www.patreon.com/funfried">
77-
<image src="imgs/logos/become_a_patron_button.png" />
78-
</logo>
79-
<logo name="Buy me a drink" href="https://www.buymeacoffee.com/funfried">
80-
<image src="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" />
81-
</logo>
82-
<logo name="Say Thanks" href="https://saythanks.io/to/funfried">
83-
<image src="https://img.shields.io/static/v1?label=say&amp;message=thanks&amp;color=green&amp;style=for-the-badge&amp;logo=handshake" />
84-
</logo>
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" />
8559
</poweredBy>
8660

8761
<body>
@@ -105,4 +79,4 @@
10579
<item name="Donate" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=926F5XBCTK2LQ&amp;source=url" />
10680
</links>
10781
</body>
108-
</site>
82+
</project>

0 commit comments

Comments
 (0)