From e60ea7324f37bd0a1086e27fad52ecc5232e9c06 Mon Sep 17 00:00:00 2001 From: Demetr Starshov Date: Tue, 11 Aug 2020 17:57:10 -0700 Subject: [PATCH 1/9] ResolveMerger: Adding test cases for GITLINK merge Add test cases which cover content-merge resolve logic. Git clients try to agressively merge blobs by content, but GITLINK types of entries can't be merged with each other or with blobs. This change ensures all possible permutations which can trigger blob and GITLINK content merge are covered. Signed-off-by: Demetr Starshov Change-Id: I7e83a28a14d4d2f9e0ba2b1cffbf3224fb7f3fef --- .../jgit/junit/RepositoryTestCase.java | 16 + .../eclipse/jgit/merge/GitlinkMergeTest.java | 291 ++++++++++++++++++ 2 files changed, 307 insertions(+) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java index de11e2c00..cc84f197a 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java @@ -34,6 +34,7 @@ import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; @@ -512,6 +513,21 @@ protected DirCacheEntry createEntry(final String path, final FileMode mode, return entry; } + /** + * Create DirCacheEntry + * + * @param path + * @param objectId + * @return the DirCacheEntry + */ + protected DirCacheEntry createGitLink(String path, AnyObjectId objectId) { + final DirCacheEntry entry = new DirCacheEntry(path, + DirCacheEntry.STAGE_0); + entry.setFileMode(FileMode.GITLINK); + entry.setObjectId(objectId); + return entry; + } + /** * Assert files are equal * diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java new file mode 100644 index 000000000..4165812e2 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java @@ -0,0 +1,291 @@ +/* + * Copyright (c) 2020, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.merge; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; + +import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.dircache.DirCache; +import org.eclipse.jgit.dircache.DirCacheBuilder; +import org.eclipse.jgit.dircache.DirCacheEntry; +import org.eclipse.jgit.lib.CommitBuilder; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectInserter; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; +import org.eclipse.jgit.treewalk.TreeWalk; +import org.junit.Ignore; +import org.junit.Test; + +public class GitlinkMergeTest extends SampleDataRepositoryTestCase { + private static final String LINK_ID1 = "DEADBEEFDEADBEEFBABEDEADBEEFDEADBEEFBABE"; + private static final String LINK_ID2 = "DEADDEADDEADDEADDEADDEADDEADDEADDEADDEAD"; + private static final String LINK_ID3 = "BEEFBEEFBEEFBEEFBEEFBEEFBEEFBEEFBEEFBEEF"; + + private static final String SUBMODULE_PATH = "submodule.link"; + + @Test + public void testGitLinkMerging_UpdateUpdate() throws Exception { + testGitLink(LINK_ID1, LINK_ID2, LINK_ID3, newResolveMerger(), false); + } + + @Test + public void testGitLinkMerging_bothAddedSameLink() throws Exception { + assertGitLinkValue( + testGitLink(null, LINK_ID2, LINK_ID2, newResolveMerger(), true), + LINK_ID2); + } + + @Test + public void testGitLinkMerging_bothAddedDifferentLink() throws Exception { + testGitLink(null, LINK_ID2, LINK_ID3, newResolveMerger(), false); + } + + @Test + public void testGitLinkMerging_AddNew_ignoreConflicts() throws Exception { + assertGitLinkValue( + testGitLink(null, null, LINK_ID3, newIgnoreConflictMerger(), + true), + LINK_ID3); + } + + @Test + @Ignore("broken - doesn't ignore conflicts") + public void testGitLinkMerging_UpdateUpdate_ignoreConflicts() + throws Exception { + assertGitLinkValue(testGitLink(LINK_ID1, LINK_ID2, LINK_ID3, + newIgnoreConflictMerger(), true), LINK_ID2); + } + + @Test + @Ignore("broken - doesn't ignore conflicts") + public void testGitLinkMerging_bothAddedSameLink_ignoreConflicts() + throws Exception { + assertGitLinkValue(testGitLink(null, LINK_ID2, LINK_ID2, + newIgnoreConflictMerger(), true), LINK_ID2); + } + + @Test + @Ignore("broken - doesn't ignore conflicts") + public void testGitLinkMerging_bothAddedDifferentLink_ignoreConflicts() + throws Exception { + assertGitLinkValue(testGitLink(null, LINK_ID2, LINK_ID3, + newIgnoreConflictMerger(), true), LINK_ID2); + } + + protected Merger testGitLink(@Nullable String baseLink, + @Nullable String oursLink, @Nullable String theirsLink, + Merger merger, boolean shouldMerge) + throws Exception { + DirCache treeB = db.readDirCache(); + DirCache treeO = db.readDirCache(); + DirCache treeT = db.readDirCache(); + + DirCacheBuilder bTreeBuilder = treeB.builder(); + DirCacheBuilder oTreeBuilder = treeO.builder(); + DirCacheBuilder tTreeBuilder = treeT.builder(); + + maybeAddLink(bTreeBuilder, baseLink); + maybeAddLink(oTreeBuilder, oursLink); + maybeAddLink(tTreeBuilder, theirsLink); + + bTreeBuilder.finish(); + oTreeBuilder.finish(); + tTreeBuilder.finish(); + + ObjectInserter ow = db.newObjectInserter(); + ObjectId b = commit(ow, treeB, new ObjectId[] {}); + ObjectId o = commit(ow, treeO, new ObjectId[] { b }); + ObjectId t = commit(ow, treeT, new ObjectId[] { b }); + + boolean merge = merger.merge(new ObjectId[] { o, t }); + assertEquals(shouldMerge, merge); + + return merger; + } + + private Merger newResolveMerger() { + return MergeStrategy.RESOLVE.newMerger(db, true); + } + + private Merger newIgnoreConflictMerger() { + return new ResolveMerger(db, true) { + @Override + protected boolean mergeImpl() throws IOException { + // emulate call with ignore conflicts. + return mergeTrees(mergeBase(), sourceTrees[0], sourceTrees[1], + true); + } + }; + } + + @Test + public void testGitLinkMerging_blobWithLink() throws Exception { + DirCache treeB = db.readDirCache(); + DirCache treeO = db.readDirCache(); + DirCache treeT = db.readDirCache(); + + DirCacheBuilder bTreeBuilder = treeB.builder(); + DirCacheBuilder oTreeBuilder = treeO.builder(); + DirCacheBuilder tTreeBuilder = treeT.builder(); + + bTreeBuilder.add( + createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob")); + oTreeBuilder.add( + createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 2")); + + maybeAddLink(tTreeBuilder, LINK_ID3); + + bTreeBuilder.finish(); + oTreeBuilder.finish(); + tTreeBuilder.finish(); + + ObjectInserter ow = db.newObjectInserter(); + ObjectId b = commit(ow, treeB, new ObjectId[] {}); + ObjectId o = commit(ow, treeO, new ObjectId[] { b }); + ObjectId t = commit(ow, treeT, new ObjectId[] { b }); + + Merger resolveMerger = MergeStrategy.RESOLVE.newMerger(db); + boolean merge = resolveMerger.merge(new ObjectId[] { o, t }); + assertFalse(merge); + } + + @Test + public void testGitLinkMerging_linkWithBlob() throws Exception { + DirCache treeB = db.readDirCache(); + DirCache treeO = db.readDirCache(); + DirCache treeT = db.readDirCache(); + + DirCacheBuilder bTreeBuilder = treeB.builder(); + DirCacheBuilder oTreeBuilder = treeO.builder(); + DirCacheBuilder tTreeBuilder = treeT.builder(); + + maybeAddLink(bTreeBuilder, LINK_ID1); + maybeAddLink(oTreeBuilder, LINK_ID2); + tTreeBuilder.add( + createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 3")); + + bTreeBuilder.finish(); + oTreeBuilder.finish(); + tTreeBuilder.finish(); + + ObjectInserter ow = db.newObjectInserter(); + ObjectId b = commit(ow, treeB, new ObjectId[] {}); + ObjectId o = commit(ow, treeO, new ObjectId[] { b }); + ObjectId t = commit(ow, treeT, new ObjectId[] { b }); + + Merger resolveMerger = MergeStrategy.RESOLVE.newMerger(db); + boolean merge = resolveMerger.merge(new ObjectId[] { o, t }); + assertFalse(merge); + } + + @Test + public void testGitLinkMerging_linkWithLink() throws Exception { + DirCache treeB = db.readDirCache(); + DirCache treeO = db.readDirCache(); + DirCache treeT = db.readDirCache(); + + DirCacheBuilder bTreeBuilder = treeB.builder(); + DirCacheBuilder oTreeBuilder = treeO.builder(); + DirCacheBuilder tTreeBuilder = treeT.builder(); + + bTreeBuilder.add( + createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob")); + maybeAddLink(oTreeBuilder, LINK_ID2); + maybeAddLink(tTreeBuilder, LINK_ID3); + + bTreeBuilder.finish(); + oTreeBuilder.finish(); + tTreeBuilder.finish(); + + ObjectInserter ow = db.newObjectInserter(); + ObjectId b = commit(ow, treeB, new ObjectId[] {}); + ObjectId o = commit(ow, treeO, new ObjectId[] { b }); + ObjectId t = commit(ow, treeT, new ObjectId[] { b }); + + Merger resolveMerger = MergeStrategy.RESOLVE.newMerger(db); + boolean merge = resolveMerger.merge(new ObjectId[] { o, t }); + assertFalse(merge); + } + + @Test + @Ignore("broken - try to do content-merge with GITLINK") + public void testGitLinkMerging_blobWithBlobFromLink() throws Exception { + DirCache treeB = db.readDirCache(); + DirCache treeO = db.readDirCache(); + DirCache treeT = db.readDirCache(); + + DirCacheBuilder bTreeBuilder = treeB.builder(); + DirCacheBuilder oTreeBuilder = treeO.builder(); + DirCacheBuilder tTreeBuilder = treeT.builder(); + + maybeAddLink(bTreeBuilder, LINK_ID1); + oTreeBuilder.add( + createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 2")); + tTreeBuilder.add( + createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 3")); + + bTreeBuilder.finish(); + oTreeBuilder.finish(); + tTreeBuilder.finish(); + + ObjectInserter ow = db.newObjectInserter(); + ObjectId b = commit(ow, treeB, new ObjectId[] {}); + ObjectId o = commit(ow, treeO, new ObjectId[] { b }); + ObjectId t = commit(ow, treeT, new ObjectId[] { b }); + + Merger resolveMerger = MergeStrategy.RESOLVE.newMerger(db); + boolean merge = resolveMerger.merge(new ObjectId[] { o, t }); + assertFalse(merge); + } + + private void maybeAddLink(DirCacheBuilder builder, + @Nullable String linkId) { + if (linkId == null) { + return; + } + DirCacheEntry newLink = createGitLink(SUBMODULE_PATH, + ObjectId.fromString(linkId)); + builder.add(newLink); + } + + private void assertGitLinkValue(Merger resolveMerger, String expectedValue) + throws Exception { + try (TreeWalk tw = new TreeWalk(db)) { + tw.setRecursive(true); + tw.reset(resolveMerger.getResultTreeId()); + + assertTrue(tw.next()); + assertEquals(SUBMODULE_PATH, tw.getPathString()); + assertEquals(ObjectId.fromString(expectedValue), tw.getObjectId(0)); + + assertFalse(tw.next()); + } + } + + private static ObjectId commit(ObjectInserter odi, DirCache treeB, + ObjectId[] parentIds) throws Exception { + CommitBuilder c = new CommitBuilder(); + c.setTreeId(treeB.writeTree(odi)); + c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0)); + c.setCommitter(c.getAuthor()); + c.setParentIds(parentIds); + c.setMessage("Tree " + c.getTreeId().name()); + ObjectId id = odi.insert(c); + odi.flush(); + return id; + } +} From 3da7ea50a996efccee198ece79c90c2513b482a7 Mon Sep 17 00:00:00 2001 From: Demetr Starshov Date: Tue, 11 Aug 2020 18:24:33 -0700 Subject: [PATCH 2/9] ResolveMerger: extracting createGitLinksMergeResult method Signed-off-by: Demetr Starshov Change-Id: Ibc8b954266b1b4b9b9f404e3433f0d7cdae107e8 --- .../org/eclipse/jgit/merge/ResolveMerger.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 506d33312..85f3fa58b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -745,14 +745,8 @@ protected boolean processEntry(CanonicalTreeParser base, add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0); if (gitlinkConflict) { - MergeResult result = new MergeResult<>( - Arrays.asList( - new SubmoduleConflict(base == null ? null - : base.getEntryObjectId()), - new SubmoduleConflict(ours == null ? null - : ours.getEntryObjectId()), - new SubmoduleConflict(theirs == null ? null - : theirs.getEntryObjectId()))); + MergeResult result = createGitLinksMergeResult( + base, ours, theirs); result.setContainsConflicts(true); mergeResults.put(tw.getPathString(), result); if (!ignoreConflicts) { @@ -825,6 +819,18 @@ protected boolean processEntry(CanonicalTreeParser base, return true; } + private MergeResult createGitLinksMergeResult( + CanonicalTreeParser base, CanonicalTreeParser ours, + CanonicalTreeParser theirs) { + return new MergeResult<>(Arrays.asList( + new SubmoduleConflict( + base == null ? null : base.getEntryObjectId()), + new SubmoduleConflict( + ours == null ? null : ours.getEntryObjectId()), + new SubmoduleConflict( + theirs == null ? null : theirs.getEntryObjectId()))); + } + /** * Does the content merge. The three texts base, ours and theirs are * specified with {@link CanonicalTreeParser}. If any of the parsers is From 29e998a0e6415fe2f1439be5fe28537c6d3d3dea Mon Sep 17 00:00:00 2001 From: Demetr Starshov Date: Tue, 11 Aug 2020 18:30:49 -0700 Subject: [PATCH 3/9] ResolveMerger: improving content merge readability Separate "GITLINK conflict" and "attributes can't be content merged" cases. Signed-off-by: Demetr Starshov Change-Id: I29424e13ea1738af750196e7bf4315256a6095b6 --- .../org/eclipse/jgit/merge/ResolveMerger.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 85f3fa58b..508f7ba62 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -739,24 +739,26 @@ protected boolean processEntry(CanonicalTreeParser base, boolean gitlinkConflict = isGitLink(modeO) || isGitLink(modeT); // Don't attempt to resolve submodule link conflicts - if (gitlinkConflict || !attributes.canBeContentMerged()) { + if (gitlinkConflict) { add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0); add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0); add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0); - if (gitlinkConflict) { - MergeResult result = createGitLinksMergeResult( - base, ours, theirs); - result.setContainsConflicts(true); - mergeResults.put(tw.getPathString(), result); - if (!ignoreConflicts) { - unmergedPaths.add(tw.getPathString()); - } - } else { - // attribute merge issues are conflicts but not failures + MergeResult result = createGitLinksMergeResult( + base, ours, theirs); + result.setContainsConflicts(true); + mergeResults.put(tw.getPathString(), result); + if (!ignoreConflicts) { unmergedPaths.add(tw.getPathString()); } return true; + } else if (!attributes.canBeContentMerged()) { + add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0); + add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0); + add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0); + // attribute merge issues are conflicts but not failures + unmergedPaths.add(tw.getPathString()); + return true; } // Check worktree before modifying files @@ -819,7 +821,7 @@ protected boolean processEntry(CanonicalTreeParser base, return true; } - private MergeResult createGitLinksMergeResult( + private static MergeResult createGitLinksMergeResult( CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs) { return new MergeResult<>(Arrays.asList( From c084729f79c840e74557a5df38b5259247c4ddbd Mon Sep 17 00:00:00 2001 From: Demetr Starshov Date: Wed, 12 Aug 2020 14:47:15 -0700 Subject: [PATCH 4/9] ResolveMerger: choose OURS on gitlink when ignoreConflicts Option ignoreConflicts is used when a caller want to create a virtual commit and use it in a future merge (recursive merge) or show it on UI (e.g. Gerrit). According to contract in case of ignoreConflicts ResolveMerger should populate only stage 0 for entries with merge conflicts as if there is no conflict. Current implementation breaks this contract for cases when gitlink revision is ambiguous. Therefore, always select 'ours' when we merge in ignoreConflicts mode. This will satisfy the contract contract, so recursive merge can succeed, however it is an arbitrary decision, so it is not guaranteed to select best GITLINK in all cases. GITLINK merging is a special case of recursive merge because of limitations of GITLINK type of entry. It can't contain more than 1 sha-1 so jgit can't write merge conflicts in place like it can with a blob. Ideally we could signal the conflict with a special value (like '0000...'), but that must be supported by all tooling (git fsck, c-git)." Signed-off-by: Demetr Starshov Change-Id: Id4e9bebc8e828f7a1ef9f83259159137df477d89 --- .../eclipse/jgit/merge/GitlinkMergeTest.java | 5 ----- .../org/eclipse/jgit/merge/ResolveMerger.java | 20 ++++++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java index 4165812e2..3f291576b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java @@ -27,7 +27,6 @@ import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; import org.eclipse.jgit.treewalk.TreeWalk; -import org.junit.Ignore; import org.junit.Test; public class GitlinkMergeTest extends SampleDataRepositoryTestCase { @@ -63,7 +62,6 @@ public void testGitLinkMerging_AddNew_ignoreConflicts() throws Exception { } @Test - @Ignore("broken - doesn't ignore conflicts") public void testGitLinkMerging_UpdateUpdate_ignoreConflicts() throws Exception { assertGitLinkValue(testGitLink(LINK_ID1, LINK_ID2, LINK_ID3, @@ -71,7 +69,6 @@ public void testGitLinkMerging_UpdateUpdate_ignoreConflicts() } @Test - @Ignore("broken - doesn't ignore conflicts") public void testGitLinkMerging_bothAddedSameLink_ignoreConflicts() throws Exception { assertGitLinkValue(testGitLink(null, LINK_ID2, LINK_ID2, @@ -79,7 +76,6 @@ public void testGitLinkMerging_bothAddedSameLink_ignoreConflicts() } @Test - @Ignore("broken - doesn't ignore conflicts") public void testGitLinkMerging_bothAddedDifferentLink_ignoreConflicts() throws Exception { assertGitLinkValue(testGitLink(null, LINK_ID2, LINK_ID3, @@ -222,7 +218,6 @@ public void testGitLinkMerging_linkWithLink() throws Exception { } @Test - @Ignore("broken - try to do content-merge with GITLINK") public void testGitLinkMerging_blobWithBlobFromLink() throws Exception { DirCache treeB = db.readDirCache(); DirCache treeO = db.readDirCache(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 508f7ba62..a88da6581 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -588,7 +588,8 @@ protected boolean processEntry(CanonicalTreeParser base, final int modeO = tw.getRawMode(T_OURS); final int modeT = tw.getRawMode(T_THEIRS); final int modeB = tw.getRawMode(T_BASE); - + boolean gitLinkMerging = isGitLink(modeO) || isGitLink(modeT) + || isGitLink(modeB); if (modeO == 0 && modeT == 0 && modeB == 0) // File is either untracked or new, staged but uncommitted return true; @@ -737,20 +738,20 @@ protected boolean processEntry(CanonicalTreeParser base, return false; } - boolean gitlinkConflict = isGitLink(modeO) || isGitLink(modeT); - // Don't attempt to resolve submodule link conflicts - if (gitlinkConflict) { + if (gitLinkMerging && ignoreConflicts) { + // Always select 'ours' in case of GITLINK merge failures so + // a caller can use virtual commit. + add(tw.getRawPath(), ours, DirCacheEntry.STAGE_0, EPOCH, 0); + return true; + } else if (gitLinkMerging) { add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0); add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0); add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0); - MergeResult result = createGitLinksMergeResult( base, ours, theirs); result.setContainsConflicts(true); mergeResults.put(tw.getPathString(), result); - if (!ignoreConflicts) { - unmergedPaths.add(tw.getPathString()); - } + unmergedPaths.add(tw.getPathString()); return true; } else if (!attributes.canBeContentMerged()) { add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0); @@ -806,7 +807,8 @@ protected boolean processEntry(CanonicalTreeParser base, } if (nonTree(modeT)) { if (e != null) { - addToCheckout(tw.getPathString(), e, attributes); + addToCheckout(tw.getPathString(), e, + attributes); } } } From 2ae84c320a34ce3e29eaae72292ff7f1b5d723ba Mon Sep 17 00:00:00 2001 From: Demetr Starshov Date: Wed, 26 Aug 2020 18:32:39 -0700 Subject: [PATCH 5/9] ResolveMerger: Adding test cases for GITLINK deletion Add test cases which cover content-merge resolve logic for deletion. Sign-off-by: Demetr Starshov Change-Id: I2f2b37e29adc973a5a0cfcc5c8bc32a2c38efdfa --- .../eclipse/jgit/merge/GitlinkMergeTest.java | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java index 3f291576b..7ca1e8ce3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java @@ -27,6 +27,7 @@ import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; import org.eclipse.jgit.treewalk.TreeWalk; +import org.junit.Ignore; import org.junit.Test; public class GitlinkMergeTest extends SampleDataRepositoryTestCase { @@ -36,6 +37,33 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { private static final String SUBMODULE_PATH = "submodule.link"; + @Test + @Ignore("Broken") + public void testGitLinkMerging_AddNew() throws Exception { + assertGitLinkValue( + testGitLink(null, null, LINK_ID3, newResolveMerger(), true), + LINK_ID3); + } + + @Test + @Ignore("Broken") + public void testGitLinkMerging_Delete() throws Exception { + assertGitLinkDoesntExist(testGitLink(LINK_ID1, LINK_ID1, null, + newResolveMerger(), true)); + } + + @Test + @Ignore("Broken") + public void testGitLinkMerging_UpdateDelete() throws Exception { + testGitLink(LINK_ID1, LINK_ID2, null, newResolveMerger(), false); + } + + @Test + @Ignore("Broken") + public void testGitLinkMerging_DeleteUpdate() throws Exception { + testGitLink(LINK_ID1, null, LINK_ID3, newResolveMerger(), false); + } + @Test public void testGitLinkMerging_UpdateUpdate() throws Exception { testGitLink(LINK_ID1, LINK_ID2, LINK_ID3, newResolveMerger(), false); @@ -61,6 +89,29 @@ public void testGitLinkMerging_AddNew_ignoreConflicts() throws Exception { LINK_ID3); } + @Test + @Ignore("Broken") + public void testGitLinkMerging_Delete_ignoreConflicts() throws Exception { + assertGitLinkDoesntExist(testGitLink(LINK_ID1, LINK_ID1, null, + newIgnoreConflictMerger(), true)); + } + + @Test + @Ignore("Broken") + public void testGitLinkMerging_UpdateDelete_ignoreConflicts() + throws Exception { + assertGitLinkValue(testGitLink(LINK_ID1, LINK_ID2, null, + newIgnoreConflictMerger(), true), LINK_ID2); + } + + @Test + @Ignore("Broken") + public void testGitLinkMerging_DeleteUpdate_ignoreConflicts() + throws Exception { + assertGitLinkDoesntExist(testGitLink(LINK_ID1, null, LINK_ID3, + newIgnoreConflictMerger(), true)); + } + @Test public void testGitLinkMerging_UpdateUpdate_ignoreConflicts() throws Exception { @@ -247,6 +298,36 @@ public void testGitLinkMerging_blobWithBlobFromLink() throws Exception { assertFalse(merge); } + @Test + @Ignore("Broken") + public void testGitLinkMerging_linkBlobDeleted() throws Exception { + // We changed a link to a blob, others has deleted this link. + DirCache treeB = db.readDirCache(); + DirCache treeO = db.readDirCache(); + DirCache treeT = db.readDirCache(); + + DirCacheBuilder bTreeBuilder = treeB.builder(); + DirCacheBuilder oTreeBuilder = treeO.builder(); + DirCacheBuilder tTreeBuilder = treeT.builder(); + + maybeAddLink(bTreeBuilder, LINK_ID1); + oTreeBuilder.add( + createEntry(SUBMODULE_PATH, FileMode.REGULAR_FILE, "blob 2")); + + bTreeBuilder.finish(); + oTreeBuilder.finish(); + tTreeBuilder.finish(); + + ObjectInserter ow = db.newObjectInserter(); + ObjectId b = commit(ow, treeB, new ObjectId[] {}); + ObjectId o = commit(ow, treeO, new ObjectId[] { b }); + ObjectId t = commit(ow, treeT, new ObjectId[] { b }); + + Merger resolveMerger = MergeStrategy.RESOLVE.newMerger(db); + boolean merge = resolveMerger.merge(new ObjectId[] { o, t }); + assertFalse(merge); + } + private void maybeAddLink(DirCacheBuilder builder, @Nullable String linkId) { if (linkId == null) { @@ -271,6 +352,16 @@ private void assertGitLinkValue(Merger resolveMerger, String expectedValue) } } + private void assertGitLinkDoesntExist(Merger resolveMerger) + throws Exception { + try (TreeWalk tw = new TreeWalk(db)) { + tw.setRecursive(true); + tw.reset(resolveMerger.getResultTreeId()); + + assertFalse(tw.next()); + } + } + private static ObjectId commit(ObjectInserter odi, DirCache treeB, ObjectId[] parentIds) throws Exception { CommitBuilder c = new CommitBuilder(); From 214c4afc2c9a7306ac989df218b7cab30ee5e026 Mon Sep 17 00:00:00 2001 From: Demetr Starshov Date: Wed, 12 Aug 2020 15:01:10 -0700 Subject: [PATCH 6/9] ResolveMerger: do not content-merge gitlinks on del/mod conflicts Previously ResolveMerger tried to make a fulltext merge entry in case one of sides got deleted regardless of file mode. This is not applicable for GITLINK type of entry. After this change it is rendering appropriate merge result. Signed-off-by: Demetr Starshov Change-Id: Ibdb4557bf8781bdb48bcee6529e37dc80582ed7e --- .../eclipse/jgit/merge/GitlinkMergeTest.java | 9 --- .../org/eclipse/jgit/merge/ResolveMerger.java | 72 +++++++++++-------- 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java index 7ca1e8ce3..c850b4d74 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java @@ -27,7 +27,6 @@ import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; import org.eclipse.jgit.treewalk.TreeWalk; -import org.junit.Ignore; import org.junit.Test; public class GitlinkMergeTest extends SampleDataRepositoryTestCase { @@ -38,7 +37,6 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { private static final String SUBMODULE_PATH = "submodule.link"; @Test - @Ignore("Broken") public void testGitLinkMerging_AddNew() throws Exception { assertGitLinkValue( testGitLink(null, null, LINK_ID3, newResolveMerger(), true), @@ -46,20 +44,17 @@ public void testGitLinkMerging_AddNew() throws Exception { } @Test - @Ignore("Broken") public void testGitLinkMerging_Delete() throws Exception { assertGitLinkDoesntExist(testGitLink(LINK_ID1, LINK_ID1, null, newResolveMerger(), true)); } @Test - @Ignore("Broken") public void testGitLinkMerging_UpdateDelete() throws Exception { testGitLink(LINK_ID1, LINK_ID2, null, newResolveMerger(), false); } @Test - @Ignore("Broken") public void testGitLinkMerging_DeleteUpdate() throws Exception { testGitLink(LINK_ID1, null, LINK_ID3, newResolveMerger(), false); } @@ -90,14 +85,12 @@ public void testGitLinkMerging_AddNew_ignoreConflicts() throws Exception { } @Test - @Ignore("Broken") public void testGitLinkMerging_Delete_ignoreConflicts() throws Exception { assertGitLinkDoesntExist(testGitLink(LINK_ID1, LINK_ID1, null, newIgnoreConflictMerger(), true)); } @Test - @Ignore("Broken") public void testGitLinkMerging_UpdateDelete_ignoreConflicts() throws Exception { assertGitLinkValue(testGitLink(LINK_ID1, LINK_ID2, null, @@ -105,7 +98,6 @@ public void testGitLinkMerging_UpdateDelete_ignoreConflicts() } @Test - @Ignore("Broken") public void testGitLinkMerging_DeleteUpdate_ignoreConflicts() throws Exception { assertGitLinkDoesntExist(testGitLink(LINK_ID1, null, LINK_ID3, @@ -299,7 +291,6 @@ public void testGitLinkMerging_blobWithBlobFromLink() throws Exception { } @Test - @Ignore("Broken") public void testGitLinkMerging_linkBlobDeleted() throws Exception { // We changed a link to a blob, others has deleted this link. DirCache treeB = db.readDirCache(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index a88da6581..6c217fdf2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -757,6 +757,7 @@ protected boolean processEntry(CanonicalTreeParser base, add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0); add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0); add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0); + // attribute merge issues are conflicts but not failures unmergedPaths.add(tw.getPathString()); return true; @@ -783,40 +784,55 @@ protected boolean processEntry(CanonicalTreeParser base, // OURS or THEIRS has been deleted if (((modeO != 0 && !tw.idEqual(T_BASE, T_OURS)) || (modeT != 0 && !tw .idEqual(T_BASE, T_THEIRS)))) { - MergeResult result = contentMerge(base, ours, theirs, - attributes); - - if (ignoreConflicts) { - // In case a conflict is detected the working tree file is - // again filled with new content (containing conflict - // markers). But also stage 0 of the index is filled with - // that content. - result.setContainsConflicts(false); - updateIndex(base, ours, theirs, result, attributes); - } else { + if (gitLinkMerging && ignoreConflicts) { + add(tw.getRawPath(), ours, DirCacheEntry.STAGE_0, EPOCH, 0); + } else if (gitLinkMerging) { add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0); add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0); - DirCacheEntry e = add(tw.getRawPath(), theirs, - DirCacheEntry.STAGE_3, EPOCH, 0); + add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0); + MergeResult result = createGitLinksMergeResult( + base, ours, theirs); + result.setContainsConflicts(true); + mergeResults.put(tw.getPathString(), result); + unmergedPaths.add(tw.getPathString()); + } else { + MergeResult result = contentMerge(base, ours, + theirs, attributes); - // OURS was deleted checkout THEIRS - if (modeO == 0) { - // Check worktree before checking out THEIRS - if (isWorktreeDirty(work, ourDce)) { - return false; - } - if (nonTree(modeT)) { - if (e != null) { - addToCheckout(tw.getPathString(), e, - attributes); + if (ignoreConflicts) { + // In case a conflict is detected the working tree file + // is again filled with new content (containing conflict + // markers). But also stage 0 of the index is filled + // with that content. + result.setContainsConflicts(false); + updateIndex(base, ours, theirs, result, attributes); + } else { + add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, + 0); + add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, + 0); + DirCacheEntry e = add(tw.getRawPath(), theirs, + DirCacheEntry.STAGE_3, EPOCH, 0); + + // OURS was deleted checkout THEIRS + if (modeO == 0) { + // Check worktree before checking out THEIRS + if (isWorktreeDirty(work, ourDce)) { + return false; + } + if (nonTree(modeT)) { + if (e != null) { + addToCheckout(tw.getPathString(), e, + attributes); + } } } + + unmergedPaths.add(tw.getPathString()); + + // generate a MergeResult for the deleted file + mergeResults.put(tw.getPathString(), result); } - - unmergedPaths.add(tw.getPathString()); - - // generate a MergeResult for the deleted file - mergeResults.put(tw.getPathString(), result); } } } From 6ae1a300041b33dc00550f68f6dd417b40c2922d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 27 Aug 2020 16:14:36 +0200 Subject: [PATCH 7/9] Prepare 5.10.0-SNAPSHOT builds Change-Id: I9a2b39e9e85f27179ceb3b1709d75c466089a3bc Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++--- .../META-INF/MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 40 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 24 ++-- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 46 ++++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 +++--- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 84 +++++++------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++-- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 26 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 16 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 106 +++++++++--------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 104 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 88 files changed, 504 insertions(+), 504 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index b454e1ba7..0147f22fc 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.ant.tasks;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index d70f4be19..dc76aa224 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 2e1f908bd..e26c2c819 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)" + org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)" Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="5.9.0", - org.eclipse.jgit.ant.tasks;version="5.9.0"; +Export-Package: org.eclipse.jgit.ant;version="5.10.0", + org.eclipse.jgit.ant.tasks;version="5.10.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index aadb6e0df..ea0fd2385 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 5e94e1a37..042030b8f 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 bf369bcd3..a9e6d0a0d 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,17 +13,17 @@ 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.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.api;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.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.9.0"; +Export-Package: org.eclipse.jgit.archive;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="5.9.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="5.10.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index eabb7c3b9..93f614fe3 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.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index da951daa4..076c69301 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 577805649..3256c4399 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index fa413a322..db9c735a9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index aa3d90f80..02dbf8e95 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.gpg.bc.internal;version="[5.9.0,5.10.0)", +Import-Package: org.eclipse.jgit.gpg.bc.internal;version="[5.10.0,5.11.0)", org.junit;version="[4.13,5.0.0)" Export-Package: org.eclipse.jgit.gpg.bc.internal;x-internal:=true Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 495755def..e0ee7f90d 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 82ce42a96..e4bca93d4 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[5.9.0,5.10.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.10.0,5.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.bouncycastle.bcpg;version="[1.65.0,2.0.0)", org.bouncycastle.gpg;version="[1.65.0,2.0.0)", @@ -17,13 +17,13 @@ Import-Package: org.bouncycastle.bcpg;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="5.9.0"; +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="5.10.0"; x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index a2501230a..e504a8c72 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 91d6c24ab..bb8047574 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 3910fab25..ead8e9c0c 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.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor @@ -25,11 +25,11 @@ Import-Package: org.apache.http;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.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="5.9.0"; + org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="5.10.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index a26e7eb61..577d5065b 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 170b676a0..e6761c4ff 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 9a922d07f..9dcc3efc3 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="5.9.0", - org.eclipse.jgit.http.server.glue;version="5.9.0"; +Export-Package: org.eclipse.jgit.http.server;version="5.10.0", + org.eclipse.jgit.http.server.glue;version="5.10.0"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="5.9.0"; + org.eclipse.jgit.http.server.resolver;version="5.10.0"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,14 +18,14 @@ 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.annotations;version="[5.9.0,5.10.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)" + org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index db0371089..82fb3a90a 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 18a8834d3..929eba660 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 a4d096bec..b5dc5801e 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor 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.9.0,5.10.0)", - org.eclipse.jgit.http.server;version="[5.9.0,5.10.0)", - org.eclipse.jgit.http.server.glue;version="[5.9.0,5.10.0)", - org.eclipse.jgit.http.server.resolver;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit.http;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.http.apache;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.http.server;version="[5.10.0,5.11.0)", + org.eclipse.jgit.http.server.glue;version="[5.10.0,5.11.0)", + org.eclipse.jgit.http.server.resolver;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit.http;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.http.apache;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index c64316680..b619f8f7a 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 3a8145f9a..0130f3cba 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor 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.9.0,5.10.0)", - org.eclipse.jgit.http.server;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.http.server;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)", org.junit;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="5.9.0"; +Export-Package: org.eclipse.jgit.junit.http;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 38a8c5742..e3eae5b61 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 220952a61..a0e24fe28 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 2bf9c1f85..839ff268b 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -30,16 +30,16 @@ Import-Package: org.apache.sshd.common;version="[2.4.0,2.5.0)", org.apache.sshd.server.shell;version="[2.4.0,2.5.0)", org.apache.sshd.server.subsystem;version="[2.4.0,2.5.0)", org.apache.sshd.server.subsystem.sftp;version="[2.4.0,2.5.0)", - org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="5.9.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="5.10.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index ccb341e4e..cc66754ee 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index e1d35ceea..5c8110eb5 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 41543a08e..3fed43b91 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.dircache;version="[5.9.0,5.10.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.merge;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="5.9.0", - org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util.time;version="[5.9.0,5.10.0)", +Import-Package: org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.dircache;version="[5.10.0,5.11.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.merge;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="5.10.0", + org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util.io;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util.time;version="[5.10.0,5.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit;version="5.9.0"; +Export-Package: org.eclipse.jgit.junit;version="5.10.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -44,4 +44,4 @@ Export-Package: org.eclipse.jgit.junit;version="5.9.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="5.9.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="5.10.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 3363e7108..cc88d5318 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 82fe656b0..c08a73a39 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 5e41446c4..db6d6a701 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor 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.9.0,5.10.0)", - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit.http;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.server;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.test;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.api;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit.http;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.server;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.test;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index f8fb301b7..c98a0dd03 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 979352ca8..20dd5f170 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="5.9.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="5.10.0"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="5.9.0"; + org.eclipse.jgit.lfs.server.fs;version="5.10.0"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="5.9.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.9.0"; + org.eclipse.jgit.lfs.server.internal;version="5.10.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="5.10.0"; 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.9.0,5.10.0)", - org.eclipse.jgit.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.http.apache;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.http.apache;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 453f128c0..9fbafd2d8 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 6f9fd2093..39f59b41a 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 44c535049..e9affdb41 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,22 +3,22 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", +Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="5.9.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="5.10.0";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 6e4decd80..ce520c759 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 ced8ad4c1..e9a396a96 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="5.9.0", - org.eclipse.jgit.lfs.errors;version="5.9.0", - org.eclipse.jgit.lfs.internal;version="5.9.0";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.9.0" +Export-Package: org.eclipse.jgit.lfs;version="5.10.0", + org.eclipse.jgit.lfs.errors;version="5.10.0", + org.eclipse.jgit.lfs.internal;version="5.10.0";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.10.0" 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.9.0,5.10.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.attributes;version="[5.9.0,5.10.0)", - org.eclipse.jgit.diff;version="[5.9.0,5.10.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.hooks;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.pack;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)" + org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.attributes;version="[5.10.0,5.11.0)", + org.eclipse.jgit.diff;version="[5.10.0,5.11.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.hooks;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.pack;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util.io;version="[5.10.0,5.11.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index ac6a4a412..249793a46 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 0922a6978..b6480bd68 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 823c8728b..c05f29c7a 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 aac507252..f3686fd1b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 73e139af7..383287a85 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-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 d912aa837..067436f0e 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-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 78077e8a4..3d79878c8 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 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-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 474e8ff06..cfdb6aa20 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-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 bbf19771e..be7358386 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 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-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 1e34ba2cb..b2d2d9623 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-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 a326fb730..f4061c949 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 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 39b3c7960..c1c251a26 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 1ebe15135..8edf546a5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-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 098f767d0..62a9ccb82 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.9.0.qualifier +Bundle-Version: 5.10.0.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 abff8baa6..640ce318c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 52d7b4985..ebaea45f1 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-SNAPSHOT + 5.10.0-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 34f1e0f7d..1027a9435 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.diff;version="[5.9.0,5.10.0)", - org.eclipse.jgit.dircache;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="5.9.0", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.merge;version="[5.9.0,5.10.0)", - org.eclipse.jgit.pgm;version="[5.9.0,5.10.0)", - org.eclipse.jgit.pgm.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.pgm.opt;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)", +Import-Package: org.eclipse.jgit.api;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.diff;version="[5.10.0,5.11.0)", + org.eclipse.jgit.dircache;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="5.10.0", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.merge;version="[5.10.0,5.11.0)", + org.eclipse.jgit.pgm;version="[5.10.0,5.11.0)", + org.eclipse.jgit.pgm.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.pgm.opt;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util.io;version="[5.10.0,5.11.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 725ad1bcd..4713e2dd0 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 a564aace6..23191accf 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,48 +13,48 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)", org.eclipse.jetty.util;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.archive;version="[5.9.0,5.10.0)", - org.eclipse.jgit.awtui;version="[5.9.0,5.10.0)", - org.eclipse.jgit.blame;version="[5.9.0,5.10.0)", - org.eclipse.jgit.diff;version="[5.9.0,5.10.0)", - org.eclipse.jgit.dircache;version="[5.9.0,5.10.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.gitrepo;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.ketch;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.io;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.reftree;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.server;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs.server.s3;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.merge;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.notes;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revplot;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk.filter;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.pack;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.http.apache;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.sshd;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)", + org.eclipse.jgit.api;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.archive;version="[5.10.0,5.11.0)", + org.eclipse.jgit.awtui;version="[5.10.0,5.11.0)", + org.eclipse.jgit.blame;version="[5.10.0,5.11.0)", + org.eclipse.jgit.diff;version="[5.10.0,5.11.0)", + org.eclipse.jgit.dircache;version="[5.10.0,5.11.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.gitrepo;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.ketch;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.io;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.reftree;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.server;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs.server.s3;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.merge;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.notes;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revplot;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk.filter;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.pack;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.http.apache;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.sshd;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util.io;version="[5.10.0,5.11.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.9.0"; +Export-Package: org.eclipse.jgit.console;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="5.9.0"; + org.eclipse.jgit.pgm;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -66,14 +66,14 @@ Export-Package: org.eclipse.jgit.console;version="5.9.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="5.9.0"; + org.eclipse.jgit.pgm.debug;version="5.10.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="5.9.0"; + org.eclipse.jgit.pgm.internal;version="5.10.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="5.9.0"; + org.eclipse.jgit.pgm.opt;version="5.10.0"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 19cd15e3a..1dc6f2020 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.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 5338cb888..a3ff9a072 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index c4ffda999..47f00695d 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -16,15 +16,15 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.4.0,2.5.0)", org.apache.sshd.common.util.net;version="[2.4.0,2.5.0)", org.apache.sshd.common.util.security;version="[2.4.0,2.5.0)", org.apache.sshd.server;version="[2.4.0,2.5.0)", - org.eclipse.jgit.api;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit.ssh;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.sshd;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.api;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit.ssh;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.sshd;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index ca7424ddb..fb28377fd 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 26d318d83..e6ccbec28 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.9.0";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.10.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,9 +23,9 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.9.0";x-inter org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.auth;version="5.9.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="5.9.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="5.9.0"; + org.eclipse.jgit.internal.transport.sshd.auth;version="5.10.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="5.10.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, @@ -75,12 +75,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.common.util.net;version="[2.4.0,2.5.0)", org.apache.sshd.common.util.security;version="[2.4.0,2.5.0)", org.apache.sshd.server.auth;version="[2.4.0,2.5.0)", - org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.fnmatch;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.fnmatch;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 53b5336f4..808476458 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 6b5b7f864..4eb9cc747 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 3e902e494..5b6defa86 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit.ssh;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit.ssh;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.transport;version="5.9.0"; +Export-Package: org.eclipse.jgit.transport;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, org.eclipse.jgit.junit.ssh" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 10acfd23e..559e92cce 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index c72b3393a..9e81eebc0 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,24 +3,24 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[5.9.0,5.10.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.10.0,5.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.9.0";x-friends:="org.eclipse.egit.core", - org.eclipse.jgit.transport;version="5.9.0"; +Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.10.0";x-friends:="org.eclipse.egit.core", + org.eclipse.jgit.transport;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.internal.transport.ssh, org.eclipse.jgit.util, com.jcraft.jsch" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util.io;version="[5.10.0,5.11.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 7048f2764..dd4233374 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 93f3544e7..dd59f792f 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 06f3c4dc3..3f3f0302f 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -16,58 +16,58 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api;version="[5.9.0,5.10.0)", - org.eclipse.jgit.api.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.archive;version="[5.9.0,5.10.0)", - org.eclipse.jgit.attributes;version="[5.9.0,5.10.0)", - org.eclipse.jgit.awtui;version="[5.9.0,5.10.0)", - org.eclipse.jgit.blame;version="[5.9.0,5.10.0)", - org.eclipse.jgit.diff;version="[5.9.0,5.10.0)", - org.eclipse.jgit.dircache;version="[5.9.0,5.10.0)", - org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.events;version="[5.9.0,5.10.0)", - org.eclipse.jgit.fnmatch;version="[5.9.0,5.10.0)", - org.eclipse.jgit.gitrepo;version="[5.9.0,5.10.0)", - org.eclipse.jgit.hooks;version="[5.9.0,5.10.0)", - org.eclipse.jgit.ignore;version="[5.9.0,5.10.0)", - org.eclipse.jgit.ignore.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.fsck;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.io;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.storage.reftree;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.transport.http;version="[5.9.0,5.10.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit;version="[5.9.0,5.10.0)", - org.eclipse.jgit.junit.time;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lfs;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.merge;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.notes;version="[5.9.0,5.10.0)", - org.eclipse.jgit.patch;version="[5.9.0,5.10.0)", - org.eclipse.jgit.pgm;version="[5.9.0,5.10.0)", - org.eclipse.jgit.pgm.internal;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revplot;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk.filter;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.file;version="[5.9.0,5.10.0)", - org.eclipse.jgit.storage.pack;version="[5.9.0,5.10.0)", - org.eclipse.jgit.submodule;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.http;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport.resolver;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.treewalk.filter;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util.io;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util.sha1;version="[5.9.0,5.10.0)", + org.eclipse.jgit.annotations;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api;version="[5.10.0,5.11.0)", + org.eclipse.jgit.api.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.archive;version="[5.10.0,5.11.0)", + org.eclipse.jgit.attributes;version="[5.10.0,5.11.0)", + org.eclipse.jgit.awtui;version="[5.10.0,5.11.0)", + org.eclipse.jgit.blame;version="[5.10.0,5.11.0)", + org.eclipse.jgit.diff;version="[5.10.0,5.11.0)", + org.eclipse.jgit.dircache;version="[5.10.0,5.11.0)", + org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.events;version="[5.10.0,5.11.0)", + org.eclipse.jgit.fnmatch;version="[5.10.0,5.11.0)", + org.eclipse.jgit.gitrepo;version="[5.10.0,5.11.0)", + org.eclipse.jgit.hooks;version="[5.10.0,5.11.0)", + org.eclipse.jgit.ignore;version="[5.10.0,5.11.0)", + org.eclipse.jgit.ignore.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.fsck;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.io;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.storage.reftree;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.transport.http;version="[5.10.0,5.11.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit;version="[5.10.0,5.11.0)", + org.eclipse.jgit.junit.time;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lfs;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.merge;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.notes;version="[5.10.0,5.11.0)", + org.eclipse.jgit.patch;version="[5.10.0,5.11.0)", + org.eclipse.jgit.pgm;version="[5.10.0,5.11.0)", + org.eclipse.jgit.pgm.internal;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revplot;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk.filter;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.file;version="[5.10.0,5.11.0)", + org.eclipse.jgit.storage.pack;version="[5.10.0,5.11.0)", + org.eclipse.jgit.submodule;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.http;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport.resolver;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.treewalk.filter;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util.io;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util.sha1;version="[5.10.0,5.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index e94547c81..100bd11e1 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-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 10d0de0b7..ec74460e7 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="5.9.0" -Import-Package: org.eclipse.jgit.errors;version="[5.9.0,5.10.0)", - org.eclipse.jgit.lib;version="[5.9.0,5.10.0)", - org.eclipse.jgit.nls;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revplot;version="[5.9.0,5.10.0)", - org.eclipse.jgit.revwalk;version="[5.9.0,5.10.0)", - org.eclipse.jgit.transport;version="[5.9.0,5.10.0)", - org.eclipse.jgit.util;version="[5.9.0,5.10.0)" +Export-Package: org.eclipse.jgit.awtui;version="5.10.0" +Import-Package: org.eclipse.jgit.errors;version="[5.10.0,5.11.0)", + org.eclipse.jgit.lib;version="[5.10.0,5.11.0)", + org.eclipse.jgit.nls;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revplot;version="[5.10.0,5.11.0)", + org.eclipse.jgit.revwalk;version="[5.10.0,5.11.0)", + org.eclipse.jgit.transport;version="[5.10.0,5.11.0)", + org.eclipse.jgit.util;version="[5.10.0,5.11.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index e3f611f7c..b2e8c253d 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 717e74e4e..56b22d69f 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 617292b0f..433a19337 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.9.0.qualifier +Bundle-Version: 5.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="5.9.0", - org.eclipse.jgit.api;version="5.9.0"; +Export-Package: org.eclipse.jgit.annotations;version="5.10.0", + org.eclipse.jgit.api;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.annotations;version="5.9.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="5.9.0"; + org.eclipse.jgit.api.errors;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="5.9.0"; + org.eclipse.jgit.attributes;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="5.9.0"; + org.eclipse.jgit.blame;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="5.9.0"; + org.eclipse.jgit.diff;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -42,47 +42,47 @@ Export-Package: org.eclipse.jgit.annotations;version="5.9.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="5.9.0"; + org.eclipse.jgit.dircache;version="5.10.0"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="5.9.0"; + org.eclipse.jgit.errors;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="5.9.0"; + org.eclipse.jgit.events;version="5.10.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="5.9.0", - org.eclipse.jgit.gitrepo;version="5.9.0"; + org.eclipse.jgit.fnmatch;version="5.10.0", + org.eclipse.jgit.gitrepo;version="5.10.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="5.9.0";x-internal:=true, - org.eclipse.jgit.hooks;version="5.9.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="5.9.0", - org.eclipse.jgit.ignore.internal;version="5.9.0"; + org.eclipse.jgit.gitrepo.internal;version="5.10.0";x-internal:=true, + org.eclipse.jgit.hooks;version="5.10.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="5.10.0", + org.eclipse.jgit.ignore.internal;version="5.10.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="5.9.0"; + org.eclipse.jgit.internal;version="5.10.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="5.9.0"; + org.eclipse.jgit.internal.fsck;version="5.10.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.ketch;version="5.9.0"; + org.eclipse.jgit.internal.ketch;version="5.10.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.revwalk;version="5.9.0";x-internal:=true, - org.eclipse.jgit.internal.storage.dfs;version="5.9.0"; + org.eclipse.jgit.internal.revwalk;version="5.10.0";x-internal:=true, + org.eclipse.jgit.internal.storage.dfs;version="5.10.0"; 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.9.0"; + org.eclipse.jgit.internal.storage.file;version="5.10.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -91,35 +91,35 @@ Export-Package: org.eclipse.jgit.annotations;version="5.9.0", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="5.9.0"; + org.eclipse.jgit.internal.storage.io;version="5.10.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="5.9.0"; + org.eclipse.jgit.internal.storage.pack;version="5.10.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="5.9.0"; + org.eclipse.jgit.internal.storage.reftable;version="5.10.0"; 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.9.0"; + org.eclipse.jgit.internal.storage.reftree;version="5.10.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="5.9.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="5.9.0"; + org.eclipse.jgit.internal.submodule;version="5.10.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="5.10.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="5.9.0"; + org.eclipse.jgit.internal.transport.http;version="5.10.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="5.9.0"; + org.eclipse.jgit.internal.transport.parser;version="5.10.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="5.9.0"; + org.eclipse.jgit.internal.transport.ssh;version="5.10.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch", - org.eclipse.jgit.lib;version="5.9.0"; + org.eclipse.jgit.lib;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -133,9 +133,9 @@ Export-Package: org.eclipse.jgit.annotations;version="5.9.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="5.9.0"; + org.eclipse.jgit.lib.internal;version="5.10.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.merge;version="5.9.0"; + org.eclipse.jgit.merge;version="5.10.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -144,40 +144,40 @@ Export-Package: org.eclipse.jgit.annotations;version="5.9.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="5.9.0", - org.eclipse.jgit.notes;version="5.9.0"; + org.eclipse.jgit.nls;version="5.10.0", + org.eclipse.jgit.notes;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="5.9.0"; + org.eclipse.jgit.patch;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="5.9.0"; + org.eclipse.jgit.revplot;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="5.9.0"; + org.eclipse.jgit.revwalk;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="5.9.0"; + org.eclipse.jgit.revwalk.filter;version="5.10.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="5.9.0"; + org.eclipse.jgit.storage.file;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="5.9.0"; + org.eclipse.jgit.storage.pack;version="5.10.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="5.9.0"; + org.eclipse.jgit.submodule;version="5.10.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="5.9.0"; + org.eclipse.jgit.transport;version="5.10.0"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -190,21 +190,21 @@ Export-Package: org.eclipse.jgit.annotations;version="5.9.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="5.9.0"; + org.eclipse.jgit.transport.http;version="5.10.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="5.9.0"; + org.eclipse.jgit.transport.resolver;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="5.9.0"; + org.eclipse.jgit.treewalk;version="5.10.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="5.9.0"; + org.eclipse.jgit.treewalk.filter;version="5.10.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="5.9.0"; + org.eclipse.jgit.util;version="5.10.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -217,12 +217,12 @@ Export-Package: org.eclipse.jgit.annotations;version="5.9.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="5.9.0"; + org.eclipse.jgit.util.io;version="5.10.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="5.9.0", - org.eclipse.jgit.util.time;version="5.9.0" + org.eclipse.jgit.util.sha1;version="5.10.0", + org.eclipse.jgit.util.time;version="5.10.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index d2489719d..97dbca581 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.9.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.9.0.qualifier";roots="." +Bundle-Version: 5.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="5.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index d89143466..1d2aac0bc 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index d102b3f91..7de31f685 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.9.0-SNAPSHOT + 5.10.0-SNAPSHOT JGit - Parent ${jgit-url} From 9d2055152c1315819839988e44e030a63977e93c Mon Sep 17 00:00:00 2001 From: Masaya Suzuki Date: Thu, 23 Jan 2020 16:47:40 -0800 Subject: [PATCH 8/9] jgit: Add DfsBundleWriter DfsBundleWriter writes out the entire repository to a Git bundle file. It packs all objects included in the packfile by concatenating all pack files. This makes the bundle creation fast and cheap. Useful for backing up a repository as-is. Change-Id: Iee20e4b1ab45b2a178dde8c72093c0dd83f04805 Signed-off-by: Masaya Suzuki --- .../storage/dfs/DfsBundleWriterTest.java | 85 +++++++++++++++++++ .../internal/storage/dfs/DfsBundleWriter.java | 52 ++++++++++++ .../internal/storage/pack/PackWriter.java | 13 +++ .../eclipse/jgit/transport/BundleWriter.java | 48 +++++++++-- 4 files changed, 189 insertions(+), 9 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriterTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriter.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriterTest.java new file mode 100644 index 000000000..4238ee6bf --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriterTest.java @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2020, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.dfs; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.Collections; +import java.util.Set; + +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.transport.FetchResult; +import org.eclipse.jgit.transport.RefSpec; +import org.eclipse.jgit.transport.TransportBundleStream; +import org.eclipse.jgit.transport.URIish; +import org.junit.Before; +import org.junit.Test; + +public class DfsBundleWriterTest { + private TestRepository git; + + private InMemoryRepository repo; + + @Before + public void setUp() throws IOException { + DfsRepositoryDescription desc = new DfsRepositoryDescription("test"); + git = new TestRepository<>(new InMemoryRepository(desc)); + repo = git.getRepository(); + } + + @Test + public void testRepo() throws Exception { + RevCommit commit0 = git.commit().message("0").create(); + RevCommit commit1 = git.commit().message("1").parent(commit0).create(); + git.update("master", commit1); + + RevCommit commit2 = git.commit().message("0").create(); + + byte[] bundle = makeBundle(); + try (Repository newRepo = new InMemoryRepository( + new DfsRepositoryDescription("copy"))) { + fetchFromBundle(newRepo, bundle); + Ref ref = newRepo.exactRef("refs/heads/master"); + assertNotNull(ref); + assertEquals(commit1.toObjectId(), ref.getObjectId()); + + // Unreferenced objects are included as well. + assertTrue(newRepo.getObjectDatabase().has(commit2)); + } + } + + private byte[] makeBundle() throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + DfsBundleWriter.writeEntireRepositoryAsBundle( + NullProgressMonitor.INSTANCE, out, repo); + return out.toByteArray(); + } + + private static FetchResult fetchFromBundle(Repository newRepo, + byte[] bundle) throws Exception { + URIish uri = new URIish("in-memory://"); + ByteArrayInputStream in = new ByteArrayInputStream(bundle); + RefSpec rs = new RefSpec("refs/heads/*:refs/heads/*"); + Set refs = Collections.singleton(rs); + try (TransportBundleStream transport = new TransportBundleStream( + newRepo, uri, in)) { + return transport.fetch(NullProgressMonitor.INSTANCE, refs); + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriter.java new file mode 100644 index 000000000..736f381d7 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBundleWriter.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2020, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.dfs; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jgit.internal.storage.pack.CachedPack; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.transport.BundleWriter; + +/** Writes {@link DfsRepository} to a Git bundle. */ +public class DfsBundleWriter { + /** + * Writes the entire {@link DfsRepository} to a Git bundle. + *

+ * This method try to avoid traversing the pack files as much as possible + * and dumps all objects as-is to a Git bundle. + * + * @param pm + * progress monitor + * @param os + * Git bundle output + * @param db + * repository + * @throws IOException + * thrown if the output stream throws one. + */ + public static void writeEntireRepositoryAsBundle(ProgressMonitor pm, + OutputStream os, DfsRepository db) throws IOException { + BundleWriter bw = new BundleWriter(db); + db.getRefDatabase().getRefs().forEach(bw::include); + List packs = new ArrayList<>(); + for (DfsPackFile p : db.getObjectDatabase().getPacks()) { + packs.add(new DfsCachedPack(p)); + } + bw.addObjectsAsIs(packs); + bw.writeBundle(pm, os); + } + + private DfsBundleWriter() { + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index 9e409490f..3e4b5df6a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -754,6 +754,19 @@ public void preparePack(@NonNull Iterator objectsSource) } } + /** + * Prepare the list of objects to be written to the pack stream. + * + *

+ * PackWriter will concat and write out the specified packs as-is. + * + * @param c + * cached packs to be written. + */ + public void preparePack(Collection c) { + cachedPacks.addAll(c); + } + /** * Prepare the list of objects to be written to the pack stream. *

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java index 57eed3ad2..e1aa9d72f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java @@ -17,12 +17,16 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.pack.CachedPack; import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; @@ -62,6 +66,8 @@ public class BundleWriter { private final Set tagTargets; + private final List cachedPacks = new ArrayList<>(); + private PackConfig packConfig; private ObjectCountCallback callback; @@ -149,6 +155,25 @@ else if (r.getObjectId() != null tagTargets.add(r.getObjectId()); } + /** + * Add objects to the bundle file. + * + *

+ * When this method is used, object traversal is disabled and specified pack + * files are directly saved to the Git bundle file. + * + *

+ * Unlike {@link #include}, this doesn't affect the refs. Even if the + * objects are not reachable from any ref, they will be included in the + * bundle file. + * + * @param c + * pack to include + */ + public void addObjectsAsIs(Collection c) { + cachedPacks.addAll(c); + } + /** * Assume a commit is available on the recipient's side. *

@@ -187,19 +212,24 @@ public void writeBundle(ProgressMonitor monitor, OutputStream os) try (PackWriter packWriter = newPackWriter()) { packWriter.setObjectCountCallback(callback); - final HashSet inc = new HashSet<>(); - final HashSet exc = new HashSet<>(); - inc.addAll(include.values()); - for (RevCommit r : assume) - exc.add(r.getId()); packWriter.setIndexDisabled(true); packWriter.setDeltaBaseAsOffset(true); - packWriter.setThin(!exc.isEmpty()); packWriter.setReuseValidatingObjects(false); - if (exc.isEmpty()) { - packWriter.setTagTargets(tagTargets); + if (cachedPacks.isEmpty()) { + HashSet inc = new HashSet<>(); + HashSet exc = new HashSet<>(); + inc.addAll(include.values()); + for (RevCommit r : assume) { + exc.add(r.getId()); + } + if (exc.isEmpty()) { + packWriter.setTagTargets(tagTargets); + } + packWriter.setThin(!exc.isEmpty()); + packWriter.preparePack(monitor, inc, exc); + } else { + packWriter.preparePack(cachedPacks); } - packWriter.preparePack(monitor, inc, exc); final Writer w = new OutputStreamWriter(os, UTF_8); w.write(TransportBundle.V2_BUNDLE_SIGNATURE); From d9b0601d3ace47e97acde83e28f11557e4929fb4 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 31 Aug 2020 21:22:26 +0200 Subject: [PATCH 9/9] SshdSession: close channel gracefully Close the channel gracefully to give the server a chance to clean up properly on its side. Bug: 565854 Change-Id: Iedda5af3b97c8321f08f7ce854274cbb30e401de Signed-off-by: Thomas Wolf --- .../src/org/eclipse/jgit/transport/sshd/SshdSession.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java index 7ea7bd1c9..dfd7cca1b 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java @@ -242,7 +242,7 @@ public int exitValue() { @Override public void destroy() { if (channel.isOpen()) { - channel.close(true); + channel.close(false); } } }