Skip to content

Commit e117402

Browse files
funfriedfunfried
authored
Merge pull request #270 from funfried/release/1.15.x
- Switched to minimum NetBeans 17
2 parents c83c5a9 + b88cc24 commit e117402

7 files changed

Lines changed: 83 additions & 93 deletions

File tree

‎.ci.settings.xml‎

Lines changed: 2 additions & 88 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>
@@ -101,50 +103,6 @@
101103
<enabled>false</enabled>
102104
</snapshots>
103105
</repository>
104-
<repository>
105-
<id>sonatype-nexus-staging</id>
106-
<name>sonatype-nexus-staging</name>
107-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
108-
<releases>
109-
<enabled>true</enabled>
110-
</releases>
111-
<snapshots>
112-
<enabled>false</enabled>
113-
</snapshots>
114-
</repository>
115-
<repository>
116-
<id>sonatype-nexus-snapshots</id>
117-
<name>sonatype-nexus-snapshots</name>
118-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
119-
<releases>
120-
<enabled>false</enabled>
121-
</releases>
122-
<snapshots>
123-
<enabled>true</enabled>
124-
</snapshots>
125-
</repository>
126-
<repository>
127-
<id>sonatype-nexus-s01-staging</id>
128-
<name>sonatype-nexus-s01-staging</name>
129-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
130-
<releases>
131-
<enabled>true</enabled>
132-
</releases>
133-
<snapshots>
134-
<enabled>false</enabled>
135-
</snapshots>
136-
</repository>
137-
<repository>
138-
<id>sonatype-nexus-s01-snapshots</id>
139-
<name>sonatype-nexus-s01-snapshots</name>
140-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
141-
<releases>
142-
<enabled>false</enabled>
143-
</releases>
144-
<snapshots>
145-
<enabled>true</enabled>
146-
</snapshots>
147-
</repository>
148106
</repositories>
149107
<pluginRepositories>
150108
<pluginRepository>
@@ -191,50 +149,6 @@
191149
<enabled>false</enabled>
192150
</snapshots>
193151
</pluginRepository>
194-
<pluginRepository>
195-
<id>sonatype-nexus-staging</id>
196-
<name>sonatype-nexus-staging</name>
197-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
198-
<releases>
199-
<enabled>true</enabled>
200-
</releases>
201-
<snapshots>
202-
<enabled>false</enabled>
203-
</snapshots>
204-
</pluginRepository>
205-
<pluginRepository>
206-
<id>sonatype-nexus-snapshots</id>
207-
<name>sonatype-nexus-snapshots</name>
208-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
209-
<releases>
210-
<enabled>false</enabled>
211-
</releases>
212-
<snapshots>
213-
<enabled>true</enabled>
214-
</snapshots>
215-
</pluginRepository>
216-
<pluginRepository>
217-
<id>sonatype-nexus-s01-staging</id>
218-
<name>sonatype-nexus-s01-staging</name>
219-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
220-
<releases>
221-
<enabled>true</enabled>
222-
</releases>
223-
<snapshots>
224-
<enabled>false</enabled>
225-
</snapshots>
226-
</pluginRepository>
227-
<pluginRepository>
228-
<id>sonatype-nexus-s01-snapshots</id>
229-
<name>sonatype-nexus-s01-snapshots</name>
230-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
231-
<releases>
232-
<enabled>false</enabled>
233-
</releases>
234-
<snapshots>
235-
<enabled>true</enabled>
236-
</snapshots>
237-
</pluginRepository>
238152
</pluginRepositories>
239153
</profile>
240154
</profiles>

‎.github/workflows/linux_maven.yml‎

Lines changed: 7 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,7 @@ 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+
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
41+
ossindex_username: ${{ secrets.OSSINDEX_USERNAME }}
42+
ossindex_password: ${{ secrets.OSSINDEX_TOKEN }}
3643
nvd_api_key: ${{ secrets.NVD_API_KEY }}

‎.github/workflows/release_maven.yml‎

Lines changed: 7 additions & 1 deletion
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:
@@ -40,11 +44,13 @@ jobs:
4044
GPG_TTY: $(tty)
4145
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
4246
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
43-
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
4447
gh_username: ${{ secrets.GH_USERNAME }}
4548
gh_token: ${{ secrets.GH_TOKEN }}
4649
sonatype_username: ${{ secrets.SONATYPE_USERNAME }}
4750
sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
4851
repoToken: ${{ secrets.COVERALLS_REPOTOKEN }}
4952
skipRemoteStaging: ${{ secrets.SKIP_REMOTE_STAGING }}
53+
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
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: 7 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,7 @@ 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+
signing_keypass: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
42+
ossindex_username: ${{ secrets.OSSINDEX_USERNAME }}
43+
ossindex_password: ${{ secrets.OSSINDEX_TOKEN }}
3744
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: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,56 @@
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+
168+
<dependency>
169+
<groupId>org.eclipse.jgit</groupId>
170+
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
171+
<version>7.4.0.202509020913-r</version>
172+
</dependency>
173+
</dependencies>
174+
</dependencyManagement>
175+
133176
<dependencies>
134177
<!-- Eclipse Formatter -->
135178
<dependency>
@@ -534,6 +577,12 @@
534577
<groupId>org.apache.maven.scm</groupId>
535578
<artifactId>maven-scm-provider-jgit</artifactId>
536579
<version>${scm.version}</version>
580+
<exclusions>
581+
<exclusion>
582+
<groupId>net.i2p.crypto</groupId>
583+
<artifactId>eddsa</artifactId>
584+
</exclusion>
585+
</exclusions>
537586
</dependency>
538587

539588
<!-- Google -->
@@ -813,6 +862,12 @@
813862
<artifactId>ossindex-maven-plugin</artifactId>
814863
<version>3.2.0</version>
815864
<configuration>
865+
<clientConfiguration>
866+
<authConfiguration>
867+
<username>${ossindex.username}</username>
868+
<password>${ossindex.password}</password>
869+
</authConfiguration>
870+
</clientConfiguration>
816871
<cvssScoreThreshold>3</cvssScoreThreshold>
817872
</configuration>
818873
</plugin>
@@ -864,7 +919,7 @@
864919
<artifactId>maven-compiler-plugin</artifactId>
865920
<configuration>
866921
<release>${java.version}</release>
867-
<forceJavacCompilerUse>true</forceJavacCompilerUse>
922+
<forceLegacyJavacApi>true</forceLegacyJavacApi>
868923
<fork>true</fork>
869924
<proc>full</proc>
870925
<compilerArgs>
@@ -1030,6 +1085,7 @@
10301085
<ignoredUnusedDeclaredDependency>org.apache.maven.scm:maven-scm-provider-jgit</ignoredUnusedDeclaredDependency>
10311086
<ignoredUnusedDeclaredDependency>org.apache.maven.scm:maven-scm-provider-gitexe</ignoredUnusedDeclaredDependency>
10321087
<ignoredUnusedDeclaredDependency>org.apache.maven.scm:maven-scm-provider-git-commons</ignoredUnusedDeclaredDependency>
1088+
<ignoredUnusedDeclaredDependency>org.apache.sshd:ssh-common</ignoredUnusedDeclaredDependency>
10331089
</ignoredUnusedDeclaredDependencies>
10341090
</configuration>
10351091
</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)