From 40d6eda3f16f24db20776d33e586737efeddc725 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 1 Mar 2021 08:30:09 +0100 Subject: HTTP: cookie file stores expiration in seconds A cookie file stores the expiration in seconds since the Linux Epoch, not in milliseconds. Correct reading and writing cookie files; with a backwards-compatibility hack to read files that contain a millisecond timestamp. Add a test, and fix tests not to rely on the actual current time so that they will also run successfully after 2030-01-01 noon. Bug: 571574 Change-Id: If3ba68391e574520701cdee119544eedc42a1ff2 Signed-off-by: Thomas Wolf --- .../transport/http/NetscapeCookieFile.java | 54 ++++++++++++---------- 1 file changed, 30 insertions(+), 24 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/http/NetscapeCookieFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/http/NetscapeCookieFile.java index 49f26c7885..dae7173059 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/http/NetscapeCookieFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/http/NetscapeCookieFile.java @@ -22,11 +22,12 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.text.MessageFormat; +import java.time.Instant; import java.util.Arrays; import java.util.Collection; -import java.util.Date; import java.util.LinkedHashSet; import java.util.Set; +import java.util.concurrent.TimeUnit; import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; @@ -53,6 +54,7 @@ import org.slf4j.LoggerFactory; * In general this class is not thread-safe. So any consumer needs to take care * of synchronization! * + * @see Cookie file format * @see Netscape Cookie File * Format * @see cookies = null; @@ -104,13 +106,13 @@ public final class NetscapeCookieFile { * where to find the cookie file */ public NetscapeCookieFile(Path path) { - this(path, new Date()); + this(path, Instant.now()); } - NetscapeCookieFile(Path path, Date creationDate) { + NetscapeCookieFile(Path path, Instant createdAt) { this.path = path; this.snapshot = FileSnapshot.DIRTY; - this.creationDate = creationDate; + this.createdAt = createdAt; } /** @@ -142,7 +144,7 @@ public final class NetscapeCookieFile { if (cookies == null || refresh) { try { byte[] in = getFileContentIfModified(); - Set newCookies = parseCookieFile(in, creationDate); + Set newCookies = parseCookieFile(in, createdAt); if (cookies != null) { cookies = mergeCookies(newCookies, cookies); } else { @@ -168,9 +170,9 @@ public final class NetscapeCookieFile { * * @param input * the file content to parse - * @param creationDate - * the date for the creation of the cookies (used to calculate - * the maxAge based on the expiration date given within the file) + * @param createdAt + * cookie creation time; used to calculate the maxAge based on + * the expiration date given within the file * @return the set of parsed cookies from the given file (even expired * ones). If there is more than one cookie with the same name in * this file the last one overwrites the first one! @@ -180,7 +182,7 @@ public final class NetscapeCookieFile { * if the given file does not have a proper format */ private static Set parseCookieFile(@NonNull byte[] input, - @NonNull Date creationDate) + @NonNull Instant createdAt) throws IOException, IllegalArgumentException { String decoded = RawParseUtils.decode(StandardCharsets.US_ASCII, input); @@ -190,7 +192,7 @@ public final class NetscapeCookieFile { new StringReader(decoded))) { String line; while ((line = reader.readLine()) != null) { - HttpCookie cookie = parseLine(line, creationDate); + HttpCookie cookie = parseLine(line, createdAt); if (cookie != null) { cookies.add(cookie); } @@ -200,7 +202,7 @@ public final class NetscapeCookieFile { } private static HttpCookie parseLine(@NonNull String line, - @NonNull Date creationDate) { + @NonNull Instant createdAt) { if (line.isEmpty() || (line.startsWith("#") //$NON-NLS-1$ && !line.startsWith(HTTP_ONLY_PREAMBLE))) { return null; @@ -236,7 +238,12 @@ public final class NetscapeCookieFile { cookie.setSecure(Boolean.parseBoolean(cookieLineParts[3])); long expires = Long.parseLong(cookieLineParts[4]); - long maxAge = (expires - creationDate.getTime()) / 1000; + // Older versions stored milliseconds. This heuristic to detect that + // will cause trouble in the year 33658. :-) + if (cookieLineParts[4].length() == 13) { + expires = TimeUnit.MILLISECONDS.toSeconds(expires); + } + long maxAge = expires - createdAt.getEpochSecond(); if (maxAge <= 0) { return null; // skip expired cookies } @@ -245,7 +252,7 @@ public final class NetscapeCookieFile { } /** - * Read the underying file and return its content but only in case it has + * Read the underlying file and return its content but only in case it has * been modified since the last access. *

* Internally calculates the hash and maintains {@link FileSnapshot}s to @@ -333,7 +340,7 @@ public final class NetscapeCookieFile { path); // reread new changes if necessary Set cookiesFromFile = NetscapeCookieFile - .parseCookieFile(cookieFileContent, creationDate); + .parseCookieFile(cookieFileContent, createdAt); this.cookies = mergeCookies(cookiesFromFile, cookies); } } catch (FileNotFoundException e) { @@ -343,7 +350,7 @@ public final class NetscapeCookieFile { ByteArrayOutputStream output = new ByteArrayOutputStream(); try (Writer writer = new OutputStreamWriter(output, StandardCharsets.US_ASCII)) { - write(writer, cookies, url, creationDate); + write(writer, cookies, url, createdAt); } LockFile lockFile = new LockFile(path.toFile()); for (int retryCount = 0; retryCount < LOCK_ACQUIRE_MAX_RETRY_COUNT; retryCount++) { @@ -377,24 +384,23 @@ public final class NetscapeCookieFile { * @param url * the url for which to write the cookie (to derive the default * values for certain cookie attributes) - * @param creationDate - * the date when the cookie has been created. Important for - * calculation the cookie expiration time (calculated from - * cookie's maxAge and this creation time) + * @param createdAt + * cookie creation time; used to calculate a cookie's expiration + * time * @throws IOException * if an I/O error occurs */ static void write(@NonNull Writer writer, @NonNull Collection cookies, @NonNull URL url, - @NonNull Date creationDate) throws IOException { + @NonNull Instant createdAt) throws IOException { for (HttpCookie cookie : cookies) { - writeCookie(writer, cookie, url, creationDate); + writeCookie(writer, cookie, url, createdAt); } } private static void writeCookie(@NonNull Writer writer, @NonNull HttpCookie cookie, @NonNull URL url, - @NonNull Date creationDate) throws IOException { + @NonNull Instant createdAt) throws IOException { if (cookie.getMaxAge() <= 0) { return; // skip expired cookies } @@ -422,7 +428,7 @@ public final class NetscapeCookieFile { final String expirationDate; // whenCreated field is not accessible in HttpCookie expirationDate = String - .valueOf(creationDate.getTime() + (cookie.getMaxAge() * 1000)); + .valueOf(createdAt.getEpochSecond() + cookie.getMaxAge()); writer.write(expirationDate); writer.write(COLUMN_SEPARATOR); writer.write(cookie.getName()); -- cgit v1.2.3 From 971dafd302ae4bb2d69345f9624774ff226feebd Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Wed, 10 Feb 2021 22:51:05 -0700 Subject: Create a PackFile class for Pack filenames The PackFile class is intended to be a central place to do all common pack filename manipulation and parsing to help reduce repeated code and bugs. Use the PackFile class in the Pack class and in many tests to ensure it works well in a variety of situations. Later changes will expand use of PackFiles to even more areas. Change-Id: I921b30f865759162bae46ddd2c6d669de06add4a Signed-off-by: Nasser Grainawi Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/junit/TestRepository.java | 11 +- .../storage/file/ConcurrentRepackTest.java | 9 +- .../internal/storage/file/GcBasicPackingTest.java | 11 +- .../internal/storage/file/GcKeepFilesTest.java | 7 +- .../jgit/internal/storage/file/PackFileTest.java | 150 ++++++++++++++++++++ .../jgit/internal/storage/file/PackTest.java | 4 +- .../jgit/internal/storage/file/PackWriterTest.java | 15 +- .../org/eclipse/jgit/internal/JGitText.properties | 1 + .../src/org/eclipse/jgit/internal/JGitText.java | 1 + .../eclipse/jgit/internal/storage/file/Pack.java | 45 ++---- .../jgit/internal/storage/file/PackFile.java | 154 +++++++++++++++++++++ 11 files changed, 348 insertions(+), 60 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index e3eb2c5367..24f7741f16 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -44,7 +44,9 @@ import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.internal.storage.file.LockFile; import org.eclipse.jgit.internal.storage.file.ObjectDirectory; import org.eclipse.jgit.internal.storage.file.Pack; +import org.eclipse.jgit.internal.storage.file.PackFile; import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; @@ -906,7 +908,7 @@ public class TestRepository implements AutoCloseable { ObjectDirectory odb = (ObjectDirectory) db.getObjectDatabase(); NullProgressMonitor m = NullProgressMonitor.INSTANCE; - final File pack, idx; + final PackFile pack, idx; try (PackWriter pw = new PackWriter(db)) { Set all = new HashSet<>(); for (Ref r : db.getRefDatabase().getRefs()) @@ -922,7 +924,7 @@ public class TestRepository implements AutoCloseable { } pack.setReadOnly(); - idx = nameFor(odb, name, ".idx"); + idx = pack.create(PackExt.INDEX); try (OutputStream out = new BufferedOutputStream(new FileOutputStream(idx))) { pw.writeIndex(out); @@ -960,9 +962,10 @@ public class TestRepository implements AutoCloseable { } } - private static File nameFor(ObjectDirectory odb, ObjectId name, String t) { + private static PackFile nameFor(ObjectDirectory odb, ObjectId name, + String t) { File packdir = odb.getPackDirectory(); - return new File(packdir, "pack-" + name.name() + t); + return new PackFile(packdir, "pack-" + name.name() + t); } private void writeFile(File p, byte[] bin) throws IOException, diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java index da3b5bbc33..ca63507354 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java @@ -27,6 +27,7 @@ import java.time.Instant; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.AnyObjectId; @@ -194,8 +195,8 @@ public class ConcurrentRepackTest extends RepositoryTestCase { } final ObjectId name = pw.computeName(); - final File packFile = fullPackFileName(name, ".pack"); - final File idxFile = fullPackFileName(name, ".idx"); + final PackFile packFile = fullPackFileName(name, ".pack"); + final PackFile idxFile = packFile.create(PackExt.INDEX); final File[] files = new File[] { packFile, idxFile }; write(files, pw); return files; @@ -242,9 +243,9 @@ public class ConcurrentRepackTest extends RepositoryTestCase { } } - private File fullPackFileName(ObjectId name, String suffix) { + private PackFile fullPackFileName(ObjectId name, String suffix) { final File packdir = db.getObjectDatabase().getPackDirectory(); - return new File(packdir, "pack-" + name.name() + suffix); + return new PackFile(packdir, "pack-" + name.name() + suffix); } private RevObject writeBlob(Repository repo, String data) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java index 42e4238451..61538c9c24 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java @@ -295,7 +295,7 @@ public class GcBasicPackingTest extends GcTestCase { // pack loose object into packfile gc.setExpireAgeMillis(0); gc.gc(); - File oldPackfile = tr.getRepository().getObjectDatabase().getPacks() + PackFile oldPackfile = tr.getRepository().getObjectDatabase().getPacks() .iterator().next().getPackFile(); assertTrue(oldPackfile.exists()); @@ -309,12 +309,9 @@ public class GcBasicPackingTest extends GcTestCase { configureGc(gc, false).setPreserveOldPacks(true); gc.gc(); - File oldPackDir = repo.getObjectDatabase().getPreservedDirectory(); - String oldPackFileName = oldPackfile.getName(); - String oldPackName = oldPackFileName.substring(0, - oldPackFileName.lastIndexOf('.')) + ".old-pack"; //$NON-NLS-1$ - File preservePackFile = new File(oldPackDir, oldPackName); - assertTrue(preservePackFile.exists()); + File preservedPackFile = oldPackfile.createPreservedForDirectory( + repo.getObjectDatabase().getPreservedDirectory()); + assertTrue(preservedPackFile.exists()); } private PackConfig configureGc(GC myGc, boolean aggressive) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcKeepFilesTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcKeepFilesTest.java index 8472983d5b..5fcdd37575 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcKeepFilesTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcKeepFilesTest.java @@ -14,10 +14,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.io.File; import java.util.Iterator; import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.junit.TestRepository.BranchBuilder; import org.junit.Test; @@ -40,10 +40,7 @@ public class GcKeepFilesTest extends GcTestCase { .iterator(); Pack singlePack = packIt.next(); assertFalse(packIt.hasNext()); - String packFileName = singlePack.getPackFile().getPath(); - String keepFileName = packFileName.substring(0, - packFileName.lastIndexOf('.')) + ".keep"; - File keepFile = new File(keepFileName); + PackFile keepFile = singlePack.getPackFile().create(PackExt.KEEP); assertFalse(keepFile.exists()); assertTrue(keepFile.createNewFile()); bb.commit().add("A", "A2").add("B", "B2").create(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java new file mode 100644 index 0000000000..88d25b73d7 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. + * 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 v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.junit.Test; + +public class PackFileTest { + private static final String TEST_ID = "0123456789012345678901234567890123456789"; + + private static final String PREFIX = "pack-"; + + private static final String OLD_PREFIX = "old-"; + + private static final String OLD_PACK = PREFIX + TEST_ID + "." + OLD_PREFIX + + PackExt.PACK.getExtension(); + + private static final File TEST_PACK_DIR = new File( + "/path/to/repo.git/objects/pack"); + + private static final File TEST_PRESERVED_DIR = new File(TEST_PACK_DIR, + "preserved"); + + private static final PackFile TEST_PACKFILE_NO_EXT = new PackFile( + new File(TEST_PACK_DIR, PREFIX + TEST_ID)); + + @Test + public void idIsSameFromFileOrDirAndName() throws Exception { + File pack = new File(TEST_PACK_DIR, PREFIX + TEST_ID); + PackFile pf = new PackFile(pack); + PackFile pfFromDirAndName = new PackFile(TEST_PACK_DIR, + PREFIX + TEST_ID); + assertEquals(pf.getId(), pfFromDirAndName.getId()); + } + + @Test + public void idIsSameFromFileWithOrWithoutExt() throws Exception { + PackFile packWithExt = new PackFile(new File(TEST_PACK_DIR, + PREFIX + TEST_ID + "." + PackExt.PACK.getExtension())); + assertEquals(packWithExt.getId(), TEST_PACKFILE_NO_EXT.getId()); + } + + @Test + public void idIsSameFromFileWithOrWithoutPrefix() throws Exception { + PackFile packWithoutPrefix = new PackFile( + new File(TEST_PACK_DIR, TEST_ID)); + assertEquals(packWithoutPrefix.getId(), TEST_PACKFILE_NO_EXT.getId()); + } + + @Test + public void canCreatePreservedFromFile() throws Exception { + PackFile preserved = new PackFile( + new File(TEST_PRESERVED_DIR, OLD_PACK)); + assertTrue(preserved.getName().contains(OLD_PACK)); + assertEquals(preserved.getId(), TEST_ID); + assertEquals(preserved.getPackExt(), PackExt.PACK); + } + + @Test + public void canCreatePreservedFromDirAndName() throws Exception { + PackFile preserved = new PackFile(TEST_PRESERVED_DIR, OLD_PACK); + assertTrue(preserved.getName().contains(OLD_PACK)); + assertEquals(preserved.getId(), TEST_ID); + assertEquals(preserved.getPackExt(), PackExt.PACK); + } + + @Test + public void cannotCreatePreservedNoExtFromNonPreservedNoExt() + throws Exception { + assertThrows(IllegalArgumentException.class, () -> TEST_PACKFILE_NO_EXT + .createPreservedForDirectory(TEST_PRESERVED_DIR)); + } + + @Test + public void canCreateAnyExtFromAnyExt() throws Exception { + for (PackExt from : PackExt.values()) { + PackFile dotFrom = TEST_PACKFILE_NO_EXT.create(from); + for (PackExt to : PackExt.values()) { + PackFile dotTo = dotFrom.create(to); + File expected = new File(TEST_PACK_DIR, + PREFIX + TEST_ID + "." + to.getExtension()); + assertEquals(dotTo.getPackExt(), to); + assertEquals(dotFrom.getId(), dotTo.getId()); + assertEquals(expected.getName(), dotTo.getName()); + } + } + } + + @Test + public void canCreatePreservedFromAnyExt() throws Exception { + for (PackExt ext : PackExt.values()) { + PackFile nonPreserved = TEST_PACKFILE_NO_EXT.create(ext); + PackFile preserved = nonPreserved + .createPreservedForDirectory(TEST_PRESERVED_DIR); + File expected = new File(TEST_PRESERVED_DIR, + PREFIX + TEST_ID + "." + OLD_PREFIX + ext.getExtension()); + assertEquals(preserved.getName(), expected.getName()); + assertEquals(preserved.getId(), TEST_ID); + assertEquals(preserved.getPackExt(), nonPreserved.getPackExt()); + } + } + + @Test + public void canCreateAnyPreservedExtFromAnyPreservedExt() throws Exception { + // Preserved PackFiles must have an extension + PackFile preserved = new PackFile(TEST_PRESERVED_DIR, OLD_PACK); + for (PackExt from : PackExt.values()) { + PackFile preservedWithExt = preserved.create(from); + for (PackExt to : PackExt.values()) { + PackFile preservedNewExt = preservedWithExt.create(to); + File expected = new File(TEST_PRESERVED_DIR, PREFIX + TEST_ID + + "." + OLD_PREFIX + to.getExtension()); + assertEquals(preservedNewExt.getPackExt(), to); + assertEquals(preservedWithExt.getId(), preservedNewExt.getId()); + assertEquals(preservedNewExt.getName(), expected.getName()); + } + } + } + + @Test + public void canCreateNonPreservedFromAnyPreservedExt() throws Exception { + // Preserved PackFiles must have an extension + PackFile preserved = new PackFile(TEST_PRESERVED_DIR, OLD_PACK); + for (PackExt ext : PackExt.values()) { + PackFile preservedWithExt = preserved.create(ext); + PackFile nonPreserved = preservedWithExt + .createForDirectory(TEST_PACK_DIR); + File expected = new File(TEST_PACK_DIR, + PREFIX + TEST_ID + "." + ext.getExtension()); + assertEquals(nonPreserved.getName(), expected.getName()); + assertEquals(nonPreserved.getId(), TEST_ID); + assertEquals(nonPreserved.getPackExt(), + preservedWithExt.getPackExt()); + } + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackTest.java index 182e422650..85bd31d711 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackTest.java @@ -246,8 +246,8 @@ public class PackTest extends LocalDiskRepositoryTestCase { File dir = new File(repo.getObjectDatabase().getDirectory(), "pack"); - File packName = new File(dir, idA.name() + ".pack"); - File idxName = new File(dir, idA.name() + ".idx"); + PackFile packName = new PackFile(dir, idA.name() + ".pack"); + PackFile idxName = packName.create(PackExt.INDEX); try (FileOutputStream f = new FileOutputStream(packName)) { f.write(packContents.toByteArray()); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java index 214ddb9893..6e8584a9c8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java @@ -34,6 +34,7 @@ import java.util.Set; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.TestRepository; @@ -305,9 +306,9 @@ public class PackWriterTest extends SampleDataRepositoryTestCase { @Test public void testWritePack2DeltasCRC32Copy() throws IOException { final File packDir = db.getObjectDatabase().getPackDirectory(); - final File crc32Pack = new File(packDir, + final PackFile crc32Pack = new PackFile(packDir, "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.pack"); - final File crc32Idx = new File(packDir, + final PackFile crc32Idx = new PackFile(packDir, "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idx"); copyFile(JGitTestUtil.getTestResourceFile( "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idxV2"), @@ -471,10 +472,8 @@ public class PackWriterTest extends SampleDataRepositoryTestCase { config.setIndexVersion(2); writeVerifyPack4(false); - File packFile = pack.getPackFile(); - String name = packFile.getName(); - String base = name.substring(0, name.lastIndexOf('.')); - File indexFile = new File(packFile.getParentFile(), base + ".idx"); + PackFile packFile = pack.getPackFile(); + PackFile indexFile = packFile.create(PackExt.INDEX); // Validate that IndexPack came up with the right CRC32 value. final PackIndex idx1 = PackIndex.open(indexFile); @@ -687,12 +686,12 @@ public class PackWriterTest extends SampleDataRepositoryTestCase { pw.preparePack(NullProgressMonitor.INSTANCE, ow, want, have, NONE); String id = pw.computeName().getName(); File packdir = repo.getObjectDatabase().getPackDirectory(); - File packFile = new File(packdir, "pack-" + id + ".pack"); + PackFile packFile = new PackFile(packdir, "pack-" + id + ".pack"); try (FileOutputStream packOS = new FileOutputStream(packFile)) { pw.writePack(NullProgressMonitor.INSTANCE, NullProgressMonitor.INSTANCE, packOS); } - File idxFile = new File(packdir, "pack-" + id + ".idx"); + PackFile idxFile = packFile.create(PackExt.INDEX); try (FileOutputStream idxOS = new FileOutputStream(idxFile)) { pw.writeIndex(idxOS); } diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index c00203dd07..9695e5742b 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -743,6 +743,7 @@ unmergedPath=Unmerged path: {0} unmergedPaths=Repository contains unmerged paths unpackException=Exception while parsing pack stream unreadablePackIndex=Unreadable pack index: {0} +unrecognizedPackExtension=Unrecognized pack extension: {0} unrecognizedRef=Unrecognized ref: {0} unsetMark=Mark not set unsupportedAlternates=Alternates not supported diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 9d215ca455..95265feb4e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -771,6 +771,7 @@ public class JGitText extends TranslationBundle { /***/ public String unmergedPaths; /***/ public String unpackException; /***/ public String unreadablePackIndex; + /***/ public String unrecognizedPackExtension; /***/ public String unrecognizedRef; /***/ public String unsetMark; /***/ public String unsupportedAlternates; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index d928633a73..fa938b3111 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -78,13 +78,11 @@ public class Pack implements Iterable { public static final Comparator SORT = (a, b) -> b.packLastModified .compareTo(a.packLastModified); - private final File packFile; + private final PackFile packFile; private final int extensions; - private File keepFile; - - private volatile String packName; + private PackFile keepFile; final int hash; @@ -137,7 +135,7 @@ public class Pack implements Iterable { * additional pack file extensions with the same base as the pack */ public Pack(File packFile, int extensions) { - this.packFile = packFile; + this.packFile = new PackFile(packFile); this.fileSnapshot = PackFileSnapshot.save(packFile); this.packLastModified = fileSnapshot.lastModifiedInstant(); this.extensions = extensions; @@ -156,16 +154,18 @@ public class Pack implements Iterable { idx = loadedIdx; if (idx == null) { if (invalid) { - throw new PackInvalidException(packFile, invalidatingCause); + throw new PackInvalidException(packFile, + invalidatingCause); } try { long start = System.currentTimeMillis(); - idx = PackIndex.open(extFile(INDEX)); + PackFile idxFile = packFile.create(INDEX); + idx = PackIndex.open(idxFile); if (LOG.isDebugEnabled()) { LOG.debug(String.format( "Opening pack index %s, size %.3f MB took %d ms", //$NON-NLS-1$ - extFile(INDEX).getAbsolutePath(), - Float.valueOf(extFile(INDEX).length() + idxFile.getAbsolutePath(), + Float.valueOf(idxFile.length() / (1024f * 1024)), Long.valueOf(System.currentTimeMillis() - start))); @@ -205,7 +205,7 @@ public class Pack implements Iterable { * * @return the File object which locates this pack on disk. */ - public File getPackFile() { + public PackFile getPackFile() { return packFile; } @@ -225,16 +225,7 @@ public class Pack implements Iterable { * @return name extracted from {@code pack-*.pack} pattern. */ public String getPackName() { - String name = packName; - if (name == null) { - name = getPackFile().getName(); - if (name.startsWith("pack-")) //$NON-NLS-1$ - name = name.substring("pack-".length()); //$NON-NLS-1$ - if (name.endsWith(".pack")) //$NON-NLS-1$ - name = name.substring(0, name.length() - ".pack".length()); //$NON-NLS-1$ - packName = name; - } - return name; + return packFile.getId(); } /** @@ -261,8 +252,9 @@ public class Pack implements Iterable { * @return true if a .keep file exist. */ public boolean shouldBeKept() { - if (keepFile == null) - keepFile = extFile(KEEP); + if (keepFile == null) { + keepFile = packFile.create(KEEP); + } return keepFile.exists(); } @@ -1137,7 +1129,7 @@ public class Pack implements Iterable { if (bitmapIdx == null && hasExt(BITMAP_INDEX)) { final PackBitmapIndex idx; try { - idx = PackBitmapIndex.open(extFile(BITMAP_INDEX), idx(), + idx = PackBitmapIndex.open(packFile.create(BITMAP_INDEX), idx(), getReverseIdx()); } catch (FileNotFoundException e) { // Once upon a time this bitmap file existed. Now it @@ -1187,13 +1179,6 @@ public class Pack implements Iterable { } } - private File extFile(PackExt ext) { - String p = packFile.getName(); - int dot = p.lastIndexOf('.'); - String b = (dot < 0) ? p : p.substring(0, dot); - return new File(packFile.getParentFile(), b + '.' + ext.getExtension()); - } - private boolean hasExt(PackExt ext) { return (extensions & ext.getBit()) != 0; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java new file mode 100644 index 0000000000..c2e6f324d1 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. + * 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 v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import java.io.File; +import java.text.MessageFormat; + +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.pack.PackExt; + +/** + * A pack file (or pack related) File. + * + * Example: "pack-0123456789012345678901234567890123456789.idx" + */ +public class PackFile extends File { + private static final long serialVersionUID = 1L; + + private static final String PREFIX = "pack-"; //$NON-NLS-1$ + + private final String base; // PREFIX + id i.e. + // pack-0123456789012345678901234567890123456789 + + private final String id; // i.e. 0123456789012345678901234567890123456789 + + private final boolean hasOldPrefix; + + private final PackExt packExt; + + /** + * Create a PackFile for a pack or related file. + * + * @param file + * File pointing to the location of the file. + */ + public PackFile(File file) { + this(file.getParentFile(), file.getName()); + } + + /** + * Create a PackFile for a pack or related file. + * + * @param directory + * Directory to create the PackFile in. + * @param name + * Filename (last path section) of the PackFile + */ + public PackFile(File directory, String name) { + super(directory, name); + int dot = name.lastIndexOf('.'); + + if (dot < 0) { + base = name; + hasOldPrefix = false; + packExt = null; + } else { + base = name.substring(0, dot); + String tail = name.substring(dot + 1); // ["old-"] + extension + packExt = getPackExt(tail); + String old = tail.substring(0, + tail.length() - getExtension().length()); + hasOldPrefix = old.equals(getExtPrefix(true)); + } + + id = base.startsWith(PREFIX) ? base.substring(PREFIX.length()) : base; + } + + /** + * Getter for the field id. + * + * @return the id (40 Hex char) section of the name. + */ + public String getId() { + return id; + } + + /** + * Getter for the field packExt. + * + * @return the packExt of the name. + */ + public PackExt getPackExt() { + return packExt; + } + + /** + * Create a new similar PackFile with the given extension instead. + * + * @param ext + * PackExt the extension to use. + * @return a PackFile instance with specified extension + */ + public PackFile create(PackExt ext) { + return new PackFile(getParentFile(), getName(ext)); + } + + /** + * Create a new similar PackFile in the given directory. + * + * @param directory + * Directory to create the new PackFile in. + * @return a PackFile in the given directory + */ + public PackFile createForDirectory(File directory) { + return new PackFile(directory, getName(false)); + } + + /** + * Create a new similar preserved PackFile in the given directory. + * + * @param directory + * Directory to create the new PackFile in. + * @return a PackFile in the given directory with "old-" prefixing the + * extension + */ + public PackFile createPreservedForDirectory(File directory) { + return new PackFile(directory, getName(true)); + } + + private String getName(PackExt ext) { + return base + '.' + getExtPrefix(hasOldPrefix) + ext.getExtension(); + } + + private String getName(boolean isPreserved) { + return base + '.' + getExtPrefix(isPreserved) + getExtension(); + } + + private String getExtension() { + return packExt == null ? "" : packExt.getExtension(); //$NON-NLS-1$ + } + + private static String getExtPrefix(boolean isPreserved) { + return isPreserved ? "old-" : ""; //$NON-NLS-1$ //$NON-NLS-2$ + } + + private static PackExt getPackExt(String endsWithExtension) { + for (PackExt ext : PackExt.values()) { + if (endsWithExtension.endsWith(ext.getExtension())) { + return ext; + } + } + throw new IllegalArgumentException(MessageFormat.format( + JGitText.get().unrecognizedPackExtension, endsWithExtension)); + } +} -- cgit v1.2.3 From dc7f0bfee9b3e3aed964d3fd03e765e8175de75d Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Thu, 18 Feb 2021 17:36:49 -0700 Subject: GC: Use PackFile to de-dup logic GC has several places where it tries to build files names for packs that we can use the PackFile class for instead. Change-Id: I99e5ceff9050f8583368fca35279251955e4644d Signed-off-by: Nasser Grainawi --- .../org/eclipse/jgit/internal/storage/file/GC.java | 41 +++++++++------------- 1 file changed, 16 insertions(+), 25 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 75de3be89e..e328870daa 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -346,7 +346,7 @@ public class GC { if (shouldLoosen) { loosen(inserter, reader, oldPack, ids); } - prunePack(oldName); + prunePack(oldPack.getPackFile()); } } @@ -360,19 +360,17 @@ public class GC { * moves the pack file to the preserved directory * * @param packFile - * @param packName - * @param ext * @param deleteOptions * @throws IOException */ - private void removeOldPack(File packFile, String packName, PackExt ext, - int deleteOptions) throws IOException { + private void removeOldPack(PackFile packFile, int deleteOptions) + throws IOException { if (pconfig.isPreserveOldPacks()) { File oldPackDir = repo.getObjectDatabase().getPreservedDirectory(); FileUtils.mkdir(oldPackDir, true); - String oldPackName = "pack-" + packName + ".old-" + ext.getExtension(); //$NON-NLS-1$ //$NON-NLS-2$ - File oldPackFile = new File(oldPackDir, oldPackName); + PackFile oldPackFile = packFile + .createPreservedForDirectory(oldPackDir); FileUtils.rename(packFile, oldPackFile); } else { FileUtils.delete(packFile, deleteOptions); @@ -401,27 +399,21 @@ public class GC { * ".index" file and when failing to delete the ".pack" file we are left * with a ".pack" file without a ".index" file. * - * @param packName + * @param packFile */ - private void prunePack(String packName) { - PackExt[] extensions = PackExt.values(); + private void prunePack(PackFile packFile) { try { // Delete the .pack file first and if this fails give up on deleting // the other files int deleteOptions = FileUtils.RETRY | FileUtils.SKIP_MISSING; - for (PackExt ext : extensions) - if (PackExt.PACK.equals(ext)) { - File f = nameFor(packName, "." + ext.getExtension()); //$NON-NLS-1$ - removeOldPack(f, packName, ext, deleteOptions); - break; - } + removeOldPack(packFile.create(PackExt.PACK), deleteOptions); + // The .pack file has been deleted. Delete as many as the other // files as you can. deleteOptions |= FileUtils.IGNORE_ERRORS; - for (PackExt ext : extensions) { + for (PackExt ext : PackExt.values()) { if (!PackExt.PACK.equals(ext)) { - File f = nameFor(packName, "." + ext.getExtension()); //$NON-NLS-1$ - removeOldPack(f, packName, ext, deleteOptions); + removeOldPack(packFile.create(ext), deleteOptions); } } } catch (IOException e) { @@ -1218,7 +1210,7 @@ public class GC { } // rename the temporary files to real files - File realPack = nameFor(id, ".pack"); //$NON-NLS-1$ + File realPack = nameFor(id, PackExt.PACK); repo.getObjectDatabase().closeAllPackHandles(realPack); tmpPack.setReadOnly(); @@ -1228,8 +1220,7 @@ public class GC { File tmpExt = tmpEntry.getValue(); tmpExt.setReadOnly(); - File realExt = nameFor(id, - "." + tmpEntry.getKey().getExtension()); //$NON-NLS-1$ + File realExt = nameFor(id, tmpEntry.getKey()); try { FileUtils.rename(tmpExt, realExt, StandardCopyOption.ATOMIC_MOVE); @@ -1275,9 +1266,9 @@ public class GC { } } - private File nameFor(String name, String ext) { - File packdir = repo.getObjectDatabase().getPackDirectory(); - return new File(packdir, "pack-" + name + ext); //$NON-NLS-1$ + private PackFile nameFor(String name, PackExt ext) { + return new PackFile(repo.getObjectDatabase().getPackDirectory(), + "pack-" + name).create(ext); //$NON-NLS-1$ } private void checkCancelled() throws CancelledException { -- cgit v1.2.3 From 49c89285a73401129fa57ed584abdb177961fd16 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Wed, 10 Feb 2021 23:33:43 -0700 Subject: PackDirectory: Use PackFile to ensure we find preserved packs Update scanPacksImpl and listPackDirectory (renamed to getPackFilesByExtById) to use the new PackFile functionality to validate file names and complete pack file sets (.pack, .idx, etc). Most importantly, this allows a later change to rely on scanPacks() to complete a packList that contains packs with the 'old-' prefix in their extension. This also eliminates duplication of logic for how to identify and construct pack files. Change-Id: I7175e5fefb187a29e0a7cf53c392aee922314f31 Signed-off-by: Nasser Grainawi --- .../jgit/internal/storage/file/PackDirectory.java | 74 +++++++++++++--------- 1 file changed, 43 insertions(+), 31 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index b2ba36bf91..2e68d46248 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -10,6 +10,8 @@ package org.eclipse.jgit.internal.storage.file; +import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; +import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import java.io.File; @@ -21,7 +23,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -398,43 +399,32 @@ class PackDirectory { private PackList scanPacksImpl(PackList old) { final Map forReuse = reuseMap(old); final FileSnapshot snapshot = FileSnapshot.save(directory); - final Set names = listPackDirectory(); - final List list = new ArrayList<>(names.size() >> 2); + Map> packFilesByExtById = getPackFilesByExtById(); + List list = new ArrayList<>(packFilesByExtById.size()); boolean foundNew = false; - for (String indexName : names) { - // Must match "pack-[0-9a-f]{40}.idx" to be an index. - // - if (indexName.length() != 49 || !indexName.endsWith(".idx")) { //$NON-NLS-1$ - continue; - } - - final String base = indexName.substring(0, indexName.length() - 3); - int extensions = 0; - for (PackExt ext : PackExt.values()) { - if (names.contains(base + ext.getExtension())) { - extensions |= ext.getBit(); - } - } - - if ((extensions & PACK.getBit()) == 0) { + for (Map packFilesByExt : packFilesByExtById + .values()) { + PackFile packFile = packFilesByExt.get(PACK); + if (packFile == null || !packFilesByExt.containsKey(INDEX)) { // Sometimes C Git's HTTP fetch transport leaves a // .idx file behind and does not download the .pack. // We have to skip over such useless indexes. - // + // Also skip if we don't have any index for this id continue; } - final String packName = base + PACK.getExtension(); - final File packFile = new File(directory, packName); - final Pack oldPack = forReuse.get(packName); + Pack oldPack = forReuse.get(packFile.getName()); if (oldPack != null && !oldPack.getFileSnapshot().isModified(packFile)) { - forReuse.remove(packName); + forReuse.remove(packFile.getName()); list.add(oldPack); continue; } - list.add(new Pack(packFile, extensions)); + list.add(new Pack(packFile, + packFilesByExt.containsKey(BITMAP_INDEX) + ? BITMAP_INDEX.getBit() + : 0)); foundNew = true; } @@ -487,18 +477,40 @@ class PackDirectory { return forReuse; } - private Set listPackDirectory() { + /** + * Scans the pack directory for + * {@link org.eclipse.jgit.internal.storage.file.PackFile}s and returns them + * organized by their extensions and their pack ids + * + * Skips files in the directory that we cannot create a + * {@link org.eclipse.jgit.internal.storage.file.PackFile} for. + * + * @return a map of {@link org.eclipse.jgit.internal.storage.file.PackFile}s + * and {@link org.eclipse.jgit.internal.storage.pack.PackExt}s keyed + * by pack ids + */ + private Map> getPackFilesByExtById() { final String[] nameList = directory.list(); if (nameList == null) { - return Collections.emptySet(); + return Collections.emptyMap(); } - final Set nameSet = new HashSet<>(nameList.length << 1); + Map> packFilesByExtById = new HashMap<>( + nameList.length / 2); // assume roughly 2 files per id for (String name : nameList) { - if (name.startsWith("pack-")) { //$NON-NLS-1$ - nameSet.add(name); + try { + PackFile pack = new PackFile(directory, name); + Map packByExt = packFilesByExtById + .get(pack.getId()); + if (packByExt == null) { + packByExt = new HashMap<>(PackExt.values().length); + packFilesByExtById.put(pack.getId(), packByExt); + } + packByExt.put(pack.getPackExt(), pack); + } catch (IllegalArgumentException e) { + continue; } } - return nameSet; + return packFilesByExtById; } static final class PackList { -- cgit v1.2.3 From 7fbff35887a4179d33b17fce96191c82b397ebd7 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Wed, 10 Feb 2021 23:26:17 -0700 Subject: Pack: Replace extensions bitset with bitmapIdx PackFile The only extension that was ever consulted from the bitmap was the bitmap index. We can simplify the Pack code as well as the code of all the callers if we focus on just that usage. Change-Id: I799ddfdee93142af67ce5081d14a430d36aa4c15 Signed-off-by: Nasser Grainawi --- .../jgit/internal/storage/file/PackTest.java | 2 +- .../internal/storage/file/ObjectDirectory.java | 43 +++++++++++----------- .../eclipse/jgit/internal/storage/file/Pack.java | 38 +++++++++---------- .../jgit/internal/storage/file/PackDirectory.java | 5 +-- 4 files changed, 40 insertions(+), 48 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackTest.java index 85bd31d711..a3596541fe 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackTest.java @@ -261,7 +261,7 @@ public class PackTest extends LocalDiskRepositoryTestCase { new PackIndexWriterV1(f).write(list, footer); } - Pack pack = new Pack(packName, PackExt.INDEX.getBit()); + Pack pack = new Pack(packName, null); try { pack.get(wc, b); fail("expected LargeObjectException.ExceedsByteArrayLimit"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java index e71a960603..170df57808 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java @@ -11,8 +11,8 @@ package org.eclipse.jgit.internal.storage.file; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; import java.io.BufferedReader; import java.io.File; @@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.ObjectToPack; -import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; @@ -216,26 +215,26 @@ public class ObjectDirectory extends FileObjectDatabase { * Add a single existing pack to the list of available pack files. */ @Override - public Pack openPack(File pack) - throws IOException { - final String p = pack.getName(); - if (p.length() != 50 || !p.startsWith("pack-") || !p.endsWith(".pack")) //$NON-NLS-1$ //$NON-NLS-2$ - throw new IOException(MessageFormat.format(JGitText.get().notAValidPack, pack)); - - // The pack and index are assumed to exist. The existence of other - // extensions needs to be explicitly checked. - // - int extensions = PACK.getBit() | INDEX.getBit(); - final String base = p.substring(0, p.length() - 4); - for (PackExt ext : PackExt.values()) { - if ((extensions & ext.getBit()) == 0) { - final String name = base + ext.getExtension(); - if (new File(pack.getParentFile(), name).exists()) - extensions |= ext.getBit(); - } - } - - Pack res = new Pack(pack, extensions); + public Pack openPack(File pack) throws IOException { + PackFile pf; + try { + pf = new PackFile(pack); + } catch (IllegalArgumentException e) { + throw new IOException( + MessageFormat.format(JGitText.get().notAValidPack, pack), + e); + } + + String p = pf.getName(); + // TODO(nasserg): See if PackFile can do these checks instead + if (p.length() != 50 || !p.startsWith("pack-") //$NON-NLS-1$ + || !pf.getPackExt().equals(PACK)) { + throw new IOException( + MessageFormat.format(JGitText.get().notAValidPack, pack)); + } + + PackFile bitmapIdx = pf.create(BITMAP_INDEX); + Pack res = new Pack(pack, bitmapIdx.exists() ? bitmapIdx : null); packed.insert(res); return res; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index fa938b3111..5efd4c5bfc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -12,7 +12,6 @@ package org.eclipse.jgit.internal.storage.file; -import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.KEEP; @@ -38,6 +37,7 @@ import java.util.zip.CRC32; import java.util.zip.DataFormatException; import java.util.zip.Inflater; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.errors.MissingObjectException; @@ -51,7 +51,6 @@ import org.eclipse.jgit.errors.UnsupportedPackVersionException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.BinaryDelta; import org.eclipse.jgit.internal.storage.pack.ObjectToPack; -import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.internal.storage.pack.PackOutputStream; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; @@ -80,8 +79,6 @@ public class Pack implements Iterable { private final PackFile packFile; - private final int extensions; - private PackFile keepFile; final int hash; @@ -105,7 +102,8 @@ public class Pack implements Iterable { private volatile Exception invalidatingCause; - private boolean invalidBitmap; + @Nullable + private PackFile bitmapIdxFile; private AtomicInteger transientErrorCount = new AtomicInteger(); @@ -131,14 +129,14 @@ public class Pack implements Iterable { * * @param packFile * path of the .pack file holding the data. - * @param extensions - * additional pack file extensions with the same base as the pack + * @param bitmapIdxFile + * existing bitmap index file with the same base as the pack */ - public Pack(File packFile, int extensions) { + public Pack(File packFile, @Nullable PackFile bitmapIdxFile) { this.packFile = new PackFile(packFile); this.fileSnapshot = PackFileSnapshot.save(packFile); this.packLastModified = fileSnapshot.lastModifiedInstant(); - this.extensions = extensions; + this.bitmapIdxFile = bitmapIdxFile; // Multiply by 31 here so we can more directly combine with another // value in WindowCache.hash(), without doing the multiply there. @@ -1124,26 +1122,28 @@ public class Pack implements Iterable { } synchronized PackBitmapIndex getBitmapIndex() throws IOException { - if (invalid || invalidBitmap) + if (invalid || bitmapIdxFile == null) { return null; - if (bitmapIdx == null && hasExt(BITMAP_INDEX)) { + } + if (bitmapIdx == null) { final PackBitmapIndex idx; try { - idx = PackBitmapIndex.open(packFile.create(BITMAP_INDEX), idx(), + idx = PackBitmapIndex.open(bitmapIdxFile, idx(), getReverseIdx()); } catch (FileNotFoundException e) { // Once upon a time this bitmap file existed. Now it // has been removed. Most likely an external gc has // removed this packfile and the bitmap - invalidBitmap = true; - return null; + bitmapIdxFile = null; + return null; } // At this point, idx() will have set packChecksum. - if (Arrays.equals(packChecksum, idx.packChecksum)) + if (Arrays.equals(packChecksum, idx.packChecksum)) { bitmapIdx = idx; - else - invalidBitmap = true; + } else { + bitmapIdxFile = null; + } } return bitmapIdx; } @@ -1179,10 +1179,6 @@ public class Pack implements Iterable { } } - private boolean hasExt(PackExt ext) { - return (extensions & ext.getBit()) != 0; - } - @SuppressWarnings("nls") @Override public String toString() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index 2e68d46248..007205e55e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -421,10 +421,7 @@ class PackDirectory { continue; } - list.add(new Pack(packFile, - packFilesByExt.containsKey(BITMAP_INDEX) - ? BITMAP_INDEX.getBit() - : 0)); + list.add(new Pack(packFile, packFilesByExt.get(BITMAP_INDEX))); foundNew = true; } -- cgit v1.2.3 From 6167641834e28f8ad322f8fde60866b339bfb7fe Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Tue, 15 Dec 2020 14:20:44 -0700 Subject: Restore preserved packs during missing object seeks Provide a recovery path for objects being referenced during the pack pruning race. Due to the pack pruning race, it is possible for objects to become referenced after a pack has been deemed safe to prune, but before it actually gets pruned. If this happened previously, the newly referenced objects would be missing and potentially result in a corrupted ref. Add the ability to recover from this situation when an object is missing but happens to still be available in a pack in the "preserved" directory. This is likely only useful when used in conjunction with the --preserve-old-packs GC option, which prunes packs by hard-linking to the preserved directory. If an object is missing and found in a pack in the preserved directory, immediately recover that pack and its associated files (idx, bitmaps...) by moving them back to the original pack directory, and then retry the operation that would have failed due to the missing object. This retry can now succeed and the repository may avoid corruption. This approach should drastically reduce the chance of a corrupt repository during pack pruning at very little extra cost. This extra cost should only be incurred when objects are missing and a failure would normally occur. Change-Id: I2a704e3276b88cc892159d9bfe2455c6eec64252 Signed-off-by: Martin Fick Signed-off-by: Nasser Grainawi --- .../internal/storage/file/GcBasicPackingTest.java | 51 +++++++++++++ .../internal/storage/file/ObjectDirectory.java | 83 ++++++++++++++++++++-- .../jgit/internal/storage/file/PackDirectory.java | 28 ++++++-- 3 files changed, 150 insertions(+), 12 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java index 61538c9c24..8dc1ddb9f6 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.eclipse.jgit.junit.TestRepository.BranchBuilder; import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.storage.file.FileBasedConfig; @@ -314,6 +315,56 @@ public class GcBasicPackingTest extends GcTestCase { assertTrue(preservedPackFile.exists()); } + @Test + public void testPruneAndRestoreOldPacks() throws Exception { + String tempRef = "refs/heads/soon-to-be-unreferenced"; + BranchBuilder bb = tr.branch(tempRef); + bb.commit().add("A", "A").add("B", "B").create(); + + // Verify setup conditions + stats = gc.getStatistics(); + assertEquals(4, stats.numberOfLooseObjects); + assertEquals(0, stats.numberOfPackedObjects); + + // Force all referenced objects into packs (to avoid having loose objects) + configureGc(gc, false); + gc.setExpireAgeMillis(0); + gc.setPackExpireAgeMillis(0); + gc.gc(); + stats = gc.getStatistics(); + assertEquals(0, stats.numberOfLooseObjects); + assertEquals(4, stats.numberOfPackedObjects); + assertEquals(1, stats.numberOfPackFiles); + + // Delete the temp ref, orphaning its commit + RefUpdate update = tr.getRepository().getRefDatabase().newUpdate(tempRef, false); + update.setForceUpdate(true); + ObjectId objectId = update.getOldObjectId(); // remember it so we can restore it! + RefUpdate.Result result = update.delete(); + assertEquals(RefUpdate.Result.FORCED, result); + + fsTick(); + + // Repack with only orphaned commit, so packfile will be pruned + configureGc(gc, false).setPreserveOldPacks(true); + gc.gc(); + stats = gc.getStatistics(); + assertEquals(0, stats.numberOfLooseObjects); + assertEquals(0, stats.numberOfPackedObjects); + assertEquals(0, stats.numberOfPackFiles); + + // Restore the temp ref to the deleted commit, should restore old-packs! + update = tr.getRepository().getRefDatabase().newUpdate(tempRef, false); + update.setNewObjectId(objectId); + update.setExpectedOldObjectId(null); + result = update.update(); + assertEquals(RefUpdate.Result.NEW, result); + + stats = gc.getStatistics(); + assertEquals(4, stats.numberOfPackedObjects); + assertEquals(1, stats.numberOfPackFiles); + } + private PackConfig configureGc(GC myGc, boolean aggressive) { PackConfig pconfig = new PackConfig(repo); if (aggressive) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java index 170df57808..627facca02 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java @@ -13,6 +13,7 @@ package org.eclipse.jgit.internal.storage.file; import static java.nio.charset.StandardCharsets.UTF_8; import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; +import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import java.io.BufferedReader; import java.io.File; @@ -31,6 +32,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.ObjectToPack; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; @@ -78,7 +80,7 @@ public class ObjectDirectory extends FileObjectDatabase { private final PackDirectory packed; - private final File preservedDirectory; + private final PackDirectory preserved; private final File alternatesFile; @@ -116,10 +118,11 @@ public class ObjectDirectory extends FileObjectDatabase { objects = dir; infoDirectory = new File(objects, "info"); //$NON-NLS-1$ File packDirectory = new File(objects, "pack"); //$NON-NLS-1$ - preservedDirectory = new File(packDirectory, "preserved"); //$NON-NLS-1$ + File preservedDirectory = new File(packDirectory, "preserved"); //$NON-NLS-1$ alternatesFile = new File(objects, Constants.INFO_ALTERNATES); loose = new LooseObjects(objects); packed = new PackDirectory(config, packDirectory); + preserved = new PackDirectory(config, preservedDirectory); this.fs = fs; this.shallowFile = shallowFile; @@ -155,7 +158,7 @@ public class ObjectDirectory extends FileObjectDatabase { * @return the location of the preserved directory. */ public final File getPreservedDirectory() { - return preservedDirectory; + return preserved.getDirectory(); } /** {@inheritDoc} */ @@ -249,7 +252,13 @@ public class ObjectDirectory extends FileObjectDatabase { @Override public boolean has(AnyObjectId objectId) { return loose.hasCached(objectId) - || hasPackedInSelfOrAlternate(objectId, null) + || hasPackedOrLooseInSelfOrAlternate(objectId) + || (restoreFromSelfOrAlternate(objectId, null) + && hasPackedOrLooseInSelfOrAlternate(objectId)); + } + + private boolean hasPackedOrLooseInSelfOrAlternate(AnyObjectId objectId) { + return hasPackedInSelfOrAlternate(objectId, null) || hasLooseInSelfOrAlternate(objectId, null); } @@ -318,6 +327,15 @@ public class ObjectDirectory extends FileObjectDatabase { @Override ObjectLoader openObject(WindowCursor curs, AnyObjectId objectId) throws IOException { + ObjectLoader ldr = openObjectWithoutRestoring(curs, objectId); + if (ldr == null && restoreFromSelfOrAlternate(objectId, null)) { + ldr = openObjectWithoutRestoring(curs, objectId); + } + return ldr; + } + + private ObjectLoader openObjectWithoutRestoring(WindowCursor curs, AnyObjectId objectId) + throws IOException { if (loose.hasCached(objectId)) { ObjectLoader ldr = openLooseObject(curs, objectId); if (ldr != null) { @@ -379,8 +397,16 @@ public class ObjectDirectory extends FileObjectDatabase { } @Override - long getObjectSize(WindowCursor curs, AnyObjectId id) - throws IOException { + long getObjectSize(WindowCursor curs, AnyObjectId id) throws IOException { + long sz = getObjectSizeWithoutRestoring(curs, id); + if (0 > sz && restoreFromSelfOrAlternate(id, null)) { + sz = getObjectSizeWithoutRestoring(curs, id); + } + return sz; + } + + private long getObjectSizeWithoutRestoring(WindowCursor curs, + AnyObjectId id) throws IOException { if (loose.hasCached(id)) { long len = loose.getSize(curs, id); if (0 <= len) { @@ -448,6 +474,51 @@ public class ObjectDirectory extends FileObjectDatabase { } } + private boolean restoreFromSelfOrAlternate(AnyObjectId objectId, + Set skips) { + if (restoreFromSelf(objectId)) { + return true; + } + + skips = addMe(skips); + for (AlternateHandle alt : myAlternates()) { + if (!skips.contains(alt.getId())) { + if (alt.db.restoreFromSelfOrAlternate(objectId, skips)) { + return true; + } + } + } + return false; + } + + private boolean restoreFromSelf(AnyObjectId objectId) { + Pack preservedPack = preserved.getPack(objectId); + if (preservedPack == null) { + return false; + } + PackFile preservedFile = new PackFile(preservedPack.getPackFile()); + // Restore the index last since the set will be considered for use once + // the index appears. + for (PackExt ext : PackExt.values()) { + if (!INDEX.equals(ext)) { + restore(preservedFile.create(ext)); + } + } + restore(preservedFile.create(INDEX)); + return true; + } + + private boolean restore(PackFile preservedPack) { + PackFile restored = preservedPack + .createForDirectory(packed.getDirectory()); + try { + Files.createLink(restored.toPath(), preservedPack.toPath()); + } catch (IOException e) { + return false; + } + return true; + } + @Override InsertLooseObjectResult insertUnpackedObject(File tmp, ObjectId id, boolean createDuplicate) throws IOException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index 007205e55e..5f30970233 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.PackInvalidException; import org.eclipse.jgit.errors.PackMismatchException; @@ -122,21 +123,36 @@ class PackDirectory { * * @param objectId * identity of the object to test for existence of. - * @return true if the specified object is stored in this PackDirectory. + * @return {@code true} if the specified object is stored in this PackDirectory. */ boolean has(AnyObjectId objectId) { + return getPack(objectId) != null; + } + + /** + * Get the {@link org.eclipse.jgit.internal.storage.file.Pack} for the + * specified object if it is stored in this PackDirectory. + * + * @param objectId + * identity of the object to find the Pack for. + * @return {@link org.eclipse.jgit.internal.storage.file.Pack} which + * contains the specified object or {@code null} if it is not stored + * in this PackDirectory. + */ + @Nullable + Pack getPack(AnyObjectId objectId) { PackList pList; do { pList = packList.get(); for (Pack p : pList.packs) { try { if (p.hasObject(objectId)) { - return true; + return p; } } catch (IOException e) { - // The hasObject call should have only touched the index, - // so any failure here indicates the index is unreadable - // by this process, and the pack is likewise not readable. + // The hasObject call should have only touched the index, so + // any failure here indicates the index is unreadable by + // this process, and the pack is likewise not readable. LOG.warn(MessageFormat.format( JGitText.get().unableToReadPackfile, p.getPackFile().getAbsolutePath()), e); @@ -144,7 +160,7 @@ class PackDirectory { } } } while (searchPacksAgain(pList)); - return false; + return null; } /** -- cgit v1.2.3 From c57b2935cd8bf160cb81ef86205ea0c5ea36da98 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Fri, 26 Feb 2021 15:49:06 -0700 Subject: PackExt: Convert to Enum This class already looked very much like an Enum, but wasn't one. As an Enum, we can use PackExt in EnumMaps and EnumSets. Convert the Map key usage in PackDirectory to an EnumMap. Change-Id: Ice097fd468a05805f914e6862fbd1d96ec8c45d1 Signed-off-by: Nasser Grainawi --- .../jgit/internal/storage/file/PackDirectory.java | 15 +++--- .../jgit/internal/storage/pack/PackExt.java | 60 ++++------------------ 2 files changed, 19 insertions(+), 56 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index 5f30970233..73745d8c64 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -512,13 +513,15 @@ class PackDirectory { for (String name : nameList) { try { PackFile pack = new PackFile(directory, name); - Map packByExt = packFilesByExtById - .get(pack.getId()); - if (packByExt == null) { - packByExt = new HashMap<>(PackExt.values().length); - packFilesByExtById.put(pack.getId(), packByExt); + if (pack.getPackExt() != null) { + Map packByExt = packFilesByExtById + .get(pack.getId()); + if (packByExt == null) { + packByExt = new EnumMap<>(PackExt.class); + packFilesByExtById.put(pack.getId(), packByExt); + } + packByExt.put(pack.getPackExt(), pack); } - packByExt.put(pack.getPackExt(), pack); } catch (IllegalArgumentException e) { continue; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackExt.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackExt.java index bedc6939c8..6fb775da8d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackExt.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackExt.java @@ -13,66 +13,26 @@ package org.eclipse.jgit.internal.storage.pack; /** * A pack file extension. */ -public class PackExt { - private static volatile PackExt[] VALUES = new PackExt[] {}; - +public enum PackExt { /** A pack file extension. */ - public static final PackExt PACK = newPackExt("pack"); //$NON-NLS-1$ + PACK("pack"), //$NON-NLS-1$ /** A pack index file extension. */ - public static final PackExt INDEX = newPackExt("idx"); //$NON-NLS-1$ + INDEX("idx"), //$NON-NLS-1$ /** A keep pack file extension. */ - public static final PackExt KEEP = newPackExt("keep"); //$NON-NLS-1$ + KEEP("keep"), //$NON-NLS-1$ /** A pack bitmap index file extension. */ - public static final PackExt BITMAP_INDEX = newPackExt("bitmap"); //$NON-NLS-1$ + BITMAP_INDEX("bitmap"), //$NON-NLS-1$ /** A reftable file. */ - public static final PackExt REFTABLE = newPackExt("ref"); //$NON-NLS-1$ - - /** - * Get all of the PackExt values. - * - * @return all of the PackExt values. - */ - public static PackExt[] values() { - return VALUES; - } - - /** - * Returns a PackExt for the file extension and registers it in the values - * array. - * - * @param ext - * the file extension. - * @return the PackExt for the ext - */ - public static synchronized PackExt newPackExt(String ext) { - PackExt[] dst = new PackExt[VALUES.length + 1]; - for (int i = 0; i < VALUES.length; i++) { - PackExt packExt = VALUES[i]; - if (packExt.getExtension().equals(ext)) - return packExt; - dst[i] = packExt; - } - if (VALUES.length >= 32) - throw new IllegalStateException( - "maximum number of pack extensions exceeded"); //$NON-NLS-1$ - - PackExt value = new PackExt(ext, VALUES.length); - dst[VALUES.length] = value; - VALUES = dst; - return value; - } + REFTABLE("ref"); //$NON-NLS-1$ private final String ext; - private final int pos; - - private PackExt(String ext, int pos) { + private PackExt(String ext) { this.ext = ext; - this.pos = pos; } /** @@ -85,12 +45,12 @@ public class PackExt { } /** - * Get the position of the extension in the values array. + * Get the position of the extension in the enum declaration. * - * @return the position of the extension in the values array. + * @return the position of the extension in the enum declaration. */ public int getPosition() { - return pos; + return ordinal(); } /** -- cgit v1.2.3 From 093020864f06b75708f8ec225e5df9e0ad54f9c1 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Wed, 3 Mar 2021 17:05:21 -0700 Subject: GC: deleteOrphans: Use PackFile It's easier to follow the logic here when we can use our own objects instead of Strings. Change-Id: I6a166edcc67903fc1ca3544f458634c4cef8fde7 Signed-off-by: Nasser Grainawi --- .../org/eclipse/jgit/internal/storage/file/GC.java | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index e328870daa..9366404ba4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -12,6 +12,8 @@ package org.eclipse.jgit.internal.storage.file; import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; +import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; +import static org.eclipse.jgit.internal.storage.pack.PackExt.KEEP; import java.io.File; import java.io.FileOutputStream; @@ -965,20 +967,21 @@ public class GC { return; } - String base = null; + String latestId = null; for (String n : fileNames) { - if (n.endsWith(PACK_EXT) || n.endsWith(KEEP_EXT)) { - base = n.substring(0, n.lastIndexOf('.')); - } else { - if (base == null || !n.startsWith(base)) { - try { - Path delete = packDir.resolve(n); - FileUtils.delete(delete.toFile(), - FileUtils.RETRY | FileUtils.SKIP_MISSING); - LOG.warn(JGitText.get().deletedOrphanInPackDir, delete); - } catch (IOException e) { - LOG.error(e.getMessage(), e); - } + PackFile pf = new PackFile(packDir.toFile(), n); + PackExt ext = pf.getPackExt(); + if (ext.equals(PACK) || ext.equals(KEEP)) { + latestId = pf.getId(); + } + if (latestId == null || !pf.getId().equals(latestId)) { + // no pack or keep for this id + try { + FileUtils.delete(pf, + FileUtils.RETRY | FileUtils.SKIP_MISSING); + LOG.warn(JGitText.get().deletedOrphanInPackDir, pf); + } catch (IOException e) { + LOG.error(e.getMessage(), e); } } } -- cgit v1.2.3 From 2a6b2eddcfac17ef5ff3b6b28dfaadd83e34956a Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Thu, 4 Mar 2021 14:14:43 -0700 Subject: PackFile: Add id + ext based constructors Add new constructors to PackFile to improve a common use case where callers know the directory, id, and extension, but previously needed to construct a valid file name (with prefix, '.', etc) to create a PackFile. Most callers can use the variant that has id as an ObjectId, but provide an id as String variant too. Change-Id: I39e4466abe8c9509f5916d5bfe675066570b8585 Signed-off-by: Nasser Grainawi --- .../src/org/eclipse/jgit/junit/TestRepository.java | 11 ++----- .../internal/storage/file/AbbreviationTest.java | 6 ++-- .../storage/file/ConcurrentRepackTest.java | 12 +++---- .../jgit/internal/storage/file/PackFileTest.java | 31 ++++++++++++++---- .../jgit/internal/storage/file/PackWriterTest.java | 4 +-- .../org/eclipse/jgit/internal/storage/file/GC.java | 12 +++---- .../internal/storage/file/LocalCachedPack.java | 3 +- .../storage/file/ObjectDirectoryPackParser.java | 9 ++--- .../jgit/internal/storage/file/PackFile.java | 33 +++++++++++++++++++ .../jgit/internal/storage/file/PackInserter.java | 9 ++--- .../eclipse/jgit/transport/WalkPushConnection.java | 38 ++++++++++++---------- 11 files changed, 106 insertions(+), 62 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index 24f7741f16..0232156a49 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -915,9 +915,8 @@ public class TestRepository implements AutoCloseable { all.add(r.getObjectId()); pw.preparePack(m, all, PackWriter.NONE); - final ObjectId name = pw.computeName(); - - pack = nameFor(odb, name, ".pack"); + pack = new PackFile(odb.getPackDirectory(), pw.computeName(), + PackExt.PACK); try (OutputStream out = new BufferedOutputStream(new FileOutputStream(pack))) { pw.writePack(m, m, out); @@ -962,12 +961,6 @@ public class TestRepository implements AutoCloseable { } } - private static PackFile nameFor(ObjectDirectory odb, ObjectId name, - String t) { - File packdir = odb.getPackDirectory(); - return new PackFile(packdir, "pack-" + name.name() + t); - } - private void writeFile(File p, byte[] bin) throws IOException, ObjectWritingException { final LockFile lck = new LockFile(p); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java index 45d864d45d..bd36337f35 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java @@ -28,6 +28,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.jgit.errors.AmbiguousObjectException; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.AbbreviatedObjectId; @@ -144,10 +145,9 @@ public class AbbreviationTest extends LocalDiskRepositoryTestCase { objects.add(new PackedObjectInfo(ObjectId.fromRaw(idBuf))); } - String packName = "pack-" + id.name(); File packDir = db.getObjectDatabase().getPackDirectory(); - File idxFile = new File(packDir, packName + ".idx"); - File packFile = new File(packDir, packName + ".pack"); + PackFile idxFile = new PackFile(packDir, id, PackExt.INDEX); + PackFile packFile = idxFile.create(PackExt.PACK); FileUtils.mkdir(packDir, true); try (OutputStream dst = new BufferedOutputStream( new FileOutputStream(idxFile))) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java index ca63507354..df5d952ee3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java @@ -194,9 +194,10 @@ public class ConcurrentRepackTest extends RepositoryTestCase { pw.addObject(o); } - final ObjectId name = pw.computeName(); - final PackFile packFile = fullPackFileName(name, ".pack"); - final PackFile idxFile = packFile.create(PackExt.INDEX); + PackFile packFile = new PackFile( + db.getObjectDatabase().getPackDirectory(), pw.computeName(), + PackExt.PACK); + PackFile idxFile = packFile.create(PackExt.INDEX); final File[] files = new File[] { packFile, idxFile }; write(files, pw); return files; @@ -243,11 +244,6 @@ public class ConcurrentRepackTest extends RepositoryTestCase { } } - private PackFile fullPackFileName(ObjectId name, String suffix) { - final File packdir = db.getObjectDatabase().getPackDirectory(); - return new PackFile(packdir, "pack-" + name.name() + suffix); - } - private RevObject writeBlob(Repository repo, String data) throws IOException { final byte[] bytes = Constants.encode(data); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java index 88d25b73d7..619cfcac31 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileTest.java @@ -17,10 +17,14 @@ import static org.junit.Assert.assertTrue; import java.io.File; import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.lib.ObjectId; import org.junit.Test; public class PackFileTest { - private static final String TEST_ID = "0123456789012345678901234567890123456789"; + private static final ObjectId TEST_OID = ObjectId + .fromString("0123456789012345678901234567890123456789"); + + private static final String TEST_ID = TEST_OID.name(); private static final String PREFIX = "pack-"; @@ -39,12 +43,20 @@ public class PackFileTest { new File(TEST_PACK_DIR, PREFIX + TEST_ID)); @Test - public void idIsSameFromFileOrDirAndName() throws Exception { - File pack = new File(TEST_PACK_DIR, PREFIX + TEST_ID); + public void objectsAreSameFromAnyConstructor() throws Exception { + String name = PREFIX + TEST_ID + "." + PackExt.PACK.getExtension(); + File pack = new File(TEST_PACK_DIR, name); PackFile pf = new PackFile(pack); - PackFile pfFromDirAndName = new PackFile(TEST_PACK_DIR, - PREFIX + TEST_ID); - assertEquals(pf.getId(), pfFromDirAndName.getId()); + PackFile pfFromDirAndName = new PackFile(TEST_PACK_DIR, name); + assertPackFilesEqual(pf, pfFromDirAndName); + + PackFile pfFromOIdAndExt = new PackFile(TEST_PACK_DIR, TEST_OID, + PackExt.PACK); + assertPackFilesEqual(pf, pfFromOIdAndExt); + + PackFile pfFromIdAndExt = new PackFile(TEST_PACK_DIR, TEST_ID, + PackExt.PACK); + assertPackFilesEqual(pf, pfFromIdAndExt); } @Test @@ -147,4 +159,11 @@ public class PackFileTest { preservedWithExt.getPackExt()); } } + + private void assertPackFilesEqual(PackFile p1, PackFile p2) { + // for test purposes, considered equal if id, name, and ext are equal + assertEquals(p1.getId(), p2.getId()); + assertEquals(p1.getPackExt(), p2.getPackExt()); + assertEquals(p1.getName(), p2.getName()); + } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java index 6e8584a9c8..e422ab9db3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java @@ -684,9 +684,9 @@ public class PackWriterTest extends SampleDataRepositoryTestCase { ObjectWalk ow = walk.toObjectWalkWithSameObjects(); pw.preparePack(NullProgressMonitor.INSTANCE, ow, want, have, NONE); - String id = pw.computeName().getName(); File packdir = repo.getObjectDatabase().getPackDirectory(); - PackFile packFile = new PackFile(packdir, "pack-" + id + ".pack"); + PackFile packFile = new PackFile(packdir, pw.computeName(), + PackExt.PACK); try (FileOutputStream packOS = new FileOutputStream(packFile)) { pw.writePack(NullProgressMonitor.INSTANCE, NullProgressMonitor.INSTANCE, packOS); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 9366404ba4..9ffff9f662 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1163,7 +1163,7 @@ public class GC { checkCancelled(); // create temporary files - String id = pw.computeName().getName(); + ObjectId id = pw.computeName(); File packdir = repo.getObjectDatabase().getPackDirectory(); packdir.mkdirs(); tmpPack = File.createTempFile("gc_", ".pack_tmp", packdir); //$NON-NLS-1$ //$NON-NLS-2$ @@ -1213,7 +1213,8 @@ public class GC { } // rename the temporary files to real files - File realPack = nameFor(id, PackExt.PACK); + File packDir = repo.getObjectDatabase().getPackDirectory(); + PackFile realPack = new PackFile(packDir, id, PackExt.PACK); repo.getObjectDatabase().closeAllPackHandles(realPack); tmpPack.setReadOnly(); @@ -1223,7 +1224,7 @@ public class GC { File tmpExt = tmpEntry.getValue(); tmpExt.setReadOnly(); - File realExt = nameFor(id, tmpEntry.getKey()); + PackFile realExt = new PackFile(packDir, id, tmpEntry.getKey()); try { FileUtils.rename(tmpExt, realExt, StandardCopyOption.ATOMIC_MOVE); @@ -1269,11 +1270,6 @@ public class GC { } } - private PackFile nameFor(String name, PackExt ext) { - return new PackFile(repo.getObjectDatabase().getPackDirectory(), - "pack-" + name).create(ext); //$NON-NLS-1$ - } - private void checkCancelled() throws CancelledException { if (pm.isCancelled() || Thread.currentThread().isInterrupted()) { throw new CancelledException(JGitText.get().operationCanceled); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LocalCachedPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LocalCachedPack.java index ae5bce6985..f112947bae 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LocalCachedPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LocalCachedPack.java @@ -17,6 +17,7 @@ import java.util.List; import org.eclipse.jgit.internal.storage.pack.CachedPack; import org.eclipse.jgit.internal.storage.pack.ObjectToPack; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.internal.storage.pack.PackOutputStream; import org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation; @@ -88,6 +89,6 @@ class LocalCachedPack extends CachedPack { private String getPackFilePath(String packName) { final File packDir = odb.getPackDirectory(); - return new File(packDir, "pack-" + packName + ".pack").getPath(); //$NON-NLS-1$ //$NON-NLS-2$ + return new PackFile(packDir, packName, PackExt.PACK).getPath(); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java index 04d2ff8ab2..dba8ccd99b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java @@ -27,6 +27,7 @@ import java.util.zip.Deflater; import org.eclipse.jgit.errors.LockFailedException; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.CoreConfig; @@ -426,10 +427,10 @@ public class ObjectDirectoryPackParser extends PackParser { d.update(oeBytes); } - final String name = ObjectId.fromRaw(d.digest()).name(); - final File packDir = new File(db.getDirectory(), "pack"); //$NON-NLS-1$ - final File finalPack = new File(packDir, "pack-" + name + ".pack"); //$NON-NLS-1$ //$NON-NLS-2$ - final File finalIdx = new File(packDir, "pack-" + name + ".idx"); //$NON-NLS-1$ //$NON-NLS-2$ + ObjectId id = ObjectId.fromRaw(d.digest()); + File packDir = new File(db.getDirectory(), "pack"); //$NON-NLS-1$ + PackFile finalPack = new PackFile(packDir, id, PackExt.PACK); + PackFile finalIdx = finalPack.create(PackExt.INDEX); final PackLock keep = new PackLock(finalPack, db.getFS()); if (!packDir.exists() && !packDir.mkdir() && !packDir.exists()) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java index c2e6f324d1..19979d0ed5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -16,6 +16,7 @@ import java.text.MessageFormat; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.lib.ObjectId; /** * A pack file (or pack related) File. @@ -36,6 +37,10 @@ public class PackFile extends File { private final PackExt packExt; + private static String createName(String id, PackExt extension) { + return PREFIX + id + '.' + extension.getExtension(); + } + /** * Create a PackFile for a pack or related file. * @@ -46,6 +51,34 @@ public class PackFile extends File { this(file.getParentFile(), file.getName()); } + /** + * Create a PackFile for a pack or related file. + * + * @param directory + * Directory to create the PackFile in. + * @param id + * the {@link ObjectId} for this pack + * @param ext + * the packExt of the name. + */ + public PackFile(File directory, ObjectId id, PackExt ext) { + this(directory, id.name(), ext); + } + + /** + * Create a PackFile for a pack or related file. + * + * @param directory + * Directory to create the PackFile in. + * @param id + * the id (40 Hex char) section of the pack name. + * @param ext + * the packExt of the name. + */ + public PackFile(File directory, String id, PackExt ext) { + this(directory, createName(id, ext)); + } + /** * Create a PackFile for a pack or related file. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackInserter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackInserter.java index a27a2b00c3..d6209c4a79 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackInserter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackInserter.java @@ -76,6 +76,7 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; @@ -273,16 +274,16 @@ public class PackInserter extends ObjectInserter { } Collections.sort(objectList); - File tmpIdx = idxFor(tmpPack); + File tmpIdx = idxFor(tmpPack); // TODO(nasserg) Use PackFile? writePackIndex(tmpIdx, packHash, objectList); - File realPack = new File(db.getPackDirectory(), - "pack-" + computeName(objectList).name() + ".pack"); //$NON-NLS-1$ //$NON-NLS-2$ + PackFile realPack = new PackFile(db.getPackDirectory(), + computeName(objectList), PackExt.PACK); db.closeAllPackHandles(realPack); tmpPack.setReadOnly(); FileUtils.rename(tmpPack, realPack, ATOMIC_MOVE); - File realIdx = idxFor(realPack); + PackFile realIdx = realPack.create(PackExt.INDEX); tmpIdx.setReadOnly(); try { FileUtils.rename(tmpIdx, realIdx, ATOMIC_MOVE); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java index f2eac8d24a..03ef852c7f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkPushConnection.java @@ -13,6 +13,7 @@ package org.eclipse.jgit.transport; import static org.eclipse.jgit.transport.WalkRemoteObjectDatabase.ROOT_DIR; import java.io.BufferedOutputStream; +import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; @@ -26,6 +27,8 @@ import java.util.TreeMap; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.file.PackFile; +import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; @@ -189,9 +192,8 @@ class WalkPushConnection extends BaseConnection implements PushConnection { private void sendpack(final List updates, final ProgressMonitor monitor) throws TransportException { - String pathPack = null; - String pathIdx = null; - + PackFile pack = null; + PackFile idx = null; try (PackWriter writer = new PackWriter(transport.getPackConfig(), local.newObjectReader())) { @@ -217,31 +219,33 @@ class WalkPushConnection extends BaseConnection implements PushConnection { for (String n : dest.getPackNames()) packNames.put(n, n); - final String base = "pack-" + writer.computeName().name(); //$NON-NLS-1$ - final String packName = base + ".pack"; //$NON-NLS-1$ - pathPack = "pack/" + packName; //$NON-NLS-1$ - pathIdx = "pack/" + base + ".idx"; //$NON-NLS-1$ //$NON-NLS-2$ + File packDir = new File("pack"); //$NON-NLS-1$ + pack = new PackFile(packDir, writer.computeName(), + PackExt.PACK); + idx = pack.create(PackExt.INDEX); - if (packNames.remove(packName) != null) { + if (packNames.remove(pack.getName()) != null) { // The remote already contains this pack. We should // remove the index before overwriting to prevent bad // offsets from appearing to clients. // dest.writeInfoPacks(packNames.keySet()); - dest.deleteFile(pathIdx); + dest.deleteFile(idx.getPath()); } // Write the pack file, then the index, as readers look the // other direction (index, then pack file). // - String wt = "Put " + base.substring(0, 12); //$NON-NLS-1$ + String wt = "Put " + pack.getName().substring(0, 12); //$NON-NLS-1$ try (OutputStream os = new BufferedOutputStream( - dest.writeFile(pathPack, monitor, wt + "..pack"))) { //$NON-NLS-1$ + dest.writeFile(pack.getPath(), monitor, + wt + "." + pack.getPackExt().getExtension()))) { //$NON-NLS-1$ writer.writePack(monitor, monitor, os); } try (OutputStream os = new BufferedOutputStream( - dest.writeFile(pathIdx, monitor, wt + "..idx"))) { //$NON-NLS-1$ + dest.writeFile(idx.getPath(), monitor, + wt + "." + idx.getPackExt().getExtension()))) { //$NON-NLS-1$ writer.writeIndex(os); } @@ -250,22 +254,22 @@ class WalkPushConnection extends BaseConnection implements PushConnection { // and discover the most recent objects there. // final ArrayList infoPacks = new ArrayList<>(); - infoPacks.add(packName); + infoPacks.add(pack.getName()); infoPacks.addAll(packNames.keySet()); dest.writeInfoPacks(infoPacks); } catch (IOException err) { - safeDelete(pathIdx); - safeDelete(pathPack); + safeDelete(idx); + safeDelete(pack); throw new TransportException(uri, JGitText.get().cannotStoreObjects, err); } } - private void safeDelete(String path) { + private void safeDelete(File path) { if (path != null) { try { - dest.deleteFile(path); + dest.deleteFile(path.getPath()); } catch (IOException cleanupFailure) { // Ignore the deletion failure. We probably are // already failing and were just trying to pick -- cgit v1.2.3 From 30b6887d4421308c973f3c18c091a3360f9eecce Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 9 Mar 2021 22:10:22 +0100 Subject: JGit v5.11.0.202103091610-r Change-Id: I8e6855eaf7228459f492036feb4e34ca085698a7 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/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- 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 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- 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/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.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 | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 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 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/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/META-INF/SOURCE-MANIFEST.MF | 4 +-- 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 +- 88 files changed, 121 insertions(+), 121 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 6e0cfa00e3..8d14dc7b63 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-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 6d1debee56..0834a9359d 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 0607696115..79403db013 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 84f22749c4..1e17843a3a 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 2ec358c61b..286a148a2a 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 0297b170b5..78338435ce 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor 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 e20f008762..e1d54b2352 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 5031972d56..183c57c6d3 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 86dd389de8..62627c74d7 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 42680e9de5..89dd8252bf 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.ant - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.archive - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.http.apache - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.http.server - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.lfs - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.pgm - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.ui - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.test - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.ant.test - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.http.test - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 57c3747954..b9b2052385 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index cac7e151e9..7f4c9c4de8 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index afb0ee151f..42a7b733cf 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.0,5.12.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 307e5d02a5..62ac2f1d4a 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index d94517c1a8..48f17d265e 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 696e672459..85b8c1890d 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 4fdfb7501c..721ee22d57 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 0d24fa5719..b033272510 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 467204daa4..36aa368c91 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="5.11.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 4d1cc64b22..559c94a176 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 5a37b6492c..ec72809ed6 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 6ade47cef8..15a39e2868 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor 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 40960b65fa..419009f9df 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 7844845a59..c225e3710b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index f3b930776b..0810f11061 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 90a570cf0e..d9e7792a31 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index f7b9a28940..5e7c718eb3 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 0e9e527f80..e8dca2e93e 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 335ddca9a4..67e37df465 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 2295bf4ca8..6896e57994 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 778226932e..386e8de1b2 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 26331c36c0..195b25800f 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 28666228f9..581f00b4d4 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor 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 90a6365b18..17e071ebfb 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 b617ecd635..75d7c5f67c 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="5.11.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 96752f74e8..4787386a66 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 290587c02a..2a2a843f9d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 419c4ca50c..e10178ab5f 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor 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 0a8126e231..b2f849b21d 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 ac374d0dec..8c4d0ae319 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="5.11.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index d501443ec6..2f727363af 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index d4018b23c4..c5d4e1886f 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 e2ba814f42..d78417409d 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 843da3fba4..29fdf52b30 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 7751955c0c..4fd0c57748 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 190b7a74b2..808e01dc1e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 2c0ab365f4..5b796af1ba 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 ad8ff86daf..d2bb171a0a 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 @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 0c9bae692e..f0cbf53f38 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 ba1c87395d..9eb133a040 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 @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 148a365e12..0f308abbf7 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 2cbfbd1363..4d835821ed 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 @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 a758e39421..4a5c45a15c 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 70a4d9db86..cc4e4fcea8 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 @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 296cdd1585..54e2475806 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 acdbf3c9d0..28c714334c 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 a7c9b975ff..b9d69781bd 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 @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 2cab8eeab8..3db8f7fe72 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index d9b12a40c5..af9fb9e95b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 8e6b8bb73a..2ae11ba5a5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index a8eba20081..a989f3743e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 8b9500eb99..2ba06adc06 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-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 fff8cd32b9..5f334df384 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index e0623d2e02..b81cb39258 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 e5b0456b63..99f02618e4 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor 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 5874457421..bd428b94a3 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 e92c83ef9d..52991c4274 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index b24adcd848..d4e766a06b 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index ba08b75fbf..60ba0397e9 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index de173f8fbb..7a5b4a80e2 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index bf8f61ce8d..5320e52a04 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 6ff43ff273..81192d4c63 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.11.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index f4a31a49d8..944a4ce03d 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 9d57e8c8bb..13952daced 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 8e2e92f440..a570438eba 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 54cce81272..5216d1c6d1 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index bd0d4cc251..1943c6752b 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.0,5.12.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.11.0";x-friends:="org.eclipse.egit.core", org.eclipse.jgit.transport;version="5.11.0"; diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 7ccf3ca2b5..d9f41a1a9d 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 48fecf4709..a3cc52f204 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 0540cfb045..6552d1d0ae 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 8781fb372a..d33f31b579 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-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 3b3acd5e74..f51c3b950e 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.awtui;version="5.11.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index f5db7d4a5c..66f24d85fc 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5acd545399..0439497f0b 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 47b030ca04..119d9edf6f 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: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.11.0.qualifier +Bundle-Version: 5.11.0.202103091610-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index e55a69d316..6ec391088c 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.11.0.qualifier";roots="." +Bundle-Version: 5.11.0.202103091610-r +Eclipse-SourceBundle: org.eclipse.jgit;version="5.11.0.202103091610-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index fa5718d143..c217b16c81 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index d938d1a149..f86d8583eb 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.11.0-SNAPSHOT + 5.11.0.202103091610-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From 1f368f886703223b7d97eaa8c664377c041042cc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 9 Mar 2021 23:42:31 +0100 Subject: Prepare 5.11.1-SNAPSHOT builds Change-Id: I94628ccbb5099a65aa4345cfd28a141ff5555b68 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++---- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 14 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 40 ++++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 ++++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 28 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 46 ++++----- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 36 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 80 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++-- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 26 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 14 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 22 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 108 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 102 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 88 files changed, 503 insertions(+), 503 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 8d14dc7b63..7bb56a0bd6 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.ant.tasks;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 0834a9359d..cc46d760c7 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 79403db013..fd05d2ca06 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)" + org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)" Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="5.11.0", - org.eclipse.jgit.ant.tasks;version="5.11.0"; +Export-Package: org.eclipse.jgit.ant;version="5.11.1", + org.eclipse.jgit.ant.tasks;version="5.11.1"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 1e17843a3a..81c01f6123 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 286a148a2a..9bc075c24b 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 78338435ce..7d22393310 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.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="5.11.0"; +Export-Package: org.eclipse.jgit.archive;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="5.11.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="5.11.1";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index e1d54b2352..8897c1dcb6 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 183c57c6d3..1440f91661 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 62627c74d7..49dae02fd1 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 89dd8252bf..bc93418f96 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index b9b2052385..2b8b1a5632 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -12,9 +12,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.sha1;version="[5.11.0,5.12.0)", + org.eclipse.jgit.gpg.bc.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.sha1;version="[5.11.1,5.12.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 7f4c9c4de8..29fc22cb2b 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 42a7b733cf..e77177ff79 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.0,5.12.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.1,5.12.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)", @@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.util;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", org.bouncycastle.util.io;version="[1.65.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", + org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="5.11.0", - org.eclipse.jgit.gpg.bc.internal;version="5.11.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="5.11.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="5.11.1", + org.eclipse.jgit.gpg.bc.internal;version="5.11.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="5.11.1";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 62ac2f1d4a..662d8f0991 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 48f17d265e..feb17dd033 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 85b8c1890d..07572c6d48 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor @@ -25,11 +25,11 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="5.11.0"; + org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="5.11.1"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 721ee22d57..806a9b6e09 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index b033272510..09525a7a84 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 36aa368c91..1efd612cf2 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="5.11.0", - org.eclipse.jgit.http.server.glue;version="5.11.0"; +Export-Package: org.eclipse.jgit.http.server;version="5.11.1", + org.eclipse.jgit.http.server.glue;version="5.11.1"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="5.11.0"; + org.eclipse.jgit.http.server.resolver;version="5.11.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,14 +18,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)" + org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 559c94a176..3e7e44418d 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index ec72809ed6..a3f1d2d57e 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 15a39e2868..fcd738d695 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,26 +28,26 @@ 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.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.http.server;version="[5.11.0,5.12.0)", - org.eclipse.jgit.http.server.glue;version="[5.11.0,5.12.0)", - org.eclipse.jgit.http.server.resolver;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit.http;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.http.apache;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.http.server;version="[5.11.1,5.12.0)", + org.eclipse.jgit.http.server.glue;version="[5.11.1,5.12.0)", + org.eclipse.jgit.http.server.resolver;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit.http;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 419009f9df..226fa3c336 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 c225e3710b..563a780ca6 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,16 +22,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.http.server;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.0,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.http.server;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", org.junit;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="5.11.0"; +Export-Package: org.eclipse.jgit.junit.http;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 0810f11061..5788778eaf 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index d9e7792a31..1b065230da 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 5e7c718eb3..fc6d388e84 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.6.0,2.7.0)", org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)", org.apache.sshd.sftp;version="[2.6.0,2.7.0)", org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)", - org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="5.11.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="5.11.1" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index e8dca2e93e..836e41935d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 67e37df465..4811ba73d3 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 6896e57994..b23b82f392 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.0,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="5.11.0", - org.eclipse.jgit.treewalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.time;version="[5.11.0,5.12.0)", +Import-Package: org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.merge;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="5.11.1", + org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.time;version="[5.11.1,5.12.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit;version="5.11.0"; +Export-Package: org.eclipse.jgit.junit;version="5.11.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -44,4 +44,4 @@ Export-Package: org.eclipse.jgit.junit;version="5.11.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="5.11.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="5.11.1";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 386e8de1b2..42e8610536 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 195b25800f..7815a5573b 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 581f00b4d4..75f5e4cfb4 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,24 +28,24 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit.http;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.server;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.test;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit.http;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.server;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.test;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 17e071ebfb..a4812b1329 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 75d7c5f67c..78f545b967 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="5.11.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="5.11.1"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="5.11.0"; + org.eclipse.jgit.lfs.server.fs;version="5.11.1"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="5.11.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.11.0"; + org.eclipse.jgit.lfs.server.internal;version="5.11.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="5.11.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.annotation;version="[3.1.0,4.0.0)", javax.servlet.http;version="[3.1.0,4.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.http.apache;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 4787386a66..b1d9aee6c8 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 2a2a843f9d..b726e6bdb5 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 e10178ab5f..72aa22bc81 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,24 +3,24 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.attributes;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", +Import-Package: org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="5.11.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="5.11.1";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 b2f849b21d..cbe507c645 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 8c4d0ae319..13f91fb82e 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="5.11.0", - org.eclipse.jgit.lfs.errors;version="5.11.0", - org.eclipse.jgit.lfs.internal;version="5.11.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.11.0" +Export-Package: org.eclipse.jgit.lfs;version="5.11.1", + org.eclipse.jgit.lfs.errors;version="5.11.1", + org.eclipse.jgit.lfs.internal;version="5.11.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="5.11.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson;version="[2.8.0,3.0.0)", com.google.gson.stream;version="[2.8.0,3.0.0)", - org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.attributes;version="[5.11.0,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.0,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.hooks;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.pack;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.0,5.12.0)" + org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)", + org.eclipse.jgit.diff;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.hooks;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 2f727363af..bd0b06a3a4 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index c5d4e1886f..1308ed8ccc 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 d78417409d..40598bbec8 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 29fdf52b30..414fc48081 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 4fd0c57748..ac452c26fc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-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 5b796af1ba..b4cbd8f627 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-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 f0cbf53f38..a245a4a797 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-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 0f308abbf7..fd0425da96 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-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 4a5c45a15c..a17381e99b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-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 54e2475806..f6b9c391ab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-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 28c714334c..90826b272d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 3db8f7fe72..45ef4aac37 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 2ae11ba5a5..539984e5f2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-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 2ba06adc06..508de9c325 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.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 5f334df384..9ed76bd42e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index b81cb39258..e5660982d6 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.0.202103091610-r + 5.11.1-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 99f02618e4..04f3d5966e 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.0,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="5.11.0", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.0,5.12.0)", - org.eclipse.jgit.pgm;version="[5.11.0,5.12.0)", - org.eclipse.jgit.pgm.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.pgm.opt;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.0,5.12.0)", +Import-Package: org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.diff;version="[5.11.1,5.12.0)", + org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="5.11.1", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.merge;version="[5.11.1,5.12.0)", + org.eclipse.jgit.pgm;version="[5.11.1,5.12.0)", + org.eclipse.jgit.pgm.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.pgm.opt;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index bd428b94a3..d5fc1d86ea 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 52991c4274..5acaed55de 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -14,46 +14,46 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)", org.eclipse.jetty.util;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.archive;version="[5.11.0,5.12.0)", - org.eclipse.jgit.awtui;version="[5.11.0,5.12.0)", - org.eclipse.jgit.blame;version="[5.11.0,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.0,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.0,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.gitrepo;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.io;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.server;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs.server.s3;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.notes;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revplot;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk.filter;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.pack;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.http.apache;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.sshd;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.archive;version="[5.11.1,5.12.0)", + org.eclipse.jgit.awtui;version="[5.11.1,5.12.0)", + org.eclipse.jgit.blame;version="[5.11.1,5.12.0)", + org.eclipse.jgit.diff;version="[5.11.1,5.12.0)", + org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.gitrepo;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.io;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.server;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs.server.s3;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.merge;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.notes;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk.filter;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.sshd;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.io;version="[5.11.1,5.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="5.11.0"; +Export-Package: org.eclipse.jgit.console;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="5.11.0"; + org.eclipse.jgit.pgm;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -65,14 +65,14 @@ Export-Package: org.eclipse.jgit.console;version="5.11.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="5.11.0"; + org.eclipse.jgit.pgm.debug;version="5.11.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="5.11.0"; + org.eclipse.jgit.pgm.internal;version="5.11.1"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="5.11.0"; + org.eclipse.jgit.pgm.opt;version="5.11.1"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index d4e766a06b..017810d4bc 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 60ba0397e9..3d6ad70257 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 7a5b4a80e2..30eb2bf8b6 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -19,15 +19,15 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)", org.apache.sshd.core;version="[2.6.0,2.7.0)", org.apache.sshd.server;version="[2.6.0,2.7.0)", org.apache.sshd.server.forward;version="[2.6.0,2.7.0)", - org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit.ssh;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.sshd;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit.ssh;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.sshd;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 5320e52a04..4080c11faa 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 81192d4c63..734343751d 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.11.0";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.11.1";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,9 +23,9 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.11.0";x-inte org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.auth;version="5.11.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="5.11.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="5.11.0"; + org.eclipse.jgit.internal.transport.sshd.auth;version="5.11.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="5.11.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, @@ -78,12 +78,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.6.0,2.7.0)", org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)", org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)", - org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.fnmatch;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.fnmatch;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 944a4ce03d..ee8d3864ac 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 13952daced..a8c98ee086 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index a570438eba..cef1558ba1 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,17 +3,17 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit.ssh;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit.ssh;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 5216d1c6d1..9d99b73053 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 1943c6752b..3bb7ffc488 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,24 +3,24 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.0,5.12.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.1,5.12.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.11.0";x-friends:="org.eclipse.egit.core", - org.eclipse.jgit.transport;version="5.11.0"; +Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.11.1";x-friends:="org.eclipse.egit.core", + org.eclipse.jgit.transport;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.internal.transport.ssh, org.eclipse.jgit.util, com.jcraft.jsch" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.0,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index d9f41a1a9d..82d9734f63 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index a3cc52f204..7afb0c2cbb 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 6552d1d0ae..ca82ab89fe 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -16,59 +16,59 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api;version="[5.11.0,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.archive;version="[5.11.0,5.12.0)", - org.eclipse.jgit.attributes;version="[5.11.0,5.12.0)", - org.eclipse.jgit.awtui;version="[5.11.0,5.12.0)", - org.eclipse.jgit.blame;version="[5.11.0,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.0,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.0,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.events;version="[5.11.0,5.12.0)", - org.eclipse.jgit.fnmatch;version="[5.11.0,5.12.0)", - org.eclipse.jgit.gitrepo;version="[5.11.0,5.12.0)", - org.eclipse.jgit.hooks;version="[5.11.0,5.12.0)", - org.eclipse.jgit.ignore;version="[5.11.0,5.12.0)", - org.eclipse.jgit.ignore.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.fsck;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.io;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.transport.http;version="[5.11.0,5.12.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.0,5.12.0)", - org.eclipse.jgit.junit.time;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lfs;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.logging;version="[5.11.0,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.notes;version="[5.11.0,5.12.0)", - org.eclipse.jgit.patch;version="[5.11.0,5.12.0)", - org.eclipse.jgit.pgm;version="[5.11.0,5.12.0)", - org.eclipse.jgit.pgm.internal;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revplot;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk.filter;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.0,5.12.0)", - org.eclipse.jgit.storage.pack;version="[5.11.0,5.12.0)", - org.eclipse.jgit.submodule;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util.sha1;version="[5.11.0,5.12.0)", + org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.archive;version="[5.11.1,5.12.0)", + org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)", + org.eclipse.jgit.awtui;version="[5.11.1,5.12.0)", + org.eclipse.jgit.blame;version="[5.11.1,5.12.0)", + org.eclipse.jgit.diff;version="[5.11.1,5.12.0)", + org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.events;version="[5.11.1,5.12.0)", + org.eclipse.jgit.fnmatch;version="[5.11.1,5.12.0)", + org.eclipse.jgit.gitrepo;version="[5.11.1,5.12.0)", + org.eclipse.jgit.hooks;version="[5.11.1,5.12.0)", + org.eclipse.jgit.ignore;version="[5.11.1,5.12.0)", + org.eclipse.jgit.ignore.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.fsck;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.io;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.transport.http;version="[5.11.1,5.12.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", + org.eclipse.jgit.junit.time;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.logging;version="[5.11.1,5.12.0)", + org.eclipse.jgit.merge;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.notes;version="[5.11.1,5.12.0)", + org.eclipse.jgit.patch;version="[5.11.1,5.12.0)", + org.eclipse.jgit.pgm;version="[5.11.1,5.12.0)", + org.eclipse.jgit.pgm.internal;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk.filter;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", + org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)", + org.eclipse.jgit.submodule;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util.sha1;version="[5.11.1,5.12.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d33f31b579..6ff1e21d3d 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-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 f51c3b950e..5f5cf27a75 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="5.11.0" -Import-Package: org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.0,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revplot;version="[5.11.0,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.0,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.0,5.12.0)", - org.eclipse.jgit.util;version="[5.11.0,5.12.0)" +Export-Package: org.eclipse.jgit.awtui;version="5.11.1" +Import-Package: org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", + org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)", + org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", + org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", + org.eclipse.jgit.util;version="[5.11.1,5.12.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 66f24d85fc..0cd6d11462 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 0439497f0b..913d1735d5 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 119d9edf6f..158e880e1a 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.11.0.202103091610-r +Bundle-Version: 5.11.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="5.11.0", - org.eclipse.jgit.api;version="5.11.0"; +Export-Package: org.eclipse.jgit.annotations;version="5.11.1", + org.eclipse.jgit.api;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="5.11.0"; + org.eclipse.jgit.api.errors;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="5.11.0"; + org.eclipse.jgit.attributes;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="5.11.0"; + org.eclipse.jgit.blame;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="5.11.0"; + org.eclipse.jgit.diff;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -42,44 +42,44 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="5.11.0"; + org.eclipse.jgit.dircache;version="5.11.1"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="5.11.0"; + org.eclipse.jgit.errors;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="5.11.0"; + org.eclipse.jgit.events;version="5.11.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="5.11.0", - org.eclipse.jgit.gitrepo;version="5.11.0"; + org.eclipse.jgit.fnmatch;version="5.11.1", + org.eclipse.jgit.gitrepo;version="5.11.1"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="5.11.0";x-internal:=true, - org.eclipse.jgit.hooks;version="5.11.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="5.11.0", - org.eclipse.jgit.ignore.internal;version="5.11.0"; + org.eclipse.jgit.gitrepo.internal;version="5.11.1";x-internal:=true, + org.eclipse.jgit.hooks;version="5.11.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="5.11.1", + org.eclipse.jgit.ignore.internal;version="5.11.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="5.11.0"; + org.eclipse.jgit.internal;version="5.11.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="5.11.0"; + org.eclipse.jgit.internal.fsck;version="5.11.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="5.11.0"; + org.eclipse.jgit.internal.revwalk;version="5.11.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="5.11.0"; + org.eclipse.jgit.internal.storage.dfs;version="5.11.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="5.11.0"; + org.eclipse.jgit.internal.storage.file;version="5.11.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -88,31 +88,31 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.0", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="5.11.0"; + org.eclipse.jgit.internal.storage.io;version="5.11.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="5.11.0"; + org.eclipse.jgit.internal.storage.pack;version="5.11.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="5.11.0"; + org.eclipse.jgit.internal.storage.reftable;version="5.11.1"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="5.11.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="5.11.0"; + org.eclipse.jgit.internal.submodule;version="5.11.1";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="5.11.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="5.11.0"; + org.eclipse.jgit.internal.transport.http;version="5.11.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="5.11.0"; + org.eclipse.jgit.internal.transport.parser;version="5.11.1"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="5.11.0"; + org.eclipse.jgit.internal.transport.ssh;version="5.11.1"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch", - org.eclipse.jgit.lib;version="5.11.0"; + org.eclipse.jgit.lib;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -126,10 +126,10 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="5.11.0"; + org.eclipse.jgit.lib.internal;version="5.11.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.logging;version="5.11.0", - org.eclipse.jgit.merge;version="5.11.0"; + org.eclipse.jgit.logging;version="5.11.1", + org.eclipse.jgit.merge;version="5.11.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -138,40 +138,40 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="5.11.0", - org.eclipse.jgit.notes;version="5.11.0"; + org.eclipse.jgit.nls;version="5.11.1", + org.eclipse.jgit.notes;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="5.11.0"; + org.eclipse.jgit.patch;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="5.11.0"; + org.eclipse.jgit.revplot;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="5.11.0"; + org.eclipse.jgit.revwalk;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="5.11.0"; + org.eclipse.jgit.revwalk.filter;version="5.11.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="5.11.0"; + org.eclipse.jgit.storage.file;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="5.11.0"; + org.eclipse.jgit.storage.pack;version="5.11.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="5.11.0"; + org.eclipse.jgit.submodule;version="5.11.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="5.11.0"; + org.eclipse.jgit.transport;version="5.11.1"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -184,21 +184,21 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="5.11.0"; + org.eclipse.jgit.transport.http;version="5.11.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="5.11.0"; + org.eclipse.jgit.transport.resolver;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="5.11.0"; + org.eclipse.jgit.treewalk;version="5.11.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="5.11.0"; + org.eclipse.jgit.treewalk.filter;version="5.11.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="5.11.0"; + org.eclipse.jgit.util;version="5.11.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -211,12 +211,12 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="5.11.0"; + org.eclipse.jgit.util.io;version="5.11.1"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="5.11.0", - org.eclipse.jgit.util.time;version="5.11.0" + org.eclipse.jgit.util.sha1;version="5.11.1", + org.eclipse.jgit.util.time;version="5.11.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 6ec391088c..21c59dee3d 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.0.202103091610-r -Eclipse-SourceBundle: org.eclipse.jgit;version="5.11.0.202103091610-r";roots="." +Bundle-Version: 5.11.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="5.11.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index c217b16c81..0c384923f5 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index f86d8583eb..5dfd2a7b4a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.11.0.202103091610-r + 5.11.1-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 232876421d067a1242e8afcaa33b9171342fee3e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 10 Mar 2021 16:06:00 +0100 Subject: Prepare 5.12.0-SNAPSHOT builds Change-Id: I736de7c3deb11da75777d459f47332df0b486443 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++---- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 14 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 40 ++++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 ++++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 28 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 46 ++++----- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 36 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 80 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++-- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 26 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 14 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 22 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 108 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 102 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 4 +- 88 files changed, 504 insertions(+), 504 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7bb56a0bd6..5fc0e9aa67 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.ant.tasks;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index cc46d760c7..f1e01e7b9c 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index fd05d2ca06..812634ee2f 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)" + org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)" Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="5.11.1", - org.eclipse.jgit.ant.tasks;version="5.11.1"; +Export-Package: org.eclipse.jgit.ant;version="5.12.0", + org.eclipse.jgit.ant.tasks;version="5.12.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 81c01f6123..ee4006afb8 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 9bc075c24b..f6a268a353 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 7d22393310..043241eb54 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="5.11.1"; +Export-Package: org.eclipse.jgit.archive;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="5.11.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="5.12.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 8897c1dcb6..e63330e281 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 1440f91661..2da96d49b2 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 49dae02fd1..6178745f9b 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index bc93418f96..6c42abf779 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 2b8b1a5632..0e584f81ce 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -12,9 +12,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.sha1;version="[5.11.1,5.12.0)", + org.eclipse.jgit.gpg.bc.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.sha1;version="[5.12.0,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 29fc22cb2b..f55b54a5e1 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index e77177ff79..11aa3fdf54 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.1,5.12.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.0,5.13.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.65.0,2.0.0)", @@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.65.0,2.0.0)", org.bouncycastle.util;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", org.bouncycastle.util.io;version="[1.65.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", + org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="5.11.1", - org.eclipse.jgit.gpg.bc.internal;version="5.11.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="5.11.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="5.12.0", + org.eclipse.jgit.gpg.bc.internal;version="5.12.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="5.12.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 662d8f0991..7851004bf4 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index feb17dd033..d5b7962579 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 07572c6d48..3f1068a2ba 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor @@ -25,11 +25,11 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="5.11.1"; + org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="5.12.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 806a9b6e09..b53fff29a6 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 09525a7a84..7d6cffe30d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 1efd612cf2..a4bbfd9994 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="5.11.1", - org.eclipse.jgit.http.server.glue;version="5.11.1"; +Export-Package: org.eclipse.jgit.http.server;version="5.12.0", + org.eclipse.jgit.http.server.glue;version="5.12.0"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="5.11.1"; + org.eclipse.jgit.http.server.resolver;version="5.12.0"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,14 +18,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)" + org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 3e7e44418d..5ef910dd6b 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index a3f1d2d57e..fb3890cb1f 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index fcd738d695..170595f08a 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,26 +28,26 @@ 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.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.http.server;version="[5.11.1,5.12.0)", - org.eclipse.jgit.http.server.glue;version="[5.11.1,5.12.0)", - org.eclipse.jgit.http.server.resolver;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit.http;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.http.server;version="[5.12.0,5.13.0)", + org.eclipse.jgit.http.server.glue;version="[5.12.0,5.13.0)", + org.eclipse.jgit.http.server.resolver;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit.http;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 226fa3c336..5e3f2d1f41 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 563a780ca6..a170764133 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,16 +22,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.http.server;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.http.server;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", org.junit;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="5.11.1"; +Export-Package: org.eclipse.jgit.junit.http;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 5788778eaf..55d08fb2cf 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 1b065230da..03b16921c9 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index fc6d388e84..b0d87bd89c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.6.0,2.7.0)", org.apache.sshd.server.subsystem;version="[2.6.0,2.7.0)", org.apache.sshd.sftp;version="[2.6.0,2.7.0)", org.apache.sshd.sftp.server;version="[2.6.0,2.7.0)", - org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="5.11.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="5.12.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 836e41935d..9dd564f0aa 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 4811ba73d3..b73fcf14af 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index b23b82f392..c9aa1ec3e2 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="5.11.1", - org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.time;version="[5.11.1,5.12.0)", +Import-Package: org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="5.12.0", + org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.time;version="[5.12.0,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit;version="5.11.1"; +Export-Package: org.eclipse.jgit.junit;version="5.12.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -44,4 +44,4 @@ Export-Package: org.eclipse.jgit.junit;version="5.11.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="5.11.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="5.12.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 42e8610536..8e44b877c1 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 7815a5573b..f1ad71a044 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 75f5e4cfb4..c0fd56e007 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,24 +28,24 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit.http;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.server;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.test;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit.http;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.server;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.test;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index a4812b1329..5d8352cb35 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 78f545b967..2bf113b775 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="5.11.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="5.12.0"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="5.11.1"; + org.eclipse.jgit.lfs.server.fs;version="5.12.0"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="5.11.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.11.1"; + org.eclipse.jgit.lfs.server.internal;version="5.12.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="5.12.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.annotation;version="[3.1.0,4.0.0)", javax.servlet.http;version="[3.1.0,4.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index b1d9aee6c8..38fc66c53c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index b726e6bdb5..cfb0f9fe49 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 72aa22bc81..3626a2f5b6 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,24 +3,24 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", +Import-Package: org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="5.11.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="5.12.0";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index cbe507c645..1e463b905d 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 13f91fb82e..73d3d3c90a 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="5.11.1", - org.eclipse.jgit.lfs.errors;version="5.11.1", - org.eclipse.jgit.lfs.internal;version="5.11.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.11.1" +Export-Package: org.eclipse.jgit.lfs;version="5.12.0", + org.eclipse.jgit.lfs.errors;version="5.12.0", + org.eclipse.jgit.lfs.internal;version="5.12.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="5.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson;version="[2.8.0,3.0.0)", com.google.gson.stream;version="[2.8.0,3.0.0)", - org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.1,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.hooks;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)" + org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.hooks;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index bd0b06a3a4..1540c2b54d 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 1308ed8ccc..1295bf8aa6 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 40598bbec8..e5ef30aa41 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 414fc48081..3fa237c316 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index ac452c26fc..bd4c49fb4f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index b4cbd8f627..5de91d50e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index a245a4a797..15ba0ff86b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index fd0425da96..2b1738d622 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index a17381e99b..0941cc69d0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index f6b9c391ab..c12f4d920b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 90826b272d..017d4f24c6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 45ef4aac37..2386f7b0c7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 539984e5f2..15cbc1594e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 508de9c325..0d297e3cde 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 9ed76bd42e..993f552384 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index e5660982d6..09ad1a43fd 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 04f3d5966e..9e18df9f00 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.1,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="5.11.1", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.1,5.12.0)", - org.eclipse.jgit.pgm;version="[5.11.1,5.12.0)", - org.eclipse.jgit.pgm.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.pgm.opt;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", +Import-Package: org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="5.12.0", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", + org.eclipse.jgit.pgm;version="[5.12.0,5.13.0)", + org.eclipse.jgit.pgm.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.pgm.opt;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index d5fc1d86ea..8398d6bfc0 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 5acaed55de..fe1b42bf8f 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -14,46 +14,46 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.servlet;version="[9.4.5,10.0.0)", org.eclipse.jetty.util;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.component;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.archive;version="[5.11.1,5.12.0)", - org.eclipse.jgit.awtui;version="[5.11.1,5.12.0)", - org.eclipse.jgit.blame;version="[5.11.1,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.1,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.gitrepo;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.io;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.server;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs.server.s3;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.notes;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk.filter;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.http.apache;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.sshd;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.archive;version="[5.12.0,5.13.0)", + org.eclipse.jgit.awtui;version="[5.12.0,5.13.0)", + org.eclipse.jgit.blame;version="[5.12.0,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.gitrepo;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.io;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.server;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs.server.s3;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.notes;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk.filter;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.http.apache;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.sshd;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="5.11.1"; +Export-Package: org.eclipse.jgit.console;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="5.11.1"; + org.eclipse.jgit.pgm;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -65,14 +65,14 @@ Export-Package: org.eclipse.jgit.console;version="5.11.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="5.11.1"; + org.eclipse.jgit.pgm.debug;version="5.12.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="5.11.1"; + org.eclipse.jgit.pgm.internal;version="5.12.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="5.11.1"; + org.eclipse.jgit.pgm.opt;version="5.12.0"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 017810d4bc..017861c8c6 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 3d6ad70257..4e1485885b 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 30eb2bf8b6..5030f2c172 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -19,15 +19,15 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.6.0,2.7.0)", org.apache.sshd.core;version="[2.6.0,2.7.0)", org.apache.sshd.server;version="[2.6.0,2.7.0)", org.apache.sshd.server.forward;version="[2.6.0,2.7.0)", - org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit.ssh;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.sshd;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit.ssh;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.sshd;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 4080c11faa..adc9bee780 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 734343751d..defa710a82 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.11.1";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.12.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,9 +23,9 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.11.1";x-inte org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.auth;version="5.11.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="5.11.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="5.11.1"; + org.eclipse.jgit.internal.transport.sshd.auth;version="5.12.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="5.12.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, @@ -78,12 +78,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.6.0,2.7.0)", org.apache.sshd.sftp.client;version="[2.6.0,2.7.0)", org.apache.sshd.sftp.common;version="[2.6.0,2.7.0)", - org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.fnmatch;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.fnmatch;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index ee8d3864ac..cd7f30c31a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index a8c98ee086..c53dcace2b 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index cef1558ba1..c2d3423cae 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,17 +3,17 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit.ssh;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit.ssh;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 9d99b73053..781d903156 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 3bb7ffc488..a23e3d801b 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,24 +3,24 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[5.11.1,5.12.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[5.12.0,5.13.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.11.1";x-friends:="org.eclipse.egit.core", - org.eclipse.jgit.transport;version="5.11.1"; +Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.12.0";x-friends:="org.eclipse.egit.core", + org.eclipse.jgit.transport;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.internal.transport.ssh, org.eclipse.jgit.util, com.jcraft.jsch" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 82d9734f63..37f209658b 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 7afb0c2cbb..ea34818f0d 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index ca82ab89fe..4800cfcf66 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -16,59 +16,59 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api;version="[5.11.1,5.12.0)", - org.eclipse.jgit.api.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.archive;version="[5.11.1,5.12.0)", - org.eclipse.jgit.attributes;version="[5.11.1,5.12.0)", - org.eclipse.jgit.awtui;version="[5.11.1,5.12.0)", - org.eclipse.jgit.blame;version="[5.11.1,5.12.0)", - org.eclipse.jgit.diff;version="[5.11.1,5.12.0)", - org.eclipse.jgit.dircache;version="[5.11.1,5.12.0)", - org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.events;version="[5.11.1,5.12.0)", - org.eclipse.jgit.fnmatch;version="[5.11.1,5.12.0)", - org.eclipse.jgit.gitrepo;version="[5.11.1,5.12.0)", - org.eclipse.jgit.hooks;version="[5.11.1,5.12.0)", - org.eclipse.jgit.ignore;version="[5.11.1,5.12.0)", - org.eclipse.jgit.ignore.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.fsck;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.io;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.transport.http;version="[5.11.1,5.12.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit;version="[5.11.1,5.12.0)", - org.eclipse.jgit.junit.time;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lfs;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.logging;version="[5.11.1,5.12.0)", - org.eclipse.jgit.merge;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.notes;version="[5.11.1,5.12.0)", - org.eclipse.jgit.patch;version="[5.11.1,5.12.0)", - org.eclipse.jgit.pgm;version="[5.11.1,5.12.0)", - org.eclipse.jgit.pgm.internal;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk.filter;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.file;version="[5.11.1,5.12.0)", - org.eclipse.jgit.storage.pack;version="[5.11.1,5.12.0)", - org.eclipse.jgit.submodule;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.http;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport.resolver;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.treewalk.filter;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.io;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util.sha1;version="[5.11.1,5.12.0)", + org.eclipse.jgit.annotations;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api;version="[5.12.0,5.13.0)", + org.eclipse.jgit.api.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.archive;version="[5.12.0,5.13.0)", + org.eclipse.jgit.attributes;version="[5.12.0,5.13.0)", + org.eclipse.jgit.awtui;version="[5.12.0,5.13.0)", + org.eclipse.jgit.blame;version="[5.12.0,5.13.0)", + org.eclipse.jgit.diff;version="[5.12.0,5.13.0)", + org.eclipse.jgit.dircache;version="[5.12.0,5.13.0)", + org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.events;version="[5.12.0,5.13.0)", + org.eclipse.jgit.fnmatch;version="[5.12.0,5.13.0)", + org.eclipse.jgit.gitrepo;version="[5.12.0,5.13.0)", + org.eclipse.jgit.hooks;version="[5.12.0,5.13.0)", + org.eclipse.jgit.ignore;version="[5.12.0,5.13.0)", + org.eclipse.jgit.ignore.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.fsck;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.io;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.transport.http;version="[5.12.0,5.13.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit;version="[5.12.0,5.13.0)", + org.eclipse.jgit.junit.time;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lfs;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.logging;version="[5.12.0,5.13.0)", + org.eclipse.jgit.merge;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.notes;version="[5.12.0,5.13.0)", + org.eclipse.jgit.patch;version="[5.12.0,5.13.0)", + org.eclipse.jgit.pgm;version="[5.12.0,5.13.0)", + org.eclipse.jgit.pgm.internal;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk.filter;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.file;version="[5.12.0,5.13.0)", + org.eclipse.jgit.storage.pack;version="[5.12.0,5.13.0)", + org.eclipse.jgit.submodule;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.http;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport.resolver;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.treewalk.filter;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.io;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util.sha1;version="[5.12.0,5.13.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 6ff1e21d3d..5339873146 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 5f5cf27a75..824a446ee7 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="5.11.1" -Import-Package: org.eclipse.jgit.errors;version="[5.11.1,5.12.0)", - org.eclipse.jgit.lib;version="[5.11.1,5.12.0)", - org.eclipse.jgit.nls;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revplot;version="[5.11.1,5.12.0)", - org.eclipse.jgit.revwalk;version="[5.11.1,5.12.0)", - org.eclipse.jgit.transport;version="[5.11.1,5.12.0)", - org.eclipse.jgit.util;version="[5.11.1,5.12.0)" +Export-Package: org.eclipse.jgit.awtui;version="5.12.0" +Import-Package: org.eclipse.jgit.errors;version="[5.12.0,5.13.0)", + org.eclipse.jgit.lib;version="[5.12.0,5.13.0)", + org.eclipse.jgit.nls;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revplot;version="[5.12.0,5.13.0)", + org.eclipse.jgit.revwalk;version="[5.12.0,5.13.0)", + org.eclipse.jgit.transport;version="[5.12.0,5.13.0)", + org.eclipse.jgit.util;version="[5.12.0,5.13.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 0cd6d11462..0a53526c47 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 913d1735d5..ca8a66372f 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 158e880e1a..7d076965e0 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.11.1.qualifier +Bundle-Version: 5.12.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="5.11.1", - org.eclipse.jgit.api;version="5.11.1"; +Export-Package: org.eclipse.jgit.annotations;version="5.12.0", + org.eclipse.jgit.api;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="5.11.1"; + org.eclipse.jgit.api.errors;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="5.11.1"; + org.eclipse.jgit.attributes;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="5.11.1"; + org.eclipse.jgit.blame;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="5.11.1"; + org.eclipse.jgit.diff;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -42,44 +42,44 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="5.11.1"; + org.eclipse.jgit.dircache;version="5.12.0"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="5.11.1"; + org.eclipse.jgit.errors;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="5.11.1"; + org.eclipse.jgit.events;version="5.12.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="5.11.1", - org.eclipse.jgit.gitrepo;version="5.11.1"; + org.eclipse.jgit.fnmatch;version="5.12.0", + org.eclipse.jgit.gitrepo;version="5.12.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="5.11.1";x-internal:=true, - org.eclipse.jgit.hooks;version="5.11.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="5.11.1", - org.eclipse.jgit.ignore.internal;version="5.11.1"; + org.eclipse.jgit.gitrepo.internal;version="5.12.0";x-internal:=true, + org.eclipse.jgit.hooks;version="5.12.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="5.12.0", + org.eclipse.jgit.ignore.internal;version="5.12.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="5.11.1"; + org.eclipse.jgit.internal;version="5.12.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="5.11.1"; + org.eclipse.jgit.internal.fsck;version="5.12.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="5.11.1"; + org.eclipse.jgit.internal.revwalk;version="5.12.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="5.11.1"; + org.eclipse.jgit.internal.storage.dfs;version="5.12.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="5.11.1"; + org.eclipse.jgit.internal.storage.file;version="5.12.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -88,31 +88,31 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="5.11.1"; + org.eclipse.jgit.internal.storage.io;version="5.12.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="5.11.1"; + org.eclipse.jgit.internal.storage.pack;version="5.12.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="5.11.1"; + org.eclipse.jgit.internal.storage.reftable;version="5.12.0"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="5.11.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="5.11.1"; + org.eclipse.jgit.internal.submodule;version="5.12.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="5.12.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="5.11.1"; + org.eclipse.jgit.internal.transport.http;version="5.12.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="5.11.1"; + org.eclipse.jgit.internal.transport.parser;version="5.12.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="5.11.1"; + org.eclipse.jgit.internal.transport.ssh;version="5.12.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch", - org.eclipse.jgit.lib;version="5.11.1"; + org.eclipse.jgit.lib;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -126,10 +126,10 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="5.11.1"; + org.eclipse.jgit.lib.internal;version="5.12.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.logging;version="5.11.1", - org.eclipse.jgit.merge;version="5.11.1"; + org.eclipse.jgit.logging;version="5.12.0", + org.eclipse.jgit.merge;version="5.12.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -138,40 +138,40 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="5.11.1", - org.eclipse.jgit.notes;version="5.11.1"; + org.eclipse.jgit.nls;version="5.12.0", + org.eclipse.jgit.notes;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="5.11.1"; + org.eclipse.jgit.patch;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="5.11.1"; + org.eclipse.jgit.revplot;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="5.11.1"; + org.eclipse.jgit.revwalk;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="5.11.1"; + org.eclipse.jgit.revwalk.filter;version="5.12.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="5.11.1"; + org.eclipse.jgit.storage.file;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="5.11.1"; + org.eclipse.jgit.storage.pack;version="5.12.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="5.11.1"; + org.eclipse.jgit.submodule;version="5.12.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="5.11.1"; + org.eclipse.jgit.transport;version="5.12.0"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -184,21 +184,21 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="5.11.1"; + org.eclipse.jgit.transport.http;version="5.12.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="5.11.1"; + org.eclipse.jgit.transport.resolver;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="5.11.1"; + org.eclipse.jgit.treewalk;version="5.12.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="5.11.1"; + org.eclipse.jgit.treewalk.filter;version="5.12.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="5.11.1"; + org.eclipse.jgit.util;version="5.12.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -211,12 +211,12 @@ Export-Package: org.eclipse.jgit.annotations;version="5.11.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="5.11.1"; + org.eclipse.jgit.util.io;version="5.12.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="5.11.1", - org.eclipse.jgit.util.time;version="5.11.1" + org.eclipse.jgit.util.sha1;version="5.12.0", + org.eclipse.jgit.util.time;version="5.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 21c59dee3d..0591651945 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.11.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.11.1.qualifier";roots="." +Bundle-Version: 5.12.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="5.12.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 0c384923f5..f947327775 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 5dfd2a7b4a..e4454ab8a2 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.11.1-SNAPSHOT + 5.12.0-SNAPSHOT JGit - Parent ${jgit-url} @@ -151,7 +151,7 @@ 1.8 ${project.build.directory}/META-INF/MANIFEST.MF - 5.10.0.202012080955-r + 5.11.0.202103091610-r 2.6.0 0.1.55 1.1.1 -- cgit v1.2.3 From 808c4495ca941038c087cf6e348b22641db92a5f Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Tue, 9 Mar 2021 22:23:14 +0100 Subject: HTTP cookies: do tilde expansion on http.cookieFile Git config http.cookieFile must have ~ expansion, compare [1]. It also should be an absolute path. While a relative path is allowed, C git just passes the value on to libcurl, so it'll be relative to the current working directory and thus not work in all directories. Log a warning if the path is relative. (Alternatives would be to throw an exception, or to resolve the path relative to the .git directory, or relative to the working tree root, or relative to the config file it occurs in. But C git does not seem to do either.) [1] https://github.com/git/git/commit/e5a39ad8e Bug: 571798 Change-Id: I5cdab6061d0613ac7d8cb7977e5b97f5b88f562d Signed-off-by: Thomas Wolf --- .../org/eclipse/jgit/internal/JGitText.properties | 1 + .../src/org/eclipse/jgit/internal/JGitText.java | 1 + .../org/eclipse/jgit/transport/TransportHttp.java | 27 +++++++++++++++------- 3 files changed, 21 insertions(+), 8 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 9695e5742b..33087d7622 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -139,6 +139,7 @@ configHandleMayBeLocked=config file handle may be locked by other process, {0}. connectionFailed=connection failed connectionTimeOut=Connection time out: {0} contextMustBeNonNegative=context must be >= 0 +cookieFilePathRelative=git config http.cookieFile contains a relative path, should be absolute: {0} corruptionDetectedReReadingAt=Corruption detected re-reading at {0} corruptObjectBadDate=bad date corruptObjectBadEmail=bad email diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 95265feb4e..3eef49b1ca 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -167,6 +167,7 @@ public class JGitText extends TranslationBundle { /***/ public String connectionFailed; /***/ public String connectionTimeOut; /***/ public String contextMustBeNonNegative; + /***/ public String cookieFilePathRelative; /***/ public String corruptionDetectedReReadingAt; /***/ public String corruptObjectBadDate; /***/ public String corruptObjectBadEmail; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java index 2e5d18dc15..0710d3fdfb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java @@ -35,6 +35,7 @@ import static org.eclipse.jgit.util.HttpSupport.METHOD_POST; import java.io.BufferedInputStream; import java.io.BufferedReader; +import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -53,8 +54,6 @@ import java.net.URL; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.nio.file.InvalidPathException; -import java.nio.file.Path; -import java.nio.file.Paths; import java.security.GeneralSecurityException; import java.security.cert.CertPathBuilderException; import java.security.cert.CertPathValidatorException; @@ -101,6 +100,7 @@ import org.eclipse.jgit.transport.HttpConfig.HttpRedirectMode; import org.eclipse.jgit.transport.http.HttpConnection; import org.eclipse.jgit.transport.http.HttpConnectionFactory; import org.eclipse.jgit.transport.http.HttpConnectionFactory2; +import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.HttpSupport; import org.eclipse.jgit.util.IO; import org.eclipse.jgit.util.RawParseUtils; @@ -1157,17 +1157,28 @@ public class TransportHttp extends HttpTransport implements WalkTransport, return new TransportException(uri, why); } - private static NetscapeCookieFile getCookieFileFromConfig( + private NetscapeCookieFile getCookieFileFromConfig( HttpConfig config) { - if (!StringUtils.isEmptyOrNull(config.getCookieFile())) { + String path = config.getCookieFile(); + if (!StringUtils.isEmptyOrNull(path)) { try { - Path cookieFilePath = Paths.get(config.getCookieFile()); + FS fs = local != null ? local.getFS() : FS.DETECTED; + File f; + if (path.startsWith("~/")) { //$NON-NLS-1$ + f = fs.resolve(fs.userHome(), path.substring(2)); + } else { + f = new File(path); + if (!f.isAbsolute()) { + f = fs.resolve(null, path); + LOG.warn(MessageFormat.format( + JGitText.get().cookieFilePathRelative, f)); + } + } return NetscapeCookieFileCache.getInstance(config) - .getEntry(cookieFilePath); + .getEntry(f.toPath()); } catch (InvalidPathException e) { LOG.warn(MessageFormat.format( - JGitText.get().couldNotReadCookieFile, - config.getCookieFile()), e); + JGitText.get().couldNotReadCookieFile, path), e); } } return null; -- cgit v1.2.3 From 84ed57d2f63307437492f3a2c9b60ce7737b96e6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 12 Mar 2021 00:30:14 +0100 Subject: Remove unused API problem filters Change-Id: I34be8afa42971b94d86312ff8b672b133cd23d45 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.archive/.settings/.api_filters | 11 ----- org.eclipse.jgit/.settings/.api_filters | 57 ------------------------- 2 files changed, 68 deletions(-) delete mode 100644 org.eclipse.jgit.archive/.settings/.api_filters delete mode 100644 org.eclipse.jgit/.settings/.api_filters (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.archive/.settings/.api_filters b/org.eclipse.jgit.archive/.settings/.api_filters deleted file mode 100644 index f4a934aeb9..0000000000 --- a/org.eclipse.jgit.archive/.settings/.api_filters +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters deleted file mode 100644 index d389ac5888..0000000000 --- a/org.eclipse.jgit/.settings/.api_filters +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 4a78d911c578a6f9028d6e74b5668dfc384ef80f Mon Sep 17 00:00:00 2001 From: Youssef Elghareeb Date: Thu, 11 Mar 2021 13:01:14 +0100 Subject: Skip detecting content renames for large files There are two code paths for detecting renames: one on tree diffs (using DiffFormatter#scan) and the other on single file diffs (using DiffFormatter#format). The latter skips binary and large files for rename detection - check [1], but the former doesn't. This change skips content rename detection for the tree diffs case for large files. This is essential to avoid expensive computations while reading the file, especially for callers who don't want to pay that cost. Content renames are those which involve files with slightly modified content. Exact renames will still be identified. The default threshold for file sizes is reused from PackConfig.DEFAULT_BIG_FILE_THRESHOLD: 50 MB. [1] https://git.eclipse.org/r/plugins/gitiles/jgit/jgit/+/232876421d067a1242e8afcaa33b9171342fee3e/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java#386 Change-Id: Idbc2c29bd381c6e387185204638f76fda47df41e Signed-off-by: Youssef Elghareeb --- .../org/eclipse/jgit/diff/RenameDetectorTest.java | 48 ++++++++++++++++++++++ .../src/org/eclipse/jgit/diff/RenameDetector.java | 28 +++++++++++++ .../jgit/diff/SimilarityRenameDetector.java | 16 ++++++++ 3 files changed, 92 insertions(+) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java index 6203feda48..2ea3cd7ebe 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java @@ -542,6 +542,43 @@ public class RenameDetectorTest extends RepositoryTestCase { assertEquals(0, modify.score); } + @Test + public void testExactRename_LargeFile() throws Exception { + ObjectId aId = blob("blah\nblah\nfoo"); // size = 14 + + DiffEntry a = DiffEntry.add(PATH_A, aId); + DiffEntry b = DiffEntry.delete(PATH_Q, aId); + + rd.add(a); + rd.add(b); + + // Exact renames are identified for large files + rd.setBigFileThreshold(10); + List entries = rd.compute(); + assertEquals(1, entries.size()); + assertRename(b, a, 100, entries.get(0)); + } + + @Test + public void testInexactRename_LargeFile() throws Exception { + ObjectId aId = blob("blah\nblah\nfoo"); // size = 14 + ObjectId bId = blob("bla\nblah\nfoo"); // size = 13 + + DiffEntry a = DiffEntry.add(PATH_A, aId); + DiffEntry b = DiffEntry.delete(PATH_Q, bId); + + rd.add(a); + rd.add(b); + + rd.setBigFileThreshold(10); + + // Inexact renames are not detected for large files + List entries = rd.compute(); + assertEquals(2, entries.size()); + assertAdd(PATH_A, aId, FileMode.REGULAR_FILE, entries.get(0)); + assertDelete(PATH_Q, bId, FileMode.REGULAR_FILE, entries.get(1)); + } + @Test public void testSetRenameScore_IllegalArgs() throws Exception { try { @@ -634,4 +671,15 @@ public class RenameDetectorTest extends RepositoryTestCase { assertEquals(AbbreviatedObjectId.fromObjectId(newId), add.newId); assertEquals(newMode, add.newMode); } + + private static void assertDelete(String oldName, ObjectId oldId, + FileMode oldMode, DiffEntry delete) { + assertEquals(DiffEntry.DEV_NULL, delete.newPath); + assertEquals(DiffEntry.A_ZERO, delete.newId); + assertEquals(FileMode.MISSING, delete.newMode); + assertEquals(ChangeType.DELETE, delete.changeType); + assertEquals(oldName, delete.oldPath); + assertEquals(AbbreviatedObjectId.fromObjectId(oldId), delete.oldId); + assertEquals(oldMode, delete.oldMode); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java index 80e1b18291..75784c2556 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.diff; import static org.eclipse.jgit.diff.DiffEntry.Side.NEW; import static org.eclipse.jgit.diff.DiffEntry.Side.OLD; +import static org.eclipse.jgit.storage.pack.PackConfig.DEFAULT_BIG_FILE_THRESHOLD; import java.io.IOException; import java.util.ArrayList; @@ -97,6 +98,12 @@ public class RenameDetector { /** Limit in the number of files to consider for renames. */ private int renameLimit; + /** + * File size threshold (in bytes) for detecting renames. Files larger + * than this size will not be processed for renames. + */ + private int bigFileThreshold = DEFAULT_BIG_FILE_THRESHOLD; + /** Set if the number of adds or deletes was over the limit. */ private boolean overRenameLimit; @@ -208,6 +215,26 @@ public class RenameDetector { renameLimit = limit; } + /** + * Get file size threshold for detecting renames. Files larger + * than this size will not be processed for rename detection. + * + * @return threshold in bytes of the file size. + * @since 5.12 + */ + public int getBigFileThreshold() { return bigFileThreshold; } + + /** + * Set the file size threshold for detecting renames. Files larger than this + * threshold will be skipped during rename detection computation. + * + * @param threshold file size threshold in bytes. + * @since 5.12 + */ + public void setBigFileThreshold(int threshold) { + this.bigFileThreshold = threshold; + } + /** * Check if the detector is over the rename limit. *

@@ -493,6 +520,7 @@ public class RenameDetector { d = new SimilarityRenameDetector(reader, deleted, added); d.setRenameScore(getRenameScore()); + d.setBigFileThreshold(getBigFileThreshold()); d.compute(pm); overRenameLimit |= d.isTableOverflow(); deleted = d.getLeftOverSources(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java index 74a11a024a..082f31d178 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.diff; import static org.eclipse.jgit.diff.DiffEntry.Side.NEW; import static org.eclipse.jgit.diff.DiffEntry.Side.OLD; +import static org.eclipse.jgit.storage.pack.PackConfig.DEFAULT_BIG_FILE_THRESHOLD; import java.io.IOException; import java.util.ArrayList; @@ -80,6 +81,12 @@ class SimilarityRenameDetector { /** Score a pair must exceed to be considered a rename. */ private int renameScore = 60; + /** + * File size threshold (in bytes) for detecting renames. Files larger + * than this size will not be processed for renames. + */ + private int bigFileThreshold = DEFAULT_BIG_FILE_THRESHOLD; + /** Set if any {@link SimilarityIndex.TableFullException} occurs. */ private boolean tableOverflow; @@ -96,6 +103,10 @@ class SimilarityRenameDetector { renameScore = score; } + void setBigFileThreshold(int threshold) { + bigFileThreshold = threshold; + } + void compute(ProgressMonitor pm) throws IOException, CancelledException { if (pm == null) pm = NullProgressMonitor.INSTANCE; @@ -253,6 +264,11 @@ class SimilarityRenameDetector { continue; } + if (max > bigFileThreshold) { + pm.update(1); + continue; + } + if (s == null) { try { s = hash(OLD, srcEnt); -- cgit v1.2.3 From 0bd2f4bf77c856213e09d656a948e71f71cfd038 Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Thu, 18 Feb 2021 13:41:19 -0600 Subject: Introduce getMergedInto(RevCommit commit, Collection refs) In cases where we need to determine if a given commit is merged into many refs, using isMergedInto(base, tip) for each ref would cause multiple unwanted walks. getMergedInto() marks the unreachable commits as uninteresting which would then avoid walking that same path again. Using the same api, also introduce isMergedIntoAny() and isMergedIntoAll() Change-Id: I65de9873dce67af9c415d1d236bf52d31b67e8fe Signed-off-by: Adithya Chakilam Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/junit/RepositoryTestCase.java | 12 +++ .../jgit/revwalk/RevWalkMergedIntoTest.java | 81 +++++++++++++++ .../src/org/eclipse/jgit/revwalk/RevWalk.java | 114 +++++++++++++++++++++ 3 files changed, 207 insertions(+) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java index 64556acc1c..5622108dcd 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java @@ -25,6 +25,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.nio.file.Path; import java.time.Instant; +import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -39,6 +40,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; +import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; @@ -385,6 +387,16 @@ public abstract class RepositoryTestCase extends LocalDiskRepositoryTestCase { updateRef.update(); } + /** + * Get all Refs + * + * @return list of refs + * @throws IOException + */ + public List getRefs() throws IOException { + return db.getRefDatabase().getRefs(); + } + /** * Checkout a branch * diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java index 2c21eb60d3..2f16aa49e8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkMergedIntoTest.java @@ -11,6 +11,9 @@ package org.eclipse.jgit.revwalk; import static org.junit.Assert.assertTrue; +import java.util.List; +import java.util.stream.Collectors; +import org.eclipse.jgit.lib.Ref; import org.junit.Test; public class RevWalkMergedIntoTest extends RevWalkTestCase { @@ -44,4 +47,82 @@ public class RevWalkMergedIntoTest extends RevWalkTestCase { final RevCommit t = commit(n, o); assertTrue(rw.isMergedInto(b, t)); } + + @Test + public void testGetMergedInto() throws Exception { + /* + * i + * / \ + * A o + * / \ \ + * o1 o2 E + * / \ / \ + * B C D + */ + String b = "refs/heads/b"; + String c = "refs/heads/c"; + String d = "refs/heads/d"; + String e = "refs/heads/e"; + final RevCommit i = commit(); + final RevCommit a = commit(i); + final RevCommit o1 = commit(a); + final RevCommit o2 = commit(a); + createBranch(commit(o1), b); + createBranch(commit(o1, o2), c); + createBranch(commit(o2), d); + createBranch(commit(commit(i)), e); + + List modifiedResult = rw.getMergedInto(a, getRefs()) + .stream().map(Ref::getName).collect(Collectors.toList()); + + assertTrue(modifiedResult.size() == 3); + assertTrue(modifiedResult.contains(b)); + assertTrue(modifiedResult.contains(c)); + assertTrue(modifiedResult.contains(d)); + } + + @Test + public void testIsMergedIntoAny() throws Exception { + /* + * i + * / \ + * A o + * / \ + * o C + * / + * B + */ + String b = "refs/heads/b"; + String c = "refs/heads/c"; + final RevCommit i = commit(); + final RevCommit a = commit(i); + createBranch(commit(commit(a)), b); + createBranch(commit(commit(i)), c); + + assertTrue( rw.isMergedIntoAny(a, getRefs())); + } + + @Test + public void testIsMergedIntoAll() throws Exception { + /* + * + * A + * / \ + * o1 o2 + * / \ / \ + * B C D + */ + + String b = "refs/heads/b"; + String c = "refs/heads/c"; + String d = "refs/heads/c"; + final RevCommit a = commit(); + final RevCommit o1 = commit(a); + final RevCommit o2 = commit(a); + createBranch(commit(o1), b); + createBranch(commit(o1, o2), c); + createBranch(commit(o2), d); + + assertTrue(rw.isMergedIntoAll(a, getRefs())); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index 631d861c0d..3ca2ff6033 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -36,6 +36,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdOwnerMap; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.ObjectReader; +import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.filter.RevFilter; import org.eclipse.jgit.treewalk.filter.TreeFilter; @@ -181,6 +182,12 @@ public class RevWalk implements Iterable, AutoCloseable { boolean shallowCommitsInitialized; + private enum GetMergedIntoStrategy { + RETURN_ON_FIRST_FOUND, + RETURN_ON_FIRST_NOT_FOUND, + EVALUATE_ALL + } + /** * Create a new revision walker for a given repository. * @@ -424,6 +431,113 @@ public class RevWalk implements Iterable, AutoCloseable { } } + /** + * Determine the Refs into which a commit is merged. + *

+ * A commit is merged into a ref if we can find a path of commits that leads + * from that specific ref and ends at commit. + *

+ * + * @param commit + * commit the caller thinks is reachable from refs. + * @param refs + * refs to start iteration from, and which is most likely a + * descendant (child) of commit. + * @return list of refs that are reachable from commit. + * @throws java.io.IOException + * a pack file or loose object could not be read. + * @since 5.12 + */ + public List getMergedInto(RevCommit commit, Collection refs) + throws IOException{ + return getMergedInto(commit, refs, GetMergedIntoStrategy.EVALUATE_ALL); + } + + /** + * Determine if a commit is merged into any of the given + * refs. + * + * @param commit + * commit the caller thinks is reachable from refs. + * @param refs + * refs to start iteration from, and which is most likely a + * descendant (child) of commit. + * @return true if commit is merged into any of the refs; false otherwise. + * @throws java.io.IOException + * a pack file or loose object could not be read. + * @since 5.12 + */ + public boolean isMergedIntoAny(RevCommit commit, Collection refs) + throws IOException { + return getMergedInto(commit, refs, + GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND).size() > 0; + } + + /** + * Determine if a commit is merged into all of the given + * refs. + * + * @param commit + * commit the caller thinks is reachable from refs. + * @param refs + * refs to start iteration from, and which is most likely a + * descendant (child) of commit. + * @return true if commit is merged into all of the refs; false otherwise. + * @throws java.io.IOException + * a pack file or loose object could not be read. + * @since 5.12 + */ + public boolean isMergedIntoAll(RevCommit commit, Collection refs) + throws IOException { + return getMergedInto(commit, refs, + GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND).size() + == refs.size(); + } + + private List getMergedInto(RevCommit needle, Collection haystacks, + Enum returnStrategy) throws IOException { + List result = new ArrayList<>(); + RevFilter oldRF = filter; + TreeFilter oldTF = treeFilter; + try { + finishDelayedFreeFlags(); + filter = RevFilter.ALL; + treeFilter = TreeFilter.ALL; + for (Ref r: haystacks) { + RevObject o = parseAny(r.getObjectId()); + if (!(o instanceof RevCommit)) { + continue; + } + RevCommit c = (RevCommit) o; + resetRetain(RevFlag.UNINTERESTING); + markStart(c); + boolean commitFound = false; + RevCommit next; + while ((next = next()) != null) { + if (References.isSameObject(next, needle)) { + result.add(r); + if (returnStrategy == GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND) { + return result; + } + commitFound = true; + break; + } + } + if(!commitFound){ + markUninteresting(c); + if (returnStrategy == GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND) { + return result; + } + } + } + } finally { + reset(~freeFlags & APP_FLAGS); + filter = oldRF; + treeFilter = oldTF; + } + return result; + } + /** * Pop the next most recent commit. * -- cgit v1.2.3 From 41643dcb79a52e9fac03b77d40d6b33df13f034b Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Tue, 23 Feb 2021 13:58:03 -0600 Subject: Optimize RevWalkUtils.findBranchesReachableFrom() In [1], improved RevWalk.getMergedInto() is introduced to avoid repeated work while performing RevWalk.isMergedInto() on many refs. Modify findBranchesReachableFrom() to use it. [1] I65de9873dce67af9c415d1d236bf52d31b67e8fe Change-Id: I81d615241638d4093df64b449637af601843a5ed Signed-off-by: Adithya Chakilam --- .../src/org/eclipse/jgit/revwalk/RevWalk.java | 42 +++++++++++++++++++--- .../src/org/eclipse/jgit/revwalk/RevWalkUtils.java | 9 ++--- 2 files changed, 41 insertions(+), 10 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index 3ca2ff6033..5d5ba12baa 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -32,10 +32,12 @@ import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.AsyncObjectLoaderQueue; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.MutableObjectId; +import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdOwnerMap; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.ObjectReader; +import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.filter.RevFilter; @@ -450,7 +452,33 @@ public class RevWalk implements Iterable, AutoCloseable { */ public List getMergedInto(RevCommit commit, Collection refs) throws IOException{ - return getMergedInto(commit, refs, GetMergedIntoStrategy.EVALUATE_ALL); + return getMergedInto(commit, refs, NullProgressMonitor.INSTANCE); + } + + /** + * Determine the Refs into which a commit is merged. + *

+ * A commit is merged into a ref if we can find a path of commits that leads + * from that specific ref and ends at commit. + *

+ * + * @param commit + * commit the caller thinks is reachable from refs. + * @param refs + * refs to start iteration from, and which is most likely a + * descendant (child) of commit. + * @param monitor + * the callback for progress and cancellation + * @return list of refs that are reachable from commit. + * @throws java.io.IOException + * a pack file or loose object could not be read. + * @since 5.12 + */ + public List getMergedInto(RevCommit commit, Collection refs, + ProgressMonitor monitor) throws IOException{ + return getMergedInto(commit, refs, + GetMergedIntoStrategy.EVALUATE_ALL, + monitor); } /** @@ -470,7 +498,8 @@ public class RevWalk implements Iterable, AutoCloseable { public boolean isMergedIntoAny(RevCommit commit, Collection refs) throws IOException { return getMergedInto(commit, refs, - GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND).size() > 0; + GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND, + NullProgressMonitor.INSTANCE).size() > 0; } /** @@ -490,12 +519,13 @@ public class RevWalk implements Iterable, AutoCloseable { public boolean isMergedIntoAll(RevCommit commit, Collection refs) throws IOException { return getMergedInto(commit, refs, - GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND).size() + GetMergedIntoStrategy.RETURN_ON_FIRST_NOT_FOUND, + NullProgressMonitor.INSTANCE).size() == refs.size(); } private List getMergedInto(RevCommit needle, Collection haystacks, - Enum returnStrategy) throws IOException { + Enum returnStrategy, ProgressMonitor monitor) throws IOException { List result = new ArrayList<>(); RevFilter oldRF = filter; TreeFilter oldTF = treeFilter; @@ -504,6 +534,10 @@ public class RevWalk implements Iterable, AutoCloseable { filter = RevFilter.ALL; treeFilter = TreeFilter.ALL; for (Ref r: haystacks) { + if (monitor.isCancelled()) { + return result; + } + monitor.update(1); RevObject o = parseAny(r.getObjectId()); if (!(o instanceof RevCommit)) { continue; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java index 3feb9c5a45..e52e916318 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java @@ -159,15 +159,12 @@ public final class RevWalkUtils { // Make sure commit is from the same RevWalk commit = revWalk.parseCommit(commit.getId()); revWalk.reset(); - List result = new ArrayList<>(); + List filteredRefs = new ArrayList<>(); monitor.beginTask(JGitText.get().searchForReachableBranches, refs.size()); final int SKEW = 24*3600; // one day clock skew for (Ref ref : refs) { - if (monitor.isCancelled()) - return result; - monitor.update(1); RevObject maybehead = revWalk.parseAny(ref.getObjectId()); if (!(maybehead instanceof RevCommit)) continue; @@ -179,9 +176,9 @@ public final class RevWalkUtils { if (headCommit.getCommitTime() + SKEW < commit.getCommitTime()) continue; - if (revWalk.isMergedInto(commit, headCommit)) - result.add(ref); + filteredRefs.add(ref); } + List result = revWalk.getMergedInto(commit, filteredRefs, monitor); monitor.endTask(); return result; } -- cgit v1.2.3