Migrate to JDK 21 unix sockets

extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml

@@ -56,11 +56,6 @@
     <folder name="Services">
 
         <folder name="Hidden">
-            <file name="com-jcraft-jzlib-antlibrary.instance">
-                <attr name="instanceCreate" methodvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspath.url"/>
-                <attr name="instanceOf" stringvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspathProvider"/>
-                <attr name="url" urlvalue="nbinst://com.jcraft.jzlib/modules/com-jcraft-jzlib.jar"/>
-            </file>
             <file name="com-jcraft-jsch-antlibrary.instance">
                 <attr name="instanceCreate" methodvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspath.url"/>
                 <attr name="instanceOf" stringvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspathProvider"/>

ide/c.jcraft.jsch/build.xml

@@ -22,16 +22,17 @@
 <project name="ide/c.jcraft.jsch" default="build" basedir=".">
     <import file="../../nbbuild/templates/projectized.xml"/>
     <target name="jar" depends="-define-FileCRC32Calculator">
-        <FileCRC32Calculator file="external/jsch-0.1.72.jar" property="c.jcraft.jsch.crc32" />
+        <FileCRC32Calculator file="external/jsch-2.28.0.jar" property="c.jcraft.jsch.crc32" />
         <jar jarfile="${cluster}/${module.jar}">
-            <zipfileset src="external/jsch-0.1.72.jar"/>
+            <zipfileset src="external/jsch-2.28.0.jar"/>
             <manifest>
+                <attribute name="Bundle-ManifestVersion" value="2"/>
                 <attribute name="Bundle-SymbolicName" value="com.jcraft.jsch"/>
-                <attribute name="Bundle-Version" value="0.1.72"/>
-                <attribute name="Export-Package" value="com.jcraft.jsch;version=0.1.72"/>
+                <attribute name="Bundle-Version" value="2.28.0"/>
+                <attribute name="Export-Package" value="com.jcraft.jsch;version=2.28.0"/>
                 <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss"/>
                 <!-- Ensure that the necessary modules/bundles are made available to JSch -->
-                <attribute name="Require-Bundle" value="com.jcraft.jzlib,bcprov,libs.c.kohlschutter.junixsocket,org.netbeans.libs.jna,org.netbeans.libs.jna.platform"/>
+                <attribute name="Require-Bundle" value="bcprov,org.netbeans.libs.jna,org.netbeans.libs.jna.platform"/>
                 <attribute name="NB-Original-CRC" value="${c.jcraft.jsch.crc32}"/>
                 <attribute name="Multi-Release" value="true"/>
             </manifest>

ide/c.jcraft.jsch/external/binaries-list

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-470C45A2B42103D48772F877B1C7287619AD490E com.github.mwiede:jsch:0.1.72
+677E8DD6F415AF40B10B921C94D82FD82034D822 com.github.mwiede:jsch:2.28.0

ide/c.jcraft.jsch/external/jsch-0.1.72-license.txt → ide/c.jcraft.jsch/external/jsch-2.28.0-license.txt

@@ -1,8 +1,8 @@
 Name: JSch
-Version: 0.1.72
+Version: 2.28.0
 License: BSD-jsch
 Origin: JCraft Inc.
-URL: https://github.com/mwiede/jsch/tree/jsch-0.1.72
+URL: https://github.com/mwiede/jsch/tree/jsch-2.28.0
 Description: Java implementation of SSH2
 
 Copyright (c) 2002-2015 Atsuhiko Yamanaka, JCraft,Inc.

ide/c.jcraft.jsch/nbproject/project.properties

@@ -16,6 +16,6 @@
 # under the License.
 
 is.autoload=true
-extra.license.files=external/jsch-0.1.72-license.txt
+extra.license.files=external/jsch-2.28.0-license.txt
 sigtest.gen.fail.on.error=false
 

ide/c.jcraft.jsch/nbproject/project.xml

@@ -30,21 +30,6 @@
                     <build-prerequisite/>
                     <run-dependency/>
                 </dependency>
-                <dependency>
-                    <code-name-base>com.jcraft.jzlib</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency/>
-                </dependency>
-                <dependency>
-                    <code-name-base>libs.c.kohlschutter.junixsocket</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>3.0</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.libs.jna</code-name-base>
                     <build-prerequisite/>
@@ -69,7 +54,7 @@
             </public-packages>
             <class-path-extension>
                 <runtime-relative-path>com-jcraft-jsch.jar</runtime-relative-path>
-                <binary-origin>external/jsch-0.1.72.jar</binary-origin>
+                <binary-origin>external/jsch-2.28.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/docker.api/nbproject/project.properties

@@ -18,5 +18,5 @@
 
 is.autoload=true
 javac.compilerargs=-Xlint -Xlint:-serial
-javac.release=17
+javac.release=21
 

ide/docker.api/nbproject/project.xml

@@ -25,15 +25,6 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.netbeans.modules.docker.api</code-name-base>
             <module-dependencies>
-                <dependency>
-                    <code-name-base>libs.c.kohlschutter.junixsocket</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>3.0</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                     <build-prerequisite/>

ide/docker.api/src/org/netbeans/modules/docker/Endpoint.java

@@ -23,6 +23,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
+import java.nio.channels.Channels;
+import java.nio.channels.SocketChannel;
 
 /**
  *
@@ -53,4 +55,22 @@ public void close() throws IOException {
         };
     }
 
+    public static Endpoint forSocketChannel(final SocketChannel channel) {
+        return new Endpoint() {
+            @Override
+            public InputStream getInputStream() throws IOException {
+                return Channels.newInputStream(channel);
+}
+
+            @Override
+            public OutputStream getOutputStream() throws IOException {
+                return Channels.newOutputStream(channel);
+            }
+
+            @Override
+            public void close() throws IOException {
+                channel.close();
+            }
+        };
+    }
 }

ide/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java

@@ -30,7 +30,6 @@
 import org.netbeans.modules.docker.DirectStreamResult;
 import org.netbeans.modules.docker.Demuxer;
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -45,8 +44,11 @@
 import java.net.Socket;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.UnixDomainSocketAddress;
 import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
 import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -78,8 +80,6 @@
 import org.netbeans.modules.docker.DockerUtils;
 import org.netbeans.modules.docker.Endpoint;
 import org.netbeans.modules.docker.StreamResult;
-import org.newsclub.net.unix.AFUNIXSocket;
-import org.newsclub.net.unix.AFUNIXSocketAddress;
 import org.openide.filesystems.FileObject;
 import org.openide.util.Pair;
 import org.openide.util.Parameters;
@@ -1269,10 +1269,8 @@ private Endpoint createEndpoint() throws IOException {
                 s.connect(new InetSocketAddress(realUrl.getHost(), port));
                 return Endpoint.forSocket(s);
             } else if ("file".equals(realUrl.getProtocol())) {
-                AFUNIXSocket s = AFUNIXSocket.newInstance();
-                AFUNIXSocketAddress sockAdd = AFUNIXSocketAddress.of(new File(realUrl.getFile()));
-                s.connect(sockAdd);
-                return Endpoint.forSocket(s);
+                SocketChannel channel = SocketChannel.open(UnixDomainSocketAddress.of(Path.of(realUrl.getFile())));
+                return Endpoint.forSocketChannel(channel);
             } else {
                 throw new IOException("Unknown protocol: " + realUrl.getProtocol());
             }

ide/docker.api/src/org/netbeans/modules/docker/api/DockerSupport.java

@@ -30,7 +30,6 @@
 import java.util.prefs.Preferences;
 import javax.swing.event.ChangeListener;
 import org.netbeans.api.annotations.common.NonNull;
-import org.newsclub.net.unix.AFUNIXSocket;
 import org.openide.util.ChangeSupport;
 import org.openide.util.NbPreferences;
 import org.openide.util.Parameters;
@@ -128,7 +127,7 @@ public void removeChangeListener(ChangeListener listener) {
     }
 
     public boolean isSocketSupported() {
-        return AFUNIXSocket.isSupported();
+        return true;
     }
 
     private boolean isInitialized() {

ide/ide.kit/module-auto-deps.xml

@@ -22,24 +22,24 @@
 <!DOCTYPE transformations PUBLIC "-//NetBeans//DTD Module Automatic Dependencies 1.0//EN" "http://www.netbeans.org/dtds/module-auto-deps-1_0.dtd">
 <transformations version="1.0">
     <transformationgroup>
-        <description>libs.jzlib and libs.jsch renamed</description>
+        <description>jzlib removed and jsch wrapper renamed</description>
         <transformation>
             <trigger-dependency type="cancel">
                 <module-dependency codenamebase="org.netbeans.libs.jzlib"/>
             </trigger-dependency>
-            <implies>
-                <result>
-                    <module-dependency codenamebase="com.jcraft.jzlib" spec="1.1.3"/>
-                </result>
-            </implies>
+        </transformation>
+        <transformation>
+            <trigger-dependency type="cancel">
+                <module-dependency codenamebase="com.jcraft.jzlib"/>
+            </trigger-dependency>
         </transformation>
         <transformation>
             <trigger-dependency type="cancel">
                 <module-dependency codenamebase="org.netbeans.libs.jsch"/>
             </trigger-dependency>
             <implies>
                 <result>
-                    <module-dependency codenamebase="com.jcraft.jsch" spec="0.1.55"/>
+                    <module-dependency codenamebase="com.jcraft.jsch" spec="2.28.0"/>
                 </result>
             </implies>
         </transformation>