Update jgit to version 7.7.1, Bouncy Castle to 1.85 and Apache Mina SSH to 2.19.0

.github/workflows/main.yml

@@ -1145,19 +1145,6 @@ jobs:
       - name: platform/openide.util.ui
         run: ant $OPTS -f platform/openide.util.ui test
 
-      # isolation required by netbinox tests
-      - name: isolate platform build
-        run: |
-          cp -r platform/ _platform/ && cp -r harness/ _harness/ && cp nbbuild/build/nbantext.jar .
-          cp -r nbbuild/netbeans/platform/ _nb_platform/ && cp -r nbbuild/netbeans/harness/ _nb_harness/
-          ant $OPTS -quiet clean && rm -Rf platform/ && rm -Rf harness/
-          mkdir nbbuild/build && mkdir nbbuild/netbeans
-          mv _platform/ platform/ && mv _harness/ harness/ && mv nbantext.jar nbbuild/build/
-          mv _nb_platform/ nbbuild/netbeans/platform/ && mv _nb_harness/ nbbuild/netbeans/harness/
-
-      - name: platform/netbinox
-        run: ant $OPTS -f platform/netbinox test -Dtest.config=stableBTD
-
       - name: Create Test Summary
         uses: test-summary/action@37b508cfee6d4d080eedd00b5bb240a6a784a6a5 # v2.6
         if: failure()

ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDLayersProvider.java

@@ -18,6 +18,8 @@
  */
 package org.netbeans.modules.ide.ergonomics.fod;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.*;
 import java.util.logging.Level;
@@ -26,6 +28,7 @@
 import org.netbeans.spi.project.support.ant.AntBasedProjectType;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.Repository;
+import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.LookupEvent;
 import org.openide.util.LookupListener;
@@ -82,15 +85,25 @@ protected void registerLayers(Collection<? super URL> context) {
     }
 
     public FeatureInfo whichProvides(FileObject template) {
-        Set<URL> layers = new HashSet<URL>();
+        Set<URI> layers = new HashSet<>();
         Object obj = template.getAttribute("layers");
-        if (obj instanceof URL[]) {
-            layers.addAll(Arrays.asList((URL[])obj));
+        if (obj instanceof URL[] urlArray) {
+            for(URL url: urlArray) {
+                try {
+                    layers.add(url.toURI());
+                } catch (URISyntaxException | NullPointerException ex) {
+                    LOG.log(Level.WARNING, "Failed to convert URL to URI: {0}", url);
+                }
+            }
         }
 
         for (FeatureInfo info : FeatureManager.features()) {
-            if (layers.contains(info.getLayerURL())) {
-                return info;
+            try {
+                if (layers.contains(info.getLayerURL().toURI())) {
+                    return info;
+                }
+            } catch (URISyntaxException | NullPointerException ex) {
+                LOG.log(Level.WARNING, "Failed to convert URL to URI: {0}", info.getLayerURL());
             }
         }
         return null;

ide/bcpg/external/bcpg-jdk18on-1.83-license.txt → ide/bcpg/external/bcpg-jdk18on-1.85-license.txt

@@ -1,5 +1,5 @@
 Name: Bouncy Castle Java OpenPGP/BCPG
-Version: 1.83
+Version: 1.85
 License: MIT-bouncycastle
 Origin: https://www.bouncycastle.org/latest_releases.html
 Description: Legion of the Bouncy Castle Java cryptography APIs

ide/bcpg/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.
-4369727B9B02E6C62C26FDE862AC42D77CE8EDEF org.bouncycastle:bcpg-jdk18on:1.83
+0EB8822A019C29A5D205811367480EBE8C747714 org.bouncycastle:bcpg-jdk18on:1.85

ide/bcpg/nbproject/project.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/bcpg-jdk18on-1.83.jar=modules/bcpg.jar
+release.external/bcpg-jdk18on-1.85.jar=modules/bcpg.jar
 is.autoload=true

ide/bcpg/nbproject/project.xml

@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>bcpg.jar</runtime-relative-path>
-                <binary-origin>external/bcpg-jdk18on-1.83.jar</binary-origin>
+                <binary-origin>external/bcpg-jdk18on-1.85.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/bcpkix/external/bcpkix-jdk18on-1.83-license.txt → ide/bcpkix/external/bcpkix-jdk18on-1.85-license.txt

@@ -1,5 +1,5 @@
 Name: Bouncy Castle Java Provider
-Version: 1.83
+Version: 1.85
 License: MIT-bouncycastle
 Origin: https://www.bouncycastle.org/latest_releases.html
 Description: Legion of the Bouncy Castle Java cryptography APIs

ide/bcpkix/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.
-3F4300D0441459BFA64A481C80062B002FF0CF65 org.bouncycastle:bcpkix-jdk18on:1.83
+B33D047ADC6801A1CFC8FFE1634B23B306A670C1 org.bouncycastle:bcpkix-jdk18on:1.85

ide/bcpkix/nbproject/project.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/bcpkix-jdk18on-1.83.jar=modules/bcpkix.jar
+release.external/bcpkix-jdk18on-1.85.jar=modules/bcpkix.jar
 is.autoload=true

ide/bcpkix/nbproject/project.xml

@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>bcpkix.jar</runtime-relative-path>
-                <binary-origin>external/bcpkix-jdk18on-1.83.jar</binary-origin>
+                <binary-origin>external/bcpkix-jdk18on-1.85.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/bcprov/external/bcprov-jdk18on-1.83-license.txt → ide/bcprov/external/bcprov-jdk18on-1.85-license.txt

@@ -1,5 +1,5 @@
 Name: Bouncy Castle Java Provider
-Version: 1.83
+Version: 1.85
 License: MIT-bouncycastle
 Origin: https://www.bouncycastle.org/latest_releases.html
 Description: Legion of the Bouncy Castle Java cryptography APIs

ide/bcprov/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.
-310E719F391BD9F4EE5103CA299C172643EFB595 org.bouncycastle:bcprov-jdk18on:1.83
+2320B854DFFE134687F7266BB22021B779E576D3 org.bouncycastle:bcprov-jdk18on:1.85

ide/bcprov/nbproject/project.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/bcprov-jdk18on-1.83.jar=modules/bcprov.jar
+release.external/bcprov-jdk18on-1.85.jar=modules/bcprov.jar
 is.autoload=true

ide/bcprov/nbproject/project.xml

@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>bcprov.jar</runtime-relative-path>
-                <binary-origin>external/bcprov-jdk18on-1.83.jar</binary-origin>
+                <binary-origin>external/bcprov-jdk18on-1.85.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/bcutil/external/bcutil-jdk18on-1.83-license.txt → ide/bcutil/external/bcutil-jdk18on-1.85-license.txt

@@ -1,5 +1,5 @@
 Name: Bouncy Castle ASN.1 Extension and Utility APIs
-Version: 1.83
+Version: 1.85
 License: MIT-bouncycastle
 Origin: https://www.bouncycastle.org/latest_releases.html
 Description: Legion of the Bouncy Castle Java cryptography APIs

ide/bcutil/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.
-DA0747F51FE1774F8E922B498B9C3E0EBE87B2D4 org.bouncycastle:bcutil-jdk18on:1.83
+C41082D6F61628919B675970563F5615E4427C9F org.bouncycastle:bcutil-jdk18on:1.85

ide/bcutil/nbproject/project.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/bcutil-jdk18on-1.83.jar=modules/bcutil.jar
+release.external/bcutil-jdk18on-1.85.jar=modules/bcutil.jar
 is.autoload=true

ide/bcutil/nbproject/project.xml

@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>bcutil.jar</runtime-relative-path>
-                <binary-origin>external/bcutil-jdk18on-1.83.jar</binary-origin>
+                <binary-origin>external/bcutil-jdk18on-1.85.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/git/nbproject/project.xml

@@ -30,6 +30,22 @@
                     <compile-dependency/>
                     <run-dependency/>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.eclipse.jgit.gpg.bc</code-name-base>
+                    <run-dependency/>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.eclipse.jgit.lfs</code-name-base>
+                    <run-dependency/>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.eclipse.jgit.ssh.apache</code-name-base>
+                    <run-dependency/>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.eclipse.jgit.ssh.apache.agent</code-name-base>
+                    <run-dependency/>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                     <build-prerequisite/>

ide/git/src/org/netbeans/modules/git/client/CredentialsCallback.java

@@ -78,6 +78,15 @@ public char[] getPassword (String uri, String prompt) {
             pwd = password.clone();
             Arrays.fill(password, (char) 0);
             credentialsReady = false;
+        } else if (passphrase != null) {
+            // the jgit apache mina client uses password instead of passphrase
+            // to unlock the identity file, an additional guard could be to
+            // check for prompt "Passphrase", but that is/could be a localized.
+            // As only ever either password _or_ passphrase are available, this
+            // should be save (see fetchCredentials)
+            pwd = passphrase.clone();
+            Arrays.fill(passphrase, (char) 0);
+            credentialsReady = false;
         }
         return pwd;
     }

ide/ide.kit/manifest.mf

@@ -2,5 +2,3 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.ide.kit
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ide/kit/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.67
-OpenIDE-Module-Needs: org.netbeans.Netbinox
-

ide/libs.git/manifest.mf

@@ -2,3 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.libs.git/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/git/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.69
+OpenIDE-Module-Install: org/netbeans/libs/git/jgit/Installer.class

ide/libs.git/nbproject/project.xml

@@ -26,11 +26,11 @@
             <code-name-base>org.netbeans.libs.git</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>com.jcraft.jsch</code-name-base>
+                    <code-name-base>org.apache.sshd.osgi</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.1.55</specification-version>
+                        <specification-version>2.17.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -42,20 +42,27 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.eclipse.jgit.ssh.jsch</code-name-base>
+                    <code-name-base>org.eclipse.jgit.ssh.apache</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.7</specification-version>
+                        <specification-version>7.6.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.modules</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.81</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.libs.jsch.agentproxy</code-name-base>
+                    <code-name-base>org.openide.util.ui</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>9.42</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>

ide/libs.git/src/org/netbeans/libs/git/jgit/Installer.java

@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.libs.git.jgit;
+
+import java.util.stream.Collectors;
+import org.apache.sshd.common.util.security.SecurityUtils;
+import org.openide.modules.ModuleInstall;
+
+import static org.apache.sshd.common.util.security.SecurityUtils.DEFAULT_SECURITY_PROVIDER_REGISTRARS;
+
+public class Installer extends ModuleInstall {
+
+    @Override
+    public void restored() {
+        // Override the security providers Apache Mina. EdDSASecurityProviderRegistrar
+        // uses net.i2p.crypto.eddsa to provide support for ed25519, that is not
+        // needed, as BouncyCastle also has support for the curve. As long as the
+        // security provider is activated Mina will try to load it and fail fatally
+        // if that fails.
+        System.setProperty(
+                SecurityUtils.SECURITY_PROVIDER_REGISTRARS,
+                DEFAULT_SECURITY_PROVIDER_REGISTRARS
+                        .stream()
+                        .filter(e -> ! e.endsWith("EdDSASecurityProviderRegistrar"))
+                        .collect(Collectors.joining(","))
+        );
+        super.restored();
+    }
+
+}