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 index a09a40d..99a5b4e 100644 --- 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 @@ -1,7 +1,7 @@ -From 3efdb201d8b4da4bf0385c27a60011e2d8418ad8 Mon Sep 17 00:00:00 2001 +From 55bae4b1398715c987537b0957c08c8616ea8b61 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 +Subject: [PATCH 1/2] Ensure the correct classpath is set for the jgit command line tool --- @@ -22,5 +22,5 @@ index a369220..2dd26aa 100644 if [ -n "$JGIT_CLASSPATH" ] then -- -2.26.2 +2.28.0 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 index 351f11b..c20c900 100644 --- 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 @@ -1,157 +1,28 @@ -From 585b45026bc8ac1ed83aee70c7c6ff11b4267fe6 Mon Sep 17 00:00:00 2001 +From a6efa36a04bee412b06af2823281ff9b78827ebf 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 +Date: Fri, 29 Jan 2021 18:35:25 +0000 +Subject: [PATCH 2/2] Don't embed versions of third-party libs, use feature requirements instead --- - .../org.eclipse.jgit.feature/feature.xml | 27 +++++-------------- - .../feature.xml | 24 +++-------------- - .../feature.xml | 24 +++-------------- - .../feature.xml | 24 +++-------------- - .../org.eclipse.jgit.lfs.feature/feature.xml | 8 +----- - .../org.eclipse.jgit.pgm.feature/feature.xml | 24 +++-------------- - .../feature.xml | 24 +++-------------- - .../feature.xml | 16 ++--------- - 8 files changed, 24 insertions(+), 147 deletions(-) + .../feature.xml | 24 +++---------------- + .../feature.xml | 2 ++ + 2 files changed, 5 insertions(+), 21 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 57dd6ab..881012c 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,12 @@ - - - -+ -+ -+ -+ -+ -+ - - -- -- -- -- -- -- - -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml -index 1a28bff..43d5e6a 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml -@@ -24,6 +24,9 @@ - - - -+ -+ -+ - - - - -- -- -- -- -- -- - -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 ef01ff7..871ca05 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,9 @@ - - - -+ -+ -+ - - - - -- -- -- -- -- -- - 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 f888808..25ca775 100644 +index 92d171f..ca1f6de 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 -@@ -25,6 +25,9 @@ +@@ -24,6 +24,9 @@ + - + + + + - @@ -176,144 +47,21 @@ index f888808..25ca775 100644 - install-size="0" - version="0.0.0" - unpack="false"/> -- - -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 0c74527..d2a6dc5 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 83db1de..8da7368 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 -@@ -38,6 +38,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 73facd9..a428902 100644 +index 48660d5..843896f 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 @@ - - - -+ -+ -+ - - - - -- -- -- -- -- -- - -diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml -index 8caf411..a878949 100644 ---- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml -+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -24,6 +24,8 @@ - -+ -+ + ++ ++ - -- -- -- -- - -- -2.26.2 +2.28.0 diff --git a/0003-Remove-requirement-on-assertj-core.patch b/0003-Remove-requirement-on-assertj-core.patch deleted file mode 100644 index 663aae3..0000000 --- a/0003-Remove-requirement-on-assertj-core.patch +++ /dev/null @@ -1,331 +0,0 @@ ---- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF -@@ -8,8 +8,7 @@ - Bundle-Localization: plugin - Bundle-Version: 5.8.0.202006091008-r - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 --Import-Package: org.assertj.core.annotations;version="3.14.0", -- org.bouncycastle.bcpg;version="[1.65.0,2.0.0)", -+Import-Package: org.bouncycastle.bcpg;version="[1.65.0,2.0.0)", - org.bouncycastle.gpg;version="[1.65.0,2.0.0)", - org.bouncycastle.gpg.keybox;version="[1.65.0,2.0.0)", - org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)", ---- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF -+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF -@@ -15,7 +15,6 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", - 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.8.0,5.9.0)", - org.eclipse.jgit.api;version="[5.8.0,5.9.0)", - org.eclipse.jgit.api.errors;version="[5.8.0,5.9.0)", ---- a/org.eclipse.jgit.test/pom.xml -+++ b/org.eclipse.jgit.test/pom.xml -@@ -65,11 +65,6 @@ - [1.1.0,2.0.0) - - -- -- org.assertj -- assertj-core -- -- - - org.mockito - mockito-core ---- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java -+++ /dev/null -@@ -1,292 +0,0 @@ --/* -- * Copyright (C) 2019, Google LLC. and others -- * -- * This program and the accompanying materials are made available under the -- * terms of the Eclipse Distribution License v. 1.0 which is available at -- * https://www.eclipse.org/org/documents/edl-v10.php. -- * -- * SPDX-License-Identifier: BSD-3-Clause -- */ --package org.eclipse.jgit.transport; -- --import static org.assertj.core.api.Assertions.assertThat; --import static org.assertj.core.api.Assertions.catchThrowableOfType; -- --import java.io.IOException; --import java.util.Arrays; --import java.util.HashMap; --import java.util.Map; -- --import org.assertj.core.api.ThrowableAssert.ThrowingCallable; --import org.eclipse.jgit.errors.TransportException; --import org.eclipse.jgit.internal.storage.dfs.DfsGarbageCollector; --import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; --import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; --import org.eclipse.jgit.junit.TestRepository; --import org.eclipse.jgit.lib.Ref; --import org.eclipse.jgit.lib.Repository; --import org.eclipse.jgit.revwalk.RevBlob; --import org.eclipse.jgit.revwalk.RevCommit; --import org.eclipse.jgit.transport.UploadPack.RequestValidator; --import org.junit.Before; --import org.junit.Test; -- --public abstract class RequestValidatorTestCase { -- -- private RevCommit reachableCommit; -- -- private RevCommit tipAdvertisedCommit; -- -- private RevCommit tipUnadvertisedCommit; -- -- private RevCommit unreachableCommit; -- -- private RevBlob reachableBlob; -- -- private RevBlob unreachableBlob; -- -- private InMemoryRepository repo; -- -- protected abstract RequestValidator createValidator(); -- -- @Before -- public void setUp() throws Exception { -- repo = new InMemoryRepository(new DfsRepositoryDescription()); -- try (TestRepository git = new TestRepository<>( -- repo)) { -- reachableBlob = git.blob("foo"); -- reachableCommit = git -- .commit(git.tree(git.file("foo", reachableBlob))); -- tipAdvertisedCommit = git.commit(reachableCommit); -- git.update("advertised", tipAdvertisedCommit); -- -- tipUnadvertisedCommit = git.commit(reachableCommit); -- git.update("unadvertised", tipUnadvertisedCommit); -- -- unreachableBlob = git.blob("unreachableFoo"); -- unreachableCommit = git -- .commit(git.tree(git.file("foo", unreachableBlob))); -- } -- } -- -- /** -- * @return true if a commit reachable from a visible tip (but not directly -- * the tip) is valid -- */ -- protected abstract boolean isReachableCommitValid(); -- -- /** @return true if a commit not reachable from any tip is valid */ -- protected abstract boolean isUnreachableCommitValid(); -- -- /** -- * @return true if the commit directly pointed by an advertised ref is valid -- */ -- protected abstract boolean isAdvertisedTipValid(); -- -- /** -- * @return true if the object directly pointed by a non-advertised ref is -- * valid -- */ -- protected abstract boolean isUnadvertisedTipCommitValid(); -- -- // UploadPack doesn't allow to ask for blobs when there is no -- // bitmap. Test both cases separately. -- /** -- * @return true if a reachable blob is valid (and the repo has bitmaps) -- */ -- protected abstract boolean isReachableBlobValid_withBitmaps(); -- -- /** -- * @return true if a reachable blob is valid (and the repo does NOT have -- * bitmaps) -- */ -- protected abstract boolean isReachableBlobValid_withoutBitmaps(); -- -- /** -- * @return true if a blob unreachable from any tip is valid -- */ -- protected abstract boolean isUnreachableBlobValid(); -- -- @Test -- public void validateReachableCommitWithBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithBitmaps()), -- Arrays.asList(reachableCommit)); -- if (!isReachableCommitValid()) { -- assertTransportException(c, -- "want " + reachableCommit.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateReachableCommitWithoutBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithoutBitmaps()), -- Arrays.asList(reachableCommit)); -- if (!isReachableCommitValid()) { -- assertTransportException(c, -- "want " + reachableCommit.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateAdvertisedTipWithBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithBitmaps()), -- Arrays.asList(tipAdvertisedCommit)); -- if (!isAdvertisedTipValid()) { -- assertTransportException(c, -- "want " + tipAdvertisedCommit.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateAdvertisedTipWithoutBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithoutBitmaps()), -- Arrays.asList(tipAdvertisedCommit)); -- if (!isAdvertisedTipValid()) { -- assertTransportException(c, -- "want " + tipAdvertisedCommit.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateUnadvertisedTipWithBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithBitmaps()), -- Arrays.asList(tipUnadvertisedCommit)); -- if (!isUnadvertisedTipCommitValid()) { -- assertTransportException(c, -- "want " + tipUnadvertisedCommit.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateUnadvertisedTipWithoutBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithoutBitmaps()), -- Arrays.asList(tipUnadvertisedCommit)); -- if (!isUnadvertisedTipCommitValid()) { -- assertTransportException(c, -- "want " + tipUnadvertisedCommit.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateUnreachableCommitWithBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithBitmaps()), -- Arrays.asList(unreachableCommit)); -- if (!isUnreachableCommitValid()) { -- assertTransportException(c, -- "want " + unreachableCommit.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateUnreachableCommitWithoutBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithoutBitmaps()), -- Arrays.asList(unreachableCommit)); -- if (!isUnreachableCommitValid()) { -- assertTransportException(c, -- "want " + unreachableCommit.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateReachableBlobWithBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithBitmaps()), -- Arrays.asList(reachableBlob)); -- if (!isReachableBlobValid_withBitmaps()) { -- assertTransportException(c, -- "want " + reachableBlob.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateReachableBlobWithoutBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithoutBitmaps()), -- Arrays.asList(reachableBlob)); -- if (!isReachableBlobValid_withoutBitmaps()) { -- assertTransportException(c, -- "want " + reachableBlob.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateUnreachableBlobWithBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithBitmaps()), -- Arrays.asList(unreachableBlob)); -- if (!isUnreachableBlobValid()) { -- assertTransportException(c, -- "want " + unreachableBlob.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- @Test -- public void validateUnreachableBlobWithoutBitmaps() throws Throwable { -- ThrowingCallable c = () -> createValidator().checkWants( -- getUploadPack(getRepoWithoutBitmaps()), -- Arrays.asList(unreachableBlob)); -- if (!isUnreachableBlobValid()) { -- assertTransportException(c, -- "want " + unreachableBlob.name() + " not valid"); -- return; -- } -- c.call(); -- } -- -- private void assertTransportException(ThrowingCallable c, -- String messageContent) throws AssertionError { -- assertThat(catchThrowableOfType(c, TransportException.class)) -- .hasMessageContaining(messageContent); -- } -- -- private UploadPack getUploadPack(Repository repository) throws IOException { -- UploadPack uploadPack = new UploadPack(repository); -- -- Ref advertisedRef = repo.getRefDatabase().findRef("advertised"); -- Map advertisedRefs = new HashMap<>(); -- advertisedRefs.put(advertisedRef.getName(), advertisedRef); -- -- uploadPack.setAdvertisedRefs(advertisedRefs); -- return uploadPack; -- } -- -- private Repository getRepoWithBitmaps() throws IOException { -- new DfsGarbageCollector(repo).pack(null); -- repo.scanForRepoChanges(); -- return repo; -- } -- -- private Repository getRepoWithoutBitmaps() { -- return repo; -- } --} diff --git a/eclipse-jgit.changes b/eclipse-jgit.changes index 90d6305..abcce85 100644 --- a/eclipse-jgit.changes +++ b/eclipse-jgit.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Jul 30 12:24:56 UTC 2021 - Fridrich Strba + +- Update to 5.11.0 + * fixes build against apache-sshd 2.7.0 +- Modified patches: + * 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch + * 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch + * jgit-shade.patch + * jgit-5.8.0-java8.patch -> jgit-5.11.0-java8.patch + + Rediff to changed context +- Added patch: + * jgit-apache-sshd-2.7.0.patch + + Adapt to apache-sshd api changes between 2.6.0 and 2.7.0 +- Removed patch: + * 0003-Remove-requirement-on-assertj-core.patch + + Not needed anymore + ------------------------------------------------------------------- Thu Nov 19 13:00:00 UTC 2020 - Fridrich Strba diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index c687e40..f712527 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -1,7 +1,7 @@ # # spec file for package eclipse-jgit # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,16 @@ # -%global gittag 5.8.0.202006091008-r +%global gittag 5.11.0.202103091610-r %define __provides_exclude osgi* Name: eclipse-jgit -Version: 5.8.0 +Version: 5.11.0 Release: 0 Summary: Eclipse JGit License: BSD-3-Clause Group: Development/Libraries/Java URL: https://www.eclipse.org/egit/ -# Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144 -Source0: https://github.com/eclipse/jgit/archive/v%{gittag}/jgit-%{gittag}.tar.gz +Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.tar.xz # Set the correct classpath for the command line tools Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # Switch to feature requirements for third-party bundles, also makes the following changes: @@ -34,14 +33,13 @@ Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # org.slf4j.api -> slf4j.api # org.slf4j.impl.log4j12 -> slf4j.simple Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch -# Remove req on assertj -Patch2: 0003-Remove-requirement-on-assertj-core.patch -Patch3: jgit-shade.patch -Patch4: jgit-5.8.0-java8.patch +Patch2: jgit-shade.patch +Patch3: jgit-5.11.0-java8.patch +Patch4: jgit-apache-sshd-2.7.0.patch # For main build BuildRequires: ant BuildRequires: apache-commons-compress -BuildRequires: apache-sshd >= 2.4 +BuildRequires: apache-sshd >= 2.7 BuildRequires: args4j BuildRequires: bouncycastle BuildRequires: bouncycastle-pg @@ -65,7 +63,7 @@ BuildRequires: xmvn-subst #!BuildIgnore: tycho-bootstrap #!BuildRequires: eclipse-emf-core eclipse-ecf-core Requires: apache-commons-compress -Requires: apache-sshd >= 2.4 +Requires: apache-sshd >= 2.7 Requires: args4j Requires: bouncycastle Requires: bouncycastle-pg @@ -104,9 +102,8 @@ for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do done # Disable "errorprone" compiler -%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:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:compilerArgs" pom.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:annotationProcessorPaths" pom.xml # Don't need target platform or repository modules with xmvn %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging diff --git a/jgit-5.8.0-java8.patch b/jgit-5.11.0-java8.patch similarity index 55% rename from jgit-5.8.0-java8.patch rename to jgit-5.11.0-java8.patch index b707ad8..ae3758e 100644 --- a/jgit-5.8.0-java8.patch +++ b/jgit-5.11.0-java8.patch @@ -1,5 +1,6 @@ ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java 2020-07-01 15:56:03.808653270 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java 2020-07-16 22:36:08.290442860 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlock.java 2021-07-30 11:47:47.425624542 +0200 @@ -13,6 +13,7 @@ package org.eclipse.jgit.internal.storage.dfs; @@ -17,8 +18,9 @@ return b; } ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java 2020-07-01 15:56:03.808653270 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java 2020-07-16 22:33:28.081395320 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java 2021-07-30 11:47:47.425624542 +0200 @@ -21,6 +21,7 @@ import java.io.EOFException; import java.io.IOException; @@ -36,8 +38,9 @@ int bufLen = read(rc, buf); if (bufLen <= ptr) { throw packfileIsTruncated(); ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java 2020-07-01 15:56:03.808653270 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java 2020-07-16 22:34:32.497816502 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftable.java 2021-07-30 11:47:47.425624542 +0200 @@ -13,6 +13,7 @@ import static org.eclipse.jgit.internal.storage.pack.PackExt.REFTABLE; @@ -55,8 +58,9 @@ return buf; } ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java 2020-07-01 15:56:03.808653270 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java 2020-07-16 22:49:51.215827431 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ByteBufferWindow.java 2021-07-30 11:47:47.425624542 +0200 @@ -13,6 +13,7 @@ package org.eclipse.jgit.internal.storage.file; @@ -92,8 +96,9 @@ final byte[] tmp = new byte[Math.min(s.remaining(), 512)]; s.get(tmp, 0, tmp.length); inf.setInput(tmp, 0, tmp.length); ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java 2020-07-01 15:56:03.812653298 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java 2020-07-16 22:47:40.366971204 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java 2021-07-30 11:47:47.425624542 +0200 @@ -31,6 +31,7 @@ import static org.eclipse.jgit.lib.Ref.Storage.PACKED; @@ -111,8 +116,9 @@ b.get(buf); } endPosition = pos + bufLen; ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java 2020-07-01 15:56:03.816653326 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java 2020-07-16 22:46:22.670462804 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java 2021-07-30 11:47:47.425624542 +0200 @@ -23,6 +23,7 @@ import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; @@ -139,17 +145,18 @@ tmp.get(buf); } if (pos == 0 && buf[FILE_HEADER_LEN] == FILE_BLOCK_TYPE) { ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java 2020-07-01 15:56:03.824653381 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java 2020-07-16 22:59:50.575747763 +0200 -@@ -15,6 +15,7 @@ - import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SYMREF; +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java 2021-07-30 11:47:47.425624542 +0200 +@@ -17,6 +17,7 @@ + import static org.eclipse.jgit.transport.GitProtocolConstants.REF_ATTR_SYMREF_TARGET; import java.io.IOException; +import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CharacterCodingException; -@@ -65,7 +66,7 @@ +@@ -67,7 +68,7 @@ throws IOException { id.copyTo(binArr, 0); binArr[OBJECT_ID_STRING_LENGTH] = ' '; @@ -158,7 +165,7 @@ append(refName); if (first) { first = false; -@@ -88,7 +89,7 @@ +@@ -90,7 +91,7 @@ chBuf = CharBuffer.wrap(chArr); } str.getChars(0, n, chArr, 0); @@ -167,7 +174,7 @@ utf8.reset(); for (;;) { CoderResult cr = utf8.encode(chBuf, binBuf, true); -@@ -115,7 +116,7 @@ +@@ -117,7 +118,7 @@ System.arraycopy(binArr, 0, tmp, 0, cnt); binArr = tmp; binBuf = ByteBuffer.wrap(binArr); @@ -176,8 +183,9 @@ } @Override ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java 2020-07-01 15:56:03.824653381 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java 2020-07-16 22:57:18.914756147 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java 2021-07-30 11:47:47.425624542 +0200 @@ -18,6 +18,7 @@ import static org.eclipse.jgit.lib.ObjectChecker.encoding; import static org.eclipse.jgit.lib.ObjectChecker.tagger; @@ -222,8 +230,9 @@ } } ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java 2020-07-01 15:56:03.840653492 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java 2020-07-16 22:26:56.886837333 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectDownloadListener.java 2021-07-30 11:47:47.425624542 +0200 @@ -10,6 +10,7 @@ package org.eclipse.jgit.lfs.server.fs; @@ -246,8 +255,9 @@ } } catch (Throwable t) { LOG.log(Level.SEVERE, t.getMessage(), t); ---- jgit-5.8.0.202006091008-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java 2020-07-01 15:56:03.840653492 +0200 -+++ jgit-5.8.0.202006091008-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java 2020-07-16 22:27:35.039086792 +0200 +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java 2021-07-30 11:47:47.425624542 +0200 @@ -11,6 +11,7 @@ import java.io.FileNotFoundException; 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 0000000..0a2ce03 --- /dev/null +++ b/jgit-5.11.0.202103091610-r.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91621edf2e92b79c377d1fb8e747ac52dde20f39441b091a439a13efe36f0577 +size 2159996 diff --git a/jgit-5.8.0.202006091008-r.tar.gz b/jgit-5.8.0.202006091008-r.tar.gz deleted file mode 100644 index 77442f5..0000000 --- a/jgit-5.8.0.202006091008-r.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9677d747990b03cef28435bd02fd9d9af37e85ebc26177814b1486dd8b672f0 -size 3484605 diff --git a/jgit-apache-sshd-2.7.0.patch b/jgit-apache-sshd-2.7.0.patch new file mode 100644 index 0000000..58ffcec --- /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.8.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.file.virtualfs;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.io;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.kex;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.signature;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.threads;version="[2.7.0,2.8.0)", ++ org.apache.sshd.core;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.auth;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.auth.gss;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.auth.keyboard;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.auth.password;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.command;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.session;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.shell;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.subsystem;version="[2.7.0,2.8.0)", ++ org.apache.sshd.sftp;version="[2.7.0,2.8.0)", ++ org.apache.sshd.sftp.server;version="[2.7.0,2.8.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.8.0)", ++ org.apache.sshd.client;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.auth;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.auth.keyboard;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.auth.password;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.auth.pubkey;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.channel;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.config.keys;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.future;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.keyverifier;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.session;version="[2.7.0,2.8.0)", ++ org.apache.sshd.client.session.forward;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.auth;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.channel;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.compression;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.config.keys.loader;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.digest;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.forward;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.future;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.io;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.kex;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.mac;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.random;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.session.helpers;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.signature;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.buffer;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.closeable;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.io;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.io.resource;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.logging;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)", ++ org.apache.sshd.core;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.auth;version="[2.7.0,2.8.0)", ++ org.apache.sshd.sftp;version="[2.7.0,2.8.0)", ++ org.apache.sshd.sftp.client;version="[2.7.0,2.8.0)", ++ org.apache.sshd.sftp.common;version="[2.7.0,2.8.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.8.0)", ++ org.apache.sshd.common;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.auth;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.config.keys;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.helpers;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.keyprovider;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.session;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.net;version="[2.7.0,2.8.0)", ++ org.apache.sshd.common.util.security;version="[2.7.0,2.8.0)", ++ org.apache.sshd.core;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server;version="[2.7.0,2.8.0)", ++ org.apache.sshd.server.forward;version="[2.7.0,2.8.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-shade.patch b/jgit-shade.patch index 833e9b0..bba3076 100644 --- a/jgit-shade.patch +++ b/jgit-shade.patch @@ -1,7 +1,7 @@ -diff -urEbwB jgit-5.7.0.202003110725-r.orig/org.eclipse.jgit.pgm/pom.xml jgit-5.7.0.202003110725-r/org.eclipse.jgit.pgm/pom.xml ---- jgit-5.7.0.202003110725-r.orig/org.eclipse.jgit.pgm/pom.xml 2020-04-07 12:24:45.966217181 +0200 -+++ jgit-5.7.0.202003110725-r/org.eclipse.jgit.pgm/pom.xml 2020-04-07 12:48:09.474568774 +0200 -@@ -145,19 +145,40 @@ +diff -urEbwB jgit-5.11.0.202103091610-r/org.eclipse.jgit.pgm/pom.xml jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.pgm/pom.xml +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.pgm/pom.xml 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.pgm/pom.xml 2021-07-30 11:40:33.894748622 +0200 +@@ -157,19 +157,40 @@ @@ -49,7 +49,7 @@ diff -urEbwB jgit-5.7.0.202003110725-r.orig/org.eclipse.jgit.pgm/pom.xml jgit-5. -@@ -172,13 +193,11 @@ +@@ -184,13 +205,11 @@ package @@ -68,18 +68,26 @@ diff -urEbwB jgit-5.7.0.202003110725-r.orig/org.eclipse.jgit.pgm/pom.xml jgit-5. -diff -urEbwB jgit-5.7.0.202003110725-r.orig/pom.xml jgit-5.7.0.202003110725-r/pom.xml ---- jgit-5.7.0.202003110725-r.orig/pom.xml 2020-04-07 12:24:45.782216086 +0200 -+++ jgit-5.7.0.202003110725-r/pom.xml 2020-04-07 12:27:10.879079553 +0200 -@@ -385,11 +385,6 @@ +Only in jgit-5.11.0.202103091610-r.new/org.eclipse.jgit.pgm: pom.xml.orig +diff -urEbwB jgit-5.11.0.202103091610-r/pom.xml jgit-5.11.0.202103091610-r.new/pom.xml +--- jgit-5.11.0.202103091610-r/pom.xml 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r.new/pom.xml 2021-07-30 11:41:51.715264903 +0200 +@@ -394,16 +394,6 @@ maven-resources-plugin - 3.1.0 + 3.2.0 - - org.springframework.boot - spring-boot-maven-plugin -- 2.1.5.RELEASE +- 2.4.1 +- +- +- org.eclipse.dash +- license-tool-plugin +- 0.0.1-SNAPSHOT - +Only in jgit-5.11.0.202103091610-r.new: pom.xml.orig +Only in jgit-5.11.0.202103091610-r.new: pom.xml.rej diff --git a/jgit.changes b/jgit.changes index cfafb2d..8330b78 100644 --- a/jgit.changes +++ b/jgit.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Jul 30 12:24:56 UTC 2021 - Fridrich Strba + +- Update to 5.11.0 + * fixes build against apache-sshd 2.7.0 +- Modified patches: + * 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch + * 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch + * jgit-shade.patch + * jgit-5.8.0-java8.patch -> jgit-5.11.0-java8.patch + + Rediff to changed context +- Added patch: + * jgit-apache-sshd-2.7.0.patch + + Adapt to apache-sshd api changes between 2.6.0 and 2.7.0 +- Removed patch: + * 0003-Remove-requirement-on-assertj-core.patch + + Not needed anymore + ------------------------------------------------------------------- Thu Jul 16 21:23:15 UTC 2020 - Fridrich Strba diff --git a/jgit.spec b/jgit.spec index 7158d26..3d19f75 100644 --- a/jgit.spec +++ b/jgit.spec @@ -1,7 +1,7 @@ # # spec file for package jgit # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # -%global gittag 5.8.0.202006091008-r +%global gittag 5.11.0.202103091610-r Name: jgit -Version: 5.8.0 +Version: 5.11.0 Release: 0 Summary: Eclipse JGit License: BSD-3-Clause Group: Development/Libraries/Java URL: https://www.eclipse.org/egit/ # Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144 -Source0: https://github.com/eclipse/jgit/archive/v%{gittag}/jgit-%{gittag}.tar.gz +Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.tar.xz # Set the correct classpath for the command line tools Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # Switch to feature requirements for third-party bundles, also makes the following changes: @@ -33,10 +33,9 @@ Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # org.slf4j.api -> slf4j.api # org.slf4j.impl.log4j12 -> slf4j.simple Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch -# Remove req on assertj -Patch2: 0003-Remove-requirement-on-assertj-core.patch -Patch3: jgit-shade.patch -Patch4: jgit-5.8.0-java8.patch +Patch2: jgit-shade.patch +Patch3: jgit-5.11.0-java8.patch +Patch4: jgit-apache-sshd-2.7.0.patch # For main build BuildRequires: ant BuildRequires: fdupes @@ -100,9 +99,8 @@ for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do done # Disable "errorprone" compiler -%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:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:compilerArgs" pom.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:annotationProcessorPaths" pom.xml # Don't need target platform or repository modules with xmvn %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging