Skip to content

Commit 2167955

Browse files
funfriedfunfried
committed
- Switched to minimum NetBeans 17
- Fixed ossindex plugin
1 parent 8aebfba commit 2167955

File tree

7 files changed

+73
-3
lines changed

7 files changed

+73
-3
lines changed

‎.ci.settings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
<properties>
5555
<repoToken>${env.repoToken}</repoToken>
5656
<keystore.pass>${env.signing_keypass}</keystore.pass>
57+
<ossindex.username>${env.ossindex_username}</ossindex.username>
58+
<ossindex.password>${env.ossindex_password}</ossindex.password>
5759
<skipRemoteStaging>${env.skipRemoteStaging}</skipRemoteStaging>
5860
</properties>
5961
<repositories>

‎.github/workflows/linux_maven.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ jobs:
2222
java-version: '21'
2323
distribution: 'adopt'
2424
cache: maven
25+
- name: Set up Maven 3.9.11
26+
uses: stCarolas/setup-maven@v5
27+
with:
28+
maven-version: 3.9.11
2529
- name: Cache Dependency-Check DB
2630
uses: actions/cache@v4
2731
with:
@@ -33,4 +37,6 @@ jobs:
3337
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
3438
env:
3539
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
40+
ossindex_username: ${{ secrets.OSSINDEX_USERNAME }}
41+
ossindex_password: ${{ secrets.OSSINDEX_TOKEN }}
3642
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎.github/workflows/release_maven.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ jobs:
1919
java-version: '21'
2020
distribution: 'adopt'
2121
cache: maven
22+
- name: Set up Maven 3.9.11
23+
uses: stCarolas/setup-maven@v5
24+
with:
25+
maven-version: 3.9.11
2226
- name: Cache Dependency-Check DB
2327
uses: actions/cache@v4
2428
with:
@@ -47,4 +51,6 @@ jobs:
4751
sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
4852
repoToken: ${{ secrets.COVERALLS_REPOTOKEN }}
4953
skipRemoteStaging: ${{ secrets.SKIP_REMOTE_STAGING }}
54+
ossindex_username: ${{ secrets.OSSINDEX_USERNAME }}
55+
ossindex_password: ${{ secrets.OSSINDEX_TOKEN }}
5056
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎.github/workflows/windows_maven.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
java-version: '21'
2424
distribution: 'adopt'
2525
cache: maven
26+
- name: Set up Maven 3.9.11
27+
uses: stCarolas/setup-maven@v5
28+
with:
29+
maven-version: 3.9.11
2630
- name: Cache Dependency-Check DB
2731
uses: actions/cache@v4
2832
with:
@@ -34,4 +38,6 @@ jobs:
3438
run: mvn -s .ci.settings.xml --no-transfer-progress clean package
3539
env:
3640
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
41+
ossindex_username: ${{ secrets.OSSINDEX_USERNAME }}
42+
ossindex_password: ${{ secrets.OSSINDEX_TOKEN }}
3743
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ the same way as e.g. your co-workers do with their Eclipse IDE.
8585

8686
Compatibility
8787
-------------
88-
Compatible with NetBeans 12.0+ and JDK 21+.
88+
Compatible with NetBeans 17.0+ and JDK 21+.
8989

9090
Downloads
9191
---------

‎pom.xml‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,50 @@
123123
<palantir-java-format.version>2.81.0</palantir-java-format.version>
124124
<xml-formatter.version>0.4.0</xml-formatter.version>
125125
<commons-lang.version>3.19.0</commons-lang.version>
126-
<netbeans.version>RELEASE120</netbeans.version>
126+
<netbeans.version>RELEASE170</netbeans.version>
127127
<jsoup.version>1.21.2</jsoup.version>
128128
<pmd.version>7.17.0</pmd.version>
129+
<sshd.version>2.16.0</sshd.version>
129130
<scm.version>2.2.1</scm.version>
130131
<argLine></argLine>
131132
</properties>
132133

134+
<dependencyManagement>
135+
<dependencies>
136+
<!-- SSHD -->
137+
<dependency>
138+
<groupId>org.apache.sshd</groupId>
139+
<artifactId>sshd-core</artifactId>
140+
<version>${sshd.version}</version>
141+
</dependency>
142+
143+
<dependency>
144+
<groupId>org.apache.sshd</groupId>
145+
<artifactId>sshd-common</artifactId>
146+
<version>${sshd.version}</version>
147+
</dependency>
148+
149+
<dependency>
150+
<groupId>org.apache.sshd</groupId>
151+
<artifactId>sshd-sftp</artifactId>
152+
<version>${sshd.version}</version>
153+
</dependency>
154+
155+
<dependency>
156+
<groupId>org.apache.sshd</groupId>
157+
<artifactId>sshd-osgi</artifactId>
158+
<version>${sshd.version}</version>
159+
</dependency>
160+
161+
<!-- JGit -->
162+
<dependency>
163+
<groupId>org.eclipse.jgit</groupId>
164+
<artifactId>org.eclipse.jgit</artifactId>
165+
<version>7.4.0.202509020913-r</version>
166+
</dependency>
167+
</dependencies>
168+
</dependencyManagement>
169+
133170
<dependencies>
134171
<!-- Eclipse Formatter -->
135172
<dependency>
@@ -534,6 +571,12 @@
534571
<groupId>org.apache.maven.scm</groupId>
535572
<artifactId>maven-scm-provider-jgit</artifactId>
536573
<version>${scm.version}</version>
574+
<exclusions>
575+
<exclusion>
576+
<groupId>net.i2p.crypto</groupId>
577+
<artifactId>eddsa</artifactId>
578+
</exclusion>
579+
</exclusions>
537580
</dependency>
538581

539582
<!-- Google -->
@@ -813,6 +856,12 @@
813856
<artifactId>ossindex-maven-plugin</artifactId>
814857
<version>3.2.0</version>
815858
<configuration>
859+
<clientConfiguration>
860+
<authConfiguration>
861+
<username>${ossindex.username}</username>
862+
<password>${ossindex.password}</password>
863+
</authConfiguration>
864+
</clientConfiguration>
816865
<cvssScoreThreshold>3</cvssScoreThreshold>
817866
</configuration>
818867
</plugin>
@@ -1030,6 +1079,7 @@
10301079
<ignoredUnusedDeclaredDependency>org.apache.maven.scm:maven-scm-provider-jgit</ignoredUnusedDeclaredDependency>
10311080
<ignoredUnusedDeclaredDependency>org.apache.maven.scm:maven-scm-provider-gitexe</ignoredUnusedDeclaredDependency>
10321081
<ignoredUnusedDeclaredDependency>org.apache.maven.scm:maven-scm-provider-git-commons</ignoredUnusedDeclaredDependency>
1082+
<ignoredUnusedDeclaredDependency>org.apache.sshd:ssh-common</ignoredUnusedDeclaredDependency>
10331083
</ignoredUnusedDeclaredDependencies>
10341084
</configuration>
10351085
</execution>

‎src/site/xdoc/index.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</subsection>
9494
<subsection name="Compatibility">
9595
<p>
96-
Compatible with NetBeans 12.0+ and JDK 21+.
96+
Compatible with NetBeans 17.0+ and JDK 21+.
9797
</p>
9898
</subsection>
9999
</section>

0 commit comments

Comments
 (0)