From 6f083e7cfd57b14c7048eec64fe06975ac015130 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 16 Jan 2020 13:07:20 +0100 Subject: Update bazlets and bazel version - bazlets need to be updated to react on Maven central no longer supporting http protocol but only https - update bazel to 2.0 Change-Id: I07f5f050f3b1db2014a5198a28b6bbf893434814 Signed-off-by: Matthias Sohn (cherry picked from commit d74daad1e064da9614c5ca2c0138c8046cfb0829) --- .bazelversion | 2 +- WORKSPACE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bazelversion b/.bazelversion index 3eefcb9dd5..227cea2156 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -1.0.0 +2.0.0 diff --git a/WORKSPACE b/WORKSPACE index 0ddbf8fbdc..46cb265dbf 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,7 +15,7 @@ versions.check(minimum_bazel_version = "0.29.0") load("//tools:bazlets.bzl", "load_bazlets") -load_bazlets(commit = "09a035e98077dce549d5f6a7472d06c4b8f792d2") +load_bazlets(commit = "f53f51fb660552d0581aa0ba52c3836ed63d56a3") load( "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", -- cgit v1.2.3 From 303dd019d160a17fc93d148ca30bf78bfe976274 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Wed, 12 May 2021 14:57:49 -0700 Subject: Optimize RefDirectory.isNameConflicting() Avoid having to scan over ALL loose refs to determine if the name is nested within or is a container of an existing reference. This can get really expensive if there are too many loose refs. Instead use exactRef and getRefsByPrefix which scan based on a prefix. With a simple shell script(like below) using jgit client to create 1k refs in a new repository on NFS, this change brings down the time from 12mins to 7mins. for ref in $(seq 1 1000); do jgit branch "$ref" done Here are few recorded elapsed times to create a new branch on NFS based repositories with varying loose refs count. As we see here, this change improves the name conflicting check from O(n^2) to O(1). loose_refs_count with_change without_change 50 44 ms 164 ms 300 45 ms 1193 ms 1k 38 ms 2610 ms 2k 44 ms 6003 ms 9k 46 ms 27860 ms 20k 45 ms 48591 ms 50k 51 ms 135471 ms 110k 43 ms 294252 ms 160k 52 ms 430976 ms Change-Id: Ie994fc184b8f82811bfb37b111eb9733dbe3e6e0 Signed-off-by: Kaushik Lingarkar --- .../jgit/internal/storage/file/RefDirectory.java | 35 ++-------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index de7e4b3f25..f7a52a54b6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -276,47 +276,18 @@ public class RefDirectory extends RefDatabase { /** {@inheritDoc} */ @Override public boolean isNameConflicting(String name) throws IOException { - RefList packed = getPackedRefs(); - RefList loose = getLooseRefs(); - // Cannot be nested within an existing reference. int lastSlash = name.lastIndexOf('/'); while (0 < lastSlash) { String needle = name.substring(0, lastSlash); - if (loose.contains(needle) || packed.contains(needle)) + if (exactRef(needle) != null) { return true; + } lastSlash = name.lastIndexOf('/', lastSlash - 1); } // Cannot be the container of an existing reference. - String prefix = name + '/'; - int idx; - - idx = -(packed.find(prefix) + 1); - if (idx < packed.size() && packed.get(idx).getName().startsWith(prefix)) - return true; - - idx = -(loose.find(prefix) + 1); - if (idx < loose.size() && loose.get(idx).getName().startsWith(prefix)) - return true; - - return false; - } - - private RefList getLooseRefs() { - final RefList oldLoose = looseRefs.get(); - - LooseScanner scan = new LooseScanner(oldLoose); - scan.scan(ALL); - - RefList loose; - if (scan.newLoose != null) { - loose = scan.newLoose.toRefList(); - if (looseRefs.compareAndSet(oldLoose, loose)) - modCnt.incrementAndGet(); - } else - loose = oldLoose; - return loose; + return !getRefsByPrefix(name + '/').isEmpty(); } /** {@inheritDoc} */ -- cgit v1.2.3 From 294a99af252c4088f616beb5cb8bbd6d7d976487 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Fri, 14 May 2021 14:24:41 -0700 Subject: BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Update tests to record the number of events fired post-setup and only assert for events fired during BatchRefUpdate.execute. For tests which use writeLooseRef to setup refs, create new tests which assert the number of RefsChangedEvent(s) rather than updating the existing ones to call RefDirectory.exactRef as it changes the code path. Change-Id: I0187811628d179d9c7e874c9bb8a7ddb44dd9df4 Signed-off-by: Kaushik Lingarkar --- .../internal/storage/file/BatchRefUpdateTest.java | 346 ++++++++++++++++++--- 1 file changed, 306 insertions(+), 40 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java index 2ac4a846ea..d0e3943d1e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java @@ -205,16 +205,32 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertRefs( "refs/heads/master", A, "refs/heads/masters", B); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, OK, REJECTED_NONFASTFORWARD); assertRefs( "refs/heads/master", B, "refs/heads/masters", B); - assertEquals(2, refsChangedEvents); } } + @Test + public void simpleNoForceRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + writeLooseRef("refs/heads/masters", B); + refdir.exactRef("refs/heads/master"); + refdir.exactRef("refs/heads/masters"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(B, A, "refs/heads/masters", + UPDATE_NONFASTFORWARD)); + execute(newBatchUpdate(cmds)); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + @Test public void simpleForce() throws IOException { writeLooseRef("refs/heads/master", A); @@ -229,7 +245,24 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertRefs( "refs/heads/master", B, "refs/heads/masters", A); - assertEquals(atomic ? 2 : 3, refsChangedEvents); + } + + @Test + public void simpleForceRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + writeLooseRef("refs/heads/masters", B); + refdir.exactRef("refs/heads/master"); + refdir.exactRef("refs/heads/masters"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(B, A, "refs/heads/masters", + UPDATE_NONFASTFORWARD)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); } @Test @@ -251,7 +284,28 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK); assertRefs("refs/heads/master", A); - assertEquals(2, refsChangedEvents); + } + + @Test + public void nonFastForwardDoesNotDoExpensiveMergeCheckRefsChangedEvents() + throws IOException { + writeLooseRef("refs/heads/master", B); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList(new ReceiveCommand(B, A, + "refs/heads/master", UPDATE_NONFASTFORWARD)); + try (RevWalk rw = new RevWalk(diskRepo) { + @Override + public boolean isMergedInto(RevCommit base, RevCommit tip) { + throw new AssertionError("isMergedInto() should not be called"); + } + }) { + newBatchUpdate(cmds).setAllowNonFastForwards(true).execute(rw, + new StrictWorkMonitor()); + } + + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); } @Test @@ -273,7 +327,6 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertRefs( "refs/heads/master", A, "refs/heads/masters", B); - assertEquals(1, refsChangedEvents); } else { // Non-atomic updates are applied in order: master succeeds, then master/x // fails due to conflict. @@ -281,10 +334,27 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertRefs( "refs/heads/master", B, "refs/heads/masters", B); - assertEquals(2, refsChangedEvents); } } + @Test + public void fileDirectoryConflictRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + writeLooseRef("refs/heads/masters", B); + refdir.exactRef("refs/heads/master"); + refdir.exactRef("refs/heads/masters"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), A, "refs/heads/master/x", CREATE), + new ReceiveCommand(zeroId(), A, "refs/heads", CREATE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true), false); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + @Test public void conflictThanksToDelete() throws IOException { writeLooseRef("refs/heads/master", A); @@ -300,15 +370,24 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertRefs( "refs/heads/master", B, "refs/heads/masters/x", A); - if (atomic) { - assertEquals(2, refsChangedEvents); - } else { - // The non-atomic case actually produces 5 events, but that's an - // implementation detail. We expect at least 4 events, one for the - // initial read due to writeLooseRef(), and then one for each - // successful ref update. - assertTrue(refsChangedEvents >= 4); - } + } + + @Test + public void conflictThanksToDeleteRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + writeLooseRef("refs/heads/masters", B); + refdir.exactRef("refs/heads/master"); + refdir.exactRef("refs/heads/masters"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), A, "refs/heads/masters/x", CREATE), + new ReceiveCommand(B, zeroId(), "refs/heads/masters", DELETE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 3, refsChangedEvents); } @Test @@ -325,16 +404,31 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, REJECTED_MISSING_OBJECT, TRANSACTION_ABORTED); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, REJECTED_MISSING_OBJECT, OK); assertRefs( "refs/heads/master", A, "refs/heads/foo2", B); - assertEquals(2, refsChangedEvents); } } + @Test + public void updateToMissingObjectRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + ObjectId bad = ObjectId + .fromString("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); + List cmds = Arrays.asList( + new ReceiveCommand(A, bad, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), B, "refs/heads/foo2", CREATE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true), false); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + @Test public void addMissingObject() throws IOException { writeLooseRef("refs/heads/master", A); @@ -349,14 +443,29 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, REJECTED_MISSING_OBJECT); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, OK, REJECTED_MISSING_OBJECT); assertRefs("refs/heads/master", B); - assertEquals(2, refsChangedEvents); } } + @Test + public void addMissingObjectRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + ObjectId bad = ObjectId + .fromString("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); + List cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), bad, "refs/heads/foo2", CREATE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true), false); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + @Test public void oneNonExistentRef() throws IOException { List cmds = Arrays.asList( @@ -387,16 +496,29 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, LOCK_FAILURE, TRANSACTION_ABORTED); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, LOCK_FAILURE, OK); assertRefs( "refs/heads/master", A, "refs/heads/foo2", B); - assertEquals(2, refsChangedEvents); } } + @Test + public void oneRefWrongOldValueRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(B, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), B, "refs/heads/foo2", CREATE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + @Test public void nonExistentRef() throws IOException { writeLooseRef("refs/heads/master", A); @@ -409,17 +531,31 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, LOCK_FAILURE); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, OK, LOCK_FAILURE); assertRefs("refs/heads/master", B); - assertEquals(2, refsChangedEvents); } } + @Test + public void nonExistentRefRefsChangedEvents() throws IOException { + writeLooseRef("refs/heads/master", A); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(A, zeroId(), "refs/heads/foo2", DELETE)); + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, refsChangedEvents); + } + @Test public void noRefLog() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; Map oldLogs = getLastReflogs("refs/heads/master", "refs/heads/branch"); @@ -434,7 +570,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertRefs( "refs/heads/master", B, "refs/heads/branch", B); - assertEquals(atomic ? 2 : 3, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogUnchanged(oldLogs, "refs/heads/master"); assertReflogUnchanged(oldLogs, "refs/heads/branch"); } @@ -443,6 +580,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { public void reflogDefaultIdent() throws IOException { writeRef("refs/heads/master", A); writeRef("refs/heads/branch2", A); + int initialRefsChangedEvents = refsChangedEvents; Map oldLogs = getLastReflogs( "refs/heads/master", "refs/heads/branch1", "refs/heads/branch2"); @@ -459,7 +597,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { "refs/heads/master", B, "refs/heads/branch1", B, "refs/heads/branch2", A); - assertEquals(atomic ? 3 : 4, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogEquals( reflog(A, B, new PersonIdent(diskRepo), "a reflog"), getLastReflog("refs/heads/master")); @@ -473,6 +612,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { public void reflogAppendStatusNoMessage() throws IOException { writeRef("refs/heads/master", A); writeRef("refs/heads/branch1", B); + int initialRefsChangedEvents = refsChangedEvents; List cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE), @@ -488,7 +628,9 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { "refs/heads/master", B, "refs/heads/branch1", A, "refs/heads/branch2", A); - assertEquals(atomic ? 3 : 5, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 3, + refsChangedEvents); assertReflogEquals( // Always forced; setAllowNonFastForwards(true) bypasses the check. reflog(A, B, new PersonIdent(diskRepo), "forced-update"), @@ -504,6 +646,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogAppendStatusFastForward() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE)); @@ -511,7 +654,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK); assertRefs("refs/heads/master", B); - assertEquals(2, refsChangedEvents); + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); assertReflogEquals( reflog(A, B, new PersonIdent(diskRepo), "fast-forward"), getLastReflog("refs/heads/master")); @@ -520,6 +663,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogAppendStatusWithMessage() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE), @@ -530,7 +674,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertRefs( "refs/heads/master", B, "refs/heads/branch", A); - assertEquals(atomic ? 2 : 3, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogEquals( reflog(A, B, new PersonIdent(diskRepo), "a reflog: fast-forward"), getLastReflog("refs/heads/master")); @@ -542,6 +687,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogCustomIdent() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE), @@ -553,7 +699,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { .setRefLogIdent(ident)); assertResults(cmds, OK, OK); - assertEquals(atomic ? 2 : 3, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertRefs( "refs/heads/master", B, "refs/heads/branch", B); @@ -571,6 +718,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { public void reflogDelete() throws IOException { writeRef("refs/heads/master", A); writeRef("refs/heads/branch", A); + int initialRefsChangedEvents = refsChangedEvents; + assertEquals( 2, getLastReflogs("refs/heads/master", "refs/heads/branch").size()); @@ -581,7 +730,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK); assertRefs("refs/heads/branch", B); - assertEquals(atomic ? 3 : 4, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertNull(getLastReflog("refs/heads/master")); assertReflogEquals( reflog(A, B, new PersonIdent(diskRepo), "a reflog"), @@ -591,6 +741,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogFileDirectoryConflict() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List cmds = Arrays.asList( new ReceiveCommand(A, zeroId(), "refs/heads/master", DELETE), @@ -599,7 +750,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertResults(cmds, OK, OK); assertRefs("refs/heads/master/x", A); - assertEquals(atomic ? 2 : 3, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertNull(getLastReflog("refs/heads/master")); assertReflogEquals( reflog(zeroId(), A, new PersonIdent(diskRepo), "a reflog"), @@ -609,6 +761,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void reflogOnLockFailure() throws IOException { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; Map oldLogs = getLastReflogs("refs/heads/master", "refs/heads/branch"); @@ -620,12 +773,12 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, LOCK_FAILURE); - assertEquals(1, refsChangedEvents); + assertEquals(initialRefsChangedEvents, refsChangedEvents); assertReflogUnchanged(oldLogs, "refs/heads/master"); assertReflogUnchanged(oldLogs, "refs/heads/branch"); } else { assertResults(cmds, OK, LOCK_FAILURE); - assertEquals(2, refsChangedEvents); + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); assertReflogEquals( reflog(A, B, new PersonIdent(diskRepo), "a reflog"), getLastReflog("refs/heads/master")); @@ -636,6 +789,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void overrideRefLogMessage() throws Exception { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; List cmds = Arrays.asList( new ReceiveCommand(A, B, "refs/heads/master", UPDATE), @@ -648,7 +802,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { .setRefLogMessage("a reflog", true)); assertResults(cmds, OK, OK); - assertEquals(atomic ? 2 : 3, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogEquals( reflog(A, B, ident, "custom log"), getLastReflog("refs/heads/master"), @@ -662,6 +817,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { @Test public void overrideDisableRefLog() throws Exception { writeRef("refs/heads/master", A); + int initialRefsChangedEvents = refsChangedEvents; Map oldLogs = getLastReflogs("refs/heads/master", "refs/heads/branch"); @@ -673,7 +829,8 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { execute(newBatchUpdate(cmds).setRefLogMessage("a reflog", true)); assertResults(cmds, OK, OK); - assertEquals(atomic ? 2 : 3, refsChangedEvents); + assertEquals(atomic ? initialRefsChangedEvents + 1 + : initialRefsChangedEvents + 2, refsChangedEvents); assertReflogUnchanged(oldLogs, "refs/heads/master"); assertReflogEquals( reflog(zeroId(), B, new PersonIdent(diskRepo), "a reflog: created"), @@ -763,20 +920,41 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, LOCK_FAILURE, TRANSACTION_ABORTED); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { // Only operates on loose refs, doesn't care that packed-refs is locked. assertResults(cmds, OK, OK); assertRefs( "refs/heads/master", B, "refs/heads/branch", B); - assertEquals(3, refsChangedEvents); } } finally { myLock.unlock(); } } + @Test + public void packedRefsLockFailureRefsChangedEvents() throws Exception { + writeLooseRef("refs/heads/master", A); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), B, "refs/heads/branch", CREATE)); + + LockFile myLock = refdir.lockPackedRefs(); + try { + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals( + atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 2, + refsChangedEvents); + } finally { + myLock.unlock(); + } + } + @Test public void oneRefLockFailure() throws Exception { writeLooseRef("refs/heads/master", A); @@ -796,19 +974,41 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { if (atomic) { assertResults(cmds, TRANSACTION_ABORTED, LOCK_FAILURE); assertRefs("refs/heads/master", A); - assertEquals(1, refsChangedEvents); } else { assertResults(cmds, OK, LOCK_FAILURE); assertRefs( "refs/heads/branch", B, "refs/heads/master", A); - assertEquals(2, refsChangedEvents); } } finally { myLock.unlock(); } } + @Test + public void oneRefLockFailureRefsChangedEvents() throws Exception { + writeLooseRef("refs/heads/master", A); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(zeroId(), B, "refs/heads/branch", CREATE), + new ReceiveCommand(A, B, "refs/heads/master", UPDATE)); + + LockFile myLock = new LockFile(refdir.fileFor("refs/heads/master")); + assertTrue(myLock.lock()); + try { + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals( + atomic ? initialRefsChangedEvents + : initialRefsChangedEvents + 1, + refsChangedEvents); + } finally { + myLock.unlock(); + } + } + @Test public void singleRefUpdateDoesNotRequirePackedRefsLock() throws Exception { writeLooseRef("refs/heads/master", A); @@ -822,13 +1022,32 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertFalse(getLockFile("refs/heads/master").exists()); assertResults(cmds, OK); - assertEquals(2, refsChangedEvents); assertRefs("refs/heads/master", B); } finally { myLock.unlock(); } } + @Test + public void singleRefUpdateDoesNotRequirePackedRefsLockRefsChangedEvents() + throws Exception { + writeLooseRef("refs/heads/master", A); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays + .asList(new ReceiveCommand(A, B, "refs/heads/master", UPDATE)); + + LockFile myLock = refdir.lockPackedRefs(); + try { + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); + } finally { + myLock.unlock(); + } + } + @Test public void atomicUpdateRespectsInProcessLock() throws Exception { assumeTrue(atomic); @@ -881,6 +1100,53 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { "refs/heads/branch", B); } + @Test + public void atomicUpdateRespectsInProcessLockRefsChangedEvents() + throws Exception { + assumeTrue(atomic); + + writeLooseRef("refs/heads/master", A); + refdir.exactRef("refs/heads/master"); + int initialRefsChangedEvents = refsChangedEvents; + + List cmds = Arrays.asList( + new ReceiveCommand(A, B, "refs/heads/master", UPDATE), + new ReceiveCommand(zeroId(), B, "refs/heads/branch", CREATE)); + + Thread t = new Thread(() -> { + try { + execute(newBatchUpdate(cmds).setAllowNonFastForwards(true)); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + ReentrantLock l = refdir.inProcessPackedRefsLock; + l.lock(); + try { + t.start(); + long timeoutSecs = 10; + + // Hold onto the lock until we observe the worker thread has + // attempted to + // acquire it. + while (l.getQueueLength() == 0) { + Thread.sleep(3); + } + + // Once we unlock, the worker thread should finish the update + // promptly. + l.unlock(); + t.join(SECONDS.toMillis(timeoutSecs)); + } finally { + if (l.isHeldByCurrentThread()) { + l.unlock(); + } + } + + assertEquals(initialRefsChangedEvents + 1, refsChangedEvents); + } + private void setLogAllRefUpdates(boolean enable) throws Exception { StoredConfig cfg = diskRepo.getConfig(); cfg.load(); -- cgit v1.2.3 From 8bc166b00da5fc74a659b42be779328a9508866b Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Wed, 12 May 2021 16:12:27 -0700 Subject: BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory Rather than getting all ref names and prefixes and saving them in memory to perform the check for conflicting names, rely on RefDirectory.isNameConflicting as it is no longer an expensive call after it was optimized in Ie994fc. The old optimization to save ref names and prefixes in memory was targeted towards making clones faster. With this change, the clone performance is unaffected when tests were done with repos containing many(~500k) refs. Here are few recorded elapsed times for creating 10 branches using BatchRefUpdate on NFS based repositories with varying loose refs count. As seen here, this change helps improve the BatchRefUpdate performance from O(n^2) to O(1). loose_refs_count with_change without_change 50 241 ms 310 ms 300 263 ms 1502 ms 1k 181 ms 4241 ms 2k 204 ms 6440 ms 9k 158 ms 25930 ms 20k 154 ms 60443 ms 50k 171 ms 135199 ms 110k 157 ms 329450 ms 160k 209 ms 396328 ms This update improves the Gerrit notedb migration performance as it uses BatchRefUpdate to write change meta refs similar to the test performed above. Change-Id: I853ac6c7feb4b39c3156c01876b38cbd182accfe Signed-off-by: Kaushik Lingarkar --- .../src/org/eclipse/jgit/lib/BatchRefUpdate.java | 54 ++++++---------------- 1 file changed, 13 insertions(+), 41 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java index 925b6beadb..46d2ab3397 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java @@ -46,7 +46,6 @@ package org.eclipse.jgit.lib; import static org.eclipse.jgit.transport.ReceiveCommand.Result.NOT_ATTEMPTED; import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_OTHER_REASON; -import static java.util.stream.Collectors.toCollection; import java.io.IOException; import java.text.MessageFormat; @@ -62,7 +61,6 @@ import java.util.concurrent.TimeoutException; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.lib.RefUpdate.Result; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.PushCertificate; import org.eclipse.jgit.transport.ReceiveCommand; @@ -528,42 +526,24 @@ public class BatchRefUpdate { } } if (!commands2.isEmpty()) { - // What part of the name space is already taken - Collection takenNames = refdb.getRefs().stream() - .map(Ref::getName) - .collect(toCollection(HashSet::new)); - Collection takenPrefixes = getTakenPrefixes(takenNames); - - // Now to the update that may require more room in the name space + // Perform updates that may require more room in the name space for (ReceiveCommand cmd : commands2) { try { if (cmd.getResult() == NOT_ATTEMPTED) { cmd.updateType(walk); RefUpdate ru = newUpdate(cmd); - SWITCH: switch (cmd.getType()) { - case DELETE: - // Performed in the first phase - break; - case UPDATE: - case UPDATE_NONFASTFORWARD: - RefUpdate ruu = newUpdate(cmd); - cmd.setResult(ruu.update(walk)); - break; - case CREATE: - for (String prefix : getPrefixes(cmd.getRefName())) { - if (takenNames.contains(prefix)) { - cmd.setResult(Result.LOCK_FAILURE); - break SWITCH; - } - } - if (takenPrefixes.contains(cmd.getRefName())) { - cmd.setResult(Result.LOCK_FAILURE); - break SWITCH; - } - ru.setCheckConflicting(false); - takenPrefixes.addAll(getPrefixes(cmd.getRefName())); - takenNames.add(cmd.getRefName()); - cmd.setResult(ru.update(walk)); + switch (cmd.getType()) { + case DELETE: + // Performed in the first phase + break; + case UPDATE: + case UPDATE_NONFASTFORWARD: + RefUpdate ruu = newUpdate(cmd); + cmd.setResult(ruu.update(walk)); + break; + case CREATE: + cmd.setResult(ru.update(walk)); + break; } } } catch (IOException err) { @@ -635,14 +615,6 @@ public class BatchRefUpdate { execute(walk, monitor, null); } - private static Collection getTakenPrefixes(Collection names) { - Collection ref = new HashSet<>(); - for (String name : names) { - addPrefixesTo(name, ref); - } - return ref; - } - /** * Get all path prefixes of a ref name. * -- cgit v1.2.3 From f3d07f664949e62265f2c12ee259ed558405f00f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 5 Jun 2021 00:31:03 +0200 Subject: JGit v5.1.16.202106041830-r Change-Id: I526ed2a08553bc0b2678aaefaff9e0c6529baefc Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 57 files changed, 60 insertions(+), 60 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index bee78b1043..64b4d5555e 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 4eaddeef99..fa75c40a53 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 322c7bbcdc..56a7f4764d 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index fadf375ab8..1bf25f8737 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index fec2b8a1a1..152667f7db 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 6ed6e3dd0b..6f17a88ac2 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.16.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.1.16.qualifier";roots="." +Bundle-Version: 5.1.16.202106041830-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.1.16.202106041830-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index eb5d8f4a0b..31d568707e 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e22ee0f84e..28781be76a 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -47,7 +47,7 @@ 4.0.0 org.eclipse.jgit - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 0fa3b200ff..73e5582076 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 56d099aaf4..c7ddcab435 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 7e4d628925..7ae5617c1d 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.http.server;version="5.1.16", diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 3432d1952e..6f24251516 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 5ea783c530..7fd2412f7e 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index e3174a4989..2953a22297 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index fbc5221383..4ef0fd7e86 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index e8020bf54d..de27675828 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index a423a27ee1..0e316310f5 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index b41f6aba15..bc5d9ebe27 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 13c7c90d1f..b9159f063d 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 038662a423..debbf48522 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index bcff52094d..8ba389423f 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.lfs.server;version="5.1.16"; diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 724c6bf7f9..01ee8d3e58 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 715ae6bf68..5f449660b5 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index b2bbe2c64d..941b014b6c 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 26b11e9b7d..612e78fc22 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.lfs;version="5.1.16", diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index b14bec3e48..182295ecd6 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.lfs 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 42ed9935aa..87669dae4c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index da62c9f196..b110cd4a29 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.feature 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 7f164c77d5..35dcfdb88a 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 @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 249a8adac4..791f84dd4b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.feature 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 7e3b1375d8..26667f177b 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 @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index bdfaf808e9..8f095d4fb3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.feature 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 e468dd934b..d929ac0c5a 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 @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 9b08c9d29e..1aeec6aeef 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.feature 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 8c61e8eecf..4130db3250 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 @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index c21dbdbb4b..fd41043f41 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 2eb3104098..01fbb878c5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index a80132db25..e4d8d43262 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 7f10a1c187..66b35b551e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 316e3006d6..3718dd1fd0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 7497fb4f28..108925ce95 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 189571eadc..ba602ccc2a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index f8ed87a9b2..4710ee3acf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index fc4a6c1884..894d29abbf 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 0dc60ff330..972780f5d3 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index a08dea16c3..73c6347b39 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 880d46524e..a304c25786 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 3ab652d8ef..854b30c338 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.16.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.1.16.qualifier";roots="." +Bundle-Version: 5.1.16.202106041830-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.1.16.202106041830-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 6cf16530b5..3ff790c2d2 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index fe52c5896c..2089d890fe 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index f4384933a0..b8c0333746 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index a0bd1a7bc2..a611357074 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.awtui;version="5.1.16" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 3e44dcb8bc..f2f95e349b 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 041d07e097..29d020267f 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.1.16.qualifier +Bundle-Version: 5.1.16.202106041830-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 1b4948d58c..20619b3709 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.16.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.1.16.qualifier";roots="." +Bundle-Version: 5.1.16.202106041830-r +Eclipse-SourceBundle: org.eclipse.jgit;version="5.1.16.202106041830-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 1f728f9eba..46bb32659f 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 2ee052994e..6bc3aee0a7 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.1.16-SNAPSHOT + 5.1.16.202106041830-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From e7b4af0d954b82839e8f8089af8d1d75ea2cf317 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 5 Jun 2021 00:45:08 +0200 Subject: Prepare 5.1.17-SNAPSHOT builds Change-Id: I20c69728465f956a5744a75eb548ef18962286dd Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 14 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 26 +++--- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 40 ++++----- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++--- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 36 ++++---- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 ++++----- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 ++++---- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 24 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 46 +++++------ org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 6 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 36 ++++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 86 +++++++++---------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 96 +++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 92 ++++++++++----------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 57 files changed, 360 insertions(+), 360 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 64b4d5555e..589dc31565 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -4,13 +4,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", + org.eclipse.jgit.ant.tasks;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index fa75c40a53..705d49bc93 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 56a7f4764d..2d38bef443 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)" + org.eclipse.jgit.storage.file;version="[5.1.17,5.2.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="5.1.16"; +Export-Package: org.eclipse.jgit.ant.tasks;version="5.1.17"; uses:="org.apache.tools.ant.types,org.apache.tools.ant" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 1bf25f8737..9b30435968 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 152667f7db..e0a76cf2b7 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,15 +13,15 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", + org.eclipse.jgit.api;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="5.1.16"; +Export-Package: org.eclipse.jgit.archive;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 6f17a88ac2..b797074d07 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.16.202106041830-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.1.16.202106041830-r";roots="." +Bundle-Version: 5.1.17.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.1.17.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 31d568707e..76c2b84911 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 28781be76a..d90ae16c2d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -47,7 +47,7 @@ 4.0.0 org.eclipse.jgit - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 73e5582076..f8a0440d41 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -23,10 +23,10 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.client;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.3.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="5.1.16"; + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="5.1.17"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index c7ddcab435..46a360d798 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 7ae5617c1d..af41e1e78b 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="5.1.16", - org.eclipse.jgit.http.server.glue;version="5.1.16"; +Export-Package: org.eclipse.jgit.http.server;version="5.1.17", + org.eclipse.jgit.http.server.glue;version="5.1.17"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="5.1.16"; + org.eclipse.jgit.http.server.resolver;version="5.1.17"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,12 +18,12 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)" + org.eclipse.jgit.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 6f24251516..ae4bafefc4 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 7fd2412f7e..6f978e3ec9 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,25 +28,25 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.http.server;version="[5.1.16,5.2.0)", - org.eclipse.jgit.http.server.glue;version="[5.1.16,5.2.0)", - org.eclipse.jgit.http.server.resolver;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit.http;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.http.apache;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.http.server;version="[5.1.17,5.2.0)", + org.eclipse.jgit.http.server.glue;version="[5.1.17,5.2.0)", + org.eclipse.jgit.http.server.resolver;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit.http;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.http.apache;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 2953a22297..c183afc634 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 4ef0fd7e86..0d910826df 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -22,16 +22,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.http.server;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.16,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.http.server;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.17,5.2.0)", org.junit;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="5.1.16"; +Export-Package: org.eclipse.jgit.junit.http;version="5.1.17"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index de27675828..425af4f70b 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 0e316310f5..3013921462 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.1.16,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.16,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util.time;version="[5.1.16,5.2.0)", +Import-Package: org.eclipse.jgit.api;version="[5.1.17,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.17,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util.time;version="[5.1.17,5.2.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners.model;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="5.1.16"; +Export-Package: org.eclipse.jgit.junit;version="5.1.17"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -36,4 +36,4 @@ Export-Package: org.eclipse.jgit.junit;version="5.1.16"; org.eclipse.jgit.util, org.eclipse.jgit.storage.file, org.eclipse.jgit.api", - org.eclipse.jgit.junit.time;version="5.1.16" + org.eclipse.jgit.junit.time;version="5.1.17" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index bc5d9ebe27..c42be4be12 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index b9159f063d..ca729ba106 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,24 +28,24 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.1.16,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit.http;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.server;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.test;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", + org.eclipse.jgit.api;version="[5.1.17,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit.http;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.server;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.test;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index debbf48522..d544a6dcce 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 8ba389423f..a195a98550 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs.server;version="5.1.16"; +Export-Package: org.eclipse.jgit.lfs.server;version="5.1.17"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="5.1.16"; + org.eclipse.jgit.lfs.server.fs;version="5.1.17"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="5.1.16";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.1.16"; + org.eclipse.jgit.lfs.server.internal;version="5.1.17";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="5.1.17"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.http;version="[3.1.0,4.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.internal;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.http.apache;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", + org.eclipse.jgit.annotations;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.internal;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.http.apache;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 01ee8d3e58..e94ea85c09 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 5f449660b5..f008be9b7f 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,23 +3,23 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", +Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="5.1.16";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="5.1.17";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 941b014b6c..46588cd844 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 612e78fc22..2aef075e98 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs;version="5.1.16", - org.eclipse.jgit.lfs.errors;version="5.1.16", - org.eclipse.jgit.lfs.internal;version="5.1.16";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.1.16" +Export-Package: org.eclipse.jgit.lfs;version="5.1.17", + org.eclipse.jgit.lfs.errors;version="5.1.17", + org.eclipse.jgit.lfs.internal;version="5.1.17";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="5.1.17" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", org.apache.http.impl.client;version="[4.2.6,5.0.0)", org.apache.http.impl.conn;version="[4.2.6,5.0.0)", - org.eclipse.jgit.annotations;version="[5.1.16,5.2.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.16,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.16,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.hooks;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.pack;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.16,5.2.0)" + org.eclipse.jgit.annotations;version="[5.1.17,5.2.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.attributes;version="[5.1.17,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.17,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.hooks;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.pack;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.17,5.2.0)" diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 182295ecd6..baad1c0735 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.lfs 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 87669dae4c..c8bb8a8582 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index b110cd4a29..bf0515e036 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.feature 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 35dcfdb88a..4a5790acb4 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 @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 791f84dd4b..fac9a7b0bb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.feature 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 26667f177b..24780318e1 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 @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 8f095d4fb3..ef0c4c3105 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.feature 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 d929ac0c5a..a79d8e3967 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 @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 1aeec6aeef..8b3e86cfa2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.feature 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 4130db3250..45a273d67a 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 @@ -2,7 +2,7 @@ @@ -31,8 +31,8 @@ version="0.0.0"/> - - + + org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 01fbb878c5..7638402f3d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index e4d8d43262..e2e648f756 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 66b35b551e..16e4a0394e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 3718dd1fd0..5e19ab9400 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 108925ce95..8ca8965f8c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index ba602ccc2a..0ef38ca9b9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 4710ee3acf..a5a705f702 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 894d29abbf..85d623ba47 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 972780f5d3..7deb65efd1 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.1.16,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.16,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="5.1.16", - org.eclipse.jgit.junit;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.16,5.2.0)", - org.eclipse.jgit.pgm;version="[5.1.16,5.2.0)", - org.eclipse.jgit.pgm.internal;version="[5.1.16,5.2.0)", - org.eclipse.jgit.pgm.opt;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.16,5.2.0)", +Import-Package: org.eclipse.jgit.api;version="[5.1.17,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.17,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="5.1.17", + org.eclipse.jgit.junit;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.17,5.2.0)", + org.eclipse.jgit.pgm;version="[5.1.17,5.2.0)", + org.eclipse.jgit.pgm.internal;version="[5.1.17,5.2.0)", + org.eclipse.jgit.pgm.opt;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.17,5.2.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 73c6347b39..f435b3563e 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index a304c25786..6024f8842c 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -28,49 +28,49 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.1.16,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.archive;version="[5.1.16,5.2.0)", - org.eclipse.jgit.awtui;version="[5.1.16,5.2.0)", - org.eclipse.jgit.blame;version="[5.1.16,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.16,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.16,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.gitrepo;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.ketch;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.io;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.reftree;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.server;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs.server.s3;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.16,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.notes;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revplot;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk.filter;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.pack;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.http.apache;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.16,5.2.0)", + org.eclipse.jgit.api;version="[5.1.17,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.archive;version="[5.1.17,5.2.0)", + org.eclipse.jgit.awtui;version="[5.1.17,5.2.0)", + org.eclipse.jgit.blame;version="[5.1.17,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.17,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.17,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.gitrepo;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.ketch;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.io;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.reftree;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.server;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs.server.s3;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.17,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.notes;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revplot;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk.filter;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.pack;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.http.apache;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.17,5.2.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="5.1.16"; +Export-Package: org.eclipse.jgit.console;version="5.1.17"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="5.1.16"; + org.eclipse.jgit.pgm;version="5.1.17"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -81,11 +81,11 @@ Export-Package: org.eclipse.jgit.console;version="5.1.16"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="5.1.16"; + org.eclipse.jgit.pgm.debug;version="5.1.17"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="5.1.16";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="5.1.16"; + org.eclipse.jgit.pgm.internal;version="5.1.17";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.kohsuke.args4j.spi, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 854b30c338..6c2ac31d7d 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.16.202106041830-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.1.16.202106041830-r";roots="." +Bundle-Version: 5.1.17.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.1.17.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 3ff790c2d2..fa49549972 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 2089d890fe..701305f893 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -17,53 +17,53 @@ 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.eclipse.jgit.api;version="[5.1.16,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.archive;version="[5.1.16,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.16,5.2.0)", - org.eclipse.jgit.awtui;version="[5.1.16,5.2.0)", - org.eclipse.jgit.blame;version="[5.1.16,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.16,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.16,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.events;version="[5.1.16,5.2.0)", - org.eclipse.jgit.fnmatch;version="[5.1.16,5.2.0)", - org.eclipse.jgit.gitrepo;version="[5.1.16,5.2.0)", - org.eclipse.jgit.hooks;version="[5.1.16,5.2.0)", - org.eclipse.jgit.ignore;version="[5.1.16,5.2.0)", - org.eclipse.jgit.ignore.internal;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.fsck;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.io;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.1.16,5.2.0)", - org.eclipse.jgit.internal.storage.reftree;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit;version="[5.1.16,5.2.0)", - org.eclipse.jgit.junit.time;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lfs;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.16,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.notes;version="[5.1.16,5.2.0)", - org.eclipse.jgit.patch;version="[5.1.16,5.2.0)", - org.eclipse.jgit.pgm;version="[5.1.16,5.2.0)", - org.eclipse.jgit.pgm.internal;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revplot;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk.filter;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.16,5.2.0)", - org.eclipse.jgit.storage.pack;version="[5.1.16,5.2.0)", - org.eclipse.jgit.submodule;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport.resolver;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util.sha1;version="[5.1.16,5.2.0)", + org.eclipse.jgit.api;version="[5.1.17,5.2.0)", + org.eclipse.jgit.api.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.archive;version="[5.1.17,5.2.0)", + org.eclipse.jgit.attributes;version="[5.1.17,5.2.0)", + org.eclipse.jgit.awtui;version="[5.1.17,5.2.0)", + org.eclipse.jgit.blame;version="[5.1.17,5.2.0)", + org.eclipse.jgit.diff;version="[5.1.17,5.2.0)", + org.eclipse.jgit.dircache;version="[5.1.17,5.2.0)", + org.eclipse.jgit.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.events;version="[5.1.17,5.2.0)", + org.eclipse.jgit.fnmatch;version="[5.1.17,5.2.0)", + org.eclipse.jgit.gitrepo;version="[5.1.17,5.2.0)", + org.eclipse.jgit.hooks;version="[5.1.17,5.2.0)", + org.eclipse.jgit.ignore;version="[5.1.17,5.2.0)", + org.eclipse.jgit.ignore.internal;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.fsck;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.io;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.1.17,5.2.0)", + org.eclipse.jgit.internal.storage.reftree;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit;version="[5.1.17,5.2.0)", + org.eclipse.jgit.junit.time;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lfs;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.merge;version="[5.1.17,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.notes;version="[5.1.17,5.2.0)", + org.eclipse.jgit.patch;version="[5.1.17,5.2.0)", + org.eclipse.jgit.pgm;version="[5.1.17,5.2.0)", + org.eclipse.jgit.pgm.internal;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revplot;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk.filter;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.file;version="[5.1.17,5.2.0)", + org.eclipse.jgit.storage.pack;version="[5.1.17,5.2.0)", + org.eclipse.jgit.submodule;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.http;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport.resolver;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.treewalk.filter;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util.io;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util.sha1;version="[5.1.17,5.2.0)", org.junit;version="[4.12,5.0.0)", org.junit.experimental.theories;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b8c0333746..a3e3f86c4b 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index a611357074..57bb68e0a1 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="5.1.16" -Import-Package: org.eclipse.jgit.errors;version="[5.1.16,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.16,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revplot;version="[5.1.16,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.16,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.16,5.2.0)", - org.eclipse.jgit.util;version="[5.1.16,5.2.0)" +Export-Package: org.eclipse.jgit.awtui;version="5.1.17" +Import-Package: org.eclipse.jgit.errors;version="[5.1.17,5.2.0)", + org.eclipse.jgit.lib;version="[5.1.17,5.2.0)", + org.eclipse.jgit.nls;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revplot;version="[5.1.17,5.2.0)", + org.eclipse.jgit.revwalk;version="[5.1.17,5.2.0)", + org.eclipse.jgit.transport;version="[5.1.17,5.2.0)", + org.eclipse.jgit.util;version="[5.1.17,5.2.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index f2f95e349b..e95c0695b8 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 29d020267f..a7354e108b 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.1.16.202106041830-r +Bundle-Version: 5.1.17.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.annotations;version="5.1.16", - org.eclipse.jgit.api;version="5.1.16"; +Export-Package: org.eclipse.jgit.annotations;version="5.1.17", + org.eclipse.jgit.api;version="5.1.17"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -22,52 +22,52 @@ Export-Package: org.eclipse.jgit.annotations;version="5.1.16", org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="5.1.16";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="5.1.16", - org.eclipse.jgit.blame;version="5.1.16"; + org.eclipse.jgit.api.errors;version="5.1.17";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", + org.eclipse.jgit.attributes;version="5.1.17", + org.eclipse.jgit.blame;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="5.1.16"; + org.eclipse.jgit.diff;version="5.1.17"; uses:="org.eclipse.jgit.patch, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="5.1.16"; + org.eclipse.jgit.dircache;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events, org.eclipse.jgit.attributes", - org.eclipse.jgit.errors;version="5.1.16"; + org.eclipse.jgit.errors;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="5.1.16";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="5.1.16", - org.eclipse.jgit.gitrepo;version="5.1.16"; + org.eclipse.jgit.events;version="5.1.17";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.fnmatch;version="5.1.17", + org.eclipse.jgit.gitrepo;version="5.1.17"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax.helpers, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="5.1.16";x-internal:=true, - org.eclipse.jgit.hooks;version="5.1.16";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="5.1.16", - org.eclipse.jgit.ignore.internal;version="5.1.16";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="5.1.16";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="5.1.16";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.ketch;version="5.1.16";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.dfs;version="5.1.16"; + org.eclipse.jgit.gitrepo.internal;version="5.1.17";x-internal:=true, + org.eclipse.jgit.hooks;version="5.1.17";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="5.1.17", + org.eclipse.jgit.ignore.internal;version="5.1.17";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="5.1.17";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.fsck;version="5.1.17";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.ketch;version="5.1.17";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.dfs;version="5.1.17"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="5.1.16"; + org.eclipse.jgit.internal.storage.file;version="5.1.17"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -75,12 +75,12 @@ Export-Package: org.eclipse.jgit.annotations;version="5.1.16", org.eclipse.jgit.lfs, org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test", - org.eclipse.jgit.internal.storage.io;version="5.1.16";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="5.1.16";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="5.1.16"; + org.eclipse.jgit.internal.storage.io;version="5.1.17";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.pack;version="5.1.17";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.reftable;version="5.1.17"; x-friends:="org.eclipse.jgit.http.test,org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftree;version="5.1.16";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="5.1.16"; + org.eclipse.jgit.internal.storage.reftree;version="5.1.17";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="5.1.17"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -90,33 +90,33 @@ Export-Package: org.eclipse.jgit.annotations;version="5.1.16", org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.lib.internal;version="5.1.16";x-internal:=true, - org.eclipse.jgit.merge;version="5.1.16"; + org.eclipse.jgit.lib.internal;version="5.1.17";x-internal:=true, + org.eclipse.jgit.merge;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache, org.eclipse.jgit.api", - org.eclipse.jgit.nls;version="5.1.16", - org.eclipse.jgit.notes;version="5.1.16"; + org.eclipse.jgit.nls;version="5.1.17", + org.eclipse.jgit.notes;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="5.1.16";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="5.1.16";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="5.1.16"; + org.eclipse.jgit.patch;version="5.1.17";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", + org.eclipse.jgit.revplot;version="5.1.17";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", + org.eclipse.jgit.revwalk;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.revwalk.filter", - org.eclipse.jgit.revwalk.filter;version="5.1.16";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="5.1.16";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="5.1.16";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="5.1.16";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="5.1.16"; + org.eclipse.jgit.revwalk.filter;version="5.1.17";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.file;version="5.1.17";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.pack;version="5.1.17";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.submodule;version="5.1.17";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", + org.eclipse.jgit.transport;version="5.1.17"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -128,24 +128,24 @@ Export-Package: org.eclipse.jgit.annotations;version="5.1.16", org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="5.1.16";uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="5.1.16";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="5.1.16"; + org.eclipse.jgit.transport.http;version="5.1.17";uses:="javax.net.ssl", + org.eclipse.jgit.transport.resolver;version="5.1.17";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", + org.eclipse.jgit.treewalk;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="5.1.16";uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="5.1.16"; + org.eclipse.jgit.treewalk.filter;version="5.1.17";uses:="org.eclipse.jgit.treewalk", + org.eclipse.jgit.util;version="5.1.17"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="5.1.16", - org.eclipse.jgit.util.sha1;version="5.1.16", - org.eclipse.jgit.util.time;version="5.1.16" + org.eclipse.jgit.util.io;version="5.1.17", + org.eclipse.jgit.util.sha1;version="5.1.17", + org.eclipse.jgit.util.time;version="5.1.17" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 20619b3709..e0e1159adf 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.1.16.202106041830-r -Eclipse-SourceBundle: org.eclipse.jgit;version="5.1.16.202106041830-r";roots="." +Bundle-Version: 5.1.17.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="5.1.17.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 46bb32659f..47ac544272 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 6bc3aee0a7..a37f2479ac 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.1.16.202106041830-r + 5.1.17-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3