diff --git a/0002-Ensure-all-packages-are-exported.patch b/0002-Ensure-all-packages-are-exported.patch deleted file mode 100644 index 7fd14162bc6ed5db153d3a55c59557a75724a7f4..0000000000000000000000000000000000000000 --- a/0002-Ensure-all-packages-are-exported.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 77a7644525c260098740a6670bf389b3957b746a Mon Sep 17 00:00:00 2001 -From: Matthias Sohn -Date: Sun, 16 Jun 2019 02:30:10 +0200 -Subject: [PATCH 2/2] Ensure all packages are exported - -This wasn't the case for the bundles -- org.eclipse.jgit.ant -- org.eclipse.jgit.archive - -Change-Id: Ibefcc82174fe23a9c1afb765099957414ac3556b -Signed-off-by: Matthias Sohn --- - org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 4 ++-- - org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) ---- - org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 4 ++-- - org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -index bb61635..7b24bf6 100644 ---- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF -@@ -9,5 +9,5 @@ Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.4.0,5.5.0)" - Bundle-Localization: plugin - Bundle-Vendor: %Provider-Name --Export-Package: org.eclipse.jgit.ant.tasks;version="5.4.0"; -- uses:="org.apache.tools.ant.types,org.apache.tools.ant" -+Export-Package: org.eclipse.jgit.ant, -+ org.eclipse.jgit.ant.tasks;version="5.4.0";uses:="org.apache.tools.ant.types,org.apache.tools.ant" -diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -index 1fa5e8c..0eabf1f 100644 ---- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF -@@ -25,4 +25,5 @@ Export-Package: org.eclipse.jgit.archive;version="5.4.0"; - uses:="org.eclipse.jgit.lib, - org.eclipse.jgit.api, - org.apache.commons.compress.archivers, -- org.osgi.framework" -+ org.osgi.framework", -+ org.eclipse.jgit.archive.internal;x-internal:=true --- -2.20.1 - diff --git a/0003-Remove-dependency-on-javax.xml.bind-package.patch b/0003-Remove-dependency-on-javax.xml.bind-package.patch deleted file mode 100644 index f9672cc3110d6ed7bb5db09047aecf00c3bacb90..0000000000000000000000000000000000000000 --- a/0003-Remove-dependency-on-javax.xml.bind-package.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 0d1cc8f8d3adb99f75fce180d857077ada3a19ee Mon Sep 17 00:00:00 2001 -From: David Ostrovsky -Date: Mon, 17 Jun 2019 23:28:52 +0200 -Subject: [PATCH 3/3] Remove dependency on javax.xml.bind package - -Replace javax.xml.bind.DatatypeConverter, that is not available any -more in Java 11 and later with Hex utility from non optional Bouncy -Castle library. - -Bug: 540790 -Change-Id: I9903c00ecc1a434e9795b8ba9267f02628fdc0e9 -Signed-off-by: David Ostrovsky ---- - BUILD | 7 ------- - org.eclipse.jgit/BUILD | 4 ---- - .../src/org/eclipse/jgit/transport/WalkEncryption.java | 7 +++---- - 3 files changed, 3 insertions(+), 15 deletions(-) - -diff --git a/BUILD b/BUILD -index 5fea669..be6dd76 100644 ---- a/BUILD -+++ b/BUILD -@@ -1,12 +1,5 @@ - package(default_visibility = ["//visibility:public"]) - --config_setting( -- name = "jdk9", -- values = { -- "java_toolchain": "@bazel_tools//tools/jdk:toolchain_jdk9", -- }, --) -- - genrule( - name = "all", - testonly = 1, -diff --git a/org.eclipse.jgit/BUILD b/org.eclipse.jgit/BUILD -index b67bfac..814ecec 100644 ---- a/org.eclipse.jgit/BUILD -+++ b/org.eclipse.jgit/BUILD -@@ -14,10 +14,6 @@ RESOURCES = glob(["resources/**"]) - java_library( - name = "jgit", - srcs = SRCS, -- javacopts = select({ -- "//:jdk9": ["--add-modules=java.xml.bind"], -- "//conditions:default": [], -- }), - resource_strip_prefix = "org.eclipse.jgit/resources", - resources = RESOURCES, - deps = [ -diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -index b4248ee..7a973af 100644 ---- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkEncryption.java -@@ -66,8 +66,8 @@ - import javax.crypto.spec.PBEKeySpec; - import javax.crypto.spec.PBEParameterSpec; - import javax.crypto.spec.SecretKeySpec; --import javax.xml.bind.DatatypeConverter; - -+import org.bouncycastle.util.encoders.Hex; - import org.eclipse.jgit.internal.JGitText; - import org.eclipse.jgit.util.Base64; - -@@ -301,7 +301,7 @@ InputStream decrypt(InputStream in) throws IOException { - String DEFAULT_KEY_ALGO = JetS3tV2.ALGORITHM; - String DEFAULT_KEY_SIZE = Integer.toString(JetS3tV2.KEY_SIZE); - String DEFAULT_KEY_ITER = Integer.toString(JetS3tV2.ITERATIONS); -- String DEFAULT_KEY_SALT = DatatypeConverter.printHexBinary(JetS3tV2.SALT); -+ String DEFAULT_KEY_SALT = Hex.toHexString(JetS3tV2.SALT); - - String EMPTY = ""; //$NON-NLS-1$ - -@@ -377,8 +377,7 @@ static GeneralSecurityException securityError(String message) { - - final byte[] salt; - try { -- salt = DatatypeConverter -- .parseHexBinary(keySalt.replaceAll(REGEX_WS, EMPTY)); -+ salt = Hex.decode(keySalt.replaceAll(REGEX_WS, EMPTY)); - } catch (Exception e) { - throw securityError(X_KEY_SALT + EMPTY + keySalt); - } --- -2.20.1 - diff --git a/jgit-5.11.0.202103091610-r.tar.xz b/jgit-5.11.0.202103091610-r.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..b5dc27102597522211b08a672fb17d64061728bc Binary files /dev/null and b/jgit-5.11.0.202103091610-r.tar.xz differ diff --git a/jgit-5.4.0.201906121030-r.tar.xz b/jgit-5.4.0.201906121030-r.tar.xz deleted file mode 100644 index 7aadcb5e932eae790f1c976727c3ae520d265e05..0000000000000000000000000000000000000000 Binary files a/jgit-5.4.0.201906121030-r.tar.xz and /dev/null differ diff --git a/jgit-apache-sshd-2.7.0.patch b/jgit-apache-sshd-2.7.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..449cd1a2737045139ed82d00318a3c64103c2f7f --- /dev/null +++ b/jgit-apache-sshd-2.7.0.patch @@ -0,0 +1,260 @@ +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF 2021-07-30 12:03:35.087914326 +0200 +@@ -8,31 +8,31 @@ + Bundle-Vendor: %Bundle-Vendor + Bundle-ActivationPolicy: lazy + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +-Import-Package: org.apache.sshd.common;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.file.virtualfs;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.io;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.kex;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.session;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.signature;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.buffer;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.logging;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.threads;version="[2.6.0,2.7.0)", +- org.apache.sshd.core;version="[2.6.0,2.7.0)", +- org.apache.sshd.server;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.auth;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.auth.gss;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.auth.keyboard;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.auth.password;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.command;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.session;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.shell;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)", +- org.apache.sshd.sftp;version="[2.6.0,2.7.0)", +- org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)", ++Import-Package: org.apache.sshd.common;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.io;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.kex;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.signature;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.buffer;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.logging;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.threads;version="[2.7.0,2.10.0)", ++ org.apache.sshd.core;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.auth;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.auth.gss;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.auth.password;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.command;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.session;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.shell;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.subsystem;version="[2.7.0,2.10.0)", ++ org.apache.sshd.sftp;version="[2.7.0,2.10.0)", ++ org.apache.sshd.sftp.server;version="[2.7.0,2.10.0)", + org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF 2021-07-30 12:03:35.087914326 +0200 +@@ -33,51 +33,51 @@ + org.apache.sshd.client.session, + org.apache.sshd.client.keyverifier" + Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", +- org.apache.sshd.agent;version="[2.6.0,2.7.0)", +- org.apache.sshd.client;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.auth;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.auth.keyboard;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.auth.password;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.auth.pubkey;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.channel;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.config.keys;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.future;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.keyverifier;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.session;version="[2.6.0,2.7.0)", +- org.apache.sshd.client.session.forward;version="[2.6.0,2.7.0)", +- org.apache.sshd.common;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.auth;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.channel;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.compression;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.config.keys.loader;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.digest;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.forward;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.future;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.io;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.kex;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.mac;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.random;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.session;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.session.helpers;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.signature;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.buffer;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.closeable;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.io;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.io.resource;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.logging;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.net;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)", +- org.apache.sshd.core;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.auth;version="[2.6.0,2.7.0)", +- org.apache.sshd.sftp;version="[2.6.0,2.7.0)", +- org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)", +- org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)", ++ org.apache.sshd.agent;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.auth;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.auth.password;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.channel;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.config.hosts;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.config.keys;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.future;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.keyverifier;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.session;version="[2.7.0,2.10.0)", ++ org.apache.sshd.client.session.forward;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.auth;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.channel;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.compression;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.digest;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.forward;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.future;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.io;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.kex;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.mac;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.random;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.session.helpers;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.signature;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.buffer;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.closeable;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.io;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.io.resource;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.logging;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.net;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.10.0)", ++ org.apache.sshd.core;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.auth;version="[2.7.0,2.10.0)", ++ org.apache.sshd.sftp;version="[2.7.0,2.10.0)", ++ org.apache.sshd.sftp.client;version="[2.7.0,2.10.0)", ++ org.apache.sshd.sftp.common;version="[2.7.0,2.10.0)", + org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", + org.eclipse.jgit.fnmatch;version="[5.11.0,5.12.0)", +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java 2021-07-30 12:04:40.688349950 +0200 +@@ -133,8 +133,8 @@ + } + + @Override +- protected IoWriteFuture sendIdentification(String ident) +- throws IOException { ++ protected IoWriteFuture sendIdentification(String ident, ++ List extraLines) throws Exception { + StatefulProxyConnector proxy = proxyHandler; + if (proxy != null) { + try { +@@ -142,7 +142,8 @@ + // from the peer only once the initial sendKexInit() following + // this call to sendIdentification() has returned! + proxy.runWhenDone(() -> { +- JGitClientSession.super.sendIdentification(ident); ++ JGitClientSession.super.sendIdentification(ident, ++ extraLines); + return null; + }); + // Called only from the ClientSessionImpl constructor, where the +@@ -154,12 +155,11 @@ + throw new IOException(other.getLocalizedMessage(), other); + } + } +- return super.sendIdentification(ident); ++ return super.sendIdentification(ident, extraLines); + } + + @Override +- protected byte[] sendKexInit() +- throws IOException, GeneralSecurityException { ++ protected byte[] sendKexInit() throws Exception { + StatefulProxyConnector proxy = proxyHandler; + if (proxy != null) { + try { +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF 2021-07-30 12:03:35.087914326 +0200 +@@ -7,18 +7,18 @@ + Bundle-Vendor: %Bundle-Vendor + Bundle-Localization: plugin + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +-Import-Package: org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)", +- org.apache.sshd.common;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.auth;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.config.keys;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.helpers;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.keyprovider;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.session;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.net;version="[2.6.0,2.7.0)", +- org.apache.sshd.common.util.security;version="[2.6.0,2.7.0)", +- org.apache.sshd.core;version="[2.6.0,2.7.0)", +- org.apache.sshd.server;version="[2.6.0,2.7.0)", +- org.apache.sshd.server.forward;version="[2.6.0,2.7.0)", ++Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.auth;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.net;version="[2.7.0,2.10.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.10.0)", ++ org.apache.sshd.core;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server;version="[2.7.0,2.10.0)", ++ org.apache.sshd.server.forward;version="[2.7.0,2.10.0)", + org.eclipse.jgit.api;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.11.0,5.12.0)", +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/META-INF/MANIFEST.MF jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.test/META-INF/MANIFEST.MF +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.test/META-INF/MANIFEST.MF 2021-07-30 11:58:52.578038135 +0200 +@@ -15,7 +15,6 @@ + org.apache.commons.compress.compressors.bzip2;version="[1.15.0,2.0)", + org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", + org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", +- org.assertj.core.api;version="[3.14.0,4.0.0)", + org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/pom.xml jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.test/pom.xml +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/pom.xml 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.test/pom.xml 2021-07-30 11:57:51.365631621 +0200 +@@ -66,11 +66,6 @@ + + + +- org.assertj +- assertj-core +- +- +- + org.mockito + mockito-core + 2.23.0 +Only in jgit-5.11.0.202103091610-r/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport: RequestValidatorTestCase.java diff --git a/jgit.spec b/jgit.spec index 367776d57dd4be2608e82677f5ff365408d86889..46f53f17832866130900bb31542f34a428fdf024 100644 --- a/jgit.spec +++ b/jgit.spec @@ -1,15 +1,15 @@ -%global gittag 5.4.0.201906121030-r +%global gittag 5.11.0.202103091610-r %bcond_with tests Name: jgit -Version: 5.4.0 -Release: 2 +Version: 5.11.0 +Release: 1 Summary: A pure java implementation of git License: BSD URL: https://www.eclipse.org/jgit/ Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.tar.xz Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch -Patch1: 0002-Ensure-all-packages-are-exported.patch -Patch2: 0003-Remove-dependency-on-javax.xml.bind-package.patch +Patch1: jgit-apache-sshd-2.7.0.patch + BuildArch: noarch BuildRequires: maven-local mvn(args4j:args4j) mvn(com.google.code.gson:gson) BuildRequires: mvn(com.googlecode.javaewah:JavaEWAH) mvn(com.jcraft:jsch) @@ -19,17 +19,17 @@ BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.apache.sshd:sshd-osgi) >= 2.2.0 mvn(org.apache.sshd:sshd-sftp) >= 2.2.0 -BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) >= 1.61 -BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) >= 1.61 -BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) >= 1.61 +BuildRequires: mvn(org.apache.sshd:sshd-osgi) >= 2.6.0 mvn(org.apache.sshd:sshd-sftp) >= 2.6.0 +BuildRequires: mvn(org.bouncycastle:bcpg-jdk15on) >= 1.65 +BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) >= 1.65 +BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) >= 1.65 BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) mvn(org.slf4j:slf4j-simple) mvn(org.tukaani:xz) %if %{with tests} BuildRequires: git mvn(org.hamcrest:hamcrest-library) mvn(org.mockito:mockito-core) %endif -Requires: bouncycastle >= 1.61 apache-sshd >= 1:2.2.0 +Requires: bouncycastle >= 1.65 apache-sshd >= 1:2.6.0 %description A pure Java implementation of the Git version control system and command line interface. @@ -43,13 +43,13 @@ Summary: API documentation for %{name} %setup -n jgit-%{gittag} -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 + rm .mvn/maven.config -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions/pom:execution[pom:id='compile-with-errorprone']" pom.xml -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:executions/pom:execution[pom:id='default-compile']/pom:configuration" pom.xml -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:dependencies" pom.xml +%pom_xpath_remove "pom:configuration/pom:annotationProcessorPaths" +%pom_xpath_remove "pom:configuration/pom:compilerArgs" %pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core:provided %pom_disable_module org.eclipse.jgit.coverage +%pom_disable_module org.eclipse.jgit.benchmarks %pom_remove_plugin :jacoco-maven-plugin %pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin -r :maven-source-plugin @@ -61,6 +61,8 @@ sed -i -e 's/@{argLine}//' $(find -name pom.xml) %pom_xpath_remove "pom:plugins/pom:plugin/pom:executions/pom:execution[pom:id='create_jgit']" org.eclipse.jgit.pgm sed -i -e 's/org\.springframework\.boot\.loader\.JarLauncher/org.eclipse.jgit.pgm.Main/' \ org.eclipse.jgit.pgm/jgit.sh +sed -i -e '/javax\.servlet/s/4\.0\.0/5.0.0/' org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +sed -i -e '/javax\.servlet/s/3\.2\.0/5.0.0/' org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF org.eclipse.jgit.http.server/META-INF/MANIFEST.MF %pom_remove_dep log4j:log4j . org.eclipse.jgit.pgm %pom_change_dep org.slf4j:slf4j-log4j12 org.slf4j:slf4j-simple . org.eclipse.jgit.pgm %if %{without tests} @@ -68,6 +70,10 @@ sed -i -e '/\.test<\/module>/d' pom.xml %endif %mvn_package ":*.test" __noinstall +%pom_disable_module org.eclipse.jgit.junit +%pom_disable_module org.eclipse.jgit.junit.ssh +%pom_disable_module org.eclipse.jgit.junit.http + %build %if %{without tests} %mvn_build -f -- -Pjavac @@ -94,6 +100,9 @@ EOF %license LICENSE %changelog +* Fri Nov 25 2022 yaoxin - 5.11.0-1 +- Update to 5.11.0 + * Fri Sep 23 2022 caodongxia - 5.4.0-2 - Add glassfish-servlet-api version limit