Update to NetBeans 26

Author: tkrodriguez

compiler/mx.compiler/mx_graal_tools.py

@@ -80,10 +80,11 @@ def run_netbeans_app(app_name, jdkhome, args=None, dist=None):
 def igv(args):
     """run the Ideal Graph Visualizer
 
-    The current version is based on NetBeans 22 which officially supports JDK 17 through JDK 22.  A
+    The current version is based on NetBeans 26 which officially supports JDK 17 through JDK 24.  A
     supported JDK will be chosen from the JDKs known to mx but it will fall back to whatever is
     configured as JAVA_HOME if a supported JDK can't be found.  It's not recommended to run igv with
-    pre-release JDKs.
+    pre-release JDKs.  Setting TOOLS_JAVA_HOME to point at a supported JDK is the recommended way to
+    configure the JDK for IGV.
 
     You can directly control which JDK is used to launch IGV using
 
@@ -96,17 +97,17 @@ def igv(args):
 
     """
     v17 = mx.VersionSpec("17")
-    v23 = mx.VersionSpec("23")
+    v25 = mx.VersionSpec("25")
     def _igvJdkVersionCheck(version):
-        return v17 <= version < v23
+        return v17 <= version < v25
 
     jdkhome = None
     if not '--jdkhome' in args:
         def _do_not_abort(msg):
             pass
 
         # try to find a fully supported version first
-        jdk = mx.get_tools_jdk(versionCheck=_igvJdkVersionCheck, versionDescription='IGV prefers JDK 17 through JDK 22', abortCallback=_do_not_abort)
+        jdk = mx.get_tools_jdk(versionCheck=_igvJdkVersionCheck, versionDescription='IGV prefers JDK 17 through JDK 24', abortCallback=_do_not_abort)
         if jdk is None:
             # try any JDK
             jdk = mx.get_jdk()

visualizer/IdealGraphVisualizer/Bytecodes/src/main/nbm/manifest.mf

@@ -3,3 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.bytecodes
 OpenIDE-Module-Layer: org/graalvm/visualizer/bytecodes/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/bytecodes/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/ControlFlow/src/main/nbm/manifest.mf

@@ -3,3 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.controlflow
 OpenIDE-Module-Layer: org/graalvm/visualizer/controlflow/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/controlflow/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Coordinator/src/main/nbm/manifest.mf

@@ -4,4 +4,4 @@ OpenIDE-Module-Install: org/graalvm/visualizer/coordinator/impl/Installer.class
 OpenIDE-Module-Layer: org/graalvm/visualizer/coordinator/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/coordinator/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.2
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Data/src/main/nbm/manifest.mf

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualizer.data
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/data/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.5
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Difference/src/main/nbm/manifest.mf

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualizer.difference
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/difference/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Filter/src/main/nbm/manifest.mf

@@ -3,3 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.filter
 OpenIDE-Module-Layer: org/graalvm/visualizer/filter/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/filter/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.3
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/FilterProfiles/src/main/nbm/manifest.mf

@@ -4,4 +4,4 @@ OpenIDE-Module: org.graalvm.visualizer.filter.profiles
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/filter/profiles/impl/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
 OpenIDE-Module-Layer: org/graalvm/visualizer/filter/profiles/resources/layer.xml
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/FilterWindow/src/main/nbm/manifest.mf

@@ -3,4 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.filterwindow
 OpenIDE-Module-Layer: org/graalvm/visualizer/filterwindow/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/filterwindow/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Graal/src/main/nbm/manifest.mf

@@ -3,4 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.graal
 OpenIDE-Module-Layer: org/graalvm/visualizer/graal/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/graal/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Graph/src/main/nbm/manifest.mf

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualizer.graph
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/graph/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/GraphSearch/src/main/nbm/manifest.mf

@@ -4,4 +4,4 @@ OpenIDE-Module: org.graalvm.visualizer.search
 OpenIDE-Module-Layer: org/graalvm/visualizer/search/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/search/Bundle.properties
 OpenIDE-Module-Specification-Version: 1
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/HierarchicalLayout/src/main/nbm/manifest.mf

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualizer.hierarchicallayout
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/hierarchicallayout/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/JSONExporter/src/main/nbm/manifest.mf

@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/jsonexporter/Bundle.properties
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/JavaSources/src/main/nbm/manifest.mf

@@ -4,3 +4,4 @@ OpenIDE-Module: org.graalvm.visualizer.source.java
 OpenIDE-Module-Layer: org/graalvm/visualizer/source/java/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/source/java/impl/Bundle.properties
 OpenIDE-Module-Recommends: cnb.org.netbeans.modules.java.j2seproject
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Layout/src/main/nbm/manifest.mf

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualizer.layout
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/layout/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/NetworkConnection/src/main/nbm/manifest.mf

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualizer.connection
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/connection/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.3
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/PolyglotRunner/src/main/nbm/manifest.mf

@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.graalvm.visualizer.polyglot.runner
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/script/impl/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/SelectionCoordinator/src/main/nbm/manifest.mf

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualizer.selectioncoordinator
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/selectioncoordinator/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Settings/src/main/nbm/manifest.mf

@@ -3,4 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.settings
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/settings/Bundle.properties
 OpenIDE-Module-Recommends: org.graalvm.visualizer.settings.ui
 OpenIDE-Module-Specification-Version: 1.1
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/SettingsUI/src/main/nbm/manifest.mf

@@ -4,4 +4,4 @@ OpenIDE-Module: org.graalvm.visualizer.settings.ui
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/settings/ui/Bundle.properties
 OpenIDE-Module-Provides: org.graalvm.visualizer.settings.ui
 OpenIDE-Module-Specification-Version: 1.0
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Shell/src/main/nbm/manifest.mf

@@ -5,4 +5,4 @@ OpenIDE-Module-Layer: org/graalvm/visualizer/shell/resources/mf-layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/shell/Bundle.properties
 OpenIDE-Module-Requires: org.openide.windows.WindowManager
 OpenIDE-Module-Specification-Version: 1.1
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/SourceRepository/src/main/nbm/manifest.mf

@@ -5,3 +5,4 @@ OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/source/Bundle.propertie
 OpenIDE-Module-Requires: org.openide.windows.WindowManager
 OpenIDE-Module-Specification-Version: 1.1
 OpenIDE-Module-Recommends: cnb.org.netbeans.modules.java.j2seproject
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Upgrade/src/main/nbm/manifest.mf

@@ -4,4 +4,4 @@ OpenIDE-Module: org.graalvm.visualizer.upgrader
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/upgrader/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
 AutoUpdate-Essential-Module: true
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/Util/src/main/nbm/manifest.mf

@@ -3,4 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.util
 OpenIDE-Module-Layer: org/graalvm/visualizer/util/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/util/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.3
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/View/src/main/nbm/manifest.mf

@@ -3,3 +3,4 @@ OpenIDE-Module: org.graalvm.visualizer.view
 OpenIDE-Module-Layer: org/graalvm/visualizer/view/impl/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/view/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.2
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/ViewerApi/src/main/nbm/manifest.mf

@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.graalvm.visualizer.view.api/1
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/view/api/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
-
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/VisualizerUI/src/main/nbm/manifest.mf

@@ -4,4 +4,5 @@ OpenIDE-Module: org.graalvm.visualizer.ui
 OpenIDE-Module-Layer: org/graalvm/visualizer/ui/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualizer/ui/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
-OpenIDE-Module-Needs: org.netbeans.Netbinox
+OpenIDE-Module-Needs: org.netbeans.Netbinox
+OpenIDE-Module-Hide-Classpath-Packages: jdk.graal.compiler.graphio.**

visualizer/IdealGraphVisualizer/application/pom.xml

@@ -86,7 +86,6 @@
                     <systemPropertyVariables>
                         <all.clusters>${all.clusters}</all.clusters>
                         <branding.token>${brandingToken}</branding.token>
-                        <java.awt.headless>true</java.awt.headless>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

visualizer/IdealGraphVisualizer/pom.xml

@@ -46,8 +46,10 @@
                         <systemPropertyVariables>
                             <java.awt.headless>true</java.awt.headless>
                         </systemPropertyVariables>
-                        <argLine>--add-opens=java.base/java.net=ALL-UNNAMED
+                        <argLine>
+                            --add-opens=java.base/java.net=ALL-UNNAMED
                             --add-exports=java.desktop/sun.awt=ALL-UNNAMED
+                            -Dpolyglot.engine.WarnInterpreterOnly=false
                         </argLine>
                     </configuration>
                 </plugin>
@@ -74,8 +76,8 @@
                             <configuration>
                                 <rules>
                                     <requireJavaVersion>
-                                        <version>[17,22)</version>
-                                        <message>The IGV Netbeans platform requires a JDK version between 17 and 22</message>
+                                        <version>[17,24)</version>
+                                        <message>The IGV Netbeans platform requires a JDK version between 17 and 24</message>
                                     </requireJavaVersion>
                                 </rules>
                             </configuration>
@@ -117,7 +119,7 @@
         <module>ViewerApi</module>
     </modules>
     <properties>
-        <netbeans.version>RELEASE220</netbeans.version>
+        <netbeans.version>RELEASE260</netbeans.version>
         <brandingToken>idealgraphvisualizer</brandingToken>
         <swinglayouts.version>1.0.2</swinglayouts.version>
         <nbmmvnplugin.version>4.8</nbmmvnplugin.version>
@@ -129,4 +131,42 @@
         <openpdf.version>1.3.29</openpdf.version>
         <wala.version>1.5.8</wala.version>
     </properties>
+    <profiles>
+        <profile>
+            <id>jdk-24-workarounds</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <version>${mvncompilerplugin.version}</version>
+                            <configuration>
+                                <!--JDK 24 requires explicitly enabled annotation processing but JDK 17 doesn't know the flag -->
+                                <compilerArgs>
+                                    <arg>-proc:full</arg>
+                                </compilerArgs>
+                            </configuration>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <version>2.12.2</version>
+                            <configuration>
+                                <!-- Avoid potential problems with jargraal and importing jdk.graal.compiler.graphio -->
+                                <argLine>
+                                    -XX:-UseJVMCICompiler
+                                    -XX:-EnableJVMCI
+                                </argLine>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+            <activation>
+                <jdk>[24,)</jdk>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+        </profile>
+    </profiles>
 </project>

visualizer/Readme.md

@@ -2,15 +2,15 @@
 
 ## Prerequisites
 
-- JDK 21 is the recommended Java runtime platform for IGV, but any release between 17 and 22 is
-  supported by the NetBeans 22 platform.
+- JDK 21 is the recommended Java runtime platform for IGV, but any release between 17 and 24 is
+  supported by the NetBeans 26 platform.
 
 ## Building and testing IGV
 
 ### MX
 
 IGV is an MX project and for convenience should be built and tested as such.  It's also a NetBeans
-22 project based on Maven so it can be developed using any tool chain which supports Maven.
+26 project based on Maven so it can be developed using any tool chain which supports Maven.
 Certains kind of edits, like editing the NetBeans module exlusions or editing the special UI
 components, will require using NetBeans.