From 7e0cd90cf7945006426b689774fd6ccdaf2c9af0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Sep 2019 01:27:02 +0200 Subject: [PATCH 1/9] Silence API warnings Change-Id: I27fd62de51ca0eedcc7e2e256487bda1e18bce8a Signed-off-by: Matthias Sohn --- org.eclipse.jgit/.settings/.api_filters | 59 +++++++++++++++++++++---- 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 1630c3fcd..3d1e656a1 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,10 +1,10 @@ - + - - + + @@ -23,12 +23,24 @@ + + + + + + + + + + + + @@ -62,12 +74,43 @@ - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3712b0a3b1b428ec446d83f13e544f605d26220e Mon Sep 17 00:00:00 2001 From: Masaya Suzuki Date: Sun, 23 Dec 2018 19:31:10 -0800 Subject: [PATCH 2/9] Change RacyGitTests to create a racy git situation in a stable way By using File#setLastModified, we can create a racy git situation stably. Tested with --runs_per_test=100 Bug: 526111 Change-Id: I60b3632d353e19f335668325aa603640be423f58 Signed-off-by: Masaya Suzuki (cherry picked from commit df637928d2ef4b9ee06af7e37344c7848f870ce4) --- .../org/eclipse/jgit/lib/RacyGitTests.java | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java index 9236b4e82..8b1d5cc37 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java @@ -61,8 +61,8 @@ import org.junit.Test; public class RacyGitTests extends RepositoryTestCase { @Test - public void testIterator() throws IllegalStateException, IOException, - InterruptedException { + public void testIterator() + throws IllegalStateException, IOException, InterruptedException { TreeSet modTimes = new TreeSet<>(); File lastFile = null; for (int i = 0; i < 10; i++) { @@ -126,9 +126,6 @@ public class RacyGitTests extends RepositoryTestCase { @Test public void testRacyGitDetection() throws Exception { - TreeSet modTimes = new TreeSet<>(); - File lastFile; - // Reset to force creation of index file try (Git git = new Git(db)) { git.reset().call(); @@ -136,42 +133,44 @@ public class RacyGitTests extends RepositoryTestCase { // wait to ensure that modtimes of the file doesn't match last index // file modtime - modTimes.add(valueOf(fsTick(db.getIndexFile()))); + fsTick(db.getIndexFile()); // create two files - addToWorkDir("a", "a"); - lastFile = addToWorkDir("b", "b"); + File a = addToWorkDir("a", "a"); + File b = addToWorkDir("b", "b"); + assertTrue(a.setLastModified(b.lastModified())); + assertTrue(b.setLastModified(b.lastModified())); // wait to ensure that file-modTimes and therefore index entry modTime // doesn't match the modtime of index-file after next persistance - modTimes.add(valueOf(fsTick(lastFile))); + fsTick(b); // now add both files to the index. No racy git expected - resetIndex(new FileTreeIteratorWithTimeControl(db, modTimes)); + resetIndex(new FileTreeIterator(db)); assertEquals( - "[a, mode:100644, time:t0, length:1, content:a]" + - "[b, mode:100644, time:t0, length:1, content:b]", + "[a, mode:100644, time:t0, length:1, content:a]" + + "[b, mode:100644, time:t0, length:1, content:b]", indexState(SMUDGE | MOD_TIME | LENGTH | CONTENT)); - // Remember the last modTime of index file. All modifications times of - // further modification are translated to this value so it looks that - // files have been modified in the same time slot as the index file - modTimes.add(Long.valueOf(db.getIndexFile().lastModified())); + // wait to ensure the file 'a' is updated at t1. + fsTick(db.getIndexFile()); - // modify one file - addToWorkDir("a", "a2"); - // now update the index the index. 'a' has to be racily clean -- because - // it's modification time is exactly the same as the previous index file - // mod time. - resetIndex(new FileTreeIteratorWithTimeControl(db, modTimes)); + // Create a racy git situation. This is a situation that the index is + // updated and then a file is modified within a second. By changing the + // index file artificially, we create a fake racy situation. + File updatedA = addToWorkDir("a", "a2"); + assertTrue(updatedA.setLastModified(updatedA.lastModified() + 100)); + resetIndex(new FileTreeIterator(db)); + assertTrue(db.getIndexFile() + .setLastModified(updatedA.lastModified() + 90)); db.readDirCache(); // although racily clean a should not be reported as being dirty assertEquals( - "[a, mode:100644, time:t1, smudged, length:0, content:a2]" + - "[b, mode:100644, time:t0, length:1, content:b]", - indexState(SMUDGE|MOD_TIME|LENGTH|CONTENT)); + "[a, mode:100644, time:t1, smudged, length:0, content:a2]" + + "[b, mode:100644, time:t0, length:1, content:b]", + indexState(SMUDGE | MOD_TIME | LENGTH | CONTENT)); } private File addToWorkDir(String path, String content) throws IOException { From 1de117780036b14db025ee3a5fa4ebd285a826cf Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 18 Jun 2019 11:32:59 +0200 Subject: [PATCH 3/9] Fix RacyGitTests#testRacyGitDetection This test case assumed file system timestamp resolution of 1 second. On filesystems with a finer resolution this test fails since the index entry is only smudged if the file index entry's lastModified and the lastModified of the git index itself are within the same filesystem timer tick. Fix this by ensuring that these timestamps are identical which should work for any filesystem timer resolution. Bug: 548188 Change-Id: Id84d59e1cfeb48fa008f8f27f2f892c4f73985de Signed-off-by: Matthias Sohn Signed-off-by: Christian Halstrick (cherry picked from commit 1159f9dd7c80a53c2509cd75d997a6afed37f9a6) --- .../org/eclipse/jgit/lib/RacyGitTests.java | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java index 8b1d5cc37..27939b212 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java @@ -44,6 +44,7 @@ package org.eclipse.jgit.lib; import static java.lang.Long.valueOf; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.File; @@ -52,10 +53,12 @@ import java.io.IOException; import java.util.TreeSet; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.treewalk.FileTreeIteratorWithTimeControl; import org.eclipse.jgit.treewalk.NameConflictTreeWalk; +import org.eclipse.jgit.treewalk.WorkingTreeOptions; import org.eclipse.jgit.util.FileUtils; import org.junit.Test; @@ -136,8 +139,8 @@ public class RacyGitTests extends RepositoryTestCase { fsTick(db.getIndexFile()); // create two files - File a = addToWorkDir("a", "a"); - File b = addToWorkDir("b", "b"); + File a = writeToWorkDir("a", "a"); + File b = writeToWorkDir("b", "b"); assertTrue(a.setLastModified(b.lastModified())); assertTrue(b.setLastModified(b.lastModified())); @@ -157,23 +160,35 @@ public class RacyGitTests extends RepositoryTestCase { fsTick(db.getIndexFile()); // Create a racy git situation. This is a situation that the index is - // updated and then a file is modified within a second. By changing the - // index file artificially, we create a fake racy situation. - File updatedA = addToWorkDir("a", "a2"); - assertTrue(updatedA.setLastModified(updatedA.lastModified() + 100)); + // updated and then a file is modified within the same tick of the + // filesystem timestamp resolution. By changing the index file + // artificially, we create a fake racy situation. + File updatedA = writeToWorkDir("a", "a2"); + long newLastModified = updatedA.lastModified() + 100; + assertTrue(updatedA.setLastModified(newLastModified)); resetIndex(new FileTreeIterator(db)); - assertTrue(db.getIndexFile() - .setLastModified(updatedA.lastModified() + 90)); + assertTrue(db.getIndexFile().setLastModified(newLastModified)); - db.readDirCache(); - // although racily clean a should not be reported as being dirty + DirCache dc = db.readDirCache(); + // check index state: although racily clean a should not be reported as + // being dirty since we forcefully reset the index to match the working + // tree assertEquals( "[a, mode:100644, time:t1, smudged, length:0, content:a2]" + "[b, mode:100644, time:t0, length:1, content:b]", indexState(SMUDGE | MOD_TIME | LENGTH | CONTENT)); + + // compare state of files in working tree with index to check that + // FileTreeIterator.isModified() works as expected + FileTreeIterator f = new FileTreeIterator(db.getWorkTree(), db.getFS(), + db.getConfig().get(WorkingTreeOptions.KEY)); + assertTrue(f.findFile("a")); + try (ObjectReader reader = db.newObjectReader()) { + assertFalse(f.isModified(dc.getEntry("a"), false, reader)); + } } - private File addToWorkDir(String path, String content) throws IOException { + private File writeToWorkDir(String path, String content) throws IOException { File f = new File(db.getWorkTree(), path); FileOutputStream fos = new FileOutputStream(f); try { From 400342bbc1cff644ee9d7fd1076e62be89bb54f4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 11 Jul 2019 10:00:23 +0200 Subject: [PATCH 4/9] Delete unused FileTreeIteratorWithTimeControl The only usage of this test iterator was removed in df637928d. Hence delete this iterator and associated test. Change-Id: I47710133ec3edc675c21db210960c024982668c6 Signed-off-by: Matthias Sohn (cherry picked from commit a024759cf5bf1cd6b9beb4f790d484943761a7e1) --- .../org/eclipse/jgit/lib/RacyGitTests.java | 68 ----------- .../FileTreeIteratorWithTimeControl.java | 109 ------------------ 2 files changed, 177 deletions(-) delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java index 27939b212..552b7a1e9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RacyGitTests.java @@ -42,7 +42,6 @@ */ package org.eclipse.jgit.lib; -import static java.lang.Long.valueOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -50,82 +49,15 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.util.TreeSet; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.treewalk.FileTreeIterator; -import org.eclipse.jgit.treewalk.FileTreeIteratorWithTimeControl; -import org.eclipse.jgit.treewalk.NameConflictTreeWalk; import org.eclipse.jgit.treewalk.WorkingTreeOptions; -import org.eclipse.jgit.util.FileUtils; import org.junit.Test; public class RacyGitTests extends RepositoryTestCase { - @Test - public void testIterator() - throws IllegalStateException, IOException, InterruptedException { - TreeSet modTimes = new TreeSet<>(); - File lastFile = null; - for (int i = 0; i < 10; i++) { - lastFile = new File(db.getWorkTree(), "0." + i); - FileUtils.createNewFile(lastFile); - if (i == 5) - fsTick(lastFile); - } - modTimes.add(valueOf(fsTick(lastFile))); - for (int i = 0; i < 10; i++) { - lastFile = new File(db.getWorkTree(), "1." + i); - FileUtils.createNewFile(lastFile); - } - modTimes.add(valueOf(fsTick(lastFile))); - for (int i = 0; i < 10; i++) { - lastFile = new File(db.getWorkTree(), "2." + i); - FileUtils.createNewFile(lastFile); - if (i % 4 == 0) - fsTick(lastFile); - } - FileTreeIteratorWithTimeControl fileIt = new FileTreeIteratorWithTimeControl( - db, modTimes); - try (NameConflictTreeWalk tw = new NameConflictTreeWalk(db)) { - tw.addTree(fileIt); - tw.setRecursive(true); - FileTreeIterator t; - long t0 = 0; - for (int i = 0; i < 10; i++) { - assertTrue(tw.next()); - t = tw.getTree(0, FileTreeIterator.class); - if (i == 0) { - t0 = t.getEntryLastModified(); - } else { - assertEquals(t0, t.getEntryLastModified()); - } - } - long t1 = 0; - for (int i = 0; i < 10; i++) { - assertTrue(tw.next()); - t = tw.getTree(0, FileTreeIterator.class); - if (i == 0) { - t1 = t.getEntryLastModified(); - assertTrue(t1 > t0); - } else { - assertEquals(t1, t.getEntryLastModified()); - } - } - long t2 = 0; - for (int i = 0; i < 10; i++) { - assertTrue(tw.next()); - t = tw.getTree(0, FileTreeIterator.class); - if (i == 0) { - t2 = t.getEntryLastModified(); - assertTrue(t2 > t1); - } else { - assertEquals(t2, t.getEntryLastModified()); - } - } - } - } @Test public void testRacyGitDetection() throws Exception { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java deleted file mode 100644 index ff5730e72..000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorWithTimeControl.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (C) 2010, Christian Halstrick - * and other copyright owners as documented in the project's IP log. - * - * This program and the accompanying materials are made available - * under the terms of the Eclipse Distribution License v1.0 which - * accompanies this distribution, is reproduced below, and is - * available at http://www.eclipse.org/org/documents/edl-v10.php - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Eclipse Foundation, Inc. nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.eclipse.jgit.treewalk; - -import java.io.File; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.lib.ObjectReader; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.util.FS; - -/** - * A {@link FileTreeIterator} used in tests which allows to specify explicitly - * what will be returned by {@link #getEntryLastModified()}. This allows to - * write tests where certain files have to have the same modification time. - *

- * This iterator is configured by a list of strictly increasing long values - * t(0), t(1), ..., t(n). For each file with a modification between t(x) and - * t(x+1) [ t(x) <= time < t(x+1) ] this iterator will report t(x). For files - * with a modification time smaller t(0) a modification time of 0 is returned. - * For files with a modification time greater or equal t(n) t(n) will be - * returned. - *

- * This class was written especially to test racy-git problems - */ -public class FileTreeIteratorWithTimeControl extends FileTreeIterator { - private TreeSet modTimes; - - public FileTreeIteratorWithTimeControl(FileTreeIterator p, Repository repo, - TreeSet modTimes) { - super(p, repo.getWorkTree(), repo.getFS()); - this.modTimes = modTimes; - } - - public FileTreeIteratorWithTimeControl(FileTreeIterator p, File f, FS fs, - TreeSet modTimes) { - super(p, f, fs); - this.modTimes = modTimes; - } - - public FileTreeIteratorWithTimeControl(Repository repo, - TreeSet modTimes) { - super(repo); - this.modTimes = modTimes; - } - - public FileTreeIteratorWithTimeControl(File f, FS fs, - TreeSet modTimes) { - super(f, fs, new Config().get(WorkingTreeOptions.KEY)); - this.modTimes = modTimes; - } - - @Override - public AbstractTreeIterator createSubtreeIterator(final ObjectReader reader) { - return new FileTreeIteratorWithTimeControl(this, - ((FileEntry) current()).getFile(), fs, modTimes); - } - - @Override - public long getEntryLastModified() { - if (modTimes == null) - return 0; - Long cutOff = Long.valueOf(super.getEntryLastModified() + 1); - SortedSet head = modTimes.headSet(cutOff); - return head.isEmpty() ? 0 : head.last().longValue(); - } -} From 0e3d4a273f3d5b79c55205a25f21d688b6f131fc Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 31 Aug 2019 21:33:58 +0200 Subject: [PATCH 5/9] BatchRefUpdate: repro racy atomic update, and fix it PackedBatchRefUpdate was creating a new packed-refs list that was potentially unsorted. This would be papered over when the list was read back from disk in parsePackedRef, which detects unsorted ref lists on reading, and sorts them. However, the BatchRefUpdate also installed the new (unsorted) list in-memory in RefDirectory#packedRefs. With the timestamp granularity code committed to stable-5.1, we can more often accurately decide that the packed-refs file is clean, and will return the erroneous unsorted data more often. Unluckily timed delays also cause the file to be clean, hence this problem was exacerbated under load. The symptom is that refs added by a BatchRefUpdate would stop being visible directly after they were added. In particular, the Gerrit integration tests uses BatchRefUpdate in its setup for creating the Admin group, and then tries to read it out directly afterward. The tests recreates one failure case. A better approach would be to revise RefList.Builder, so it detects out-of-order lists and automatically sorts them. Fixes https://bugs.eclipse.org/bugs/show_bug.cgi?id=548716 and https://bugs.chromium.org/p/gerrit/issues/detail?id=11373. Bug: 548716 Change-Id: I613c8059964513ce2370543620725b540b3cb6d1 Signed-off-by: Han-Wen Nienhuys Signed-off-by: Matthias Sohn --- .../storage/file/BatchRefUpdateTest.java | 29 +++++ .../storage/file/PackedBatchRefUpdate.java | 118 +++++++++--------- 2 files changed, 87 insertions(+), 60 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java index 3c4b8cf4b..2ac4a846e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java @@ -43,6 +43,7 @@ package org.eclipse.jgit.internal.storage.file; +import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.eclipse.jgit.internal.storage.file.BatchRefUpdateTest.Result.LOCK_FAILURE; @@ -64,6 +65,7 @@ import static org.junit.Assume.assumeTrue; import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -161,6 +163,33 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { refsChangedEvents = 0; } + @Test + public void packedRefsFileIsSorted() throws IOException { + assumeTrue(atomic); + + for (int i = 0; i < 2; i++) { + BatchRefUpdate bu = diskRepo.getRefDatabase().newBatchUpdate(); + String b1 = String.format("refs/heads/a%d",i); + String b2 = String.format("refs/heads/b%d",i); + bu.setAtomic(atomic); + ReceiveCommand c1 = new ReceiveCommand(ObjectId.zeroId(), A, b1); + ReceiveCommand c2 = new ReceiveCommand(ObjectId.zeroId(), B, b2); + bu.addCommand(c1, c2); + try (RevWalk rw = new RevWalk(diskRepo)) { + bu.execute(rw, NullProgressMonitor.INSTANCE); + } + assertEquals(c1.getResult(), ReceiveCommand.Result.OK); + assertEquals(c2.getResult(), ReceiveCommand.Result.OK); + } + + File packed = new File(diskRepo.getDirectory(), "packed-refs"); + String packedStr = new String(Files.readAllBytes(packed.toPath()), UTF_8); + + int a2 = packedStr.indexOf("refs/heads/a1"); + int b1 = packedStr.indexOf("refs/heads/b0"); + assertTrue(a2 < b1); + } + @Test public void simpleNoForce() throws IOException { writeLooseRef("refs/heads/master", A); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java index c1f547649..9ab9a1bad 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java @@ -50,10 +50,10 @@ import static org.eclipse.jgit.transport.ReceiveCommand.Result.REJECTED_NONFASTF import java.io.IOException; import java.text.MessageFormat; -import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -347,65 +347,72 @@ class PackedBatchRefUpdate extends BatchRefUpdate { private static RefList applyUpdates(RevWalk walk, RefList refs, List commands) throws IOException { - int nDeletes = 0; - List adds = new ArrayList<>(commands.size()); + // Construct a new RefList by merging the old list with the updates. + // This assumes that each ref occurs at most once as a ReceiveCommand. + Collections.sort(commands, new Comparator() { + @Override + public int compare(ReceiveCommand a, ReceiveCommand b) { + return a.getRefName().compareTo(b.getRefName()); + } + }); + + int delta = 0; for (ReceiveCommand c : commands) { - if (c.getType() == ReceiveCommand.Type.CREATE) { - adds.add(c); - } else if (c.getType() == ReceiveCommand.Type.DELETE) { - nDeletes++; + switch (c.getType()) { + case DELETE: + delta--; + break; + case CREATE: + delta++; + break; + default: } } - int addIdx = 0; - - // Construct a new RefList by linearly scanning the old list, and merging in - // any updates. - Map byName = byName(commands); - RefList.Builder b = - new RefList.Builder<>(refs.size() - nDeletes + adds.size()); - for (Ref ref : refs) { - String name = ref.getName(); - ReceiveCommand cmd = byName.remove(name); - if (cmd == null) { - b.add(ref); - continue; - } - if (!cmd.getOldId().equals(ref.getObjectId())) { - lockFailure(cmd, commands); - return null; + + RefList.Builder b = new RefList.Builder<>(refs.size() + delta); + int refIdx = 0; + int cmdIdx = 0; + while (refIdx < refs.size() || cmdIdx < commands.size()) { + Ref ref = (refIdx < refs.size()) ? refs.get(refIdx) : null; + ReceiveCommand cmd = (cmdIdx < commands.size()) + ? commands.get(cmdIdx) + : null; + int cmp = 0; + if (ref != null && cmd != null) { + cmp = ref.getName().compareTo(cmd.getRefName()); + } else if (ref == null) { + cmp = 1; + } else if (cmd == null) { + cmp = -1; } - // Consume any adds between the last and current ref. - while (addIdx < adds.size()) { - ReceiveCommand currAdd = adds.get(addIdx); - if (currAdd.getRefName().compareTo(name) < 0) { - b.add(peeledRef(walk, currAdd)); - byName.remove(currAdd.getRefName()); - } else { - break; + if (cmp < 0) { + b.add(ref); + refIdx++; + } else if (cmp > 0) { + assert cmd != null; + if (cmd.getType() != ReceiveCommand.Type.CREATE) { + lockFailure(cmd, commands); + return null; } - addIdx++; - } - if (cmd.getType() != ReceiveCommand.Type.DELETE) { b.add(peeledRef(walk, cmd)); - } - } - - // All remaining adds are valid, since the refs didn't exist. - while (addIdx < adds.size()) { - ReceiveCommand cmd = adds.get(addIdx++); - byName.remove(cmd.getRefName()); - b.add(peeledRef(walk, cmd)); - } + cmdIdx++; + } else { + assert cmd != null; + assert ref != null; + if (!cmd.getOldId().equals(ref.getObjectId())) { + lockFailure(cmd, commands); + return null; + } - // Any remaining updates/deletes do not correspond to any existing refs, so - // they are lock failures. - if (!byName.isEmpty()) { - lockFailure(byName.values().iterator().next(), commands); - return null; + if (cmd.getType() != ReceiveCommand.Type.DELETE) { + b.add(peeledRef(walk, cmd)); + } + cmdIdx++; + refIdx++; + } } - return b.toRefList(); } @@ -484,15 +491,6 @@ class PackedBatchRefUpdate extends BatchRefUpdate { } } - private static Map byName( - List commands) { - Map ret = new LinkedHashMap<>(); - for (ReceiveCommand cmd : commands) { - ret.put(cmd.getRefName(), cmd); - } - return ret; - } - private static Ref peeledRef(RevWalk walk, ReceiveCommand cmd) throws IOException { ObjectId newId = cmd.getNewId().copy(); From 25e2b23a976a5229b4f8421d99d46798acbc3564 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 16 Jul 2019 11:19:09 +0900 Subject: [PATCH 6/9] Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file FileTreeIteratorWithTimeControl was deleted in a024759, but was not removed from the BUILD file, thus causing the bazel build to fail. Change-Id: I892c0ffcac947298d0d6009374ee2c5d9afefb66 Signed-off-by: David Pursehouse (cherry picked from commit e54fde8616f53a6fab5201db4a0c7e67dd0145c5) --- org.eclipse.jgit.test/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index bbda838f0..ac8c1914f 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -19,7 +19,6 @@ HELPERS = glob(["src/**/*.java"]) + [PKG + c for c in [ "revwalk/RevQueueTestCase.java", "revwalk/RevWalkTestCase.java", "transport/SpiTransport.java", - "treewalk/FileTreeIteratorWithTimeControl.java", "treewalk/filter/AlwaysCloneTreeFilter.java", "test/resources/SampleDataRepositoryTestCase.java", "util/CPUTimeStopWatch.java", From 66169ca759a7b4844a7ad12461b155ecf174ef16 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 3 Sep 2019 20:35:47 +0900 Subject: [PATCH 7/9] Bazel: Update bazlets to the latest master revision The latest revision includes various fixes to allow the build to work with recent versions of Bazel. Change-Id: I72c100b99762010946d9b2784286af560bbdf185 Signed-off-by: David Pursehouse --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index afd58b205..2e42e0b2f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,7 +2,7 @@ workspace(name = "jgit") load("//tools:bazlets.bzl", "load_bazlets") -load_bazlets(commit = "3afbeab55ece585dbfc7a980bf7214b24ddbbe86") +load_bazlets(commit = "09a035e98077dce549d5f6a7472d06c4b8f792d2") load( "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", From 9a2deb20496c6dff236fd4d7180881edc7c6b075 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Sep 2019 14:37:49 +0200 Subject: [PATCH 8/9] JGit v4.11.9.201909030838-r Change-Id: Ie60468569074197d49e19cbd0ffaedfe88f3d74e Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 56 files changed, 59 insertions(+), 59 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index ff150edcd..55bd93c91 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 3cbc08914..cc41f4dd8 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 8ddba7485..bd0267a46 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index d3a194069..b37c2ba1b 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index f58b1a0b7..f349a6c1e 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 55a662a71..3a75c5eda 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: 4.11.9.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.11.9.qualifier";roots="." +Bundle-Version: 4.11.9.201909030838-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.11.9.201909030838-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index dd3990743..b00fa81b0 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index ae72e51d0..7ddf46d7c 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: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 9433e3869..c6f488a64 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 8c14c8e01..537997de6 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.http.server;version="4.11.9", diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index a6b8f6c3e..59c056293 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 8e3bb5521..2c99b1c31 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 95e4f0533..ffc1bf523 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 713e41d97..f28baa7cd 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index e10e11e7c..e34321a48 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 2a3bd6cb3..4e6f6f961 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 09d1254f2..d37fc7c1c 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 2c4437721..1ec029d7d 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index d6c0d6a67..1099ce6e8 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 33b784bc1..e45053ffe 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.lfs.server;version="4.11.9"; diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 1955a122f..7eb5d6652 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index dbd18d5df..815108f44 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2016344be..7f319d21d 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 9403b2ed5..e3f4fea7c 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.lfs;version="4.11.9", diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 9e03bf9f1..bb832362b 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index f88b3dfab..a6cc00a30 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 0fab5d828..aff6412f2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index a08bcec76..e8cfe503d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 06010204b..734d02995 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 133249fa5..eee2d9e49 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index db1fe35dd..3a3fdde2d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 3ff39f355..565a831d7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 9bbc66138..21b1c6d5f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index dbc980cd8..79950bc9b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 49d1fe9c8..1ce63abcd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index fecb46435..9009e0d8c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index fba8332e7..54adc202b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 9bc44f712..a6446f3cd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index df2307d78..ac8129cdf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index b04112da3..0e70b7416 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 921534a7c..8b576cccb 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: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 1d5fad34b..94b956ac2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 54ee2d4d3..fd3729304 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 129ba0341..b52fa6d28 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index ddbf9c4ae..f1395dc79 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 585b532d5..58259c354 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 372b7e8c7..16f87b05a 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: 4.11.9.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.11.9.qualifier";roots="." +Bundle-Version: 4.11.9.201909030838-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.11.9.201909030838-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 9d50afd38..c6dd83d96 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 7fb4b831e..ddd19d352 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index c95ae2717..b68d91014 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 0ca9f98f6..cb072a017 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.awtui;version="4.11.9" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index b8c430a9f..69b3e7750 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 16c28d906..46a28ed70 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.11.9.qualifier +Bundle-Version: 4.11.9.201909030838-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 909ffccc2..4e6ff944c 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: 4.11.9.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="4.11.9.qualifier";roots="." +Bundle-Version: 4.11.9.201909030838-r +Eclipse-SourceBundle: org.eclipse.jgit;version="4.11.9.201909030838-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index bf4dfbabc..ec24a5109 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 7ec242cf5..bacb1396b 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.11.9-SNAPSHOT + 4.11.9.201909030838-r JGit - Parent ${jgit-url} From 261881055d42b34def764ffb99898665ba0bc6a7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Sep 2019 14:49:20 +0200 Subject: [PATCH 9/9] Prepare 4.11.10-SNAPSHOT builds Change-Id: Ic98bd87d96ce627d38e1ecc2c3cb28b517ab489e 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 | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 14 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 26 +++--- 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 ++-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 36 ++++---- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 ++++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 +++--- 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 +++++----- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 6 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.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 | 86 ++++++++--------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 92 +++++++++---------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 92 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 56 files changed, 356 insertions(+), 356 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 55bd93c91..91809daee 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -4,13 +4,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[4.11.9,4.12.0)", - org.eclipse.jgit.junit;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", + org.eclipse.jgit.ant.tasks;version="[4.11.10,4.12.0)", + org.eclipse.jgit.junit;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index cc41f4dd8..dba6e7ab8 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 bd0267a46..b050db2c2 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)" + org.eclipse.jgit.storage.file;version="[4.11.10,4.12.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="4.11.9"; +Export-Package: org.eclipse.jgit.ant.tasks;version="4.11.10"; uses:="org.apache.tools.ant.types,org.apache.tools.ant" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index b37c2ba1b..f5b1c9722 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 f349a6c1e..781b7965b 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,15 +13,15 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", + org.eclipse.jgit.api;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.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="4.11.9"; +Export-Package: org.eclipse.jgit.archive;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 3a75c5eda..767e99c15 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: 4.11.9.201909030838-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.11.9.201909030838-r";roots="." +Bundle-Version: 4.11.10.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.11.10.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index b00fa81b0..146edf7c4 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 7ddf46d7c..74500ba0c 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: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -23,10 +23,10 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.client;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.3.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.http;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="4.11.9"; + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.http;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="4.11.10"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index c6f488a64..698227c44 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 537997de6..a7044e5cd 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="4.11.9", - org.eclipse.jgit.http.server.glue;version="4.11.9"; +Export-Package: org.eclipse.jgit.http.server;version="4.11.10", + org.eclipse.jgit.http.server.glue;version="4.11.10"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="4.11.9"; + org.eclipse.jgit.http.server.resolver;version="4.11.10"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,12 +18,12 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.resolver;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)" + org.eclipse.jgit.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.resolver;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 59c056293..52099fd5d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 2c99b1c31..6169d0c0f 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -25,25 +25,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="[4.11.9,4.12.0)", - org.eclipse.jgit.http.server;version="[4.11.9,4.12.0)", - org.eclipse.jgit.http.server.glue;version="[4.11.9,4.12.0)", - org.eclipse.jgit.http.server.resolver;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[4.11.9,4.12.0)", - org.eclipse.jgit.junit;version="[4.11.9,4.12.0)", - org.eclipse.jgit.junit.http;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.http;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.http.apache;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.resolver;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", + org.eclipse.jgit.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.http.server;version="[4.11.10,4.12.0)", + org.eclipse.jgit.http.server.glue;version="[4.11.10,4.12.0)", + org.eclipse.jgit.http.server.resolver;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.reftable;version="[4.11.10,4.12.0)", + org.eclipse.jgit.junit;version="[4.11.10,4.12.0)", + org.eclipse.jgit.junit.http;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.http;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.http.apache;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.resolver;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index ffc1bf523..16795b593 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 f28baa7cd..316d4861a 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -22,16 +22,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.http.server;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.junit;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.resolver;version="[4.11.9,4.12.0)", + org.eclipse.jgit.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.http.server;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.junit;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.resolver;version="[4.11.10,4.12.0)", org.junit;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="4.11.9"; +Export-Package: org.eclipse.jgit.junit.http;version="4.11.10"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index e34321a48..eb84dc669 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 4e6f6f961..a8157c039 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[4.11.9,4.12.0)", - org.eclipse.jgit.api.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.dircache;version="[4.11.9,4.12.0)", - org.eclipse.jgit.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.merge;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk.filter;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util.io;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util.time;version="[4.11.9,4.12.0)", +Import-Package: org.eclipse.jgit.api;version="[4.11.10,4.12.0)", + org.eclipse.jgit.api.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.dircache;version="[4.11.10,4.12.0)", + org.eclipse.jgit.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.merge;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk.filter;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util.io;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util.time;version="[4.11.10,4.12.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners.model;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="4.11.9"; +Export-Package: org.eclipse.jgit.junit;version="4.11.10"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -36,4 +36,4 @@ Export-Package: org.eclipse.jgit.junit;version="4.11.9"; org.eclipse.jgit.util, org.eclipse.jgit.storage.file, org.eclipse.jgit.api", - org.eclipse.jgit.junit.time;version="4.11.9" + org.eclipse.jgit.junit.time;version="4.11.10" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index d37fc7c1c..417cafa92 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 1ec029d7d..5dec2fa97 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,24 +28,24 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[4.11.9,4.12.0)", - org.eclipse.jgit.api.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.junit;version="[4.11.9,4.12.0)", - org.eclipse.jgit.junit.http;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.server;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.server.fs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.test;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk.filter;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", + org.eclipse.jgit.api;version="[4.11.10,4.12.0)", + org.eclipse.jgit.api.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.junit;version="[4.11.10,4.12.0)", + org.eclipse.jgit.junit.http;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.server;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.server.fs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.test;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk.filter;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 1099ce6e8..688ac4623 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 e45053ffe..1581acae1 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs.server;version="4.11.9"; +Export-Package: org.eclipse.jgit.lfs.server;version="4.11.10"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="4.11.9"; + org.eclipse.jgit.lfs.server.fs;version="4.11.10"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="4.11.9";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="4.11.9"; + org.eclipse.jgit.lfs.server.internal;version="4.11.10";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="4.11.10"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -25,14 +25,14 @@ 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="[4.11.9,4.12.0)", - org.eclipse.jgit.internal;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.internal;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.http;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.http.apache;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", + org.eclipse.jgit.annotations;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.internal;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.http;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.http.apache;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 7eb5d6652..6a08ecda5 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 815108f44..c20c7e9d0 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,23 +3,23 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.junit;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk.filter;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", +Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.junit;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk.filter;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="4.11.9";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="4.11.10";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 7f319d21d..7bba15285 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 e3f4fea7c..869f2bc2a 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs;version="4.11.9", - org.eclipse.jgit.lfs.errors;version="4.11.9", - org.eclipse.jgit.lfs.internal;version="4.11.9";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="4.11.9" +Export-Package: org.eclipse.jgit.lfs;version="4.11.10", + org.eclipse.jgit.lfs.errors;version="4.11.10", + org.eclipse.jgit.lfs.internal;version="4.11.10";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="4.11.10" 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="[4.11.9,4.12.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.attributes;version="[4.11.9,4.12.0)", - org.eclipse.jgit.diff;version="[4.11.9,4.12.0)", - org.eclipse.jgit.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.hooks;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.pack;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.http;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk.filter;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util.io;version="[4.11.9,4.12.0)" + org.eclipse.jgit.annotations;version="[4.11.10,4.12.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.attributes;version="[4.11.10,4.12.0)", + org.eclipse.jgit.diff;version="[4.11.10,4.12.0)", + org.eclipse.jgit.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.hooks;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.pack;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.http;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk.filter;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util.io;version="[4.11.10,4.12.0)" diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index bb832362b..315ea5ac5 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 a6cc00a30..2a5460c54 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 aff6412f2..5e2ce205d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-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 e8cfe503d..f5cd50bca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 734d02995..f14606f3f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-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 eee2d9e49..d51d1ec72 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 3a3fdde2d..6733dd8b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-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 565a831d7..253f5154d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 21b1c6d5f..a4ef0dc03 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-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 79950bc9b..b13bba97d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -31,8 +31,8 @@ version="0.0.0"/> - - + + org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 9009e0d8c..3faf79994 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index 54adc202b..1f4d7b318 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-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 a6446f3cd..3bbf7a967 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-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 ac8129cdf..553c46de2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 0e70b7416..5d4cd8cfc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-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 8b576cccb..2d47f4b6b 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: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.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 94b956ac2..a324d0b53 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index fd3729304..d13cf303c 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.11.9.201909030838-r + 4.11.10-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 b52fa6d28..292509b87 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[4.11.9,4.12.0)", - org.eclipse.jgit.api.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.diff;version="[4.11.9,4.12.0)", - org.eclipse.jgit.dircache;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="4.11.9", - org.eclipse.jgit.junit;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.merge;version="[4.11.9,4.12.0)", - org.eclipse.jgit.pgm;version="[4.11.9,4.12.0)", - org.eclipse.jgit.pgm.internal;version="[4.11.9,4.12.0)", - org.eclipse.jgit.pgm.opt;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util.io;version="[4.11.9,4.12.0)", +Import-Package: org.eclipse.jgit.api;version="[4.11.10,4.12.0)", + org.eclipse.jgit.api.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.diff;version="[4.11.10,4.12.0)", + org.eclipse.jgit.dircache;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="4.11.10", + org.eclipse.jgit.junit;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.merge;version="[4.11.10,4.12.0)", + org.eclipse.jgit.pgm;version="[4.11.10,4.12.0)", + org.eclipse.jgit.pgm.internal;version="[4.11.10,4.12.0)", + org.eclipse.jgit.pgm.opt;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util.io;version="[4.11.10,4.12.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f1395dc79..65acd67c0 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 58259c354..a7e36fc07 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -28,49 +28,49 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[4.11.9,4.12.0)", - org.eclipse.jgit.api.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.archive;version="[4.11.9,4.12.0)", - org.eclipse.jgit.awtui;version="[4.11.9,4.12.0)", - org.eclipse.jgit.blame;version="[4.11.9,4.12.0)", - org.eclipse.jgit.diff;version="[4.11.9,4.12.0)", - org.eclipse.jgit.dircache;version="[4.11.9,4.12.0)", - org.eclipse.jgit.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.gitrepo;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.ketch;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.io;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.server;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.server.fs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs.server.s3;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.merge;version="[4.11.9,4.12.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.notes;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revplot;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk.filter;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.pack;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.http.apache;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.resolver;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk.filter;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util.io;version="[4.11.9,4.12.0)", + org.eclipse.jgit.api;version="[4.11.10,4.12.0)", + org.eclipse.jgit.api.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.archive;version="[4.11.10,4.12.0)", + org.eclipse.jgit.awtui;version="[4.11.10,4.12.0)", + org.eclipse.jgit.blame;version="[4.11.10,4.12.0)", + org.eclipse.jgit.diff;version="[4.11.10,4.12.0)", + org.eclipse.jgit.dircache;version="[4.11.10,4.12.0)", + org.eclipse.jgit.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.gitrepo;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.ketch;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.io;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.reftable;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.server;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.server.fs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs.server.s3;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.merge;version="[4.11.10,4.12.0)", + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.notes;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revplot;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk.filter;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.pack;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.http.apache;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.resolver;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk.filter;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util.io;version="[4.11.10,4.12.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="4.11.9"; +Export-Package: org.eclipse.jgit.console;version="4.11.10"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="4.11.9"; + org.eclipse.jgit.pgm;version="4.11.10"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -81,11 +81,11 @@ Export-Package: org.eclipse.jgit.console;version="4.11.9"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="4.11.9"; + org.eclipse.jgit.pgm.debug;version="4.11.10"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="4.11.9";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="4.11.9"; + org.eclipse.jgit.pgm.internal;version="4.11.10";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.kohsuke.args4j.spi, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 16f87b05a..0999f3b3b 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: 4.11.9.201909030838-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.11.9.201909030838-r";roots="." +Bundle-Version: 4.11.10.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.11.10.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index c6dd83d96..9a4b54c6d 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index ddd19d352..83dc2bf08 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,58 +3,58 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.api;version="[4.11.9,4.12.0)", - org.eclipse.jgit.api.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.attributes;version="[4.11.9,4.12.0)", - org.eclipse.jgit.awtui;version="[4.11.9,4.12.0)", - org.eclipse.jgit.blame;version="[4.11.9,4.12.0)", - org.eclipse.jgit.diff;version="[4.11.9,4.12.0)", - org.eclipse.jgit.dircache;version="[4.11.9,4.12.0)", - org.eclipse.jgit.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.events;version="[4.11.9,4.12.0)", - org.eclipse.jgit.fnmatch;version="[4.11.9,4.12.0)", - org.eclipse.jgit.gitrepo;version="[4.11.9,4.12.0)", - org.eclipse.jgit.hooks;version="[4.11.9,4.12.0)", - org.eclipse.jgit.ignore;version="[4.11.9,4.12.0)", - org.eclipse.jgit.ignore.internal;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.fsck;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.io;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[4.11.9,4.12.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.11.9,4.12.0)", - org.eclipse.jgit.junit;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lfs;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.merge;version="[4.11.9,4.12.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.notes;version="[4.11.9,4.12.0)", - org.eclipse.jgit.patch;version="[4.11.9,4.12.0)", - org.eclipse.jgit.pgm;version="[4.11.9,4.12.0)", - org.eclipse.jgit.pgm.internal;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revplot;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk.filter;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.file;version="[4.11.9,4.12.0)", - org.eclipse.jgit.storage.pack;version="[4.11.9,4.12.0)", - org.eclipse.jgit.submodule;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.http;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport.resolver;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.treewalk.filter;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util.io;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util.sha1;version="[4.11.9,4.12.0)", + org.eclipse.jgit.api;version="[4.11.10,4.12.0)", + org.eclipse.jgit.api.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.attributes;version="[4.11.10,4.12.0)", + org.eclipse.jgit.awtui;version="[4.11.10,4.12.0)", + org.eclipse.jgit.blame;version="[4.11.10,4.12.0)", + org.eclipse.jgit.diff;version="[4.11.10,4.12.0)", + org.eclipse.jgit.dircache;version="[4.11.10,4.12.0)", + org.eclipse.jgit.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.events;version="[4.11.10,4.12.0)", + org.eclipse.jgit.fnmatch;version="[4.11.10,4.12.0)", + org.eclipse.jgit.gitrepo;version="[4.11.10,4.12.0)", + org.eclipse.jgit.hooks;version="[4.11.10,4.12.0)", + org.eclipse.jgit.ignore;version="[4.11.10,4.12.0)", + org.eclipse.jgit.ignore.internal;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.fsck;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.io;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.reftable;version="[4.11.10,4.12.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.11.10,4.12.0)", + org.eclipse.jgit.junit;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lfs;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.merge;version="[4.11.10,4.12.0)", + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.notes;version="[4.11.10,4.12.0)", + org.eclipse.jgit.patch;version="[4.11.10,4.12.0)", + org.eclipse.jgit.pgm;version="[4.11.10,4.12.0)", + org.eclipse.jgit.pgm.internal;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revplot;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk.filter;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.file;version="[4.11.10,4.12.0)", + org.eclipse.jgit.storage.pack;version="[4.11.10,4.12.0)", + org.eclipse.jgit.submodule;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.http;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport.resolver;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.treewalk.filter;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util.io;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util.sha1;version="[4.11.10,4.12.0)", org.junit;version="[4.12,5.0.0)", org.junit.experimental.theories;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b68d91014..ab8b8ba84 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-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 cb072a017..f611d1e5d 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="4.11.9" -Import-Package: org.eclipse.jgit.errors;version="[4.11.9,4.12.0)", - org.eclipse.jgit.lib;version="[4.11.9,4.12.0)", - org.eclipse.jgit.nls;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revplot;version="[4.11.9,4.12.0)", - org.eclipse.jgit.revwalk;version="[4.11.9,4.12.0)", - org.eclipse.jgit.transport;version="[4.11.9,4.12.0)", - org.eclipse.jgit.util;version="[4.11.9,4.12.0)" +Export-Package: org.eclipse.jgit.awtui;version="4.11.10" +Import-Package: org.eclipse.jgit.errors;version="[4.11.10,4.12.0)", + org.eclipse.jgit.lib;version="[4.11.10,4.12.0)", + org.eclipse.jgit.nls;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revplot;version="[4.11.10,4.12.0)", + org.eclipse.jgit.revwalk;version="[4.11.10,4.12.0)", + org.eclipse.jgit.transport;version="[4.11.10,4.12.0)", + org.eclipse.jgit.util;version="[4.11.10,4.12.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 69b3e7750..016d033bd 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 46a28ed70..b3d096a45 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.11.9.201909030838-r +Bundle-Version: 4.11.10.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.annotations;version="4.11.9", - org.eclipse.jgit.api;version="4.11.9"; +Export-Package: org.eclipse.jgit.annotations;version="4.11.10", + org.eclipse.jgit.api;version="4.11.10"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -22,52 +22,52 @@ Export-Package: org.eclipse.jgit.annotations;version="4.11.9", org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="4.11.9";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="4.11.9", - org.eclipse.jgit.blame;version="4.11.9"; + org.eclipse.jgit.api.errors;version="4.11.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", + org.eclipse.jgit.attributes;version="4.11.10", + org.eclipse.jgit.blame;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="4.11.9"; + org.eclipse.jgit.diff;version="4.11.10"; uses:="org.eclipse.jgit.patch, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="4.11.9"; + org.eclipse.jgit.dircache;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events, org.eclipse.jgit.attributes", - org.eclipse.jgit.errors;version="4.11.9"; + org.eclipse.jgit.errors;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="4.11.9";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="4.11.9", - org.eclipse.jgit.gitrepo;version="4.11.9"; + org.eclipse.jgit.events;version="4.11.10";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.fnmatch;version="4.11.10", + org.eclipse.jgit.gitrepo;version="4.11.10"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax.helpers, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="4.11.9";x-internal:=true, - org.eclipse.jgit.hooks;version="4.11.9";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="4.11.9", - org.eclipse.jgit.ignore.internal;version="4.11.9";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="4.11.9";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="4.11.9";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.ketch;version="4.11.9";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.dfs;version="4.11.9"; + org.eclipse.jgit.gitrepo.internal;version="4.11.10";x-internal:=true, + org.eclipse.jgit.hooks;version="4.11.10";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="4.11.10", + org.eclipse.jgit.ignore.internal;version="4.11.10";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="4.11.10";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.fsck;version="4.11.10";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.ketch;version="4.11.10";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.dfs;version="4.11.10"; 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="4.11.9"; + org.eclipse.jgit.internal.storage.file;version="4.11.10"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -75,12 +75,12 @@ Export-Package: org.eclipse.jgit.annotations;version="4.11.9", org.eclipse.jgit.lfs, org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test", - org.eclipse.jgit.internal.storage.io;version="4.11.9";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="4.11.9";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="4.11.9"; + org.eclipse.jgit.internal.storage.io;version="4.11.10";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.pack;version="4.11.10";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.reftable;version="4.11.10"; 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="4.11.9";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="4.11.9"; + org.eclipse.jgit.internal.storage.reftree;version="4.11.10";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="4.11.10"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -90,33 +90,33 @@ Export-Package: org.eclipse.jgit.annotations;version="4.11.9", org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.lib.internal;version="4.11.9";x-internal:=true, - org.eclipse.jgit.merge;version="4.11.9"; + org.eclipse.jgit.lib.internal;version="4.11.10";x-internal:=true, + org.eclipse.jgit.merge;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache, org.eclipse.jgit.api", - org.eclipse.jgit.nls;version="4.11.9", - org.eclipse.jgit.notes;version="4.11.9"; + org.eclipse.jgit.nls;version="4.11.10", + org.eclipse.jgit.notes;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="4.11.9";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="4.11.9";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="4.11.9"; + org.eclipse.jgit.patch;version="4.11.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", + org.eclipse.jgit.revplot;version="4.11.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", + org.eclipse.jgit.revwalk;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.revwalk.filter", - org.eclipse.jgit.revwalk.filter;version="4.11.9";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="4.11.9";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="4.11.9";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="4.11.9";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="4.11.9"; + org.eclipse.jgit.revwalk.filter;version="4.11.10";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.file;version="4.11.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.pack;version="4.11.10";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.submodule;version="4.11.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", + org.eclipse.jgit.transport;version="4.11.10"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -128,24 +128,24 @@ Export-Package: org.eclipse.jgit.annotations;version="4.11.9", org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="4.11.9";uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="4.11.9";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="4.11.9"; + org.eclipse.jgit.transport.http;version="4.11.10";uses:="javax.net.ssl", + org.eclipse.jgit.transport.resolver;version="4.11.10";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", + org.eclipse.jgit.treewalk;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="4.11.9";uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="4.11.9"; + org.eclipse.jgit.treewalk.filter;version="4.11.10";uses:="org.eclipse.jgit.treewalk", + org.eclipse.jgit.util;version="4.11.10"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="4.11.9", - org.eclipse.jgit.util.sha1;version="4.11.9", - org.eclipse.jgit.util.time;version="4.11.9" + org.eclipse.jgit.util.io;version="4.11.10", + org.eclipse.jgit.util.sha1;version="4.11.10", + org.eclipse.jgit.util.time;version="4.11.10" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 4e6ff944c..9ed44970c 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: 4.11.9.201909030838-r -Eclipse-SourceBundle: org.eclipse.jgit;version="4.11.9.201909030838-r";roots="." +Bundle-Version: 4.11.10.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="4.11.10.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index ec24a5109..a49d4262b 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.11.9.201909030838-r + 4.11.10-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index bacb1396b..a16bc8ce2 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.11.9.201909030838-r + 4.11.10-SNAPSHOT JGit - Parent ${jgit-url}