diff --git a/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch b/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch new file mode 100644 index 0000000000000000000000000000000000000000..8db8827fcf0760931ff7f0c67aaeae1d5e9f1f03 --- /dev/null +++ b/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch @@ -0,0 +1,26 @@ +From ad4138003819eec19784222aa12dec973efc010e Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 7 Dec 2018 10:04:44 +0000 +Subject: [PATCH 1/3] Ensure the correct classpath is set for the jgit command + line tool + +--- + org.eclipse.jgit.pgm/jgit.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh +index 8267147..a8d491d 100644 +--- a/org.eclipse.jgit.pgm/jgit.sh ++++ b/org.eclipse.jgit.pgm/jgit.sh +@@ -60,7 +60,7 @@ esac + this_script=`which "$0" 2>/dev/null` + [ $? -gt 0 -a -f "$0" ] && this_script="$0" + cp=$this_script +- ++export JGIT_CLASSPATH="$(build-classpath jgit slf4j/api slf4j/simple args4j jzlib jsch commons-compress xz-java javaewah httpcomponents/httpcore httpcomponents/httpclient commons-logging commons-codec eddsa apache-sshd)" + platform="`uname`" + if [ -n "$JGIT_CLASSPATH" ] + then +-- +2.19.1 + diff --git a/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch b/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch new file mode 100644 index 0000000000000000000000000000000000000000..c52afd6931f0b6edc0bf4c4bae29c980a7c177f9 --- /dev/null +++ b/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch @@ -0,0 +1,269 @@ +From 6875e01ca3e26b430b54c6bbcc40dd1adf35dfe3 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 7 Dec 2018 10:17:02 +0000 +Subject: [PATCH 2/3] Don't embed versions of third-party libs, use feature + requirements instead + +--- + .../org.eclipse.jgit.feature/feature.xml | 59 +++---------------- + .../feature.xml | 16 +---- + .../feature.xml | 24 +------- + .../org.eclipse.jgit.lfs.feature/feature.xml | 8 +-- + .../org.eclipse.jgit.pgm.feature/feature.xml | 24 +------- + .../feature.xml | 24 +------- + 6 files changed, 21 insertions(+), 134 deletions(-) + +diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +index ce03e05..f32b48b 100644 +--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml ++++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +@@ -22,6 +22,15 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- + +diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +index 5780db5..addf7b9 100644 +--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml ++++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +@@ -24,6 +24,8 @@ + + + ++ ++ + + + + +- +- +- +- + +diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +index d55fd5a..d034cc7 100644 +--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml ++++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +@@ -24,6 +24,9 @@ + + + ++ ++ ++ + + + + +- +- +- +- +- +- + +diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +index bb916e4..2d1201c 100644 +--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml ++++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +@@ -24,6 +24,7 @@ + + + ++ + + + + +- +- + +diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +index 43e688e..b9c93e0 100644 +--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml ++++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +@@ -34,6 +34,9 @@ + + + ++ ++ ++ + + + + +- +- +- +- +- +- + +diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +index 3e12d53..e05202e 100644 +--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml ++++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +@@ -24,6 +24,9 @@ + + + ++ ++ ++ + + + + +- +- +- +- +- +- + +-- +2.19.1 + diff --git a/0003-Port-to-apache-sshd-2.1.0.patch b/0003-Port-to-apache-sshd-2.1.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..8cca0f6f02328450bd0d1d016cbeefa3e09d0b18 --- /dev/null +++ b/0003-Port-to-apache-sshd-2.1.0.patch @@ -0,0 +1,247 @@ +From 730b9c8d0751b0611dea5338726e507a71ed7184 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 7 Dec 2018 10:33:23 +0000 +Subject: [PATCH 3/3] Port to apache-sshd 2.1.0 + +IoConnector.connect() grew an extra parameter to support specifying +the local bind port/address. Passing null continues to use an +automatically selected ephemeral port/address. + +The shutdownOnExit parameter was removed everywhere the use of +'java.util.concurrent.ExecutorService' was substituted for the use +of 'org.apache.sshd.common.util.threads.ExecutorService' +--- + .../META-INF/MANIFEST.MF | 42 +++++----- + .../jgit/junit/ssh/SshTestGitServer.java | 15 ++-- + .../META-INF/MANIFEST.MF | 80 +++++++++---------- + .../transport/sshd/JGitSshClient.java | 2 +- + pom.xml | 2 +- + 5 files changed, 71 insertions(+), 70 deletions(-) + +diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +index aa11f7a..a52526d 100644 +--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF ++++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +@@ -8,27 +8,27 @@ Bundle-Localization: plugin + Bundle-Vendor: %provider_name + Bundle-ActivationPolicy: lazy + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +-Import-Package: org.apache.sshd.common;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.config.keys;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.file.virtualfs;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.helpers;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.io;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.kex;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.keyprovider;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.session;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.buffer;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.logging;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.security;version="[2.0.0,2.1.0)", +- org.apache.sshd.server;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.auth;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.auth.gss;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.auth.keyboard;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.auth.password;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.command;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.session;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.shell;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.subsystem;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.subsystem.sftp;version="[2.0.0,2.1.0)", ++Import-Package: org.apache.sshd.common;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.config.keys;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.file.virtualfs;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.helpers;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.io;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.kex;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.keyprovider;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.session;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.buffer;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.logging;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.security;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.auth;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.auth.gss;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.auth.keyboard;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.auth.password;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.command;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.session;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.shell;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.subsystem;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.subsystem.sftp;version="[2.1.0,2.2.0)", + org.eclipse.jgit.annotations;version="[5.2.0,5.3.0)", + org.eclipse.jgit.lib;version="[5.2.0,5.3.0)", + org.eclipse.jgit.transport;version="[5.2.0,5.3.0)", +diff --git a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java +index f5af2e5..d680f48 100644 +--- a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java ++++ b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestGitServer.java +@@ -55,7 +55,6 @@ + import java.util.Collections; + import java.util.List; + import java.util.Locale; +-import java.util.concurrent.ExecutorService; + import java.util.concurrent.Executors; + + import org.apache.sshd.common.NamedFactory; +@@ -67,6 +66,8 @@ + import org.apache.sshd.common.session.Session; + import org.apache.sshd.common.util.buffer.Buffer; + import org.apache.sshd.common.util.security.SecurityUtils; ++import org.apache.sshd.common.util.threads.CloseableExecutorService; ++import org.apache.sshd.common.util.threads.ThreadUtils; + import org.apache.sshd.server.ServerAuthenticationManager; + import org.apache.sshd.server.SshServer; + import org.apache.sshd.server.auth.UserAuth; +@@ -110,8 +111,8 @@ + @NonNull + protected PublicKey testKey; + +- private final ExecutorService executorService = Executors +- .newFixedThreadPool(2); ++ private final CloseableExecutorService executorService = ThreadUtils ++ .newFixedThreadPool("", 2); + + /** + * Creates a ssh git test server. It serves one single repository, +@@ -341,8 +342,8 @@ public void setTestUserPublicKey(Path key) + private class GitUploadPackCommand extends AbstractCommandSupport { + + protected GitUploadPackCommand(String command, +- ExecutorService executorService) { +- super(command, executorService, false); ++ CloseableExecutorService executorService) { ++ super(command, executorService); + } + + @Override +@@ -370,8 +371,8 @@ public void run() { + private class GitReceivePackCommand extends AbstractCommandSupport { + + protected GitReceivePackCommand(String command, +- ExecutorService executorService) { +- super(command, executorService, false); ++ CloseableExecutorService executorService) { ++ super(command, executorService); + } + + @Override +diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +index e93fc1f..45a8d81 100644 +--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF ++++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +@@ -32,46 +32,46 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.2.0";x-inter + 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.0.0,2.1.0)", +- org.apache.sshd.client;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.auth;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.auth.keyboard;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.auth.password;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.auth.pubkey;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.channel;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.config.hosts;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.config.keys;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.future;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.keyverifier;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.session;version="[2.0.0,2.1.0)", +- org.apache.sshd.client.subsystem.sftp;version="[2.0.0,2.1.0)", +- org.apache.sshd.common;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.auth;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.channel;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.compression;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.config.keys;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.config.keys.loader;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.digest;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.forward;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.future;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.helpers;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.io;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.kex;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.keyprovider;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.mac;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.random;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.session;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.session.helpers;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.signature;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.subsystem.sftp;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.buffer;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.closeable;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.io;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.logging;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.net;version="[2.0.0,2.1.0)", +- org.apache.sshd.common.util.security;version="[2.0.0,2.1.0)", +- org.apache.sshd.server.auth;version="[2.0.0,2.1.0)", ++ org.apache.sshd.agent;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.auth;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.auth.keyboard;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.auth.password;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.auth.pubkey;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.channel;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.config.hosts;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.config.keys;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.future;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.keyverifier;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.session;version="[2.1.0,2.2.0)", ++ org.apache.sshd.client.subsystem.sftp;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.auth;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.channel;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.compression;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.config.keys;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.config.keys.loader;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.digest;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.forward;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.future;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.helpers;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.io;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.kex;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.keyprovider;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.mac;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.random;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.session;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.session.helpers;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.signature;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.subsystem.sftp;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.buffer;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.closeable;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.io;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.logging;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.net;version="[2.1.0,2.2.0)", ++ org.apache.sshd.common.util.security;version="[2.1.0,2.2.0)", ++ org.apache.sshd.server.auth;version="[2.1.0,2.2.0)", + org.eclipse.jgit.annotations;version="[5.2.0,5.3.0)", + org.eclipse.jgit.errors;version="[5.2.0,5.3.0)", + org.eclipse.jgit.fnmatch;version="[5.2.0,5.3.0)", +diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitSshClient.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitSshClient.java +index 212b67f..5d78728 100644 +--- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitSshClient.java ++++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitSshClient.java +@@ -149,7 +149,7 @@ public ConnectFuture connect(HostConfigEntry hostConfig) + address = configureProxy(proxy, address); + proxy.clearPassword(); + } +- connector.connect(address).addListener(listener); ++ connector.connect(address,null).addListener(listener); + return connectFuture; + } + +diff --git a/pom.xml b/pom.xml +index 2528cb4..ff67f9b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -198,7 +198,7 @@ + ${project.build.directory}/META-INF/MANIFEST.MF + + 4.11.0.201803080745-r +- 2.0.0 ++ 2.1.0 + 0.1.54 + 1.1.1 + 1.1.6 +-- +2.19.1 + diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec new file mode 100644 index 0000000000000000000000000000000000000000..1c9a185672759e49e53ca2cda4b1c54d3b422926 --- /dev/null +++ b/eclipse-jgit.spec @@ -0,0 +1,124 @@ +Name: eclipse-jgit +Version: 5.2.0 +Release: 5 +Summary: Java implementation of the Git version control system +License: BSD +URL: http://www.eclipse.org/egit/ +Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-5.2.0.201812061821-r.tar.xz + +Patch0001: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch +Patch0002: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch +Patch0003: 0003-Port-to-apache-sshd-2.1.0.patch + +BuildArch: noarch + +BuildRequires: maven-local mvn(args4j:args4j) mvn(com.google.code.gson:gson) mvn(com.googlecode.javaewah:JavaEWAH) +BuildRequires: mvn(com.jcraft:jsch) mvn(com.jcraft:jzlib) mvn(javax.servlet:javax.servlet-api) mvn(junit:junit) +BuildRequires: mvn(net.i2p.crypto:eddsa) mvn(org.apache.ant:ant) mvn(org.apache.commons:commons-compress) +BuildRequires: mvn(org.apache.httpcomponents:httpclient) mvn(org.apache.httpcomponents:httpcore) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) mvn(org.apache.maven.plugins:maven-clean-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-install-plugin) mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) mvn(org.apache.sshd:sshd-core) +BuildRequires: mvn(org.apache.sshd:sshd-sftp) mvn(org.bouncycastle:bcprov-jdk15on) >= 1.61 mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) mvn(org.hamcrest:hamcrest-library) mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.osgi:osgi.core) mvn(org.slf4j:slf4j-api) mvn(org.slf4j:slf4j-simple) mvn(org.tukaani:xz) git +BuildRequires: tycho jgit = %{version} + +Requires: eclipse-platform jzlib bouncycastle >= 1.61 jgit = %{version}-%{release} + +%description +A pure Java implementation of the Git version control system. + +%package help +Summary: Help documentation for %{name} +Provides: jgit-javadoc = %{version}-%{release} +Obsoletes: jgit-javadoc < %{version}-%{release} + +%description help +Man pages and other related help documents for %{name}. + +%package -n jgit +Summary: Java-based command line Git interface + +%description -n jgit +Command line Git tool built entirely in Java. + +%prep +%autosetup -n jgit-5.2.0.201812061821-r -p1 + +rm .mvn/maven.config + +%pom_remove_dep com.googlecode.javaewah:JavaEWAH +for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do + grep -q dependencies $p && %pom_xpath_remove "pom:dependencies" $p +done + +%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_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging +%pom_disable_module org.eclipse.jgit.repository org.eclipse.jgit.packaging +%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin/pom:configuration/pom:target" \ + org.eclipse.jgit.packaging/pom.xml + +%pom_disable_module org.eclipse.jgit.source.feature org.eclipse.jgit.packaging +%pom_disable_module org.eclipse.jgit.pgm.source.feature org.eclipse.jgit.packaging + +%pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core +%pom_remove_plugin :jacoco-maven-plugin +%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-enforcer-plugin org.eclipse.jgit.packaging +%pom_remove_plugin -r :japicmp-maven-plugin + +%pom_remove_plugin org.codehaus.mojo:build-helper-maven-plugin org.eclipse.jgit.pgm + +%pom_remove_dep log4j:log4j . org.eclipse.jgit.pgm +%pom_change_dep org.slf4j:slf4j-log4j12 org.slf4j:slf4j-simple . org.eclipse.jgit.pgm + +cd org.eclipse.jgit.packaging +%mvn_package "::pom::" __noinstall +cd - +%mvn_package ":*.test" __noinstall + +%build + +%mvn_build --post install:install -- -Pjavac \ + -Dmaven.repo.local=$(pwd)/org.eclipse.jgit.packaging/.m2 -Dmaven.test.failure.ignore=true + +cd org.eclipse.jgit.packaging +%mvn_build -j -- -Dfedora.p2.repos=$(pwd)/.m2 +cd - + + +%install +xmvn-install -R .xmvn-reactor -n jgit -d %{buildroot} +install -dm755 %{buildroot}%{_javadocdir}/jgit +cp -pr .xmvn/apidocs/* %{buildroot}%{_javadocdir}/jgit +echo '%{_javadocdir}/jgit' >>.mfiles-javadoc + +cd org.eclipse.jgit.packaging +%mvn_install +cd - + +install -Dp -m755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit +%{!?_licensedir:%global license %doc} + +install -dm 755 %{buildroot}%{_sysconfdir}/ant.d +cat > %{buildroot}%{_sysconfdir}/ant.d/jgit < - 5.2.0-5 +- Package init diff --git a/jgit-5.2.0.201812061821-r.tar.xz b/jgit-5.2.0.201812061821-r.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..855db307aed2e1391685554de008b0c25267c682 Binary files /dev/null and b/jgit-5.2.0.201812061821-r.tar.xz differ