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 c2a81b9..9148707 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 @@ -65,7 +65,7 @@ index 1a28bff..43d5e6a 100644 @@ -24,6 +24,9 @@ - + + + + @@ -105,7 +105,7 @@ index ef01ff7..871ca05 100644 @@ -24,6 +24,9 @@ - + + + + @@ -145,7 +145,7 @@ index f888808..25ca775 100644 @@ -25,6 +25,9 @@ - + + + + @@ -185,7 +185,7 @@ index 0c74527..d2a6dc5 100644 @@ -24,6 +24,7 @@ - + + @@ -207,9 +207,9 @@ 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 @@ - - - + + + + + + @@ -249,7 +249,7 @@ index 73facd9..a428902 100644 @@ -24,6 +24,9 @@ - + + + + @@ -289,7 +289,7 @@ index 8caf411..a878949 100644 @@ -24,6 +24,8 @@ - + + + diff --git a/0003-Remove-requirement-on-assertj-core.patch b/0003-Remove-requirement-on-assertj-core.patch deleted file mode 100644 index 4d59e35..0000000 --- a/0003-Remove-requirement-on-assertj-core.patch +++ /dev/null @@ -1,341 +0,0 @@ -From 3bd2d3d0c8c886ceb1f8d8c14e03b512daf3c69a Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Mon, 22 Jun 2020 04:00:51 +0100 -Subject: [PATCH 3/3] Remove requirement on assertj-core - ---- - org.eclipse.jgit.test/META-INF/MANIFEST.MF | 1 - - org.eclipse.jgit.test/pom.xml | 5 - - .../transport/RequestValidatorTestCase.java | 292 ------------------ - 3 files changed, 298 deletions(-) - delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java - -diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF -index 83c9dc1..b7f0a53 100644 ---- 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)", -diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml -index 3b100fa..a5b19ce 100644 ---- 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 -diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java -deleted file mode 100644 -index cc910b3..0000000 ---- 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; -- } --} --- -2.26.2 - diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index 36a03d7..e6779ff 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -1,8 +1,8 @@ -%global gittag 5.8.0.202006091008-r +%global gittag 5.8.1.202007141445-r Name: eclipse-jgit -Version: 5.8.0 -Release: 2%{?dist} +Version: 5.8.1 +Release: 1%{?dist} Summary: Eclipse JGit # The jgit Eclipse plug-ins are "EDL" licensed, which is equivilent to the new BSD license @@ -18,9 +18,6 @@ Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # 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 - BuildArch: noarch # Upstream Eclipse no longer supports non-64bit arches @@ -39,7 +36,6 @@ A pure Java implementation of the Git version control system. %setup -n jgit-%{gittag} -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Disable multithreaded build rm .mvn/maven.config @@ -57,6 +53,9 @@ done # Don't build source features %pom_disable_module org.eclipse.jgit.source.feature org.eclipse.jgit.packaging +# Don't build junit testing features +%pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging + # Remove unnecessary plugins for RPM builds %pom_remove_plugin :maven-enforcer-plugin org.eclipse.jgit.packaging @@ -79,6 +78,9 @@ popd %doc README.md %changelog +* Fri Aug 21 2020 Mat Booth - 5.8.1-1 +- Update to latest upstream release + * Mon Jul 27 2020 Fedora Release Engineering - 5.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 431a54e..ef2b3be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jgit-5.8.0.202006091008-r.tar.xz) = aa91309dcf1fa66846ec06e6270f3418b75fcd68ff363f873c0893a82ebe7603032d8495d413109ef05d62db846cfb1ae3401438a6cbfdf7211a7d658c89b74b +SHA512 (jgit-5.8.1.202007141445-r.tar.xz) = fd8009ced093c34bd10254b35533cf4cc0bd5803090a8516ade073e04aed40c959e478a67324ee8983f293054822730b84bddd4d6a64b5079d07bf84160cf667