Skip to content

Commit 724df31

Browse files
committed
Upgrading to NetBeans 27, and JDK 17 as the baseline.
1 parent 4a37164 commit 724df31

File tree

5 files changed

+26
-20
lines changed

5 files changed

+26
-20
lines changed

.github/workflows/main.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,19 @@ jobs:
4545

4646
- name: Set up Ubuntu dependencies
4747
run: |
48-
sudo apt install openjdk-11-jdk openjdk-17-jdk openjdk-21-jdk
48+
sudo apt update
49+
sudo apt install openjdk-17-jdk openjdk-21-jdk
50+
51+
- name: Set up latest JDK 24 from jdk.java.net
52+
uses: oracle-actions/setup-java@v1
53+
with:
54+
website: jdk.java.net
55+
release: 24
4956

5057
- name: Set up NetBeans
5158
run: |
52-
wget -q 'https://archive.apache.org/dist/netbeans/netbeans/20/netbeans-20-bin.zip' -O /tmp/netbeans-20-bin.zip
53-
(cd $HOME; unzip /tmp/netbeans-20-bin.zip)
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)
5461
5562
- name: Run RAT
5663
run: |
@@ -60,9 +67,9 @@ jobs:
6067
6168
- name: Do build Jackpot
6269
run: |
63-
export JDK11=/usr/lib/jvm/java-11-openjdk-amd64
6470
export JDK17=/usr/lib/jvm/java-17-openjdk-amd64
6571
export JDK21=/usr/lib/jvm/java-21-openjdk-amd64
66-
export JAVA_HOME=$JDK11
72+
export JDK24=$JAVA_HOME
73+
export JAVA_HOME=$JDK17
6774
export PATH=$JAVA_HOME/bin:$PATH
68-
(cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness -DNETBEANS_PLATFORM=$HOME/netbeans -DJDK11=$JDK11 -DJDK17=$JDK17 -DJDK21=$JDK21 build-and-test)
75+
(cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness -DNETBEANS_PLATFORM=$HOME/netbeans -DJDK17=$JDK17 -DJDK21=$JDK21 -DJDK24=$JDK24 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 20
31-
* JDK 11, JDK 17 and JDK 21
30+
* Apache NetBeans 27
31+
* JDK 17, JDK 21 and JDK 24
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 11-21
38+
* JDK 17-24
3939

4040
### Building
4141

4242
Build using:
4343

4444
```
45-
$ ant -DNETBEANS_PLATFORM=<path-to-NetBeans-20> -DJDK11=<path-to-JDK-11> -DJDK17=<path-to-JDK-17> -DJDK21=<path-to-JDK-21> build-and-test
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
4646
```
4747

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

cmdline/build.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@
6666
<ant dir="${basedir}" inheritAll="false" inheritRefs="false">
6767
<property name="nbplatform.default.harness.dir" value="${NETBEANS_PLATFORM}/harness" />
6868
<property name="nbplatform.default.netbeans.dest.dir" value="${NETBEANS_PLATFORM}" />
69-
<property name="test.nbjdk.home" value="${JDK11}" />
69+
<property name="test.nbjdk.home" value="${JDK17}" />
7070
<property name="jackpot.root" location="${jackpot.root}" />
7171
<target name="test" />
7272
</ant>
7373
<ant dir="${basedir}" inheritAll="false" inheritRefs="false">
7474
<property name="nbplatform.default.harness.dir" value="${NETBEANS_PLATFORM}/harness" />
7575
<property name="nbplatform.default.netbeans.dest.dir" value="${NETBEANS_PLATFORM}" />
76-
<property name="test.nbjdk.home" value="${JDK17}" />
76+
<property name="test.nbjdk.home" value="${JDK21}" />
7777
<property name="jackpot.root" location="${jackpot.root}" />
7878
<target name="test" />
7979
</ant>
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="${JDK21}" />
83+
<property name="test.nbjdk.home" value="${JDK24}" />
8484
<property name="jackpot.root" location="${jackpot.root}" />
8585
<target name="test" />
8686
</ant>
@@ -93,10 +93,6 @@
9393
<property environment="env"/>
9494
<exec executable="build/test/scripted/run" dir="tool" failonerror="true">
9595
</exec>
96-
<exec executable="build/test/scripted/run" dir="tool" failonerror="true">
97-
<env key="JAVA_HOME" path="${JDK11}" />
98-
<env key="PATH" path="${JDK11}/bin:${env.PATH}" />
99-
</exec>
10096
<exec executable="build/test/scripted/run" dir="tool" failonerror="true">
10197
<env key="JAVA_HOME" path="${JDK17}" />
10298
<env key="PATH" path="${JDK17}/bin:${env.PATH}" />
@@ -105,6 +101,10 @@
105101
<env key="JAVA_HOME" path="${JDK21}" />
106102
<env key="PATH" path="${JDK21}/bin:${env.PATH}" />
107103
</exec>
104+
<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}" />
107+
</exec>
108108
<echo>Installing tool to the local maven repository:</echo>
109109
<exec dir="." executable="mvn" failonerror="true">
110110
<arg line="install:install-file -Dfile=tool/build/jackpot/jackpot.jar -DgroupId=org.apache.netbeans.modules.jackpot30 -DartifactId=tool -Dversion=${version} -Dpackaging=jar -DpomFile=tool/scripts/pom.xml" />

cmdline/lib/nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
# limitations under the License.
1515

1616
is.autoload=true
17-
javac.source=1.8
17+
javac.release=17
1818
javac.compilerargs=-Xlint -Xlint:-serial
1919
spec.version.base=1.16.0

cmdline/tool/nbproject/project.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
javac.source=11
17-
javac.target=11
16+
javac.release=17
1817
javac.compilerargs=-Xlint -Xlint:-serial
1918
cp.extra=build/jopt-simple-3.2.jar:build/diffparser-1.4.jar:build/slf4j-api-1.7.25.jar:build/slf4j-nop-1.7.25.jar:${tools.jar}
2019
spec.version.base=1.16.0

0 commit comments

Comments
 (0)