Merge pull request oracle#553 from sid-srini/upgrade-nb28-plus

Upgrade to NetBeans 28 and nb-javac to jdk-26+27

Author: Achal1607

THIRD_PARTY_LICENSES.txt

@@ -49,33 +49,17 @@
     <loadresource property="patch-files">
         <string>
             patches/6330.diff
-            patches/7610.diff
             patches/8038-draft.diff
             patches/7893-draft.diff
             patches/8460-draft.diff
-            patches/8662.diff
-            patches/8664.diff
-            patches/8690.diff
-            patches/8694.diff
-            patches/8745.diff
-            patches/8748.diff
-            patches/8760.diff
-            patches/8770.diff
-            patches/8762.diff
-            patches/8769.diff
-            patches/8797.diff
-            patches/8816.diff
-            patches/8821.diff
-            patches/8827.diff
-            patches/8828.diff
-            patches/8829.diff
+            patches/8856.diff
             patches/8897.diff
-            patches/8856-draft.diff
-            patches/8952-draft.diff
+            patches/8952.diff
+            patches/8968.diff
             patches/8974-draft.diff
             patches/8975.diff
-            patches/8968.diff
             patches/9005-draft.diff
+            patches/9044.diff
             patches/9062.diff
             patches/disable-error-notification.diff
             patches/mvn-sh.diff
@@ -84,7 +68,6 @@
             patches/rename-debugger.diff
             patches/remove-db.diff
             patches/nbjavac-not-required.diff
-            patches/l10n-licence.diff
             patches/dev-dependency-licenses.diff
             patches/nb-telemetry.diff
             patches/gradle-files-scan-root.diff

build.xml

@@ -1,13 +1,14 @@
 diff --git a/java/java.sourceui/src/org/netbeans/api/java/source/ui/ElementOpen.java b/java/java.sourceui/src/org/netbeans/api/java/source/ui/ElementOpen.java
-index f561cb51c8..81000c3ed9 100644
+index f561cb51c8cf..b69173fef503 100644
 --- a/java/java.sourceui/src/org/netbeans/api/java/source/ui/ElementOpen.java
 +++ b/java/java.sourceui/src/org/netbeans/api/java/source/ui/ElementOpen.java
-@@ -573,6 +573,10 @@ public final class ElementOpen {
+@@ -573,6 +573,11 @@ static void fillInTreePositions(CompilationInfo info, Tree forTree, Object[] tar
          int[] span = null;
          switch(forTree.getKind()) {
              case CLASS:
 +                if ((int) target[1] >= 0 && (int) target[2] == -1) {
-+                // Compact Source file (JEP 512)  issue implicit class end position not found in code 
++                    // Compact Source file (JEP 512)  issue implicit class end position not found in code 
++                    // see JDK-8364015
 +                    target[2] = (int) info.getTrees().getSourcePositions().getEndPosition(cu, cu);
 +                }
              case INTERFACE:

netbeans

@@ -1,57 +1,3 @@
-diff --git a/java/java.lsp.server/build.xml b/java/java.lsp.server/build.xml
-index baa4e971cb..31e7cf3f33 100644
---- a/java/java.lsp.server/build.xml
-+++ b/java/java.lsp.server/build.xml
-@@ -163,4 +163,49 @@
-             <arg value="apisupport" />
-         </exec>
-     </target>
-+
-+    <target name="generate-netbeans-license-summary" depends="-set-use-jdk-javac,proxy-setup" description="Generate license summary">
-+        <delete dir="${build.dir}/nblic" />
-+        <mkdir dir="${build.dir}/nblic/nbcode" />
-+        <mkdir dir="${build.dir}/nblic/summary" />
-+
-+        <ant dir="nbcode" target="build-zip" inheritall="false" inheritrefs="false">
-+            <property name="nbplatform.default.netbeans.dest.dir" location="${nbplatform.default.netbeans.dest.dir}" />
-+            <property name="nbplatform.default.harness.dir" location="${nbplatform.default.harness.dir}" />
-+            <property name="nbantext.jar" location="${nbantext.jar}" />
-+        </ant>
-+        <unzip src="nbcode/dist/nbcode.zip" dest="${build.dir}/nblic/">
-+        </unzip>
-+
-+        <delete dir="${build.dir}/nblic/nbcode/nbcode" />
-+
-+        <taskdef name="createlicensesummary" classname="org.netbeans.nbbuild.extlibs.CreateLicenseSummary" classpath="${nbantext.jar}"/>
-+
-+        <property name="config.javadoc.all" value="" />
-+
-+        <taskdef name="resolvelist" classname="org.netbeans.nbbuild.ResolveList" classpath="${nbantext.jar}" />
-+        <resolvelist name="allmodules" path="modules.fullpath" dir="${nb_all}" list="${clusters.config.full.list}"/>
-+
-+        <createlicensesummary licenseStub="${nb_all}/LICENSE"
-+                              noticeStub="${nb_all}/nbbuild/notice-stub.txt"
-+                              report="${build.dir}/createlicensesummary.xml"
-+                              nball="${nb_all}"
-+                              build="${build.dir}/nblic/nbcode"
-+                              license="${build.dir}/nblic/summary/LICENSE"
-+                              notice="${build.dir}/nblic/summary/NOTICE"
-+                              dependencies="${build.dir}/nblic/summary/DEPENDECIES"
-+                              binary="true"
-+                              excludes="${nb-extra-files}"
-+                              includeAllFiles="true"
-+        />
-+        <concat destfile="${build.dir}/nblic/summary/NOTICE-ext">
-+            <header>Content of the NOTICE file:
-+
-+</header>
-+            <filelist dir="${build.dir}/nblic/summary" files="NOTICE"/>
-+        </concat>
-+        <concat destfile="${build.dir}/nblic/netbeans-third-party.txt">
-+            <filelist dir="${build.dir}/nblic/summary" files="LICENSE,NOTICE"/>
-+        </concat>
-+    </target>
- </project>
 diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateDependencies.java b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateDependencies.java
 index 2512043daf..eef8882085 100644
 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CreateDependencies.java

patches/8856-draft.diff patches/8856.diffpatches/8856-draft.diff renamed to patches/8856.diff

@@ -1,5 +1,5 @@
 diff --git a/java/java.j2seproject/nbproject/project.properties b/java/java.j2seproject/nbproject/project.properties
-index dc44efa75d..525c4ecfc8 100644
+index 9f68c5272c..bfbc1e60c3 100644
 --- a/java/java.j2seproject/nbproject/project.properties
 +++ b/java/java.j2seproject/nbproject/project.properties
 @@ -27,8 +27,8 @@ test.unit.run.cp.extra=${tools.jar}
@@ -216,15 +216,15 @@ index 0000000000..9d39755a86
 +===============================================
 +
 diff --git a/java/testng.ui/nbproject/project.xml b/java/testng.ui/nbproject/project.xml
-index 65c7364426..fe338b1acf 100644
+index fc2864d7df..d658c63b30 100644
 --- a/java/testng.ui/nbproject/project.xml
 +++ b/java/testng.ui/nbproject/project.xml
 @@ -109,7 +109,7 @@
                      <compile-dependency/>
                      <run-dependency>
                          <release-version>1</release-version>
 -                        <specification-version>1.11</specification-version>
-+                        <specification-version>1.45</specification-version>
++                        <specification-version>1.46</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
@@ -325,15 +325,15 @@ index 11afdedbc4..49508b1507 100644
          URL url = null;
          try {
 diff --git a/java/testng/nbproject/project.xml b/java/testng/nbproject/project.xml
-index de6d32ff03..1bf62c3756 100644
+index 93b37bd39d..671653af8e 100644
 --- a/java/testng/nbproject/project.xml
 +++ b/java/testng/nbproject/project.xml
 @@ -92,7 +92,7 @@
                      <compile-dependency/>
                      <run-dependency>
                          <release-version>1</release-version>
 -                        <specification-version>1.0</specification-version>
-+                        <specification-version>1.45</specification-version>
++                        <specification-version>1.46</specification-version>
                      </run-dependency>
                  </dependency>
                  <dependency>
@@ -444,10 +444,10 @@ index 1c30d02d29..66cabfb9c1 100644
      }
  }
 diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
-index 240ed93945..86153557a9 100644
+index 6de8195957..7da63ba169 100644
 --- a/nbbuild/templates/common.xml
 +++ b/nbbuild/templates/common.xml
-@@ -787,7 +787,7 @@
+@@ -796,7 +796,7 @@
                          outputdir="${build.test.@{test.type}.results.dir}"
                          workingDir="${build.test.@{test.type}.results.dir}"
                          suitename="${code.name.base}"
@@ -456,7 +456,7 @@ index 240ed93945..86153557a9 100644
                          jvm="${test.nbjdk.java}"
                  >
                      <classfileset dir="${build.test.@{test.type}.classes.dir}" excludes="${test.excludes}" includes="${test.includes}"/>
-@@ -890,7 +890,7 @@
+@@ -899,7 +899,7 @@
                           outputdir="${build.test.@{test.type}.results.dir}"
                           workingDir="${build.test.@{test.type}.results.dir}"
                           suitename="${code.name.base}"
@@ -465,7 +465,7 @@ index 240ed93945..86153557a9 100644
                           jvm="${test.nbjdk.java}"
                  >
                      <propertyset refid="test.@{test.type}.properties"/>
-@@ -919,7 +919,7 @@
+@@ -928,7 +928,7 @@
                           outputdir="${build.test.@{test.type}.results.dir}"
                           workingDir="${build.test.@{test.type}.results.dir}"
                           suitename="${code.name.base}"
@@ -474,7 +474,7 @@ index 240ed93945..86153557a9 100644
                           jvm="${test.nbjdk.java}"
                  >
                      <propertyset refid="test.@{test.type}.properties"/>
-@@ -1012,7 +1012,7 @@
+@@ -1021,7 +1021,7 @@
                      <jvmarg value="-ea"/>
                      <arg line="-mixed"/>
                      <arg line="-d ${build.test.@{test.type}.results.dir}"/>
@@ -483,7 +483,7 @@ index 240ed93945..86153557a9 100644
                      <arg line="-suitename ${code.name.base}"/>
                      <arg line="-testname ${test.class}"/>
                      <arg line="${testng.args.line}"/>
-@@ -1034,7 +1034,7 @@
+@@ -1043,7 +1043,7 @@
                           outputdir="${build.test.@{test.type}.results.dir}"
                           workingDir="${build.test.@{test.type}.results.dir}"
                           suitename="${code.name.base}"
@@ -492,7 +492,7 @@ index 240ed93945..86153557a9 100644
                           jvm="${test.nbjdk.java}"
                  >
                      <propertyset refid="test.@{test.type}.properties"/>
-@@ -1126,7 +1126,7 @@
+@@ -1135,7 +1135,7 @@
                          outputdir="${build.test.@{test.type}.results.dir}"
                          workingDir="${build.test.@{test.type}.results.dir}"
                          suitename="${code.name.base}"
@@ -865,17 +865,17 @@ index 9d9366b8ed..494c4ae3d7 100644
  Manifest-Version: 1.0
  AutoUpdate-Show-In-Client: true
  OpenIDE-Module: org.netbeans.libs.testng/1
--OpenIDE-Module-Specification-Version: 1.43
-+OpenIDE-Module-Specification-Version: 1.45
+-OpenIDE-Module-Specification-Version: 1.44
++OpenIDE-Module-Specification-Version: 1.46
  OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/testng/Bundle.properties
 diff --git a/platform/libs.testng/nbproject/org-netbeans-libs-testng.sig b/platform/libs.testng/nbproject/org-netbeans-libs-testng.sig
-index 3add7cf2b2..2b345b1c30 100644
+index 9bcfefd912..2b345b1c30 100644
 --- a/platform/libs.testng/nbproject/org-netbeans-libs-testng.sig
 +++ b/platform/libs.testng/nbproject/org-netbeans-libs-testng.sig
 @@ -1,5 +1,5 @@
  #Signature file v4.1
--#Version 1.41
-+#Version 1.45
+-#Version 1.43
++#Version 1.46
 
  CLSS public abstract interface java.io.Serializable