Skip to content

Commit 368a01e

Browse files
committed
Upgrade to NB 28 and JDK 25.
1 parent abccf77 commit 368a01e

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ jobs:
4848
sudo apt update
4949
sudo apt install openjdk-17-jdk openjdk-21-jdk
5050
51-
- name: Set up latest JDK 24 from jdk.java.net
51+
- name: Set up latest JDK 25 from jdk.java.net
5252
uses: oracle-actions/setup-java@b1546e588c27008e88bfcabda44d11c22316b9b8 # v1.4.2
5353
with:
5454
website: jdk.java.net
55-
release: 24
55+
release: 25
5656

5757
- name: Set up NetBeans
5858
run: |
59-
wget -q 'https://archive.apache.org/dist/netbeans/netbeans/27/netbeans-27-bin.zip' -O /tmp/netbeans-27-bin.zip
60-
(cd $HOME; unzip /tmp/netbeans-27-bin.zip)
59+
wget -q 'https://archive.apache.org/dist/netbeans/netbeans/28/netbeans-28-bin.zip' -O /tmp/netbeans-28-bin.zip
60+
(cd $HOME; unzip /tmp/netbeans-28-bin.zip)
6161
6262
- name: Run RAT
6363
run: |
@@ -69,7 +69,7 @@ jobs:
6969
run: |
7070
export JDK17=/usr/lib/jvm/java-17-openjdk-amd64
7171
export JDK21=/usr/lib/jvm/java-21-openjdk-amd64
72-
export JDK24=$JAVA_HOME
72+
export JDK25=$JAVA_HOME
7373
export JAVA_HOME=$JDK17
7474
export PATH=$JAVA_HOME/bin:$PATH
75-
(cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness -DNETBEANS_PLATFORM=$HOME/netbeans -DJDK17=$JDK17 -DJDK21=$JDK21 -DJDK24=$JDK24 build-and-test)
75+
(cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness -DNETBEANS_PLATFORM=$HOME/netbeans -DJDK17=$JDK17 -DJDK21=$JDK21 -DJDK25=$JDK25 build-and-test)

cmdline/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ This tool allows to run NetBeans Java code checker without the NetBeans IDE. Thi
2727

2828
#### To Build
2929

30-
* Apache NetBeans 27
31-
* JDK 17, JDK 21 and JDK 24
30+
* Apache NetBeans 28
31+
* JDK 17, JDK 21 and JDK 25
3232
* bash
3333
* Apache ant 1.9.9 or above
3434
* Apache Maven 3.3.9 or above
3535

3636
#### To Run
3737

38-
* JDK 17-24
38+
* JDK 17-25
3939

4040
### Building
4141

4242
Build using:
4343

4444
```
45-
$ ant -DNETBEANS_PLATFORM=<path-to-NetBeans-27> -DJDK17=<path-to-JDK-17> -DJDK21=<path-to-JDK-21> -DJDK24=<path-to-JDK24> build-and-test
45+
$ ant -DNETBEANS_PLATFORM=<path-to-NetBeans-28> -DJDK17=<path-to-JDK-17> -DJDK21=<path-to-JDK-21> -DJDK25=<path-to-JDK25> build-and-test
4646
```
4747

4848
The built product is in tool/build/jackpot.

cmdline/build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
</target>
5353

5454
<target name="build-and-test">
55-
<property name="version" value="20.0" />
55+
<property name="version" value="28.0" />
5656
<condition property="jackpot.root" value="${basedir}" else="${basedir}/..">
5757
<available file="${basedir}/LICENSE" />
5858
</condition>
@@ -80,7 +80,7 @@
8080
<ant dir="${basedir}" inheritAll="false" inheritRefs="false">
8181
<property name="nbplatform.default.harness.dir" value="${NETBEANS_PLATFORM}/harness" />
8282
<property name="nbplatform.default.netbeans.dest.dir" value="${NETBEANS_PLATFORM}" />
83-
<property name="test.nbjdk.home" value="${JDK24}" />
83+
<property name="test.nbjdk.home" value="${JDK25}" />
8484
<property name="jackpot.root" location="${jackpot.root}" />
8585
<target name="test" />
8686
</ant>
@@ -102,8 +102,8 @@
102102
<env key="PATH" path="${JDK21}/bin:${env.PATH}" />
103103
</exec>
104104
<exec executable="build/test/scripted/run" dir="tool" failonerror="true">
105-
<env key="JAVA_HOME" path="${JDK24}" />
106-
<env key="PATH" path="${JDK24}/bin:${env.PATH}" />
105+
<env key="JAVA_HOME" path="${JDK25}" />
106+
<env key="PATH" path="${JDK25}/bin:${env.PATH}" />
107107
</exec>
108108
<echo>Installing tool to the local maven repository:</echo>
109109
<exec dir="." executable="mvn" failonerror="true">

cmdline/maven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<groupId>org.apache.netbeans.modules.jackpot30</groupId>
2323
<artifactId>jackpot30-maven-plugin</artifactId>
24-
<version>20.0</version>
24+
<version>28.0</version>
2525
<packaging>maven-plugin</packaging>
2626

2727
<name>Jackpot 3.0 Command Line Tool Maven Bridge</name>

cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected void runTest() throws Throwable {
6767

6868
Process p = Runtime.getRuntime().exec(new String[] {
6969
maven,
70-
"-Djackpot.plugin.version=20.0",
70+
"-Djackpot.plugin.version=28.0",
7171
"-q",
7272
"--batch-mode",
7373
"jackpot30:analyze"

cmdline/maven/tests/fail-on-warnings/golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
${basedir}/src/main/java/test/App.java:24: warning: [Convert_to_Lambda_or_Member_Reference] This anonymous inner class creation can be turned into a lambda expression.
22
Runnable r = new Runnable() { public void run() { } };
33
^
4-
[ERROR] Failed to execute goal org.apache.netbeans.modules.jackpot30:jackpot30-maven-plugin:20.0:analyze (default-cli) on project maven-test: jackpo30 failed. -> [Help 1]
4+
[ERROR] Failed to execute goal org.apache.netbeans.modules.jackpot30:jackpot30-maven-plugin:28.0:analyze (default-cli) on project maven-test: jackpo30 failed. -> [Help 1]
55
[ERROR]
66
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
77
[ERROR] Re-run Maven using the -X switch to enable full debug logging.

cmdline/maven/tests/sl-failure/golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
unrecognized source level specification: unparseable
2-
[ERROR] Failed to execute goal org.apache.netbeans.modules.jackpot30:jackpot30-maven-plugin:20.0:analyze (default-cli) on project maven-test: jackpo30 failed. -> [Help 1]
2+
[ERROR] Failed to execute goal org.apache.netbeans.modules.jackpot30:jackpot30-maven-plugin:28.0:analyze (default-cli) on project maven-test: jackpo30 failed. -> [Help 1]
33
[ERROR]
44
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
55
[ERROR] Re-run Maven using the -X switch to enable full debug logging.

0 commit comments

Comments
 (0)