mbien · mbien · Feb 19, 2025 · Feb 21, 2025
diff --git a/...r.jpda.truffle/test/unit/src/org/netbeans/modules/debugger/jpda/truffle/JPDATestCase.java b/...r.jpda.truffle/test/unit/src/org/netbeans/modules/debugger/jpda/truffle/JPDATestCase.java
@@ -48,7 +48,7 @@ protected static Test createSuite(Class<? extends TestCase> clazz) {
                 enableClasspathModules(false). 
                 clusters(".*").
                 // TODO remove once polyglot tests can run on JDK 17+ and uncomment the other line again
-                enableModules("(?!org.netbeans.modules.languages.hcl|org.netbeans.lib.nbjshell9|org.netbeans.lib.nbjshell|org.netbeans.libs.graalsdk.system).*").hideExtraModules(true).
+                enableModules("(?!org.netbeans.modules.languages.hcl|org.netbeans.lib.nbjshell|org.netbeans.libs.graalsdk.system).*").hideExtraModules(true).
 //                enableModules("org.netbeans.libs.nbjavacapi").
                 suite();
     }

diff --git a/java/java.lsp.server/nbcode/nbproject/platform.properties b/java/java.lsp.server/nbcode/nbproject/platform.properties
@@ -61,8 +61,6 @@ disabled.modules=\
     org.netbeans.core.output2,\
     org.netbeans.core.windows,\
     org.netbeans.lib.jshell.agent,\
-    org.netbeans.lib.nbjshell,\
-    org.netbeans.lib.nbjshell9,\
     org.netbeans.lib.terminalemulator,\
     org.netbeans.libs.cglib,\
     org.netbeans.libs.commons_net,\

diff --git a/java/jshell.support/nbproject/project.xml b/java/jshell.support/nbproject/project.xml
@@ -104,14 +104,6 @@
                         <specification-version>1.7</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.lib.nbjshell</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.libs.javacapi</code-name-base>
                     <build-prerequisite/>

diff --git a/java/lib.jshell.agent/build.xml b/java/lib.jshell.agent/build.xml
@@ -55,20 +55,6 @@
     </target>
 
     <target name="jar-probe" depends="probe-init">
-        <unjar src="${agentsrc.jshell.cp}" dest="build/agent/classes">
-            <patternset>
-                <include name="jdk/jshell/execution/**"/>
-                <exclude name="**/JDI*.class"/>
-                <exclude name="**/LocalExecutionControl.class"/>
-                <exclude name="**/StreamingExecutionControl.class"/>
-                <!--<exclude name="**/DemultiplexInput.class"/>-->
-            </patternset>
-            <patternset>
-                <include name="jdk/jshell/spi/ExecutionControl*.class"/>
-                <exclude name="jdk/jshell/spi/ExecutionControl*Generator.class"/>
-                <include name="jdk/jshell/spi/SPIResolutionException.class"/>
-            </patternset>
-        </unjar>
         <mkdir dir="${cluster}/modules/ext"/>
         <nb-ext-jar jarfile="${cluster}/modules/ext/nb-custom-jshell-probe.jar">
             <manifest>

diff --git a/java/lib.jshell.agent/external/binaries-list b/java/lib.jshell.agent/external/binaries-list
diff --git a/java/lib.jshell.agent/external/jshell-9-license.txt b/java/lib.jshell.agent/external/jshell-9-license.txt
diff --git a/java/lib.jshell.agent/nbproject/project.properties b/java/lib.jshell.agent/nbproject/project.properties
@@ -16,10 +16,9 @@
 # under the License.
 
 is.autoload=true
-javac.source=1.8
+javac.release=11
 javac.compilerargs=-Xlint -Xlint:-serial
 extra.module.files=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
 jnlp.indirect.jars=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
 
 agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.7.1.jar
-agentsrc.jshell.cp=external/jshell-9.jar
diff --git a/java/lib.jshell.agent/nbproject/project.xml b/java/lib.jshell.agent/nbproject/project.xml
@@ -33,12 +33,6 @@
                         <specification-version>5.3</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.lib.nbjshell</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <public-packages/>
             <extra-compilation-unit>

diff --git a/java/lib.nbjshell/build.xml b/java/lib.nbjshell/build.xml
diff --git a/java/lib.nbjshell/manifest.mf b/java/lib.nbjshell/manifest.mf
diff --git a/java/lib.nbjshell/nbproject/org-netbeans-lib-nbjshell.sig b/java/lib.nbjshell/nbproject/org-netbeans-lib-nbjshell.sig
diff --git a/java/lib.nbjshell/nbproject/project.properties b/java/lib.nbjshell/nbproject/project.properties
diff --git a/java/lib.nbjshell/nbproject/project.xml b/java/lib.nbjshell/nbproject/project.xml
diff --git a/java/lib.nbjshell/src/org/netbeans/lib/nbjshell/Bundle.properties b/java/lib.nbjshell/src/org/netbeans/lib/nbjshell/Bundle.properties
diff --git a/java/lib.nbjshell9/build.xml b/java/lib.nbjshell9/build.xml
diff --git a/java/lib.nbjshell9/manifest.mf b/java/lib.nbjshell9/manifest.mf
diff --git a/java/lib.nbjshell9/nbproject/project.properties b/java/lib.nbjshell9/nbproject/project.properties
diff --git a/java/lib.nbjshell9/nbproject/project.xml b/java/lib.nbjshell9/nbproject/project.xml
diff --git a/java/lib.nbjshell9/src/org/netbeans/lib/nbjshell9/Bundle.properties b/java/lib.nbjshell9/src/org/netbeans/lib/nbjshell9/Bundle.properties
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
@@ -662,8 +662,6 @@ nb.cluster.java=\
         languages.antlr,\
         lib.jshell.agent,\
         lib.nbjavac,\
-        lib.nbjshell,\
-        lib.nbjshell9,\
         libs.cglib,\
         libs.corba.omgapi,\
         libs.javacapi,\