Check jdk 8337976

.github/ISSUE_TEMPLATE/netbeans_bug_report.yml

@@ -28,7 +28,7 @@ body:
       multiple: false
       options:
         - "Apache NetBeans 22"
-#        - "Apache NetBeans 22 release candidate"
+        - "Apache NetBeans 23 release candidate"
         - "Apache NetBeans latest daily build"
     validations:
       required: true
@@ -73,6 +73,7 @@ body:
       multiple: false
       options:
         - "No / Don't know"
+        - "Apache NetBeans 22"
         - "Apache NetBeans 21"
         - "Apache NetBeans 20"
         - "Apache NetBeans 19"

.github/workflows/main.yml

@@ -124,7 +124,7 @@ jobs:
     timeout-minutes: 40
     strategy:
       matrix:
-        java: [ '17', '21', '22' ]
+        java: [ '17', '21', '23-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
@@ -525,6 +525,18 @@ jobs:
       - name: Extract
         run: tar --zstd -xf build.tar.zst
 
+      - name: apisupport.project
+        run: ant $OPTS -f apisupport/apisupport.project test
+
+      - name: apisupport.refactoring
+        run: ant $OPTS -f apisupport/apisupport.refactoring test
+
+      - name: apisupport.wizards
+        run: ant $OPTS -f apisupport/apisupport.wizards test
+
+      - name: timers
+        run: ant $OPTS -f apisupport/timers test
+
       - name: ide/api.xml
         run: ant $OPTS -f ide/api.xml test
 
@@ -808,7 +820,7 @@ jobs:
     timeout-minutes: 50
     strategy:
       matrix:
-        java: [ '17', '21', '22' ]
+        java: [ '17', '21', '23-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
@@ -1403,56 +1415,6 @@ jobs:
           paths: "./*/*/build/test/*/results/TEST-*.xml"
 
 
-  # TODO merge this job into other jobs once tests are fixed
-  apisupport-modules-test:
-    name: APISupport Modules on Linux/JDK ${{ matrix.java }}
-    needs: base-build
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        java: [ '17' ]
-      fail-fast: false
-    steps:
-
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
-
-      - name: Setup Xvfb
-        run: |
-          echo "DISPLAY=:99.0" >> $GITHUB_ENV
-          Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-
-      - name: Download Build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-
-      - name: Extract
-        run: tar --zstd -xf build.tar.zst
-
-      - name: apisupport.project
-        run: ant $OPTS -f apisupport/apisupport.project test
-
-      - name: apisupport.refactoring
-        run: ant $OPTS -f apisupport/apisupport.refactoring test
-
-      - name: apisupport.wizards
-        run: ant $OPTS -f apisupport/apisupport.wizards test
-
-      - name: timers
-        run: ant $OPTS -f apisupport/timers test
-
-      - name: Create Test Summary
-        uses: test-summary/action@v2
-        if: failure()
-        with:
-          paths: "./*/*/build/test/*/results/TEST-*.xml"
-
-
   java-hints-test:
     name: Java Hints ${{ matrix.config }} on Linux/JDK ${{ matrix.java }}
     # equals env.test_java == 'true'
@@ -1462,10 +1424,10 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17', '22' ]
+        java: [ '17', '23-ea' ]
         config: [ 'batch1', 'batch2' ]
         exclude:
-          - java: ${{ github.event_name == 'pull_request' && 'nothing' || '22' }}
+          - java: ${{ github.event_name == 'pull_request' && 'nothing' || '23-ea' }}
       fail-fast: false
     steps:
 
@@ -1509,13 +1471,13 @@ jobs:
   java-debugger-test:
     name: Java Debugger tests on Linux/JDK ${{ matrix.java }}
     # equals env.test_java == 'true'
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'Java') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'Java') || contains(github.event.pull_request.labels.*.name, 'debugger') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
     needs: base-build
     runs-on: ubuntu-latest
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17', '21', '22' ]
+        java: [ '17', '21', '23-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
@@ -2114,9 +2076,8 @@ jobs:
       - name: web.jsfapi
         run: ant $OPTS -f enterprise/web.jsfapi test
 
-# Fails
-#      - name: web.jspparser
-#        run: ant $OPTS -f enterprise/web.jspparser test
+      - name: web.jspparser
+        run: ant $OPTS -f enterprise/web.jspparser test
 
 # Fails
 #      - name: web.project
@@ -2658,7 +2619,6 @@ jobs:
       - java-hints-test
       - java-debugger-test
       - profiler-test
-      - apisupport-modules-test
       - build-tools
       - webcommon-test
       - php

.gitignore

@@ -50,6 +50,8 @@
 /nb/ide.launcher/windows/nbproject/Package-*.bash
 /platform/o.n.bootstrap/launcher/windows/nbproject/Makefile-*.mk
 /platform/o.n.bootstrap/launcher/windows/nbproject/Package-*.bash
+/enterprise/web.jspparser/test/unit/data/emptyWebProject/lib/*.jar
+/enterprise/web.jspparser/test/unit/data/project2/lib/*.jar
 
 # Database logs
 derby.log

apisupport/apisupport.ant/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.apisupport.ant
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.97
+OpenIDE-Module-Specification-Version: 2.98
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/resources/layer.xml

apisupport/apisupport.installer.maven/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.apisupport.installer.maven
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/installer/maven/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
 

apisupport/apisupport.installer/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.apisupport.installer
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/installer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
 

apisupport/apisupport.kit/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.apisupport.kit
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.55
+OpenIDE-Module-Specification-Version: 1.56
 OpenIDE-Module-Provides: org.netbeans.modules.apisupport.kit
 

apisupport/apisupport.project/manifest.mf

@@ -4,5 +4,5 @@ OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/api/Bu
 OpenIDE-Module-Requires: javax.script.ScriptEngine.freemarker
 OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/resources/layer.xml
 AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.101
+OpenIDE-Module-Specification-Version: 1.102
 

apisupport/apisupport.refactoring/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.apisupport.refactoring
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/refactoring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.62
+OpenIDE-Module-Specification-Version: 1.63
 

apisupport/apisupport.wizards/manifest.mf

@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.apisupport.wizards
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
 

apisupport/maven.apisupport/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.maven.apisupport/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/apisupport/Bundle.properties
 AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.84
+OpenIDE-Module-Specification-Version: 1.85
 

apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NBMNativeMWI.java

@@ -24,8 +24,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
@@ -49,6 +47,7 @@
 import org.netbeans.modules.maven.model.pom.Project;
 import org.netbeans.modules.maven.model.pom.Repository;
 import org.netbeans.modules.maven.model.pom.RepositoryPolicy;
+import org.netbeans.modules.maven.options.MavenVersionSettings;
 import org.netbeans.modules.maven.spi.newproject.CreateProjectBuilder;
 import org.openide.util.Exceptions;
 
@@ -58,12 +57,12 @@
  */
 final class NBMNativeMWI {
 
-    static void instantiate(ProjectInfo vi, File projFile, String version, boolean useOsgi, MavenProject mp) {
+    static void instantiate(ProjectInfo vi, File projFile, String nbVersion, boolean useOsgi, MavenProject mp) {
         CreateProjectBuilder builder = new CreateProjectBuilder(projFile, vi.groupId, vi.artifactId, vi.version)
                 .setPackageName(vi.packageName)
                 .setPackaging("nbm")
                 .setAdditionalNonPomWork(new AdditionalFiles())
-                .setAdditionalOperations(new AdditionalOperations(version, useOsgi));
+                .setAdditionalOperations(new AdditionalOperations(nbVersion, useOsgi));
         if (mp != null) {
             builder = builder.setParentProject(mp);
         }
@@ -237,7 +236,6 @@ public void performOperation(POMModel model) {
                 //nbm-maven-plugin
                 boolean addPlugin = true;
                 String managedPVersion = null;
-                String pVersion = MavenNbModuleImpl.getLatestNbmPluginVersion();
 //                boolean useOsgiDepsSet = false;
                 if (parent != null) {
                     //TODO do we want to support the case when the plugin is defined in parent pom with inherited=true?
@@ -259,12 +257,13 @@ public void performOperation(POMModel model) {
                         }
                     }
                 }
+                MavenVersionSettings settings = MavenVersionSettings.getDefault();
                 if (addPlugin) {
                     Plugin p = model.getFactory().createPlugin();
                     p.setGroupId(MavenNbModuleImpl.GROUPID_APACHE);
                     p.setArtifactId(MavenNbModuleImpl.NBM_PLUGIN);
                     if (managedPVersion == null) {
-                        p.setVersion(pVersion);
+                        p.setVersion(MavenNbModuleImpl.getLatestNbmPluginVersion());
                     }
                     p.setExtensions(true);
                     if (useOsgi) {
@@ -278,52 +277,44 @@ public void performOperation(POMModel model) {
                 //now comes the compiler plugin
                 addPlugin = true;
                 managedPVersion = null;
-                String source = null;
-                String target = null;
-                pVersion = "3.11.0";
                 if (parent != null) {
                     //TODO do we want to support the case when the plugin is defined in parent pom with inherited=true?
                     PluginManagement pm = parent.getPluginManagement();
                     if (pm != null) {
-                        for (org.apache.maven.model.Plugin p : pm.getPlugins()) {
-                            if (Constants.GROUP_APACHE_PLUGINS.equals(p.getGroupId()) && Constants.PLUGIN_COMPILER.equals(p.getArtifactId())) {
-                                managedPVersion = p.getVersion();
-                                Xpp3Dom conf = (Xpp3Dom) p.getConfiguration();
-                                if (conf != null) {
-                                    Xpp3Dom sourceEl = conf.getChild("source");
-                                    if (sourceEl != null) {
-                                        source = sourceEl.getValue();
-                                    }
-                                    Xpp3Dom targetEl = conf.getChild("target");
-                                    if (targetEl != null) {
-                                        target = targetEl.getValue();
+                        if (parent.getProperties().getProperty("maven.compiler.release") != null) {
+                            addPlugin = false;
+                        } else {
+                            for (org.apache.maven.model.Plugin p : pm.getPlugins()) {
+                                if (Constants.GROUP_APACHE_PLUGINS.equals(p.getGroupId()) && Constants.PLUGIN_COMPILER.equals(p.getArtifactId())) {
+                                    managedPVersion = p.getVersion();
+                                    Xpp3Dom conf = (Xpp3Dom) p.getConfiguration();
+                                    if (conf != null) {
+                                        if (   conf.getChild("release") != null
+                                            || conf.getChild("source") != null
+                                            || conf.getChild("target") != null) {
+                                            addPlugin = false;
+                                        }
                                     }
+                                    break;
                                 }
-                                break;
                             }
                         }
                     }
                 }
-                addPlugin = target == null || source == null;
                 if (addPlugin) {
                     Plugin p = model.getFactory().createPlugin();
                     p.setGroupId(Constants.GROUP_APACHE_PLUGINS);
                     p.setArtifactId(Constants.PLUGIN_COMPILER);
                     if (managedPVersion == null) {
-                        p.setVersion(pVersion);
+                        p.setVersion(settings.getVersion(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_COMPILER));
                     }
-                    Configuration c = model.getFactory().createConfiguration();
-                    c.setSimpleParameter("source", "1.8");
-                    c.setSimpleParameter("target", "1.8");
-                    p.setConfiguration(c);
                     getOrCreateBuild(model).addPlugin(p);
+                    model.getProject().getProperties().setProperty("maven.compiler.release", "17");
                 }
 
                 //now the jar plugin
-                addPlugin = true;
                 managedPVersion = null;
                 String useManifest = null;
-                pVersion = "3.3.0";
                 if (parent != null) {
                     //TODO do we want to support the case when the plugin is defined in parent pom with inherited=true?
                     PluginManagement pm = parent.getPluginManagement();
@@ -359,6 +350,7 @@ public void performOperation(POMModel model) {
                     p.setGroupId(Constants.GROUP_APACHE_PLUGINS);
                     p.setArtifactId(Constants.PLUGIN_JAR);
                     if (managedPVersion == null) {
+                        String pVersion = settings.getVersion(Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_JAR);
                         p.setVersion(pVersion);
                         managedPVersion = pVersion;
                     }