CI: bump lower bound to JDK 21

.github/workflows/main.yml

@@ -137,7 +137,7 @@ jobs:
     timeout-minutes: 40
     strategy:
       matrix:
-        java: [ '17', '25', '26-ea' ]
+        java: [ '21', '25', '26-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '25' }}
       fail-fast: false
@@ -167,11 +167,11 @@ jobs:
         run: ant $OPTS -quiet -Dcluster.config=$CLUSTER_CONFIG build-nozip
 
       - name: Prepare Artifact
-        if: ${{ matrix.java == '17' }}
+        if: ${{ matrix.java == '21' }}
         run: tar -I 'zstd -9 -T0' -cf /tmp/build.tar.zst --exclude ".git" .
 
       - name: Upload Workspace
-        if: ${{ (matrix.java == '17') && success() }}
+        if: ${{ (matrix.java == '21') && success() }}
         uses: actions/upload-artifact@v6
         with:
           name: build
@@ -181,11 +181,11 @@ jobs:
           if-no-files-found: error
 
       - name: Create Dev Build
-        if: ${{ matrix.java == '17' && contains(github.event.pull_request.labels.*.name, 'ci:dev-build') && success() }}
+        if: ${{ matrix.java == '21' && contains(github.event.pull_request.labels.*.name, 'ci:dev-build') && success() }}
         run: ant $OPTS -quiet -Dcluster.config=$CLUSTER_CONFIG zip-cluster-config
 
       - name: Upload Dev Build
-        if: ${{ matrix.java == '17' && contains(github.event.pull_request.labels.*.name, 'ci:dev-build') && success() }}
+        if: ${{ matrix.java == '21' && contains(github.event.pull_request.labels.*.name, 'ci:dev-build') && success() }}
         uses: actions/upload-artifact@v6
         with:
           name: dev-build_${{github.event.pull_request.number || github.run_id}}
@@ -239,7 +239,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        java: [ 17 ]
+        java: [ '21' ]
         include:
           - os: ubuntu-latest
             java: 26-ea
@@ -273,7 +273,7 @@ jobs:
         run: tar --zstd -xf build.tar.zst
 
       - name: platform/masterfs
-        if: ${{ matrix.java == '17' }}
+        if: ${{ matrix.java == '21' }}
         run: .github/retry.sh ant $OPTS -f platform/masterfs test
 
       - name: Commit Validation tests
@@ -301,7 +301,7 @@ jobs:
       ANT_OPTS: -Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
     steps:
 
       - name: Check PR labels
@@ -379,7 +379,7 @@ jobs:
     timeout-minutes: 100
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -420,8 +420,9 @@ jobs:
       - name: ergonomics/ide.ergonomics
         run: ant $OPTS -f ergonomics/ide.ergonomics test -Dtest.config=commit
 
-      - name: nb/deadlock.detector
-        run: ant $OPTS -f nb/deadlock.detector test
+      # TODO not JDK 21 compatible
+#      - name: nb/deadlock.detector
+#        run: ant $OPTS -f nb/deadlock.detector test
 
       - name: nb/ide.branding
         run: ant $OPTS -f nb/ide.branding test
@@ -473,7 +474,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
         config: [ 'platform', 'release' ]
       fail-fast: false
     steps:
@@ -519,7 +520,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -849,9 +850,9 @@ jobs:
     timeout-minutes: 50
     strategy:
       matrix:
-        java: [ '17', '21', '25', '26-ea' ]
+        java: [ '21', '25', '26-ea' ]
         exclude:
-          - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
+          - java: ${{ github.event_name == 'pull_request' && 'nothing' || '25' }}
       fail-fast: false
     steps:
 
@@ -935,28 +936,35 @@ jobs:
         run: ant $OPTS -f java/gradle.test test
 
       - name: java/gradle.java
-        if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
+        if: ${{ matrix.java == '21' || matrix.java == '25' }}
         run: .github/retry.sh ant $OPTS -f java/gradle.java test
 
       - name: extide/gradle
-        if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
+        if: ${{ matrix.java == '21' || matrix.java == '25' }}
         run: ant $OPTS -f extide/gradle test
 
       - name: java/gradle.dependencies
-        if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
+        if: ${{ matrix.java == '21' || matrix.java == '25' }}
         run: ant $OPTS -f java/gradle.dependencies test
 
       # TODO next are JDK 21 or 25 incompatibe steps
       - name: java/java.mx.project
-        if: ${{ matrix.java == '17' || matrix.java == '21' }}
+        if: ${{ matrix.java == '21' }}
         run: .github/retry.sh ant $OPTS -f java/java.mx.project test
 
+      - name: Set up JDK 17 for ant
+        uses: actions/setup-java@v5
+        if: ${{ matrix.java == '21' }}
+        with:
+          java-version: 17
+          distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
+
       - name: extide/o.apache.tools.ant.module
-        if: ${{ matrix.java == '17' }}
+        if: ${{ matrix.java == '21' }}
         run: ant $OPTS -f extide/o.apache.tools.ant.module test
 
       - name: apisupport.ant
-        if: ${{ matrix.java == '17' }}
+        if: ${{ matrix.java == '21' }}
         run: ant $OPTS -f apisupport/apisupport.ant test
 
       - name: Create Test Summary
@@ -975,7 +983,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -1138,7 +1146,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -1273,7 +1281,7 @@ jobs:
     timeout-minutes: 100
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -1459,7 +1467,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17', '26-ea' ]
+        java: [ '21', '26-ea' ]
         config: [ 'batch1', 'batch2' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '26-ea' }}
@@ -1516,7 +1524,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17', '25', '26-ea' ]
+        java: [ '21', '25', '26-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '25' }}
       fail-fast: false
@@ -1578,7 +1586,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -1623,7 +1631,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -1801,7 +1809,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -1849,9 +1857,9 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17', '21' ]
-        exclude:
-          - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
+        java: [ '21' ]
+#        exclude:
+#          - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
     steps:
 
@@ -1902,7 +1910,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -1950,7 +1958,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
     steps:
 
@@ -2195,7 +2203,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
 
     steps:
@@ -2278,7 +2286,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
 
     services:
@@ -2340,7 +2348,7 @@ jobs:
       DISPLAY: ":99.0"
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
         os: [ 'windows-latest', 'ubuntu-latest' ]
         exclude:
           - os: ${{ github.event_name == 'pull_request' && 'nothing' || 'windows-latest' }}
@@ -2496,7 +2504,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '21' ]
       fail-fast: false
 
     steps:

harness/apisupport.harness/nbproject/project.properties

@@ -97,3 +97,6 @@ test.unit.cp.extra=${netbeans.dest.dir}/harness/jnlp/jnlp-launcher.jar
 javadoc.arch=${basedir}/arch.xml
 
 test.config.stableBTD.includes=**/*Test.class
+
+# todo: needed for tests; remove with jnlp code
+test.jms.flags=-Djava.security.manager=allow

ide/versioning/nbproject/project.properties

@@ -43,3 +43,6 @@ test.config.stableBTD.excludes=\
     **/GetAnnotatedOwnerTest.class,\
     **/VCSContextTest.class,\
     **/VersioningAnnotationProviderTest.class
+
+# todo remove SM usage in tests
+test.jms.flags=-Djava.security.manager=allow

java/java.editor/test/unit/src/org/netbeans/modules/java/editor/imports/ComputeImportsTest.java

@@ -34,7 +34,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -68,7 +67,7 @@
  */
 public class ComputeImportsTest extends NbTestCase {
 
-    private static final Set<String> IGNORE_CLASSES = new HashSet<String>(Arrays.asList(new String[] {
+    private static final Set<String> IGNORE_CLASSES = Set.of(
         "com.sun.tools.javac.util.List",
         "com.sun.tools.javac.code.Attribute.RetentionPolicy",
         "com.sun.tools.classfile.Opcode.Set",
@@ -81,6 +80,8 @@ public class ComputeImportsTest extends NbTestCase {
         "com.sun.xml.internal.bind.v2.runtime.output.NamespaceContextImpl.Element",
         "com.sun.xml.internal.bind.v2.schemagen.xmlschema.Element",
         "sun.text.normalizer.RangeValueIterator.Element",
+        "jdk.internal.org.commonmark.node.Document",
+        "java.lang.StringTemplate.STR",
         "javax.xml.bind.Element",
         "javax.lang.model.element.Element",
         "com.sun.org.apache.xalan.internal.xsltc.runtime.AttributeList",
@@ -90,13 +91,13 @@ public class ComputeImportsTest extends NbTestCase {
         "com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type.Element",
         "com.sun.xml.internal.ws.policy.privateutil.PolicyUtils.Collections",
         "com.azul.crs.client.service.JarLoadMonitor.ProcessedJarFiles.LRU.Element"
-    }));
+    );
 
-    private static final List<Pattern> IGNORE_PATTERNS = Collections.unmodifiableList(Arrays.asList(
+    private static final List<Pattern> IGNORE_PATTERNS = List.of(
         Pattern.compile("jdk\\..*\\.internal\\..*"),
         Pattern.compile("org\\.graalvm\\..*"),
         Pattern.compile("com\\.azul\\.crs\\..*") // https://docs.azul.com/vulnerability-detection/detailed-information/configuration-options
-    ));
+    );
 
     private FileObject testSource;
     private JavaSource js;

java/java.source.base/nbproject/project.properties

@@ -18,7 +18,7 @@
 #javac.compilerargs=-Xlint:unchecked
 nbroot=../..
 is.autoload=true
-javac.release=17
+javac.release=21
 javadoc.name=Java Source Base
 javadoc.title=Java Source Base
 javadoc.arch=${basedir}/arch.xml
@@ -206,5 +206,5 @@ test.config.vanilla-javac.excludes=\
 
 # remove default compiler JMS flags so that we don't get "Unknown module" warnings due to --limit-modules
 jms-compiler.flags.jvm=
-test.jms.flags=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming
+test.jms.flags=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming,jdk.jfr
 test.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true