From b994eb49a9703c74d869b9fdbde690f8f0988964 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Thu, 5 Feb 2026 20:28:27 +0000 Subject: [PATCH 001/200] Do not log packfiles moved away or pruned When a packfile is pruned or moved to the /preserved directory, it may cause existing threads to raise a FileNotFoundException, which is then propagated as a cause of another outer exception. The disappearance of a packfile was logged as a warning, and dumping the log with large amount of lines, which were unnecessary, expensive to compute and overloading the local disk. Look for the root cause of the exception and do not log anymore the condition as a warning, but only at debug level. Also, the debug level formats the output message only if debug is enabled, saving further precious system load. Change-Id: I8400c1d625592c61d9f105973a33f015d796ab66 --- .../internal/storage/file/PackDirectory.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 544961b9368..5a36a13d54b 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 @@ -317,14 +317,9 @@ private void handlePackError(IOException e, Pack p) { String debugTemplate = null; int transientErrorCount = 0; String errorTemplate = JGitText.get().exceptionWhileReadingPack; - if ((e instanceof CorruptObjectException) - || (e instanceof PackInvalidException)) { - warnTemplate = JGitText.get().corruptPack; - LOG.warn(MessageFormat.format(warnTemplate, - p.getPackFile().getAbsolutePath()), e); - // Assume the pack is corrupted, and remove it from the list. - remove(p); - } else if (e instanceof FileNotFoundException) { + Throwable executionCause = e.getCause(); + if (e instanceof FileNotFoundException + || executionCause instanceof FileNotFoundException) { if (p.getPackFile().exists()) { errorTemplate = JGitText.get().packInaccessible; transientErrorCount = p.incrementTransientErrorCount(); @@ -332,6 +327,13 @@ private void handlePackError(IOException e, Pack p) { debugTemplate = JGitText.get().packWasDeleted; remove(p); } + } else if ((e instanceof CorruptObjectException) + || (e instanceof PackInvalidException)) { + warnTemplate = JGitText.get().corruptPack; + LOG.warn(MessageFormat.format(warnTemplate, + p.getPackFile().getAbsolutePath()), e); + // Assume the pack is corrupted, and remove it from the list. + remove(p); } else if (FileUtils.isStaleFileHandleInCausalChain(e)) { warnTemplate = JGitText.get().packHandleIsStale; remove(p); @@ -341,9 +343,9 @@ private void handlePackError(IOException e, Pack p) { if (warnTemplate != null) { LOG.warn(MessageFormat.format(warnTemplate, p.getPackFile().getAbsolutePath()), e); - } else if (debugTemplate != null) { + } else if (debugTemplate != null && LOG.isDebugEnabled()) { LOG.debug(MessageFormat.format(debugTemplate, - p.getPackFile().getAbsolutePath()), e); + p.getPackFile().getAbsolutePath()), e); } else { if (doLogExponentialBackoff(transientErrorCount)) { // Don't remove the pack from the list, as the error may be From b104d8c2894cc46c080395414f7ebb08c5c48fc7 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 5 Feb 2026 14:08:35 -0800 Subject: [PATCH 002/200] PackIndexMerger: use MidxIterators instead of its own PackIndexMerge has its own iterators to merge/dedup entries in the PackIndex. Now we have a better set of iterators in MidxIterators that do the same AND can also include midx in the operations. Use the new iterators in the merger. Change-Id: I35d59602eb8f4920f193a79bef4f1f4d6a6a6964 --- .../storage/midx/PackIndexMergerTest.java | 18 +- .../midx/PackIndexPeekIteratorTest.java | 71 ------ .../storage/midx/MultiPackIndexWriter.java | 18 +- .../storage/midx/PackIndexMerger.java | 218 ++---------------- 4 files changed, 38 insertions(+), 287 deletions(-) delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexPeekIteratorTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java index a43992d70e0..8d031eb57ed 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java @@ -19,6 +19,7 @@ import java.util.LinkedHashMap; import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MutableEntry; import org.eclipse.jgit.junit.FakeIndexFactory; import org.eclipse.jgit.junit.FakeIndexFactory.IndexObject; import org.junit.Test; @@ -44,7 +45,7 @@ public void rawIterator_noDuplicates() { assertEquals(9, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.rawIterator(); + Iterator it = merger.rawIterator(); assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501); assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13); @@ -79,7 +80,7 @@ public void rawIterator_noDuplicates_honorPackOrder() { assertEquals(9, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.rawIterator(); + Iterator it = merger.rawIterator(); assertNextEntry(it, "0000000000000000000000000000000000000001", 2, 500); assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501); assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13); @@ -106,7 +107,7 @@ public void rawIterator_allDuplicates() { assertEquals(3, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.rawIterator(); + Iterator it = merger.rawIterator(); assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); assertNextEntry(it, "0000000000000000000000000000000000000001", 1, 500); assertNextEntry(it, "0000000000000000000000000000000000000001", 2, 500); @@ -141,7 +142,7 @@ public void bySha1Iterator_noDuplicates() { assertEquals(9, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.bySha1Iterator(); + Iterator it = merger.bySha1Iterator(); assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501); assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13); @@ -168,7 +169,7 @@ public void bySha1Iterator_allDuplicates() { assertEquals(3, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.bySha1Iterator(); + Iterator it = merger.bySha1Iterator(); assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12); assertNextEntry(it, "0000000000000000000000000000000000000010", 0, @@ -192,7 +193,7 @@ public void bySha1Iterator_differentIndexSizes() { assertEquals(6, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.bySha1Iterator(); + Iterator it = merger.rawIterator(); assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 500); assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 12); assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 500); @@ -315,10 +316,9 @@ public void getObjectsPerPack_emptyIndexes() { } private static void assertNextEntry( - Iterator it, String oid, - int packId, long offset) { + Iterator it, String oid, int packId, long offset) { assertTrue(it.hasNext()); - PackIndexMerger.MidxMutableEntry e = it.next(); + MutableEntry e = it.next(); assertEquals(oid, e.getObjectId().name()); assertEquals(packId, e.getPackId()); assertEquals(offset, e.getOffset()); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexPeekIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexPeekIteratorTest.java deleted file mode 100644 index 0b3ccacfc11..00000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexPeekIteratorTest.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2025, Google LLC - * - * 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.midx; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import java.util.Arrays; - -import org.eclipse.jgit.internal.storage.file.PackIndex; -import org.eclipse.jgit.junit.FakeIndexFactory; -import org.junit.Test; - -public class PackIndexPeekIteratorTest { - @Test - public void next() { - PackIndex index1 = indexOf( - object("0000000000000000000000000000000000000001", 500), - object("0000000000000000000000000000000000000003", 1500), - object("0000000000000000000000000000000000000005", 3000)); - PackIndexMerger.PackIndexPeekIterator it = new PackIndexMerger.PackIndexPeekIterator(0, index1); - assertEquals("0000000000000000000000000000000000000001", it.next().name()); - assertEquals("0000000000000000000000000000000000000003", it.next().name()); - assertEquals("0000000000000000000000000000000000000005", it.next().name()); - assertNull(it.next()); - } - - @Test - public void peek_doesNotAdvance() { - PackIndex index1 = indexOf( - object("0000000000000000000000000000000000000001", 500), - object("0000000000000000000000000000000000000003", 1500), - object("0000000000000000000000000000000000000005", 3000)); - PackIndexMerger.PackIndexPeekIterator it = new PackIndexMerger.PackIndexPeekIterator(0, index1); - it.next(); - assertEquals("0000000000000000000000000000000000000001", it.peek().name()); - assertEquals("0000000000000000000000000000000000000001", it.peek().name()); - it.next(); - assertEquals("0000000000000000000000000000000000000003", it.peek().name()); - assertEquals("0000000000000000000000000000000000000003", it.peek().name()); - it.next(); - assertEquals("0000000000000000000000000000000000000005", it.peek().name()); - assertEquals("0000000000000000000000000000000000000005", it.peek().name()); - it.next(); - assertNull(it.peek()); - assertNull(it.peek()); - } - - @Test - public void empty() { - PackIndex index1 = indexOf(); - PackIndexMerger.PackIndexPeekIterator it = new PackIndexMerger.PackIndexPeekIterator(0, index1); - assertNull(it.next()); - assertNull(it.peek()); - } - - private static PackIndex indexOf(FakeIndexFactory.IndexObject... objs) { - return FakeIndexFactory.indexOf(Arrays.asList(objs)); - } - - private static FakeIndexFactory.IndexObject object(String name, long offset) { - return new FakeIndexFactory.IndexObject(name, offset); - } -} \ No newline at end of file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java index 4d2e580317a..67163e2f0d5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -37,7 +37,7 @@ import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.io.CancellableDigestOutputStream; -import org.eclipse.jgit.internal.storage.midx.PackIndexMerger.MidxMutableEntry; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MutableEntry; import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.util.NB; @@ -223,9 +223,9 @@ private void writeChunkLookup(CancellableDigestOutputStream out, private void writeFanoutTable(WriteContext ctx) throws IOException { byte[] tmp = new byte[4]; int[] fanout = new int[256]; - Iterator iterator = ctx.data.bySha1Iterator(); + Iterator iterator = ctx.data.bySha1Iterator(); while (iterator.hasNext()) { - MidxMutableEntry e = iterator.next(); + MutableEntry e = iterator.next(); fanout[e.getObjectId().getFirstByte() & 0xff]++; } for (int i = 1; i < fanout.length; i++) { @@ -250,9 +250,9 @@ private void writeFanoutTable(WriteContext ctx) throws IOException { private void writeOidLookUp(WriteContext ctx) throws IOException { byte[] tmp = new byte[OBJECT_ID_LENGTH]; - Iterator iterator = ctx.data.bySha1Iterator(); + Iterator iterator = ctx.data.bySha1Iterator(); while (iterator.hasNext()) { - MidxMutableEntry e = iterator.next(); + MutableEntry e = iterator.next(); e.getObjectId().copyRawTo(tmp, 0); ctx.out.write(tmp, 0, OBJECT_ID_LENGTH); } @@ -272,9 +272,9 @@ private void writeOidLookUp(WriteContext ctx) throws IOException { */ private void writeObjectOffsets(WriteContext ctx) throws IOException { byte[] entry = new byte[8]; - Iterator iterator = ctx.data.bySha1Iterator(); + Iterator iterator = ctx.data.bySha1Iterator(); while (iterator.hasNext()) { - MidxMutableEntry e = iterator.next(); + MutableEntry e = iterator.next(); NB.encodeInt32(entry, 0, e.getPackId()); if (!ctx.data.needsLargeOffsetsChunk() || fitsIn31bits(e.getOffset())) { @@ -305,10 +305,10 @@ private void writeRidx(WriteContext ctx) throws IOException { // memory. We could also iterate reverse indexes looking up // their position in the midx (and discarding if the pack doesn't // match). - Iterator iterator = ctx.data.bySha1Iterator(); + Iterator iterator = ctx.data.bySha1Iterator(); int midxPosition = 0; while (iterator.hasNext()) { - MidxMutableEntry e = iterator.next(); + MutableEntry e = iterator.next(); OffsetPosition op = new OffsetPosition(e.getOffset(), midxPosition); midxPosition++; packOffsets.computeIfAbsent(e.getPackId(), k -> new ArrayList<>()) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index 4a296ee6401..94d7912b759 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -9,14 +9,12 @@ */ package org.eclipse.jgit.internal.storage.midx; -import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; import org.eclipse.jgit.internal.storage.file.PackIndex; -import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MidxIterator; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MutableEntry; import org.eclipse.jgit.lib.MutableObjectId; /** @@ -38,53 +36,7 @@ class PackIndexMerger { private static final long LIMIT_32_BITS = (1L << 32) - 1; - /** - * Object returned by the iterator. - *

- * The iterator returns (on each next()) the same instance with different - * values, to avoid allocating many short-lived objects. Callers should not - * keep a reference to that returned value. - */ - static class MidxMutableEntry { - // The object id - private final MutableObjectId oid = new MutableObjectId(); - - // Position of the pack in the ordered list of pack in this merger - private int packId; - - // Offset in its pack - private long offset; - - public AnyObjectId getObjectId() { - return oid; - } - - public int getPackId() { - return packId; - } - - public long getOffset() { - return offset; - } - - /** - * Copy values from another mutable entry - * - * @param packId - * packId - * @param other - * another mutable entry - */ - private void fill(int packId, PackIndex.MutableEntry other) { - other.copyOidTo(oid); - this.packId = packId; - this.offset = other.getOffset(); - } - } - - private final List packNames; - - private final List indexes; + private final Map packs; private final boolean needsLargeOffsetsChunk; @@ -103,34 +55,33 @@ private void fill(int packId, PackIndex.MutableEntry other) { * map of pack names to indexes, ordered. */ PackIndexMerger(Map packs) { - this.packNames = packs.keySet().stream().toList(); - this.indexes = packs.values().stream().toList(); + this.packs = packs; - objectsPerPack = new int[packNames.size()]; + objectsPerPack = new int[packs.size()]; // Iterate for duplicates int objectCount = 0; boolean hasLargeOffsets = false; int over31bits = 0; MutableObjectId lastSeen = new MutableObjectId(); - MultiIndexIterator it = new MultiIndexIterator(indexes); + MidxIterator it = rawIterator(); while (it.hasNext()) { - MidxMutableEntry entry = it.next(); + MutableEntry entry = it.next(); if (lastSeen.equals(entry.oid)) { continue; } // If there is at least one offset value larger than 2^32-1, then // the large offset chunk must exist, and offsets larger than // 2^31-1 must be stored in it instead - if (entry.offset > LIMIT_32_BITS) { + if (entry.getOffset() > LIMIT_32_BITS) { hasLargeOffsets = true; } - if (entry.offset > LIMIT_31_BITS) { + if (entry.getOffset() > LIMIT_31_BITS) { over31bits++; } lastSeen.fromObjectId(entry.oid); objectCount++; - objectsPerPack[entry.packId]++; + objectsPerPack[entry.getPackId()]++; } uniqueObjectCount = objectCount; offsetsOver31BitsCount = over31bits; @@ -187,7 +138,7 @@ int[] getObjectsPerPack() { * @return List of pack names, in the order used by the merge. */ List getPackNames() { - return packNames; + return packs.keySet().stream().toList(); } /** @@ -196,7 +147,7 @@ List getPackNames() { * @return count of packs merged */ int getPackCount() { - return packNames.size(); + return packs.size(); } /** @@ -207,9 +158,8 @@ int getPackCount() { * * @return an iterator in sha1 order without duplicates. */ - Iterator bySha1Iterator() { - return new DedupMultiIndexIterator(new MultiIndexIterator(indexes), - getUniqueObjectCount()); + MidxIterator bySha1Iterator() { + return MidxIterators.dedup(rawIterator()); } /** @@ -217,139 +167,11 @@ Iterator bySha1Iterator() { * * @return an iterator of all objects in sha1 order, including duplicates. */ - Iterator rawIterator() { - return new MultiIndexIterator(indexes); - } - - /** - * Iterator over n-indexes in ObjectId order. - *

- * It returns duplicates if the same object id is in different indexes. Wrap - * it with {@link DedupMultiIndexIterator (Iterator, int)} to avoid - * duplicates. - */ - private static final class MultiIndexIterator - implements Iterator { - - private final List indexIterators; - - private final MidxMutableEntry mutableEntry = new MidxMutableEntry(); - - MultiIndexIterator(List indexes) { - this.indexIterators = new ArrayList<>(indexes.size()); - for (int i = 0; i < indexes.size(); i++) { - PackIndexPeekIterator it = new PackIndexPeekIterator(i, - indexes.get(i)); - // Position in the first element - if (it.next() != null) { - indexIterators.add(it); - } - } - } - - @Override - public boolean hasNext() { - return !indexIterators.isEmpty(); - } - - @Override - public MidxMutableEntry next() { - PackIndexPeekIterator winner = null; - for (int index = 0; index < indexIterators.size(); index++) { - PackIndexPeekIterator current = indexIterators.get(index); - if (winner == null - || current.peek().compareBySha1To(winner.peek()) < 0) { - winner = current; - } - } - - if (winner == null) { - throw new NoSuchElementException(); - } - - mutableEntry.fill(winner.getPackId(), winner.peek()); - if (winner.next() == null) { - indexIterators.remove(winner); - } - return mutableEntry; - } - } - - private static class DedupMultiIndexIterator - implements Iterator { - private final MultiIndexIterator src; - - private int remaining; - - private final MutableObjectId lastOid = new MutableObjectId(); - - DedupMultiIndexIterator(MultiIndexIterator src, int totalCount) { - this.src = src; - this.remaining = totalCount; - } - - @Override - public boolean hasNext() { - return remaining > 0; - } - - @Override - public MidxMutableEntry next() { - MidxMutableEntry next = src.next(); - while (next != null && lastOid.equals(next.oid)) { - next = src.next(); - } - - if (next == null) { - throw new NoSuchElementException(); - } - - lastOid.fromObjectId(next.oid); - remaining--; - return next; - } - } - - /** - * Convenience around the PackIndex iterator to read the current value - * multiple times without consuming it. - *

- * This is used to merge indexes in the multipack index, where we need to - * compare the current value between indexes multiple times to find the - * next. - *

- * We could also implement this keeping the position (int) and - * MutableEntry#getObjectId, but that would create an ObjectId per entry. - * This implementation reuses the MutableEntry and avoid instantiations. - */ - // Visible for testing - static class PackIndexPeekIterator { - private final Iterator it; - - private final int packId; - - PackIndex.MutableEntry current; - - PackIndexPeekIterator(int packId, PackIndex index) { - it = index.iterator(); - this.packId = packId; - } - - PackIndex.MutableEntry next() { - if (it.hasNext()) { - current = it.next(); - } else { - current = null; - } - return current; - } - - PackIndex.MutableEntry peek() { - return current; - } - - int getPackId() { - return packId; - } + MidxIterator rawIterator() { + List list = packs.entrySet().stream() + .map(e -> MidxIterators.fromPackIndexIterator(e.getKey(), + e.getValue().iterator())) + .toList(); + return MidxIterators.join(list); } } From 58dcc0e280083971d1baa14fcec14fd0ce6d3cce Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 10:36:29 -0800 Subject: [PATCH 003/200] PackIndexMerge: Use deduped iterators instead of deduping while reading Change-Id: I2e2bcf14fa162546821e70d1026025ad6a6a6964 --- .../eclipse/jgit/internal/storage/midx/PackIndexMerger.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index 94d7912b759..760277def7d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -63,12 +63,9 @@ class PackIndexMerger { boolean hasLargeOffsets = false; int over31bits = 0; MutableObjectId lastSeen = new MutableObjectId(); - MidxIterator it = rawIterator(); + MidxIterator it = bySha1Iterator(); while (it.hasNext()) { MutableEntry entry = it.next(); - if (lastSeen.equals(entry.oid)) { - continue; - } // If there is at least one offset value larger than 2^32-1, then // the large offset chunk must exist, and offsets larger than // 2^31-1 must be stored in it instead From 40e6368b2d4e7e88288dbe73fed8e05d02719c24 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 11:43:24 -0800 Subject: [PATCH 004/200] PackIndexMerger: remove rawIterator() method It was a workaround to test the internal iterators. Now we use MidxIterators that have their own tests. Change-Id: Ie917a8253c2dbbf613c857c2427b4da16a6a6964 --- .../storage/midx/PackIndexMergerTest.java | 73 ++----------------- .../storage/midx/PackIndexMerger.java | 11 +-- 2 files changed, 7 insertions(+), 77 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java index 8d031eb57ed..9db897c212d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java @@ -27,7 +27,7 @@ public class PackIndexMergerTest { @Test - public void rawIterator_noDuplicates() { + public void bySha1Iterator_noDuplicates() { PackIndex idxOne = indexOf( oidOffset("0000000000000000000000000000000000000001", 500), oidOffset("0000000000000000000000000000000000000005", 12), @@ -45,7 +45,7 @@ public void rawIterator_noDuplicates() { assertEquals(9, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.rawIterator(); + Iterator it = merger.bySha1Iterator(); assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501); assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13); @@ -62,79 +62,18 @@ public void rawIterator_noDuplicates() { } @Test - public void rawIterator_noDuplicates_honorPackOrder() { + public void bySha1Iterator_withDuplicates() { PackIndex idxOne = indexOf( oidOffset("0000000000000000000000000000000000000001", 500), - oidOffset("0000000000000000000000000000000000000005", 12), oidOffset("0000000000000000000000000000000000000010", 1500)); PackIndex idxTwo = indexOf( oidOffset("0000000000000000000000000000000000000002", 501), oidOffset("0000000000000000000000000000000000000003", 13), + oidOffset("0000000000000000000000000000000000000005", 800), oidOffset("0000000000000000000000000000000000000015", 1501)); PackIndex idxThree = indexOf( oidOffset("0000000000000000000000000000000000000004", 502), - oidOffset("0000000000000000000000000000000000000007", 14), - oidOffset("0000000000000000000000000000000000000012", 1502)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p3", idxThree, "p2", idxTwo, "p1", idxOne)); - assertEquals(9, merger.getUniqueObjectCount()); - assertEquals(3, merger.getPackCount()); - assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.rawIterator(); - assertNextEntry(it, "0000000000000000000000000000000000000001", 2, 500); - assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501); - assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13); - assertNextEntry(it, "0000000000000000000000000000000000000004", 0, 502); - assertNextEntry(it, "0000000000000000000000000000000000000005", 2, 12); - assertNextEntry(it, "0000000000000000000000000000000000000007", 0, 14); - assertNextEntry(it, "0000000000000000000000000000000000000010", 2, - 1500); - assertNextEntry(it, "0000000000000000000000000000000000000012", 0, - 1502); - assertNextEntry(it, "0000000000000000000000000000000000000015", 1, - 1501); - assertFalse(it.hasNext()); - } - - @Test - public void rawIterator_allDuplicates() { - PackIndex idxOne = indexOf( - oidOffset("0000000000000000000000000000000000000001", 500), oidOffset("0000000000000000000000000000000000000005", 12), - oidOffset("0000000000000000000000000000000000000010", 1500)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idxOne, "p2", idxOne, "p3", idxOne)); - assertEquals(3, merger.getUniqueObjectCount()); - assertEquals(3, merger.getPackCount()); - assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.rawIterator(); - assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); - assertNextEntry(it, "0000000000000000000000000000000000000001", 1, 500); - assertNextEntry(it, "0000000000000000000000000000000000000001", 2, 500); - assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12); - assertNextEntry(it, "0000000000000000000000000000000000000005", 1, 12); - assertNextEntry(it, "0000000000000000000000000000000000000005", 2, 12); - assertNextEntry(it, "0000000000000000000000000000000000000010", 0, - 1500); - assertNextEntry(it, "0000000000000000000000000000000000000010", 1, - 1500); - assertNextEntry(it, "0000000000000000000000000000000000000010", 2, - 1500); - assertFalse(it.hasNext()); - } - - @Test - public void bySha1Iterator_noDuplicates() { - PackIndex idxOne = indexOf( - oidOffset("0000000000000000000000000000000000000001", 500), - oidOffset("0000000000000000000000000000000000000005", 12), - oidOffset("0000000000000000000000000000000000000010", 1500)); - PackIndex idxTwo = indexOf( - oidOffset("0000000000000000000000000000000000000002", 501), - oidOffset("0000000000000000000000000000000000000003", 13), - oidOffset("0000000000000000000000000000000000000015", 1501)); - PackIndex idxThree = indexOf( - oidOffset("0000000000000000000000000000000000000004", 502), oidOffset("0000000000000000000000000000000000000007", 14), oidOffset("0000000000000000000000000000000000000012", 1502)); PackIndexMerger merger = new PackIndexMerger( @@ -147,7 +86,7 @@ public void bySha1Iterator_noDuplicates() { assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501); assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13); assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 502); - assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12); + assertNextEntry(it, "0000000000000000000000000000000000000005", 1, 800); assertNextEntry(it, "0000000000000000000000000000000000000007", 2, 14); assertNextEntry(it, "0000000000000000000000000000000000000010", 0, 1500); @@ -193,7 +132,7 @@ public void bySha1Iterator_differentIndexSizes() { assertEquals(6, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); - Iterator it = merger.rawIterator(); + Iterator it = merger.bySha1Iterator(); assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 500); assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 12); assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 500); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index 760277def7d..a7b38b17672 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -156,19 +156,10 @@ int getPackCount() { * @return an iterator in sha1 order without duplicates. */ MidxIterator bySha1Iterator() { - return MidxIterators.dedup(rawIterator()); - } - - /** - * For testing. Iterate all entries, not skipping duplicates (stable order) - * - * @return an iterator of all objects in sha1 order, including duplicates. - */ - MidxIterator rawIterator() { List list = packs.entrySet().stream() .map(e -> MidxIterators.fromPackIndexIterator(e.getKey(), e.getValue().iterator())) .toList(); - return MidxIterators.join(list); + return MidxIterators.dedup(MidxIterators.join(list)); } } From 0c99df911af7f10a9deb482b9189353f7baa93f0 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 08:21:50 -0800 Subject: [PATCH 005/200] MidxIterator: Add reset method We need to iterate twice over the input collection while building the midx. We are creating a new iterator per iteration. This works fine until we add single-pack midx to the merge, because it requires the ctx (DfsReader) to create the iterator. Offer a reset method in the MidxIterator. Then we can reuse the iterator the two iterations, we do not need ctx and building the merger is easier. Change-Id: Iddfcfb304763de2997afd7e8b45a11996a6a6964 --- .../storage/midx/MidxIteratorsTest.java | 105 ++++++++++++++++-- .../internal/storage/midx/MidxIterators.java | 40 +++++-- .../internal/storage/midx/MultiPackIndex.java | 10 ++ .../storage/midx/MultiPackIndexV1.java | 5 + .../storage/midx/PackIndexMerger.java | 2 +- 5 files changed, 140 insertions(+), 22 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxIteratorsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxIteratorsTest.java index 19a2cdeb98c..065385f4ad1 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxIteratorsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxIteratorsTest.java @@ -31,8 +31,7 @@ public void fromPackIndexIterator_basicIteration() { PackIndex index1 = indexOf(object("000001", 500), object("000003", 3000), object("000005", 1500)); - MidxIterator it = MidxIterators.fromPackIndexIterator("index1", - index1.iterator()); + MidxIterator it = MidxIterators.fromPackIndexIterator("index1", index1); assertNextEntry(it, "000001", 0, 500); assertNextEntry(it, "000003", 0, 3000); assertNextEntry(it, "000005", 0, 1500); @@ -44,8 +43,7 @@ public void fromPackIndexIterator_peek() { PackIndex index1 = indexOf(object("000001", 500), object("000003", 3000), object("000005", 1500)); - MidxIterator it = MidxIterators.fromPackIndexIterator("index1", - index1.iterator()); + MidxIterator it = MidxIterators.fromPackIndexIterator("index1", index1); assertPeekEntry(it, "000001", 0, 500); assertPeekEntry(it, "000001", 0, 500); assertNextEntry(it, "000001", 0, 500); @@ -60,20 +58,35 @@ public void fromPackIndexIterator_peek() { assertFalse(it.hasNext()); } + @Test + public void fromPackIndexIterator_reset() { + PackIndex index1 = indexOf(object("000001", 500), + object("000003", 3000), object("000005", 1500)); + + MidxIterator it = MidxIterators.fromPackIndexIterator("index1", index1); + while (it.hasNext()) { + it.next(); + } + it.reset(); + assertNextEntry(it, "000001", 0, 500); + assertNextEntry(it, "000003", 0, 3000); + + it.reset(); + assertPeekEntry(it, "000001", 0, 500); + } + @Test public void fromPackIndexIterator_getPackNames() { PackIndex index1 = indexOf(object("000001", 500), object("000003", 1500), object("000005", 3000)); - MidxIterator it = MidxIterators.fromPackIndexIterator("index1", - index1.iterator()); + MidxIterator it = MidxIterators.fromPackIndexIterator("index1", index1); assertEquals(List.of("index1"), it.getPackNames()); } @Test public void fromPackIndexIterator_empty() { - PackIndex index1 = indexOf(); MidxIterator it = MidxIterators.fromPackIndexIterator("index1", - index1.iterator()); + indexOf()); assertFalse(it.hasNext()); } @@ -104,10 +117,8 @@ public void join_basicIteration_packIndexIterators() { object("000003", 1500), object("000004", 3000)); List packIts = List.of( - MidxIterators.fromPackIndexIterator("index1", - idxOne.iterator()), - MidxIterators.fromPackIndexIterator("index2", - idxTwo.iterator())); + MidxIterators.fromPackIndexIterator("index1", idxOne), + MidxIterators.fromPackIndexIterator("index2", idxTwo)); MidxIterator it = MidxIterators.join(packIts); assertNextEntry(it, "000001", 0, 500); assertNextEntry(it, "000002", 1, 500); @@ -165,6 +176,29 @@ public void join_peek() { assertFalse(it.hasNext()); } + @Test + public void join_reset() { + FakeMidxIterator itOne = FakeMidxIterator.from("itOne", 2, + List.of(new IndexEntry("000001", 0, 500), + new IndexEntry("000003", 1, 1500))); + + FakeMidxIterator itTwo = FakeMidxIterator.from("itTwo", 2, + List.of(new IndexEntry("000002", 0, 500), + new IndexEntry("000004", 1, 1500))); + + MidxIterator it = MidxIterators.join(List.of(itOne, itTwo)); + while (it.hasNext()) { + it.next(); + } + + it.reset(); + assertNextEntry(it, "000001", 0, 500); + assertNextEntry(it, "000002", 2, 500); + + it.reset(); + assertPeekEntry(it, "000001", 0, 500); + } + @Test public void join_getPackNames() { FakeMidxIterator itOne = FakeMidxIterator.from("itOne", 2, @@ -236,6 +270,49 @@ public void dedup_peek() { assertFalse(it.hasNext()); } + @Test + public void dedup_reset() { + FakeMidxIterator itOne = FakeMidxIterator.from("itOne", 2, + List.of(new IndexEntry("000001", 0, 500), + new IndexEntry("000001", 1, 600), + new IndexEntry("000003", 0, 1500), + new IndexEntry("000003", 1, 1501), + new IndexEntry("000005", 0, 200), + new IndexEntry("000005", 1, 201))); + + MidxIterator it = MidxIterators.dedup(itOne); + while (it.hasNext()) { + it.next(); + } + it.reset(); + assertNextEntry(it, "000001", 0, 500); + assertNextEntry(it, "000003", 0, 1500); + + it.reset(); + assertPeekEntry(it, "000001", 0, 500); + } + + @Test + public void dedup_reset_sameElement() { + FakeMidxIterator itOne = FakeMidxIterator.from("itOne", 2, + List.of(new IndexEntry("000001", 0, 500), + new IndexEntry("000001", 1, 600), + new IndexEntry("000001", 2, 1500), + new IndexEntry("000001", 3, 1501), + new IndexEntry("000001", 4, 200), + new IndexEntry("000001", 5, 201))); + + MidxIterator it = MidxIterators.dedup(itOne); + while (it.hasNext()) { + it.next(); + } + it.reset(); + assertNextEntry(it, "000001", 0, 500); + + it.reset(); + assertPeekEntry(it, "000001", 0, 500); + } + @Test public void dedup_getPackNames() { FakeMidxIterator itOne = FakeMidxIterator.from("itOne", 4, @@ -322,6 +399,10 @@ public MultiPackIndex.MutableEntry next() { return entries.get(position++).asMutableEntry(); } + @Override + public void reset() { + position = 0; + } } record IndexEntry(String shortOid, int packId, int offset) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxIterators.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxIterators.java index 30dc612e451..d1fa881ae70 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxIterators.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxIterators.java @@ -29,14 +29,14 @@ public final class MidxIterators { * * @param packName * pack name this iterator is going over - * @param idxIt - * iterator over a PackIndex + * @param idx + * a PackIndex * @return a midx iterator that returns the objects of the pack index in the * original iterator order */ public static MidxIterator fromPackIndexIterator(String packName, - Iterator idxIt) { - return new MidxIteratorOverPackIndex(packName, idxIt); + PackIndex idx) { + return new MidxIteratorOverPackIndex(packName, idx); } /** @@ -80,17 +80,19 @@ private static class MidxIteratorOverPackIndex implements MidxIterator { private final List packNames; - private final Iterator idxIt; + private final PackIndex idx; + + private Iterator idxIt; private boolean peeked; - private final MutableEntry entry; + private final MutableEntry entry = new MutableEntry(); MidxIteratorOverPackIndex(String packName, - Iterator idxIt) { + PackIndex idx) { this.packNames = List.of(packName); - this.idxIt = idxIt; - this.entry = new MutableEntry(); + this.idx = idx; + this.idxIt = idx.iterator(); } @Override @@ -132,6 +134,13 @@ private void readNext() { idx.copyOidTo(entry.oid); entry.packOffset.setValues(0, idx.getOffset()); } + + @Override + public void reset() { + this.idxIt = idx.iterator(); + this.entry.clear(); + peeked = false; + } } private static class JoinMidxIterator implements MidxIterator { @@ -205,6 +214,12 @@ private int best() { return winnerPos; } + + @Override + public void reset() { + indexIterators.stream().forEach(MidxIterator::reset); + local.clear(); + } } private static class DedupMidxIterator implements MidxIterator { @@ -264,5 +279,12 @@ private void readNext() { } } } + + @Override + public void reset() { + lastOid.clear(); + src.reset(); + readNext(); + } } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndex.java index 1721cb69ca0..e31c061983d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndex.java @@ -162,6 +162,11 @@ interface MidxIterator extends Iterator { * @return pack names */ List getPackNames(); + + /** + * Restart the iteration from the beginning + */ + void reset(); } /** @@ -278,6 +283,11 @@ public long getOffset() { return packOffset.getOffset(); } + public void clear() { + oid.clear(); + packOffset.setValues(0, 0); + } + @Override public String toString() { return String.format("%s,%s", oid.name(), packOffset); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexV1.java index ac6f00c3cc4..cfa5c33be7f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexV1.java @@ -392,6 +392,11 @@ public MutableEntry peek() { public List getPackNames() { return Arrays.asList(midx.getPackNames()); } + + @Override + public void reset() { + position = 0; + } } private static class ReverseIndex { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index a7b38b17672..a6651a58fb1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -158,7 +158,7 @@ int getPackCount() { MidxIterator bySha1Iterator() { List list = packs.entrySet().stream() .map(e -> MidxIterators.fromPackIndexIterator(e.getKey(), - e.getValue().iterator())) + e.getValue())) .toList(); return MidxIterators.dedup(MidxIterators.join(list)); } From da8d1a834d22781524cea53e962525f1bc00c0a2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 17 Feb 2026 22:05:44 +0100 Subject: [PATCH 006/200] JGit v7.6.0.202602172005-m3 Signed-off-by: Matthias Sohn Change-Id: Ief13182a3204bf56f83065d4dab26c3e8f02358e --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index b114e7d36f4..f32accf0cc5 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 483e833a83c..f09ebc7040f 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 18acf74202a..6fd3aba56a5 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index d9b324140f9..44e92b285eb 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index dab8a3d8e57..a4bba36dc36 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 3f9d2c121af..5a332c4df10 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 86336e3b9eb..b20326dd626 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index bbe279b4ccf..9de063920a2 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index b4daf7dc81c..eacd047506a 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 80b421dac5f..bc5d454b745 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.ant - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.archive - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.ui - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.test - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 647c97d26e6..d10a433c7eb 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 05e504ed732..7ec7a6d9249 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 cc6eda7801e..f1f43dfd629 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.80.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 82df526a6e6..82b2f2ef416 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index bfc359047b3..0146f42b37b 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 9b0f12f83b6..0d6b9be4dd1 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 cd65a4f2c40..92ad1ee6546 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 55828b2dbb8..91f3db66456 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 e97e314c22c..34fdb06e3d3 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 3d4256867e2..a8d79092490 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2be8efe1a96..aa8bec39a36 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 dd507d323f5..57c28de9f6b 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index c8d9baac5b2..5985b39f396 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 03aae759347..4265fd8e460 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: OSGI-INF/l10n/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 64d2e4eb2bb..18a222993ea 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c5a9e8e2648..17927629ba8 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 012f00bf72f..6b850a791f7 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: OSGI-INF/l10n/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 9c1adcb4a2d..941d1578cab 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 8d6d068adcb..b6d4f584e1c 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 bf528656d9e..ab2633eaf8e 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: OSGI-INF/l10n/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 cb07dc904c1..f8f2b6450cc 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index fa798c8ae80..4a9cf93d93e 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 9b0f742fee6..acda0914951 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3cdda74bfd7..70055a76f53 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 b0ee6b4beb0..aa349f0034f 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 c2a8147e8ee..c5adaa69bdf 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 1b4a73b4de0..a05ea7fe56c 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 d79ae9a34fc..f0b218f22cf 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 4f9de97f59b..5a499fb02c4 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 44d84770ecd..8c8512b9c40 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index cdc7cf9b7bf..3afd18893f2 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 803606acf18..875ed77a27d 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 c5521eea303..93c0399662a 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 95ec4e95b99..971adcc8585 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 1518beb7854..febfa07afb4 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 f3f10fd2ab2..6e8976f7e0b 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 b9815d6a251..973a739c477 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 1f0ad42946e..0edd14eb616 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 efbf3c03d15..d0abb73745d 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 a0f6e9263b0..4b28dcb60dc 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 fef54ecbba2..cfb6858635f 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 74daa110a44..229a3fec018 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 868aa02c2db..67334afaef6 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 8812d722f52..b3f38f51de0 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 5c71af5fc99..737054b3773 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 bfb53604c02..5222426cec8 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 4eb2a6daf73..eb72282a768 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 cc7a9d67614..30fc195747d 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 bd383609364..b92c9820e91 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 ab0775e3421..29fea09f885 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 7d881a52494..4eeba79ced1 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 07f6f21f45f..b09b09732ed 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 5f81b7d60d7..5d58f28a173 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 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 de0a37aa8a6..685ef45fc83 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 0e19ea5ff81..6939657c9a4 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index dcb551955e6..6d6c05366c4 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 041c46db7c5..f6b12d018f8 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 2ef72566aa4..6b424c04025 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.0,7.7.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 56d463f7f96..4ab97a53109 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 9c2bf0345c7..6ba1844d23e 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit.ssh.apache.agent 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 d2bf5aeb258..386abf025cb 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 5a9057fe5cd..b006d5b1629 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 7a7d7e1b84f..ed4a98f7159 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 5ef864b3899..f06cd67b33f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 3edf6e6ce65..2c67ca2d94d 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 4632a36b0bf..8928182ec66 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 70b0af03255..447eb2d38bb 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 436d2510170..ddc8242664e 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.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 7cba3294642..6bb31845ca5 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 91caa5e818e..442fda3559c 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 bee0f4927ee..b90e2f7b29e 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 387f1683069..ba0d09ed6fb 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 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 b3ecf33ca23..a4e660bc5bb 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index e20c4f219c8..8b07ab3b0b6 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 2acf0e0b343..bcfe61d1af7 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 - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 15ae6efaadf..dde8a14818c 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 48db010fc9e..be845aaca24 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602172005-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.202602172005-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 890cb9cbf19..7173ef9bc90 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 50055da6338..a2c45819cae 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.6.0-SNAPSHOT + 7.6.0.202602172005-m3 JGit - Parent ${jgit-url} From 250179289d1293b8e83dfb9fc066af2c7b4e7310 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 6 Feb 2026 10:49:19 -0800 Subject: [PATCH 007/200] PackIndexMerger: replace constructor with Builder With the current constructor, we can only pass PackIndexes as sources for the midx. We would like to use a midx as a source for a new midx (e.g. to merge them). Add a builder to the merger. At the moment only with PackIndexes. Change-Id: Iede4ae4dcc850dfd304e5facadca037e6a6a6964 --- .../storage/midx/PackIndexMergerTest.java | 72 +++++++++---------- .../storage/midx/MultiPackIndexWriter.java | 7 +- .../storage/midx/PackIndexMerger.java | 61 ++++++++++------ 3 files changed, 78 insertions(+), 62 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java index 9db897c212d..32ce5b1223f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java @@ -16,7 +16,6 @@ import java.util.Arrays; import java.util.Iterator; -import java.util.LinkedHashMap; import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MutableEntry; @@ -40,8 +39,8 @@ public void bySha1Iterator_noDuplicates() { oidOffset("0000000000000000000000000000000000000004", 502), oidOffset("0000000000000000000000000000000000000007", 14), oidOffset("0000000000000000000000000000000000000012", 1502)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idxOne, "p2", idxTwo, "p3", idxThree)); + PackIndexMerger merger = createMergerFor("p1", idxOne, "p2", idxTwo, + "p3", idxThree); assertEquals(9, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); @@ -76,8 +75,8 @@ public void bySha1Iterator_withDuplicates() { oidOffset("0000000000000000000000000000000000000005", 12), oidOffset("0000000000000000000000000000000000000007", 14), oidOffset("0000000000000000000000000000000000000012", 1502)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idxOne, "p2", idxTwo, "p3", idxThree)); + PackIndexMerger merger = createMergerFor("p1", idxOne, "p2", idxTwo, + "p3", idxThree); assertEquals(9, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); @@ -103,8 +102,8 @@ public void bySha1Iterator_allDuplicates() { oidOffset("0000000000000000000000000000000000000001", 500), oidOffset("0000000000000000000000000000000000000005", 12), oidOffset("0000000000000000000000000000000000000010", 1500)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idxOne, "p2", idxOne, "p3", idxOne)); + PackIndexMerger merger = createMergerFor("p1", idxOne, "p2", idxOne, + "p3", idxOne); assertEquals(3, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); @@ -127,8 +126,8 @@ public void bySha1Iterator_differentIndexSizes() { oidOffset("0000000000000000000000000000000000000004", 500), oidOffset("0000000000000000000000000000000000000007", 12), oidOffset("0000000000000000000000000000000000000012", 1500)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idxOne, "p2", idxTwo, "p3", idxThree)); + PackIndexMerger merger = createMergerFor("p1", idxOne, "p2", idxTwo, + "p3", idxThree); assertEquals(6, merger.getUniqueObjectCount()); assertEquals(3, merger.getPackCount()); assertFalse(merger.needsLargeOffsetsChunk()); @@ -146,7 +145,7 @@ public void bySha1Iterator_differentIndexSizes() { @Test public void merger_noIndexes() { - PackIndexMerger merger = new PackIndexMerger(new LinkedHashMap<>()); + PackIndexMerger merger = PackIndexMerger.builder().build(); assertEquals(0, merger.getUniqueObjectCount()); assertFalse(merger.needsLargeOffsetsChunk()); assertTrue(merger.getPackNames().isEmpty()); @@ -156,8 +155,8 @@ public void merger_noIndexes() { @Test public void merger_emptyIndexes() { - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", indexOf(), "p2", indexOf())); + PackIndexMerger merger = createMergerFor("p1", indexOf(), "p2", + indexOf()); assertEquals(0, merger.getUniqueObjectCount()); assertFalse(merger.needsLargeOffsetsChunk()); assertEquals(2, merger.getPackNames().size()); @@ -172,8 +171,7 @@ public void bySha1Iterator_largeOffsets_needsChunk() { oidOffset("0000000000000000000000000000000000000004", 12)); PackIndex idx2 = indexOf(oidOffset( "0000000000000000000000000000000000000003", (1L << 31) + 10)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idx1, "p2", idx2)); + PackIndexMerger merger = createMergerFor("p1", idx1, "p2", idx2); assertTrue(merger.needsLargeOffsetsChunk()); assertEquals(2, merger.getOffsetsOver31BitsCount()); assertEquals(3, merger.getUniqueObjectCount()); @@ -188,8 +186,7 @@ public void bySha1Iterator_largeOffsets_noChunk() { oidOffset("0000000000000000000000000000000000000004", 12)); PackIndex idx2 = indexOf(oidOffset( "0000000000000000000000000000000000000003", (1L << 31) + 10)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idx1, "p2", idx2)); + PackIndexMerger merger = createMergerFor("p1", idx1, "p2", idx2); assertFalse(merger.needsLargeOffsetsChunk()); assertEquals(2, merger.getOffsetsOver31BitsCount()); assertEquals(3, merger.getUniqueObjectCount()); @@ -209,8 +206,8 @@ public void getObjectsPerPack_noDuplicates() { oidOffset("0000000000000000000000000000000000000004", 502), oidOffset("0000000000000000000000000000000000000007", 14), oidOffset("0000000000000000000000000000000000000012", 1502)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idxOne, "p2", idxTwo, "p3", idxThree)); + PackIndexMerger merger = createMergerFor("p1", idxOne, "p2", idxTwo, + "p3", idxThree); assertArrayEquals(new int[] { 3, 3, 3 }, merger.getObjectsPerPack()); } @@ -225,8 +222,8 @@ public void getObjectsPerPack_differentIndexSizes() { oidOffset("0000000000000000000000000000000000000004", 500), oidOffset("0000000000000000000000000000000000000007", 12), oidOffset("0000000000000000000000000000000000000012", 1500)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idxOne, "p2", idxTwo, "p3", idxThree)); + PackIndexMerger merger = createMergerFor("p1", idxOne, "p2", idxTwo, + "p3", idxThree); assertArrayEquals(new int[] { 1, 2, 3 }, merger.getObjectsPerPack()); } @@ -236,21 +233,21 @@ public void getObjectsPerPack_allDuplicates() { oidOffset("0000000000000000000000000000000000000001", 500), oidOffset("0000000000000000000000000000000000000005", 12), oidOffset("0000000000000000000000000000000000000010", 1500)); - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", idxOne, "p2", idxOne, "p3", idxOne)); + PackIndexMerger merger = createMergerFor("p1", idxOne, "p2", idxOne, + "p3", idxOne); assertArrayEquals(new int[] { 3, 0, 0 }, merger.getObjectsPerPack()); } @Test public void getObjectsPerPack_noIndexes() { - PackIndexMerger merger = new PackIndexMerger(new LinkedHashMap<>()); + PackIndexMerger merger = PackIndexMerger.builder().build(); assertArrayEquals(new int[] {}, merger.getObjectsPerPack()); } @Test public void getObjectsPerPack_emptyIndexes() { - PackIndexMerger merger = new PackIndexMerger( - orderedMapOf("p1", indexOf(), "p2", indexOf())); + PackIndexMerger merger = createMergerFor("p1", indexOf(), "p2", + indexOf()); assertArrayEquals(new int[] { 0, 0 }, merger.getObjectsPerPack()); } @@ -271,21 +268,16 @@ private static PackIndex indexOf(IndexObject... objs) { return FakeIndexFactory.indexOf(Arrays.asList(objs)); } - private static LinkedHashMap orderedMapOf(String s1, - PackIndex pi1, String s2, PackIndex pi2) { - LinkedHashMap map = new LinkedHashMap(3); - map.put(s1, pi1); - map.put(s2, pi2); - return map; - } + private static PackIndexMerger createMergerFor(String s1, PackIndex pi1, + String s2, PackIndex pi2) { + return PackIndexMerger.builder().addPack(s1, pi1).addPack(s2, pi2) + .build(); + } - private static LinkedHashMap orderedMapOf(String s1, - PackIndex pi1, String s2, PackIndex pi2, String s3, PackIndex pi3) { - LinkedHashMap map = new LinkedHashMap(3); - map.put(s1, pi1); - map.put(s2, pi2); - map.put(s3, pi3); - return map; - } + private static PackIndexMerger createMergerFor(String s1, PackIndex pi1, + String s2, PackIndex pi2, String s3, PackIndex pi3) { + return PackIndexMerger.builder().addPack(s1, pi1).addPack(s2, pi2) + .addPack(s3, pi3).build(); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java index 67163e2f0d5..37b81cd1921 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -87,7 +87,12 @@ public record Result(long bytesWritten, int objectCount, */ public Result write(ProgressMonitor monitor, OutputStream outputStream, Map inputs) throws IOException { - PackIndexMerger data = new PackIndexMerger(inputs); + // TODO(ifrade): Pass the PackIndexMerger as parameter instead of making + // a map to them make the merger. + PackIndexMerger.Builder builder = PackIndexMerger.builder(); + inputs.entrySet().stream() + .forEach(e -> builder.addPack(e.getKey(), e.getValue())); + PackIndexMerger data = builder.build(); // List of chunks in the order they need to be written List chunkHeaders = createChunkHeaders(data); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index a6651a58fb1..0f35d674df3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -9,8 +9,8 @@ */ package org.eclipse.jgit.internal.storage.midx; +import java.util.ArrayList; import java.util.List; -import java.util.Map; import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MidxIterator; @@ -36,7 +36,7 @@ class PackIndexMerger { private static final long LIMIT_32_BITS = (1L << 32) - 1; - private final Map packs; + private final MidxIterator midxIterator; private final boolean needsLargeOffsetsChunk; @@ -46,26 +46,45 @@ class PackIndexMerger { private final int[] objectsPerPack; + private final List packnames; + + static class Builder { + + private final List packIndexes = new ArrayList<>(); + + public Builder addPack(String name, PackIndex idx) { + packIndexes.add(MidxIterators.fromPackIndexIterator(name, idx)); + return this; + } + + public PackIndexMerger build() { + return new PackIndexMerger( + MidxIterators.dedup(MidxIterators.join(packIndexes))); + } + } + + public static Builder builder() { + return new Builder(); + } + /** - * Build a common view of these pack indexes - *

- * Order matters: in case of duplicates, the first pack with the object wins + * A common view of the input pack indexes * - * @param packs - * map of pack names to indexes, ordered. + * @param midxIterator + * MidxIterator built by deduping union of all pack indexes */ - PackIndexMerger(Map packs) { - this.packs = packs; + private PackIndexMerger(MidxIterator midxIterator) { + this.midxIterator = midxIterator; + this.packnames = midxIterator.getPackNames(); - objectsPerPack = new int[packs.size()]; + objectsPerPack = new int[packnames.size()]; // Iterate for duplicates int objectCount = 0; boolean hasLargeOffsets = false; int over31bits = 0; MutableObjectId lastSeen = new MutableObjectId(); - MidxIterator it = bySha1Iterator(); - while (it.hasNext()) { - MutableEntry entry = it.next(); + while (midxIterator.hasNext()) { + MutableEntry entry = midxIterator.next(); // If there is at least one offset value larger than 2^32-1, then // the large offset chunk must exist, and offsets larger than // 2^31-1 must be stored in it instead @@ -116,7 +135,7 @@ int getOffsetsOver31BitsCount() { } /** - * Number of objects selected for the midx per packid + * Number of objects selected for the midx per pack id * * @return array where position n contains the amount of objects selected * for pack id n @@ -135,7 +154,7 @@ int[] getObjectsPerPack() { * @return List of pack names, in the order used by the merge. */ List getPackNames() { - return packs.keySet().stream().toList(); + return packnames; } /** @@ -144,22 +163,22 @@ List getPackNames() { * @return count of packs merged */ int getPackCount() { - return packs.size(); + return packnames.size(); } /** * Iterator over the merged indexes in sha1 order without duplicates *

+ * This always returns the same iterator resetted. We don't support two + * iterators over this merged data. + *

* The returned entry in the iterator is mutable, callers should NOT keep a * reference to it. * * @return an iterator in sha1 order without duplicates. */ MidxIterator bySha1Iterator() { - List list = packs.entrySet().stream() - .map(e -> MidxIterators.fromPackIndexIterator(e.getKey(), - e.getValue())) - .toList(); - return MidxIterators.dedup(MidxIterators.join(list)); + midxIterator.reset(); + return midxIterator; } } From 545e1ff7d4098ba9985c93922f639d70744f0dc1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 17:23:39 +0100 Subject: [PATCH 008/200] JGit v7.6.0.202602181523-m3 Signed-off-by: Matthias Sohn Change-Id: I3b3a8081a847ea01ba40a1cc13c1aad70b1a8cf7 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index f32accf0cc5..e6c4791de5c 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index f09ebc7040f..33645b97928 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 6fd3aba56a5..1d910194d66 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 44e92b285eb..7114a83d1be 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index a4bba36dc36..dd4e4d7aceb 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 5a332c4df10..970851bfb03 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index b20326dd626..e26950432b7 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 9de063920a2..8e817f23a71 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index eacd047506a..d51c458e984 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index bc5d454b745..6abea2012fb 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.ant - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.archive - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.ui - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.test - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 d10a433c7eb..81c62fc15a6 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 7ec7a6d9249..8b361df3ea5 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 f1f43dfd629..ac6073cad1a 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.80.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 82b2f2ef416..b97ed8ecf43 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 0146f42b37b..efc15bfe2bc 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 0d6b9be4dd1..8a256ef060e 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 92ad1ee6546..aa18af94d9d 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 91f3db66456..8c3899b3aa4 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 34fdb06e3d3..ebb2d7d5622 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 a8d79092490..ec1c4636f51 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index aa8bec39a36..cab3061d367 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 57c28de9f6b..28c98400c51 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 5985b39f396..b0f535ced04 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 4265fd8e460..3eb6c43e383 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: OSGI-INF/l10n/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 18a222993ea..fecf08d712d 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 17927629ba8..c7b12d99bad 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 6b850a791f7..2ed30b6a038 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: OSGI-INF/l10n/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 941d1578cab..7cdbb45d397 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index b6d4f584e1c..b65b635eff1 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 ab2633eaf8e..c4425cfe74b 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: OSGI-INF/l10n/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 f8f2b6450cc..57559b7ac77 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 4a9cf93d93e..e527530d1cf 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 acda0914951..4991a665898 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 70055a76f53..55d2eab2b15 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 aa349f0034f..580e54bc415 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 c5adaa69bdf..45aa255040c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index a05ea7fe56c..617210d602e 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 f0b218f22cf..61cac4d125b 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 5a499fb02c4..4ff654dfdfb 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 8c8512b9c40..fc71a4b5458 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 3afd18893f2..c251855122b 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 875ed77a27d..cd8d709b589 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 93c0399662a..760d780c45f 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 971adcc8585..56ba5d40a2a 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 febfa07afb4..152db20c7de 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 6e8976f7e0b..4938948c265 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 973a739c477..5772e53192a 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 0edd14eb616..31f24d41e0d 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 d0abb73745d..6a6532ec46b 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 4b28dcb60dc..6b3eb874430 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 cfb6858635f..465eef37f05 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 229a3fec018..c40ac22094d 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 67334afaef6..58fb9adb1b5 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 b3f38f51de0..39b986927c9 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 737054b3773..cb9fc9f4069 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 5222426cec8..d4e177e5ee5 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 eb72282a768..344d4ad39a3 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 30fc195747d..bc1862cebb1 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 b92c9820e91..645d43d04f9 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 29fea09f885..5bb936d13dc 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 4eeba79ced1..21e7eb18c0b 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index b09b09732ed..d3b192d5420 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 5d58f28a173..b5a9d797b0d 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 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 685ef45fc83..9412ec1505d 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 6939657c9a4..a5265d21841 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 6d6c05366c4..5206a39c536 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index f6b12d018f8..4a405a21b4e 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 6b424c04025..a2ad5304c60 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.0,7.7.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 4ab97a53109..cc69877662b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 6ba1844d23e..2ce3628f327 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit.ssh.apache.agent 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 386abf025cb..439dff45888 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index b006d5b1629..f4184261225 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 ed4a98f7159..c1fe42c3745 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 f06cd67b33f..650b6ff93f6 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 2c67ca2d94d..407ea7d337e 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 8928182ec66..bdf945d3bcf 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 447eb2d38bb..9366351cd65 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 ddc8242664e..41f3f5b0993 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.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 6bb31845ca5..c29e6722ae1 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 442fda3559c..c9145433d38 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 b90e2f7b29e..e3fd4ec0b4f 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index ba0d09ed6fb..298a8c918e4 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 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 a4e660bc5bb..b73d5a48458 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 8b07ab3b0b6..7165557abae 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index bcfe61d1af7..7fe5d427b18 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 - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index dde8a14818c..498f3dc095b 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: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index be845aaca24..3d1ff9fe656 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602172005-m3 +Bundle-Version: 7.6.0.202602181523-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.202602172005-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.202602181523-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 7173ef9bc90..22a04be3b45 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index a2c45819cae..4756516bf81 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.6.0.202602172005-m3 + 7.6.0.202602181523-m3 JGit - Parent ${jgit-url} From 8450ee563c7374a04d57d4f448160445102f9773 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 22:10:18 +0100 Subject: [PATCH 009/200] Prepare 7.6.0-SNAPSHOT builds Change-Id: I1cb36fe8798b309a213fbbc6bc307115ae00e186 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index e6c4791de5c..b114e7d36f4 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 33645b97928..483e833a83c 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 - 7.6.0.202602181523-m3 + 7.6.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 1d910194d66..18acf74202a 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 7114a83d1be..d9b324140f9 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index dd4e4d7aceb..dab8a3d8e57 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 - 7.6.0.202602181523-m3 + 7.6.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 970851bfb03..3f9d2c121af 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index e26950432b7..86336e3b9eb 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 8e817f23a71..bbe279b4ccf 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 - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index d51c458e984..b4daf7dc81c 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 6abea2012fb..80b421dac5f 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 - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.6.0.202602181523-m3 + 7.6.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 81c62fc15a6..647c97d26e6 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 8b361df3ea5..05e504ed732 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 - 7.6.0.202602181523-m3 + 7.6.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 ac6073cad1a..cc6eda7801e 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.80.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 b97ed8ecf43..82df526a6e6 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index efc15bfe2bc..bfc359047b3 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 - 7.6.0.202602181523-m3 + 7.6.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 8a256ef060e..9b0f12f83b6 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 aa18af94d9d..cd65a4f2c40 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 8c3899b3aa4..55828b2dbb8 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 - 7.6.0.202602181523-m3 + 7.6.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 ebb2d7d5622..e97e314c22c 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 ec1c4636f51..3d4256867e2 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index cab3061d367..2be8efe1a96 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 - 7.6.0.202602181523-m3 + 7.6.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 28c98400c51..dd507d323f5 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index b0f535ced04..c8d9baac5b2 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 - 7.6.0.202602181523-m3 + 7.6.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 3eb6c43e383..03aae759347 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 fecf08d712d..64d2e4eb2bb 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c7b12d99bad..c5a9e8e2648 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 - 7.6.0.202602181523-m3 + 7.6.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 2ed30b6a038..012f00bf72f 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 7cdbb45d397..9c1adcb4a2d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index b65b635eff1..8d6d068adcb 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 - 7.6.0.202602181523-m3 + 7.6.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 c4425cfe74b..bf528656d9e 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 57559b7ac77..cb07dc904c1 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index e527530d1cf..fa798c8ae80 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 - 7.6.0.202602181523-m3 + 7.6.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 4991a665898..9b0f742fee6 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 55d2eab2b15..3cdda74bfd7 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 - 7.6.0.202602181523-m3 + 7.6.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 580e54bc415..b0ee6b4beb0 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 45aa255040c..c2a8147e8ee 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 617210d602e..1b4a73b4de0 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 - 7.6.0.202602181523-m3 + 7.6.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 61cac4d125b..d79ae9a34fc 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 4ff654dfdfb..4f9de97f59b 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 - 7.6.0.202602181523-m3 + 7.6.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 fc71a4b5458..44d84770ecd 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index c251855122b..cdc7cf9b7bf 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index cd8d709b589..803606acf18 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 - 7.6.0.202602181523-m3 + 7.6.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 760d780c45f..c5521eea303 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 56ba5d40a2a..95ec4e95b99 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 - 7.6.0.202602181523-m3 + 7.6.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 152db20c7de..1518beb7854 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 4938948c265..f3f10fd2ab2 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 - 7.6.0.202602181523-m3 + 7.6.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 5772e53192a..b9815d6a251 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 31f24d41e0d..1f0ad42946e 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 - 7.6.0.202602181523-m3 + 7.6.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 6a6532ec46b..efbf3c03d15 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 6b3eb874430..a0f6e9263b0 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 - 7.6.0.202602181523-m3 + 7.6.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 465eef37f05..fef54ecbba2 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 c40ac22094d..74daa110a44 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 - 7.6.0.202602181523-m3 + 7.6.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 58fb9adb1b5..868aa02c2db 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 39b986927c9..8812d722f52 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 - 7.6.0.202602181523-m3 + 7.6.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 cb9fc9f4069..5c71af5fc99 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 - 7.6.0.202602181523-m3 + 7.6.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 d4e177e5ee5..bfb53604c02 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 344d4ad39a3..4eb2a6daf73 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 - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.6.0.202602181523-m3 + 7.6.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 bc1862cebb1..cc7a9d67614 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 645d43d04f9..bd383609364 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 - 7.6.0.202602181523-m3 + 7.6.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 5bb936d13dc..ab0775e3421 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 21e7eb18c0b..7d881a52494 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 - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index d3b192d5420..07f6f21f45f 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 - 7.6.0.202602181523-m3 + 7.6.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 b5a9d797b0d..5f81b7d60d7 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier 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 9412ec1505d..de0a37aa8a6 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 - 7.6.0.202602181523-m3 + 7.6.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 a5265d21841..0e19ea5ff81 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 5206a39c536..dcb551955e6 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 4a405a21b4e..041c46db7c5 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 - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index a2ad5304c60..2ef72566aa4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.0,7.7.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index cc69877662b..56d463f7f96 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 2ce3628f327..9c2bf0345c7 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 439dff45888..d2bf5aeb258 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index f4184261225..5a9057fe5cd 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 - 7.6.0.202602181523-m3 + 7.6.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 c1fe42c3745..7a7d7e1b84f 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 650b6ff93f6..5ef864b3899 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 407ea7d337e..3edf6e6ce65 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 - 7.6.0.202602181523-m3 + 7.6.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 bdf945d3bcf..4632a36b0bf 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 9366351cd65..70b0af03255 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 - 7.6.0.202602181523-m3 + 7.6.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 41f3f5b0993..436d2510170 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.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 c29e6722ae1..7cba3294642 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index c9145433d38..91caa5e818e 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 - 7.6.0.202602181523-m3 + 7.6.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 e3fd4ec0b4f..bee0f4927ee 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 298a8c918e4..387f1683069 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 - 7.6.0.202602181523-m3 + 7.6.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 b73d5a48458..b3ecf33ca23 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 7165557abae..e20c4f219c8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 7fe5d427b18..2acf0e0b343 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 - 7.6.0.202602181523-m3 + 7.6.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 498f3dc095b..15ae6efaadf 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: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 3d1ff9fe656..48db010fc9e 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602181523-m3 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.202602181523-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 22a04be3b45..890cb9cbf19 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 4756516bf81..50055da6338 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.6.0.202602181523-m3 + 7.6.0-SNAPSHOT JGit - Parent ${jgit-url} From 52b8488c1e97d68697cf550bf535abe91c29009a Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 14:50:20 -0800 Subject: [PATCH 010/200] DfsPackFileMidx: Offer localIterator We need the iterator to use an exiting midx as input to write a new one. Add a localIterator() method to get the iterator over local objects. Change-Id: Ie5037639dbec0abc8af8a6e195aa5c756a6a6964 --- .../jgit/internal/storage/dfs/DfsPackFileMidx.java | 13 +++++++++++++ .../internal/storage/dfs/DfsPackFileMidxNPacks.java | 6 ++++++ .../internal/storage/dfs/DfsPackFileMidxSingle.java | 10 ++++++++++ 3 files changed, 29 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java index 0582737753a..3c63db2fcfa 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java @@ -20,6 +20,7 @@ import org.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableException; import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.file.PackReverseIndex; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex; import org.eclipse.jgit.internal.storage.pack.ObjectToPack; import org.eclipse.jgit.internal.storage.pack.PackOutputStream; import org.eclipse.jgit.lib.AbbreviatedObjectId; @@ -152,6 +153,18 @@ protected int getObjectCount(DfsReader ctx) throws IOException { */ protected abstract byte[] getChecksum(DfsReader ctx) throws IOException; + /** + * Get a midx iterator over the contents of *this* midx, without the base. + * + * @param ctx + * a ready + * @return an iterator over the objects in this midx in sha1 order + * @throws IOException + * an error loading the underlying data + */ + protected abstract MultiPackIndex.MidxIterator localIterator(DfsReader ctx) + throws IOException; + @Override public final PackIndex getPackIndex(DfsReader ctx) { return new MidxPackIndex(this, ctx); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacks.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacks.java index bed7a534999..7b030cf1809 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacks.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacks.java @@ -242,6 +242,12 @@ protected byte[] getChecksum(DfsReader ctx) throws IOException { return midx(ctx).getChecksum(); } + @Override + protected MultiPackIndex.MidxIterator localIterator(DfsReader ctx) + throws IOException { + return midx(ctx).iterator(); + } + /** * Packs indexed by this multipack index (base NOT included) * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxSingle.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxSingle.java index 71ff884cda7..89dbf9daf49 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxSingle.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxSingle.java @@ -25,6 +25,8 @@ import org.eclipse.jgit.internal.storage.file.PackBitmapIndex; import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.file.PackReverseIndex; +import org.eclipse.jgit.internal.storage.midx.MidxIterators; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex; import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.PackOffset; import org.eclipse.jgit.internal.storage.pack.ObjectToPack; import org.eclipse.jgit.internal.storage.pack.PackExt; @@ -149,6 +151,14 @@ protected byte[] getChecksum(DfsReader ctx) throws IOException { return checksum; } + @Override + protected MultiPackIndex.MidxIterator localIterator(DfsReader ctx) + throws IOException { + String packName = pack.getPackDescription().getPackName(); + PackIndex packIndex = pack.getPackIndex(ctx); + return MidxIterators.fromPackIndexIterator(packName, packIndex); + } + /** * Packs indexed by this multipack index (base NOT included) * From 9cebcc02aa2c22c3ce04d44e386b5f234b0a6aef Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 14:50:20 -0800 Subject: [PATCH 011/200] MidxIterators join: compare shifted packId When comparing entries, for the same SHA1 we want the object with the smallest packId. We are doing that comparison without shifting the packId. This works when joining iterators over single packs, because packId is always 0 and we choose in iterator order, but this won't work with midx iterators that cover multiple packs. Include the packId shift in the comparison. Remove the Comparable from MutableEntry as it was our only use and it is rather confusing that it works only over a single midx. Change-Id: I69362c77a6a124fa2f93a4a2a733ca546a6a6964 --- .../storage/midx/MidxIteratorsTest.java | 18 ++++++++++++++++++ .../internal/storage/midx/MidxIterators.java | 16 +++++++++++++++- .../internal/storage/midx/MultiPackIndex.java | 12 +----------- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxIteratorsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxIteratorsTest.java index 065385f4ad1..310542345cb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxIteratorsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxIteratorsTest.java @@ -147,6 +147,24 @@ public void join_duplicates_inPackIdOrder() { assertFalse(it.hasNext()); } + @Test + public void join_duplicates_inPackIdOrder_shift() { + FakeMidxIterator itOne = FakeMidxIterator.from("itOne", 5, + List.of(new IndexEntry("000001", 4, 501), + new IndexEntry("000003", 2, 1501))); + + FakeMidxIterator itTwo = FakeMidxIterator.from("itTwo", 2, + List.of(new IndexEntry("000001", 0, 500), + new IndexEntry("000003", 1, 1500))); + + MidxIterator it = MidxIterators.join(List.of(itOne, itTwo)); + assertNextEntry(it, "000001", 4, 501); + assertNextEntry(it, "000001", 5, 500); + assertNextEntry(it, "000003", 2, 1501); + assertNextEntry(it, "000003", 6, 1500); + assertFalse(it.hasNext()); + } + @Test public void join_peek() { FakeMidxIterator itOne = FakeMidxIterator.from("itOne", 2, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxIterators.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxIterators.java index d1fa881ae70..c30b9b8c989 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxIterators.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxIterators.java @@ -195,6 +195,7 @@ private MutableEntry shiftPackId(MutableEntry entry, int shift) { private int best() { int winnerPos = -1; + int winnerPackShift = 0; MidxIterator winner = null; for (int index = 0; index < indexIterators.size(); index++) { MidxIterator current = indexIterators.get(index); @@ -202,9 +203,11 @@ private int best() { continue; } if (winner == null - || current.peek().compareTo(winner.peek()) < 0) { + || compareEntries(current.peek(), packCountAgg[index], + winner.peek(), winnerPackShift) < 0) { winner = current; winnerPos = index; + winnerPackShift = packCountAgg[winnerPos]; } } @@ -215,6 +218,17 @@ private int best() { return winnerPos; } + private static int compareEntries(MutableEntry a, int aPackShift, + MutableEntry b, int bPackShift) { + int cmp = a.oid.compareTo(b.oid); + if (cmp != 0) { + return cmp; + } + + return Integer.compare(a.getPackId() + aPackShift, + b.getPackId() + bPackShift); + } + @Override public void reset() { indexIterators.stream().forEach(MidxIterator::reset); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndex.java index e31c061983d..b209aa96a6c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndex.java @@ -240,21 +240,11 @@ public String toString() { *

* Mutable so the iterator can reuse the instance for performance. */ - class MutableEntry implements Comparable { + class MutableEntry { protected final MutableObjectId oid = new MutableObjectId(); protected final PackOffset packOffset = new PackOffset(); - @Override - public int compareTo(MutableEntry mutableEntry) { - int cmp = oid.compareTo(mutableEntry.oid); - if (cmp != 0) { - return cmp; - } - - return packOffset.getPackId() - mutableEntry.packOffset.getPackId(); - } - /** * Copy data from other into this instance, adding the shift to the * packId From bb5d998fd538f6a111eaca4a90aa853bc7000366 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 12 Feb 2026 12:31:33 -0800 Subject: [PATCH 012/200] DfsMidxWriter: Pass the PackIndexMerger instead of a Map of sources The first thing the writer does is putting the map into a PackIndexMerger. Let callers do that. The PackIndexMerger.Builder is more explicit than the map, we save an intermediate transformation and this enables adding midxs as input to the merger. Change-Id: I3dd0f116a7779c34b2be278d46716e306a6a6964 --- .../org/eclipse/jgit/pgm/MultiPackIndex.java | 9 ++- .../midx/CgitMidxCompatibilityTest.java | 9 +-- .../midx/MultiPackIndexLoaderTest.java | 9 +-- .../storage/midx/MultiPackIndexTest.java | 60 +++++++++---------- .../midx/MultiPackIndexWriterTest.java | 24 ++++---- .../internal/storage/dfs/DfsMidxWriter.java | 11 ++-- .../storage/midx/MultiPackIndexWriter.java | 16 ++--- .../storage/midx/PackIndexMerger.java | 33 +++++++++- 8 files changed, 87 insertions(+), 84 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java index a7df4faa29c..d91f7130a0e 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java @@ -16,14 +16,13 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import java.util.LinkedHashMap; 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; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexPrettyPrinter; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; +import org.eclipse.jgit.internal.storage.midx.PackIndexMerger; import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.lib.NullProgressMonitor; import org.kohsuke.args4j.Argument; @@ -86,11 +85,11 @@ private void writeMultiPackIndex() throws IOException { ObjectDirectory odb = (ObjectDirectory) db.getObjectDatabase(); - LinkedHashMap indexes = new LinkedHashMap<>(); + PackIndexMerger.Builder builder = PackIndexMerger.builder(); for (Pack pack : odb.getPacks()) { PackFile packFile = pack.getPackFile().create(PackExt.INDEX); try { - indexes.put(packFile.getName(), pack.getIndex()); + builder.addPack(packFile.getName(), pack.getIndex()); } catch (IOException e) { throw die("Cannot open index in pack", e); } @@ -98,7 +97,7 @@ private void writeMultiPackIndex() throws IOException { MultiPackIndexWriter writer = new MultiPackIndexWriter(); try (FileOutputStream out = new FileOutputStream(midxPath)) { - writer.write(NullProgressMonitor.INSTANCE, out, indexes); + writer.write(NullProgressMonitor.INSTANCE, out, builder.build()); } catch (IOException e) { throw die("Cannot write midx " + midxPath, e); } diff --git a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java index 334e52b0423..3aa6d69b103 100644 --- a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java +++ b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java @@ -25,13 +25,10 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.eclipse.jgit.internal.storage.file.Pack; import org.eclipse.jgit.internal.storage.file.PackFile; -import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; @@ -93,15 +90,15 @@ public void jgit_loadsCgitMidx() } private byte[] generateJGitMidx() throws IOException { - Map indexes = new HashMap<>(); + PackIndexMerger.Builder builder = PackIndexMerger.builder(); for (Pack pack : db.getObjectDatabase().getPacks()) { PackFile packFile = pack.getPackFile().create(PackExt.INDEX); - indexes.put(packFile.getName(), pack.getIndex()); + builder.addPack(packFile.getName(), pack.getIndex()); } MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, indexes); + writer.write(NullProgressMonitor.INSTANCE, out, builder.build()); return out.toByteArray(); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoaderTest.java index 3c7e27d6670..a59e8749172 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoaderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoaderTest.java @@ -17,7 +17,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.LinkedHashMap; import java.util.List; import org.eclipse.jgit.internal.storage.file.PackIndex; @@ -64,13 +63,11 @@ public void load_validFile_basic_jgit() throws Exception { new FakeIndexFactory.IndexObject( "0000000000000000000000000000000000000012", 1502))); - LinkedHashMap packs = new LinkedHashMap<>(3); - packs.put("p1", idxOne); - packs.put("p2", idxTwo); - packs.put("p3", idxThree); + PackIndexMerger data = PackIndexMerger.builder().addPack("p1", idxOne) + .addPack("p2", idxTwo).addPack("p3", idxThree).build(); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, packs); + writer.write(NullProgressMonitor.INSTANCE, out, data); MultiPackIndex midx = MultiPackIndexLoader .read(new ByteArrayInputStream(out.toByteArray())); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexTest.java index a2c86f3dce0..75a5a956cdf 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexTest.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; import java.util.Set; @@ -114,7 +113,7 @@ public void jgit_largeOffsetChunk() throws IOException { "0000000000000000000000000000000000000002", (1L << 35)), new FakeIndexFactory.IndexObject( "0000000000000000000000000000000000000003", 13))); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger packs = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -145,7 +144,7 @@ public void jgit_largeOffset_noChunk() throws IOException { "0000000000000000000000000000000000000002", 501), new FakeIndexFactory.IndexObject( "0000000000000000000000000000000000000003", 13))); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger packs = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -182,7 +181,7 @@ public void jgit_resolve() throws IOException { // Match "32fe829a1c000000000000000000000000000010"); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger packs = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -226,7 +225,7 @@ public void jgit_resolve_matchLimit() throws IOException { // Match "32fe829a1c000000000000000000000000000010"); - LinkedHashMap packs = orderedMapOf("r1", idxOne, + PackIndexMerger packs = midxDataFor("r1", idxOne, "r2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -261,7 +260,7 @@ public void jgit_resolve_noMatches() throws IOException { "bbbbbb0000000000000000000000000000000003", "32fe829a1c000000000000000000000000000010"); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger packs = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -292,7 +291,7 @@ public void jgit_resolve_noMatches_last() throws IOException { "bbbbbb0000000000000000000000000000000003", "32fe829a1c000000000000000000000000000010"); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger packs = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -314,11 +313,11 @@ public void jgit_resolve_empty() throws IOException { PackIndex idxOne = FakeIndexFactory.indexOf(List.of()); PackIndex idxTwo = FakeIndexFactory.indexOf(List.of()); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger data = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, packs); + writer.write(NullProgressMonitor.INSTANCE, out, data); MultiPackIndex midx = MultiPackIndexLoader .read(new ByteArrayInputStream(out.toByteArray())); @@ -377,11 +376,11 @@ private static MultiPackIndex createMultiPackIndex() throws IOException { new FakeIndexFactory.IndexObject( "0000000000000000000000000000000000000012", 1502))); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger data = midxDataFor("p1", idxOne, "p2", idxTwo, "p3", idxThree); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, packs); + writer.write(NullProgressMonitor.INSTANCE, out, data); return MultiPackIndexLoader .read(new ByteArrayInputStream(out.toByteArray())); @@ -398,11 +397,11 @@ public void jgit_getObjectCount_emtpy() throws IOException { PackIndex idxOne = FakeIndexFactory.indexOf(List.of()); PackIndex idxTwo = FakeIndexFactory.indexOf(List.of()); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger data = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, packs); + writer.write(NullProgressMonitor.INSTANCE, out, data); MultiPackIndex midx = MultiPackIndexLoader .read(new ByteArrayInputStream(out.toByteArray())); @@ -433,11 +432,11 @@ public void jgit_findBitmapPosition() throws IOException { new FakeIndexFactory.IndexObject( "0000000000000000000000000000000000000012", 1502))); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger data = midxDataFor("p1", idxOne, "p2", idxTwo, "p3", idxThree); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, packs); + writer.write(NullProgressMonitor.INSTANCE, out, data); MultiPackIndex midx = MultiPackIndexLoader .read(new ByteArrayInputStream(out.toByteArray())); @@ -495,11 +494,11 @@ public void jgit_getObjectAtBitmapPosition() throws IOException { new FakeIndexFactory.IndexObject( "0000000000000000000000000000000000000012", 1502))); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger data = midxDataFor("p1", idxOne, "p2", idxTwo, "p3", idxThree); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, packs); + writer.write(NullProgressMonitor.INSTANCE, out, data); MultiPackIndex midx = MultiPackIndexLoader .read(new ByteArrayInputStream(out.toByteArray())); @@ -563,11 +562,11 @@ public void jgit_iterator_emtpy() throws IOException { PackIndex idxOne = FakeIndexFactory.indexOf(List.of()); PackIndex idxTwo = FakeIndexFactory.indexOf(List.of()); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger data = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, packs); + writer.write(NullProgressMonitor.INSTANCE, out, data); MultiPackIndex midx = MultiPackIndexLoader .read(new ByteArrayInputStream(out.toByteArray())); @@ -591,11 +590,11 @@ public void jgit_iterator_peek() throws IOException { new FakeIndexFactory.IndexObject( "0000000000000000000000000000000000000015", 1501))); - LinkedHashMap packs = orderedMapOf("p1", idxOne, + PackIndexMerger data = midxDataFor("p1", idxOne, "p2", idxTwo); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - writer.write(NullProgressMonitor.INSTANCE, out, packs); + writer.write(NullProgressMonitor.INSTANCE, out, data); MultiPackIndex midx = MultiPackIndexLoader .read(new ByteArrayInputStream(out.toByteArray())); @@ -662,21 +661,16 @@ private static void assertEntry(MultiPackIndex.MutableEntry e, String oid, assertEquals(expectedOffset, e.packOffset.getOffset()); } - private static LinkedHashMap orderedMapOf(String s1, - PackIndex pi1, String s2, PackIndex pi2) { - LinkedHashMap map = new LinkedHashMap<>(2); - map.put(s1, pi1); - map.put(s2, pi2); - return map; + private static PackIndexMerger midxDataFor(String s1, PackIndex pi1, + String s2, PackIndex pi2) { + return PackIndexMerger.builder().addPack(s1, pi1).addPack(s2, pi2) + .build(); } - private static LinkedHashMap orderedMapOf(String s1, + private static PackIndexMerger midxDataFor(String s1, PackIndex pi1, String s2, PackIndex pi2, String s3, PackIndex pi3) { - LinkedHashMap map = new LinkedHashMap<>(3); - map.put(s1, pi1); - map.put(s2, pi2); - map.put(s3, pi3); - return map; + return PackIndexMerger.builder().addPack(s1, pi1).addPack(s2, pi2) + .addPack(s3, pi3).build(); } private static ObjectId oid(String last3chars) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java index 5971dcebf30..1ca8aaf492e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedHashMap; import java.util.List; import org.eclipse.jgit.internal.storage.file.PackIndex; @@ -47,9 +46,9 @@ public void write_allSmallOffsets() throws IOException { object("0000000000000000000000000000000000000004", 1500), object("0000000000000000000000000000000000000006", 3000)); - LinkedHashMap data = new LinkedHashMap<>(); - data.put("packname1", index1); - data.put("packname2", index2); + PackIndexMerger data = PackIndexMerger.builder() + .addPack("packname1", index1).addPack("packname2", index2) + .build(); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -85,9 +84,9 @@ public void write_smallOffset_limit() throws IOException { object("0000000000000000000000000000000000000002", 500), object("0000000000000000000000000000000000000004", 1500), object("0000000000000000000000000000000000000006", 3000)); - LinkedHashMap data = new LinkedHashMap<>(2); - data.put("packname1", index1); - data.put("packname2", index2); + PackIndexMerger data = PackIndexMerger.builder() + .addPack("packname1", index1).addPack("packname2", index2) + .build(); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -122,9 +121,9 @@ public void write_largeOffset() throws IOException { object("0000000000000000000000000000000000000002", 500), object("0000000000000000000000000000000000000004", 1500), object("0000000000000000000000000000000000000006", 3000)); - LinkedHashMap data = new LinkedHashMap<>(2); - data.put("bbbbbbbbb", index1); - data.put("aaaaaaaaa", index2); + PackIndexMerger data = PackIndexMerger.builder() + .addPack("bbbbbbbbb", index1).addPack("aaaaaaaaa", index2) + .build(); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -159,9 +158,8 @@ public void write_largeOffset() throws IOException { public void jgit_emptyMidx() throws IOException { PackIndex idxOne = FakeIndexFactory.indexOf(List.of()); PackIndex idxTwo = FakeIndexFactory.indexOf(List.of()); - LinkedHashMap packs = new LinkedHashMap<>(2); - packs.put("p1", idxOne); - packs.put("p2", idxTwo); + PackIndexMerger packs = PackIndexMerger.builder().addPack("p1", idxOne) + .addPack("p2", idxTwo).build(); MultiPackIndexWriter writer = new MultiPackIndexWriter(); ByteArrayOutputStream out = new ByteArrayOutputStream(); writer.write(NullProgressMonitor.INSTANCE, out, packs); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java index 654bc30225f..0cdb304be05 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -26,8 +25,8 @@ import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; -import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; +import org.eclipse.jgit.internal.storage.midx.PackIndexMerger; import org.eclipse.jgit.internal.storage.pack.PackBitmapCalculator; import org.eclipse.jgit.internal.storage.pack.PackBitmapIndexWriter; import org.eclipse.jgit.lib.Constants; @@ -92,11 +91,10 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, DfsObjDatabase objdb, List packs, @Nullable DfsPackDescription base, PackConfig packConfig) throws IOException { - LinkedHashMap inputs = new LinkedHashMap<>( - packs.size()); + PackIndexMerger.Builder dataBuilder = PackIndexMerger.builder(); try (DfsReader ctx = objdb.newReader()) { for (DfsPackFile pack : packs) { - inputs.put(pack.getPackDescription().getPackName(), + dataBuilder.addPack(pack.getPackDescription().getPackName(), pack.getPackIndex(ctx)); } } @@ -105,7 +103,8 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, try (DfsOutputStream out = objdb.writeFile(midxPackDesc, MULTI_PACK_INDEX)) { MultiPackIndexWriter w = new MultiPackIndexWriter(); - MultiPackIndexWriter.Result result = w.write(pm, out, inputs); + MultiPackIndexWriter.Result result = w.write(pm, out, + dataBuilder.build()); midxPackDesc.addFileExt(MULTI_PACK_INDEX); midxPackDesc.setFileSize(MULTI_PACK_INDEX, result.bytesWritten()); midxPackDesc.setObjectCount(result.objectCount()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java index 37b81cd1921..7c69b7842d4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -35,7 +35,6 @@ import java.util.Map; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.io.CancellableDigestOutputStream; import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MutableEntry; import org.eclipse.jgit.lib.ProgressMonitor; @@ -78,22 +77,15 @@ public record Result(long bytesWritten, int objectCount, * progress monitor * @param outputStream * stream to write the multipack index file - * @param inputs - * pairs of name and index for each pack to include in the - * multipack index. + * @param data + * a pack index merger with the data sources (in order) for this + * midx * @return data about the write (e.g. bytes written) * @throws IOException * Error writing to the stream */ public Result write(ProgressMonitor monitor, OutputStream outputStream, - Map inputs) throws IOException { - // TODO(ifrade): Pass the PackIndexMerger as parameter instead of making - // a map to them make the merger. - PackIndexMerger.Builder builder = PackIndexMerger.builder(); - inputs.entrySet().stream() - .forEach(e -> builder.addPack(e.getKey(), e.getValue())); - PackIndexMerger data = builder.build(); - + PackIndexMerger data) throws IOException { // List of chunks in the order they need to be written List chunkHeaders = createChunkHeaders(data); long expectedSize = calculateExpectedSize(chunkHeaders); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index 0f35d674df3..0a0088518dc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -30,7 +30,7 @@ * entries. The stats of the combined index are calculated in an iteration at * construction time. */ -class PackIndexMerger { +public class PackIndexMerger { private static final int LIMIT_31_BITS = (1 << 31) - 1; @@ -48,21 +48,45 @@ class PackIndexMerger { private final List packnames; - static class Builder { + /** + * Builder collecting the inputs for the merger. + *

+ * Order matters. Packs will appear in the midx in the order they are added. + */ + public static class Builder { private final List packIndexes = new ArrayList<>(); + /** + * Add a regular pack to the midx + * + * @param name + * name of the pack + * @param idx + * primary index of the pack + * @return this builder + */ public Builder addPack(String name, PackIndex idx) { packIndexes.add(MidxIterators.fromPackIndexIterator(name, idx)); return this; } + /** + * Build the merger instance + * + * @return a merger instance + */ public PackIndexMerger build() { return new PackIndexMerger( MidxIterators.dedup(MidxIterators.join(packIndexes))); } } + /** + * Create a builder + * + * @return an empty builder + */ public static Builder builder() { return new Builder(); } @@ -78,7 +102,8 @@ private PackIndexMerger(MidxIterator midxIterator) { this.packnames = midxIterator.getPackNames(); objectsPerPack = new int[packnames.size()]; - // Iterate for duplicates + // Iterate for duplicates and counts that we need to build the chunk + // headers. int objectCount = 0; boolean hasLargeOffsets = false; int over31bits = 0; @@ -97,6 +122,8 @@ private PackIndexMerger(MidxIterator midxIterator) { lastSeen.fromObjectId(entry.oid); objectCount++; + // TODO(ifrade): we can calculate the fanout table already here. + // It saves an iteration over all objects for only 1Kb of memory objectsPerPack[entry.getPackId()]++; } uniqueObjectCount = objectCount; From e73bde33736b902e32e03754a64318ec1450f78f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 22:16:29 +0100 Subject: [PATCH 013/200] Orbit: update org.objenesis to 3.5.0 Change-Id: I052e6a5d397f64adc73ec9ae6ec212ca2a376e36 --- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +++--- .../org.eclipse.jgit.target/orbit/orbit-4.39.tpd | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 5836dd394a4..4886972355d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -24,8 +24,8 @@ - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.39.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.39.tpd index 48725cafb07..54f77894741 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.39.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.39.tpd @@ -22,8 +22,8 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 org.objectweb.asm.util [9.9.1,9.9.1] org.objectweb.asm.tree [9.9.1,9.9.1] org.objectweb.asm.tree.analysis [9.9.1,9.9.1] - org.objenesis [3.4,3.4] - org.objenesis.source [3.4,3.4] + org.objenesis [3.5.0,3.5.0] + org.objenesis.source [3.5.0,3.5.0] org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] } From 0cc5bdb670e02bc42c351c92d1c23b87e42a5d71 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 22:17:21 +0100 Subject: [PATCH 014/200] Update commons-codec to 1.21.0 Change-Id: If06da6825412977c294a23a9c6a568828e97c13b --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 7b70fa27d66..ea2fcd78fbb 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -45,7 +45,7 @@ maven.install( "com.googlecode.javaewah:JavaEWAH:1.2.3", "com.jcraft:jsch:0.1.55", "com.jcraft:jzlib:1.1.3", - "commons-codec:commons-codec:1.20.0", + "commons-codec:commons-codec:1.21.0", "commons-io:commons-io:2.21.0", "commons-logging:commons-logging:1.3.5", "jakarta.servlet:jakarta.servlet-api:6.1.0", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 2f519a09985..1a131948076 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -259,7 +259,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index abaa5a4c572..5c560395663 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -259,7 +259,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index c6a05ea4061..ab4e450440b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -259,7 +259,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index a4b0cac3128..36df9bf2500 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -259,7 +259,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index e75ee6d2b23..9c7d72a9ab5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -259,7 +259,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 4886972355d..31c3beb2184 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -259,7 +259,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index b67fa77a86c..2458ef16af6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -10,7 +10,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.20.0" + version = "1.21.0" } dependency { groupId = "org.apache.commons" diff --git a/pom.xml b/pom.xml index 50055da6338..d87d4bbd9d0 100644 --- a/pom.xml +++ b/pom.xml @@ -899,7 +899,7 @@ commons-codec commons-codec - 1.20.0 + 1.21.0 From cf1670a31cac02fc34028937d8f1f8bed905d494 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 22:28:59 +0100 Subject: [PATCH 015/200] Update bytebuddy to 1.18.5 Change-Id: I69f2445e34999124e52337dc404cb91d61313e6c --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index ea2fcd78fbb..19d23dbe558 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -23,7 +23,7 @@ git_repository( BOUNCYCASTLE_VERSION = "1.83" -BYTE_BUDDY_VERSION = "1.18.4" +BYTE_BUDDY_VERSION = "1.18.5" JETTY_VERSION = "12.1.5" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 1a131948076..b3033c4ed6a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -195,13 +195,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 5c560395663..b909a4e8dda 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -195,13 +195,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index ab4e450440b..754e83d1376 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -195,13 +195,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 36df9bf2500..6b8f742ecf9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -195,13 +195,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 9c7d72a9ab5..55de40da0f4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -195,13 +195,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 31c3beb2184..42a0798cf50 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -195,13 +195,13 @@ net.bytebuddy byte-buddy - 1.18.4 + 1.18.5 jar net.bytebuddy byte-buddy-agent - 1.18.4 + 1.18.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 2458ef16af6..69714808df7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.4" + version = "1.18.5" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.4" + version = "1.18.5" } } diff --git a/pom.xml b/pom.xml index d87d4bbd9d0..8fce55b1925 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 3.0 3.27.7 5.18.1 - 1.18.4 + 1.18.5 jacoco From 065980a9241c169baacabafabd6bc4befb0ab527 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 18 Feb 2026 23:04:02 +0100 Subject: [PATCH 016/200] Update jetty to 12.1.6 Change-Id: Ic9f42f51b404d2b53b17643fb12a0d0e3ad20eef --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.35.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.36.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.37.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.38.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.39.target | 18 +++++++++--------- .../maven/dependencies.tpd | 16 ++++++++-------- pom.xml | 2 +- 9 files changed, 64 insertions(+), 64 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 19d23dbe558..c8f5319e07c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -25,7 +25,7 @@ BOUNCYCASTLE_VERSION = "1.83" BYTE_BUDDY_VERSION = "1.18.5" -JETTY_VERSION = "12.1.5" +JETTY_VERSION = "12.1.6" JMH_VERSION = "1.37" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index b3033c4ed6a..2d3f3625d00 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -107,49 +107,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index b909a4e8dda..5ec0fcc2cc7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -107,49 +107,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 754e83d1376..3a8524f34df 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -107,49 +107,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 6b8f742ecf9..81298424579 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -107,49 +107,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 55de40da0f4..bdaac33092f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -107,49 +107,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 42a0798cf50..995e06b16e0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -107,49 +107,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-http - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-io - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-security - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-server - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-session - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util - 12.1.5 + 12.1.6 jar org.eclipse.jetty jetty-util-ajax - 12.1.5 + 12.1.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 69714808df7..314de5d5673 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.5" + version = "12.1.6" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 8fce55b1925..57849fa90ed 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.28.0 6.0.0 6.1.0 - 12.1.5 + 12.1.6 0.25.0 4.5.14 4.4.16 From d85c8801376c7aeac40dcd52089bfbcced87f9e9 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 14:50:20 -0800 Subject: [PATCH 017/200] DfsMidxWriterTest: Rename to DfsMidxWriterBitmapsTest This test is really writing bitmaps. We need the DfsMidxWriterTest name for basic test of the writer. Change-Id: I254ec40e5f7238b1fe82e8840dcbdd496a6a6964 --- .../{DfsMidxWriterTest.java => DfsMidxWriterBitmapsTest.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/{DfsMidxWriterTest.java => DfsMidxWriterBitmapsTest.java} (98%) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriterBitmapsTest.java similarity index 98% rename from org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriterTest.java rename to org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriterBitmapsTest.java index ac89baaadc8..0872dd41e97 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriterBitmapsTest.java @@ -37,7 +37,7 @@ import com.googlecode.javaewah.EWAHCompressedBitmap; @RunWith(Parameterized.class) -public class DfsMidxWriterTest { +public class DfsMidxWriterBitmapsTest { @Parameterized.Parameters(name = "{0}") public static Iterable data() throws Exception { @@ -55,7 +55,7 @@ public String toString() { private TestInput ti; - public DfsMidxWriterTest(TestInput ti) { + public DfsMidxWriterBitmapsTest(TestInput ti) { this.ti = ti; } From eff7695f0bebd667ee1e0b9c5813813b0ea097f1 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 14:50:20 -0800 Subject: [PATCH 018/200] DfsPackFileMidxNPacks: Use only the list of packs in midx order The constructor receives a list of packs to convert from packname to DfsPackFile the "covered packs" of the midx. That list can have more packs than needed, because it looks reasonable to pass all packs there and let the instance take what it needs (and nothing blocks it anywhere). Use "packsInIdOrder" for all the pack needs in this class. We know that it contains all required packs and nothing more. This is more permissive to the caller and safer the class. Change-Id: I44bd83df68f788bfddc81d0ddff946ff6a6a6964 --- .../storage/dfs/DfsPackFileMidxNPacks.java | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacks.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacks.java index 7b030cf1809..f042f2e61ec 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacks.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacks.java @@ -52,8 +52,6 @@ public final class DfsPackFileMidxNPacks extends DfsPackFileMidx { private static final int REF_POSITION = 0; - private final List packs; - // The required packs, in the order specified in the multipack index // Initialized lazily, when the midx is loaded private final DfsPackFile[] packsInIdOrder; @@ -64,14 +62,27 @@ public final class DfsPackFileMidxNPacks extends DfsPackFileMidx { private final VOffsetCalculatorNPacks offsetCalculator; + /** + * Create the DfsPackFileMidx instance for this midx with n packs + * + * @param cache + * dfs block cache + * @param desc + * description of the midx + * @param knownPacks + * known packs, to translate the pack names in coveredPacks into + * DfsPackFile instances. It must contain at least all packs + * covered by this midx. + * @param base + * base used by this midx. + */ DfsPackFileMidxNPacks(DfsBlockCache cache, DfsPackDescription desc, - List requiredPacks, @Nullable DfsPackFileMidx base) { + List knownPacks, @Nullable DfsPackFileMidx base) { super(cache, desc); this.base = base; - this.packs = requiredPacks; String[] coveredPackNames = desc.getCoveredPacks().stream() .map(DfsPackDescription::getPackName).toArray(String[]::new); - packsInIdOrder = getPacksInMidxIdOrder(coveredPackNames); + packsInIdOrder = getPacksInMidxIdOrder(knownPacks, coveredPackNames); offsetCalculator = VOffsetCalculatorNPacks.fromPacks(packsInIdOrder, base != null ? base.getOffsetCalculator() : null); this.length = offsetCalculator.getMaxOffset(); @@ -114,8 +125,9 @@ private static RefWithSize loadMultiPackIndex(DfsReader ctx, private record RefWithSize(MultiPackIndex idx, long size) { } - private DfsPackFile[] getPacksInMidxIdOrder(String[] packNames) { - Map byName = packs.stream() + private DfsPackFile[] getPacksInMidxIdOrder(List knownPacks, + String[] packNames) { + Map byName = knownPacks.stream() .collect(Collectors.toUnmodifiableMap( p -> p.getPackDescription().getPackName(), Function.identity())); @@ -170,7 +182,7 @@ && getPackDescription().hasFileExt(BITMAP_INDEX)) { List fullyIncludedIn(DfsReader ctx, BitmapIndex.BitmapBuilder need) throws IOException { List fullyIncluded = new ArrayList<>(); - for (DfsPackFile pack : packs) { + for (DfsPackFile pack : packsInIdOrder) { List includedPacks = pack.fullyIncludedIn(ctx, need); if (!includedPacks.isEmpty()) { fullyIncluded.addAll(includedPacks); @@ -186,7 +198,7 @@ List fullyIncludedIn(DfsReader ctx, @Override public CommitGraph getCommitGraph(DfsReader ctx) throws IOException { - for (DfsPackFile pack : packs) { + for (DfsPackFile pack : packsInIdOrder) { CommitGraph cg = pack.getCommitGraph(ctx); if (cg != null) { return cg; @@ -255,7 +267,7 @@ protected MultiPackIndex.MidxIterator localIterator(DfsReader ctx) */ @Override public List getCoveredPacks() { - return packs; + return List.of(packsInIdOrder); } /** @@ -350,7 +362,7 @@ void resolve(DfsReader ctx, Set matches, AbbreviatedObjectId id, @Override void copyPackAsIs(PackOutputStream out, DfsReader ctx) throws IOException { // Assumming the order of the packs does not really matter - for (DfsPackFile pack : packs) { + for (DfsPackFile pack : packsInIdOrder) { pack.copyPackAsIs(out, ctx); } From b2868827d609d6f08d59a0e53ef08c3a1d88f098 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 14:50:20 -0800 Subject: [PATCH 019/200] PackIndexMerger: Accept a midx as input to build another midx Change-Id: If1913bd7c66d31b183f6482eb9d285466a6a6964 --- .../storage/midx/PackIndexMergerTest.java | 58 ++++++++++++++++++- .../storage/midx/PackIndexMerger.java | 14 +++++ 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java index 32ce5b1223f..971087ee9e9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java @@ -14,6 +14,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.Arrays; import java.util.Iterator; @@ -21,6 +24,7 @@ import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MutableEntry; import org.eclipse.jgit.junit.FakeIndexFactory; import org.eclipse.jgit.junit.FakeIndexFactory.IndexObject; +import org.eclipse.jgit.lib.NullProgressMonitor; import org.junit.Test; public class PackIndexMergerTest { @@ -143,6 +147,44 @@ public void bySha1Iterator_differentIndexSizes() { assertFalse(it.hasNext()); } + @Test + public void bySha1Iterator_withAnotherMidx() throws IOException { + PackIndex idxOne = indexOf( + oidOffset("0000000000000000000000000000000000000010", 1500)); + PackIndex idxTwo = indexOf( + oidOffset("0000000000000000000000000000000000000002", 500), + oidOffset("0000000000000000000000000000000000000003", 12)); + PackIndex idxThree = indexOf( + oidOffset("0000000000000000000000000000000000000004", 500), + oidOffset("0000000000000000000000000000000000000007", 12), + oidOffset("0000000000000000000000000000000000000012", 1500)); + MultiPackIndex midx = midxOf("one", idxOne, "two", idxTwo, "three", + idxThree); + + PackIndex idxFour = indexOf( + oidOffset("0000000000000000000000000000000000000001", 12), + oidOffset("0000000000000000000000000000000000000007", 600), + oidOffset("0000000000000000000000000000000000000015", 300)); + + PackIndexMerger merger = PackIndexMerger.builder() + .addMidx(midx.iterator()).addPack("four", idxFour).build(); + assertEquals(8, merger.getUniqueObjectCount()); + assertEquals(4, merger.getPackCount()); + assertFalse(merger.needsLargeOffsetsChunk()); + Iterator it = merger.bySha1Iterator(); + assertNextEntry(it, "0000000000000000000000000000000000000001", 3, 12); + assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 500); + assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 12); + assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 500); + assertNextEntry(it, "0000000000000000000000000000000000000007", 2, 12); + assertNextEntry(it, "0000000000000000000000000000000000000010", 0, + 1500); + assertNextEntry(it, "0000000000000000000000000000000000000012", 2, + 1500); + assertNextEntry(it, "0000000000000000000000000000000000000015", 3, 300); + assertFalse(it.hasNext()); + } + @Test public void merger_noIndexes() { PackIndexMerger merger = PackIndexMerger.builder().build(); @@ -251,8 +293,8 @@ public void getObjectsPerPack_emptyIndexes() { assertArrayEquals(new int[] { 0, 0 }, merger.getObjectsPerPack()); } - private static void assertNextEntry( - Iterator it, String oid, int packId, long offset) { + private static void assertNextEntry(Iterator it, String oid, + int packId, long offset) { assertTrue(it.hasNext()); MutableEntry e = it.next(); assertEquals(oid, e.getObjectId().name()); @@ -268,6 +310,18 @@ private static PackIndex indexOf(IndexObject... objs) { return FakeIndexFactory.indexOf(Arrays.asList(objs)); } + private static MultiPackIndex midxOf(String s1, PackIndex idx1, String s2, + PackIndex idx2, String s3, PackIndex idx3) throws IOException { + PackIndexMerger merger = createMergerFor(s1, idx1, s2, idx2, s3, idx3); + MultiPackIndexWriter w = new MultiPackIndexWriter(); + + ByteArrayOutputStream out = new ByteArrayOutputStream(); + w.write(NullProgressMonitor.INSTANCE, out, merger); + + ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); + return MultiPackIndexLoader.read(in); + } + private static PackIndexMerger createMergerFor(String s1, PackIndex pi1, String s2, PackIndex pi2) { return PackIndexMerger.builder().addPack(s1, pi1).addPack(s2, pi2) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index 0a0088518dc..34364465b31 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -71,6 +71,20 @@ public Builder addPack(String name, PackIndex idx) { return this; } + /** + * Add data from this midx iterator to the merge + *

+ * Packs are kept in the order of the iterator. + * + * @param midx + * a midx iterator + * @return this builder + */ + public Builder addMidx(MidxIterator midx) { + packIndexes.add(midx); + return this; + } + /** * Build the merger instance * From 577b624f6d4d2da71a57fd2e235378aa959eb2e5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 12 Feb 2026 13:34:45 +0100 Subject: [PATCH 020/200] Refactor handlePackError method to improve readability by - extracting another private method for each error case - getting rid of the message template variables Change-Id: I336d65bd6a2d463af35fa58533b92492789d4de9 --- .../internal/storage/file/PackDirectory.java | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-) 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 5a36a13d54b..872bb9e4a83 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 @@ -313,47 +313,53 @@ private int checkRescanPackThreshold(int retries, PackMismatchException e) } private void handlePackError(IOException e, Pack p) { - String warnTemplate = null; - String debugTemplate = null; - int transientErrorCount = 0; - String errorTemplate = JGitText.get().exceptionWhileReadingPack; - Throwable executionCause = e.getCause(); + Throwable cause = e.getCause(); if (e instanceof FileNotFoundException - || executionCause instanceof FileNotFoundException) { - if (p.getPackFile().exists()) { - errorTemplate = JGitText.get().packInaccessible; - transientErrorCount = p.incrementTransientErrorCount(); - } else { - debugTemplate = JGitText.get().packWasDeleted; - remove(p); - } - } else if ((e instanceof CorruptObjectException) - || (e instanceof PackInvalidException)) { - warnTemplate = JGitText.get().corruptPack; - LOG.warn(MessageFormat.format(warnTemplate, - p.getPackFile().getAbsolutePath()), e); - // Assume the pack is corrupted, and remove it from the list. - remove(p); + || cause instanceof FileNotFoundException) { + handleFileNotFound(e, p); + } else if (e instanceof CorruptObjectException + || e instanceof PackInvalidException) { + handleCorruptPack(e, p); } else if (FileUtils.isStaleFileHandleInCausalChain(e)) { - warnTemplate = JGitText.get().packHandleIsStale; - remove(p); + handleStaleFileHandle(e, p); } else { - transientErrorCount = p.incrementTransientErrorCount(); + handleTransientError(e, p, + JGitText.get().exceptionWhileReadingPack); } - if (warnTemplate != null) { - LOG.warn(MessageFormat.format(warnTemplate, - p.getPackFile().getAbsolutePath()), e); - } else if (debugTemplate != null && LOG.isDebugEnabled()) { - LOG.debug(MessageFormat.format(debugTemplate, - p.getPackFile().getAbsolutePath()), e); + } + + private void handleFileNotFound(IOException e, Pack p) { + if (p.getPackFile().exists()) { + handleTransientError(e, p, JGitText.get().packInaccessible); } else { - if (doLogExponentialBackoff(transientErrorCount)) { - // Don't remove the pack from the list, as the error may be - // transient. - LOG.error(MessageFormat.format(errorTemplate, - p.getPackFile().getAbsolutePath(), - Integer.valueOf(transientErrorCount)), e); + if (LOG.isDebugEnabled()) { + LOG.debug(MessageFormat.format(JGitText.get().packWasDeleted, + p.getPackFile().getAbsolutePath()), e); } + remove(p); + } + } + + private void handleCorruptPack(IOException e, Pack p) { + LOG.warn(MessageFormat.format(JGitText.get().corruptPack, + p.getPackFile().getAbsolutePath()), e); + // Assume the pack is corrupted, and remove it from the list. + remove(p); + } + + private void handleStaleFileHandle(IOException e, Pack p) { + LOG.warn(MessageFormat.format(JGitText.get().packHandleIsStale, + p.getPackFile().getAbsolutePath()), e); + remove(p); + } + + private void handleTransientError(IOException e, Pack p, + String errorTemplate) { + int transientErrorCount = p.incrementTransientErrorCount(); + if (doLogExponentialBackoff(transientErrorCount)) { + LOG.error(MessageFormat.format(errorTemplate, + p.getPackFile().getAbsolutePath(), + Integer.valueOf(transientErrorCount)), e); } } From a18985148557f5c210d8ebb221d77fde90d69b14 Mon Sep 17 00:00:00 2001 From: Federico Jeanne Date: Mon, 23 Feb 2026 10:58:24 +0100 Subject: [PATCH 021/200] Remove the option to create 'blank issues' in GitHub As described in the official documentation: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser Change-Id: If3fa6cf33ce44711c54c22a6b29a6cbe9e841801 --- .github/ISSUE_TEMPLATE/config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000000..ec4bb386bcf --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false \ No newline at end of file From 490ed19fc73522265027ea377ff745289160d21f Mon Sep 17 00:00:00 2001 From: Federico Jeanne Date: Mon, 23 Feb 2026 12:54:52 +0100 Subject: [PATCH 022/200] RebaseCommand: Honor the commit message cleanup configuration When continuing a rebase that has been started from the git cli, the comments containing the files which had conflicts were not removed. This change makes sure that the cleanup mode is taken from the configuration and, if appropriate, remove the comments. Note: comments will only be removed if the cleanup mode has been set to "strip" in the git configuration. Also declare some fields in CommitConfig to be final to improve readability. Bug: jgit-245 Change-Id: Idcb6447d2167db4e3bbb87f83ae833962a68e59e --- .../src/org/eclipse/jgit/api/RebaseCommand.java | 2 ++ org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 3ae7a6c81e2..ae0389cc3d3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -1039,6 +1039,8 @@ private RevCommit continueRebase() throws GitAPIException, IOException { CommitCommand commit = git.commit(); commit.setMessage(rebaseState.readFile(MESSAGE)); commit.setAuthor(parseAuthor()); + commit.setCleanupMode( + commitConfig.resolve(CleanupMode.DEFAULT, false)); return commit.call(); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java index b1ba5dfa280..ae5b2143078 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java @@ -97,11 +97,11 @@ public boolean matchConfigValue(String in) { private final static Charset DEFAULT_COMMIT_MESSAGE_ENCODING = StandardCharsets.UTF_8; - private String i18nCommitEncoding; + private final String i18nCommitEncoding; - private String commitTemplatePath; + private final String commitTemplatePath; - private CleanupMode cleanupMode; + private final CleanupMode cleanupMode; private char commentCharacter = '#'; From d4ceb3f8daf02a39d109921d08f79bf98774e925 Mon Sep 17 00:00:00 2001 From: Jason Krause Date: Tue, 3 Feb 2026 08:12:52 +0100 Subject: [PATCH 023/200] Support diff3 conflict style in merges Add conflict style setters to commands that can produce merge conflicts and default to merge.conflictStyle from the Git config. Propagate the setting into the merger and select the appropriate formatter in ResolveMerger. Activate existing diff3 support and add tests for the new behavior. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=442284 Change-Id: Ic201492b2f086712d61fa61dc2c53fcbe5de46b3 --- .../jgit/api/CherryPickCommandTest.java | 20 +++++++++ .../eclipse/jgit/api/MergeCommandTest.java | 36 ++++++++++++++++ .../org/eclipse/jgit/api/PullCommandTest.java | 37 +++++++++++++++++ .../eclipse/jgit/api/RebaseCommandTest.java | 40 ++++++++++++++++++ .../eclipse/jgit/api/RevertCommandTest.java | 22 ++++++++++ .../jgit/api/StashApplyCommandTest.java | 41 +++++++++++++++++++ .../org/eclipse/jgit/merge/MergerTest.java | 36 ++++++++++++++++ .../eclipse/jgit/api/CherryPickCommand.java | 29 ++++++++++++- .../org/eclipse/jgit/api/MergeCommand.java | 21 +++++++++- .../src/org/eclipse/jgit/api/PullCommand.java | 28 +++++++++++++ .../org/eclipse/jgit/api/RebaseCommand.java | 30 +++++++++++++- .../org/eclipse/jgit/api/RevertCommand.java | 26 ++++++++++++ .../eclipse/jgit/api/StashApplyCommand.java | 37 ++++++++++++++--- .../org/eclipse/jgit/merge/MergeConfig.java | 24 +++++++++++ .../org/eclipse/jgit/merge/ResolveMerger.java | 37 ++++++++++++++++- 15 files changed, 451 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java index 3f5c5da55a1..cb91b121c64 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java @@ -11,6 +11,8 @@ import static org.eclipse.jgit.api.CherryPickCommitMessageProvider.ORIGINAL; import static org.eclipse.jgit.api.CherryPickCommitMessageProvider.ORIGINAL_WITH_REFERENCE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -22,6 +24,7 @@ import java.util.Iterator; import org.eclipse.jgit.api.CherryPickResult.CherryPickStatus; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; @@ -395,6 +398,23 @@ public void testCherryPickConflictMarkers() throws Exception { } } + @Test + public void testCherryPickConflictDiff3Markers() throws Exception { + try (Git git = new Git(db)) { + RevCommit sideCommit = prepareCherryPick(git); + + db.getConfig().setEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); + + CherryPickResult result = git.cherryPick() + .include(sideCommit.getId()).call(); + assertEquals(CherryPickStatus.CONFLICTING, result.getStatus()); + + String expected = "<<<<<<< master\na(master)\n||||||| BASE\na\n=======\na(side)\n>>>>>>> 527460a side\n"; + checkFile(new File(db.getWorkTree(), "a"), expected); + } + } + @Test public void testCherryPickConflictFiresModifiedEvent() throws Exception { ListenerHandle listener = null; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java index 1ec506798c4..086e2613867 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java @@ -10,6 +10,8 @@ */ package org.eclipse.jgit.api; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.eclipse.jgit.lib.Constants.MASTER; import static org.eclipse.jgit.lib.Constants.R_HEADS; import static org.junit.Assert.assertEquals; @@ -27,6 +29,7 @@ import java.util.Iterator; import java.util.regex.Pattern; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.MergeCommand.FastForwardMode; import org.eclipse.jgit.api.MergeResult.MergeStatus; import org.eclipse.jgit.api.ResetCommand.ResetType; @@ -2220,4 +2223,37 @@ private void checkMergeFailedResult(final MergeResult result, assertEquals(null, result.getConflicts()); assertEquals(RepositoryState.SAFE, db.getRepositoryState()); } + + @Test + public void testDiff3ConflictStyle() throws Exception { + try (Git git = new Git(db)) { + writeTrashFile("a", "1\na\n3\n"); + git.add().addFilepattern("a").call(); + RevCommit initialCommit = git.commit().setMessage("initial").call(); + + createBranch(initialCommit, "refs/heads/side"); + checkoutBranch("refs/heads/side"); + + writeTrashFile("a", "1\na(side)\n3\n"); + git.add().addFilepattern("a").call(); + RevCommit secondCommit = git.commit().setMessage("side").call(); + + checkoutBranch("refs/heads/master"); + + writeTrashFile("a", "1\na(main)\n3\n"); + git.add().addFilepattern("a").call(); + git.commit().setMessage("main").call(); + + db.getConfig().setEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); + + MergeResult result = git.merge().include(secondCommit.getId()) + .setStrategy(MergeStrategy.RESOLVE).call(); + assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus()); + + assertEquals( + "1\n<<<<<<< HEAD\na(main)\n||||||| BASE\na\n=======\na(side)\n>>>>>>> d97aebf6e0bbdb3f21f8a22ec8cbf1ac24d986d8\n3\n", + read(new File(db.getWorkTree(), "a"))); + } + } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java index 695681de8dc..5c33f038cf1 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java @@ -10,6 +10,8 @@ package org.eclipse.jgit.api; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -25,6 +27,7 @@ import java.util.concurrent.Callable; import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.MergeResult.MergeStatus; import org.eclipse.jgit.api.errors.NoHeadException; import org.eclipse.jgit.junit.JGitTestUtil; @@ -162,6 +165,40 @@ public void testPullConflict() throws Exception { assertEquals(StageState.BOTH_MODIFIED, conflicting.get("SomeFile.txt")); } + @Test + public void testPullConflictDiff3() throws Exception { + PullResult res = target.pull().call(); + // nothing to update since we don't have different data yet + assertTrue(res.getFetchResult().getTrackingRefUpdates().isEmpty()); + assertTrue(res.getMergeResult().getMergeStatus() + .equals(MergeStatus.ALREADY_UP_TO_DATE)); + + assertFileContentsEqual(targetFile, "Hello world"); + + // change the source file + writeToFile(sourceFile, "Source change"); + source.add().addFilepattern("SomeFile.txt").call(); + source.commit().setMessage("Source change in remote").call(); + + // change the target file + writeToFile(targetFile, "Target change"); + target.add().addFilepattern("SomeFile.txt").call(); + target.commit().setMessage("Target change in local").call(); + + target.getRepository().getConfig().setEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); + + res = target.pull().call(); + + String sourceChangeString = "Source change\n>>>>>>> branch 'master' of " + + target.getRepository().getConfig().getString("remote", + "origin", "url"); + + assertFileContentsEqual(targetFile, "<<<<<<< HEAD\n" + "Target change\n" + + "||||||| BASE\n" + "Hello world\n" + "=======\n" + + sourceChangeString + "\n"); + } + @Test public void testPullConflictTheirs() throws Exception { PullResult res = target.pull().call(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java index 4c8cf06a673..d99c2856455 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java @@ -10,6 +10,8 @@ package org.eclipse.jgit.api; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; @@ -30,6 +32,7 @@ import java.util.Iterator; import java.util.List; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.MergeResult.MergeStatus; import org.eclipse.jgit.api.RebaseCommand.InteractiveHandler; import org.eclipse.jgit.api.RebaseCommand.InteractiveHandler2; @@ -370,6 +373,43 @@ public void testRebaseNoMergeBaseConflict() throws Exception { + ">>>>>>> " + first.abbreviate(7).name() + " Add file\n"); } + /** + * Create a commit A and an unrelated commit B creating the same file with + * different content. Then rebase A onto B. The rebase should stop with a + * conflict and the conflict style should be DIFF3. + * + * @throws Exception on errors + */ + @Test + public void testRebaseNoMergeBaseConflictDiff3() throws Exception { + writeTrashFile(FILE1, FILE1); + git.add().addFilepattern(FILE1).call(); + RevCommit first = git.commit().setMessage("Add file").call(); + File file1 = new File(db.getWorkTree(), FILE1); + assertTrue(file1.exists()); + // Create an independent branch + git.checkout().setOrphan(true).setName("orphan").call(); + git.rm().addFilepattern(FILE1).call(); + assertFalse(file1.exists()); + writeTrashFile(FILE1, "something else"); + git.add().addFilepattern(FILE1).call(); + git.commit().setMessage("Orphan").call(); + checkoutBranch("refs/heads/master"); + assertEquals(first.getId(), db.resolve("HEAD")); + + db.getConfig().setEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); + + RebaseResult res = git.rebase().setUpstream("refs/heads/orphan").call(); + assertEquals(Status.STOPPED, res.getStatus()); + assertEquals(first, res.getCurrentCommit()); + checkFile(file1, + "<<<<<<< Upstream, based on orphan\n" + "something else\n" + + "||||||| BASE\n" + "=======\n" + "file1\n" + + ">>>>>>> " + + first.abbreviate(7).name() + " Add file\n"); + } + /** * Create the following commits and then attempt to rebase topic onto * master. This will serialize the branches. diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java index 89fdb322204..a7a1dff8d1b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java @@ -9,6 +9,8 @@ */ package org.eclipse.jgit.api; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_ABBREV_STRING_LENGTH; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -20,6 +22,7 @@ import java.io.IOException; import java.util.Iterator; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.MergeResult.MergeStatus; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; @@ -376,6 +379,25 @@ public void testRevertConflictMarkers() throws Exception { } } + @Test + public void testRevertConflictMarkersDiff3() throws Exception { + try (Git git = new Git(db)) { + RevCommit sideCommit = prepareRevert(git); + + db.getConfig().setEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); + + RevertCommand revert = git.revert(); + RevCommit newHead = revert.include(sideCommit.getId()).call(); + assertNull(newHead); + MergeResult result = revert.getFailingResult(); + assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus()); + + String expected = "<<<<<<< master\na(latest)\n||||||| BASE\na(previous)\n=======\na\n>>>>>>> ca96c31 second master\n"; + checkFile(new File(db.getWorkTree(), "a"), expected); + } + } + @Test public void testRevertOurCommitName() throws Exception { try (Git git = new Git(db)) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java index 49b31b1c4c7..b169fac9483 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java @@ -9,15 +9,19 @@ */ package org.eclipse.jgit.api; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; import java.text.MessageFormat; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.errors.InvalidRefNameException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.NoHeadException; @@ -428,6 +432,43 @@ public void stashedContentMerge() throws Exception { read(PATH)); } + @Test + public void stashedContentMergeDiff3() throws Exception { + writeTrashFile(PATH, "content\nmore content\n"); + git.add().addFilepattern(PATH).call(); + git.commit().setMessage("more content").call(); + + writeTrashFile(PATH, "content\nhead change\nmore content\n"); + git.add().addFilepattern(PATH).call(); + git.commit().setMessage("even content").call(); + + writeTrashFile(PATH, "content\nstashed change\nmore content\n"); + + db.getConfig().setEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); + + RevCommit stashed = git.stashCreate().call(); + assertNotNull(stashed); + assertEquals("content\nhead change\nmore content\n", + read(committedFile)); + assertTrue(git.status().call().isClean()); + recorder.assertEvent(new String[] { PATH }, ChangeRecorder.EMPTY); + + writeTrashFile(PATH, "content\nmore content\ncommitted change\n"); + git.add().addFilepattern(PATH).call(); + git.commit().setMessage("committed change").call(); + recorder.assertNoEvent(); + + assertThrows(StashApplyFailureException.class, + () -> git.stashApply().call()); + recorder.assertEvent(new String[] { PATH }, ChangeRecorder.EMPTY); + Status status = new StatusCommand(db).call(); + assertEquals(1, status.getConflicting().size()); + assertEquals( + "content\n<<<<<<< HEAD\n||||||| stashed HEAD\nhead change\n=======\nstashed change\n>>>>>>> stash\nmore content\ncommitted change\n", + read(PATH)); + } + @Test public void stashedContentMergeXtheirs() throws Exception { writeTrashFile(PATH, "content\nmore content\n"); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java index c6a6321cf80..b5e4b2122bb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java @@ -11,6 +11,8 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.time.Instant.EPOCH; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,6 +32,7 @@ import java.util.Set; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.MergeResult; import org.eclipse.jgit.api.MergeResult.MergeStatus; import org.eclipse.jgit.api.RebaseResult; @@ -963,6 +966,39 @@ public void checkContentMergeConflict(MergeStrategy strategy) assertEquals(expected, read("file")); } + @Theory + public void checkContentMergeConflictDiff3(MergeStrategy strategy) + throws Exception { + Git git = Git.wrap(db); + + writeTrashFile("file", "1\n2\n3"); + git.add().addFilepattern("file").call(); + RevCommit first = git.commit().setMessage("added file").call(); + + writeTrashFile("file", "1master\n2\n3"); + git.commit().setAll(true).setMessage("modified file on master").call(); + + git.checkout().setCreateBranch(true).setStartPoint(first) + .setName("side").call(); + writeTrashFile("file", "1side\n2\n3"); + RevCommit sideCommit = git.commit().setAll(true) + .setMessage("modified file on side").call(); + + git.checkout().setName("master").call(); + + db.getConfig().setEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); + + MergeResult result = git.merge().setStrategy(strategy) + .include(sideCommit).call(); + assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus()); + String expected = "<<<<<<< HEAD\n" + "1master\n" + "||||||| BASE\n" + + "1\n" + "=======\n" + "1side\n" + ">>>>>>> " + + sideCommit.name() + "\n" + "2\n" + + "3"; + assertEquals(expected, read("file")); + } + @Theory public void checkContentMergeConflict_noTree(MergeStrategy strategy) throws Exception { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java index a353d1a1358..6761f1eee56 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java @@ -10,6 +10,9 @@ package org.eclipse.jgit.api; import static org.eclipse.jgit.api.CherryPickCommitMessageProvider.ORIGINAL; +import static org.eclipse.jgit.api.MergeCommand.ConflictStyle.MERGE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_ABBREV_STRING_LENGTH; import java.io.IOException; @@ -18,6 +21,7 @@ import java.util.List; import java.util.Map; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; @@ -73,6 +77,8 @@ public class CherryPickCommand extends GitCommand { private ContentMergeStrategy contentStrategy; + private ConflictStyle conflictStyle; + private Integer mainlineParentNumber; private boolean noCommit = false; @@ -138,9 +144,9 @@ public CherryPickResult call() throws GitAPIException, NoMessageException, boolean noProblems; Map failingPaths = null; List unmergedPaths = null; - if (merger instanceof ResolveMerger) { - ResolveMerger resolveMerger = (ResolveMerger) merger; + if (merger instanceof ResolveMerger resolveMerger) { resolveMerger.setContentMergeStrategy(contentStrategy); + resolveMerger.setConflictStyle(getConflictStyle()); resolveMerger.setCommitNames( new String[] { "BASE", ourName, cherryPickName }); //$NON-NLS-1$ resolveMerger @@ -362,6 +368,25 @@ public CherryPickCommand setContentMergeStrategy( return this; } + /** + * Sets the conflict style to be used when formatting merge conflicts. + * + * @param conflictStyle + * a {@link org.eclipse.jgit.api.MergeCommand.ConflictStyle} + * @return {@code this} + * @since 7.6 + */ + public CherryPickCommand setConflictStyle(ConflictStyle conflictStyle) { + this.conflictStyle = conflictStyle; + return this; + } + + private ConflictStyle getConflictStyle() { + return conflictStyle != null ? conflictStyle + : repo.getConfig().getEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, MERGE); + } + /** * Set the (1-based) parent number to diff against * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java index 7064f5a57a9..a79fbf73497 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -75,6 +75,8 @@ public class MergeCommand extends GitCommand { private ContentMergeStrategy contentStrategy; + private ConflictStyle conflictStyle; + private List commits = new ArrayList<>(); private Boolean squash; @@ -336,9 +338,9 @@ public MergeResult call() throws GitAPIException, NoHeadException, Map> lowLevelResults = null; Map failingPaths = null; List unmergedPaths = null; - if (merger instanceof ResolveMerger) { - ResolveMerger resolveMerger = (ResolveMerger) merger; + if (merger instanceof ResolveMerger resolveMerger) { resolveMerger.setContentMergeStrategy(contentStrategy); + resolveMerger.setConflictStyle(conflictStyle); resolveMerger.setCommitNames(new String[] { "BASE", "HEAD", ref.getName() }); //$NON-NLS-1$ //$NON-NLS-2$ resolveMerger.setWorkingTreeIterator(new FileTreeIterator(repo)); @@ -456,6 +458,8 @@ private void fallBackToConfiguration() { commit = Boolean.valueOf(config.isCommit()); if (fastForwardMode == null) fastForwardMode = config.getFastForwardMode(); + if (conflictStyle == null) + conflictStyle = config.getConflictStyle(); } private void updateHead(StringBuilder refLogMessage, ObjectId newHeadId, @@ -510,6 +514,19 @@ public MergeCommand setContentMergeStrategy(ContentMergeStrategy strategy) { return this; } + /** + * Sets the conflict style to be used when formatting merge conflicts. + * + * @param conflictStyle + * a {@link org.eclipse.jgit.api.MergeCommand.ConflictStyle} + * @return {@code this} + * @since 7.6 + */ + public MergeCommand setConflictStyle(ConflictStyle conflictStyle) { + this.conflictStyle = conflictStyle; + return this; + } + /** * Reference to a commit to be merged with the current head * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java index 4b2cee45c26..ff5dbffea22 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java @@ -11,10 +11,15 @@ */ package org.eclipse.jgit.api; +import static org.eclipse.jgit.api.MergeCommand.ConflictStyle.MERGE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; + import java.io.IOException; import java.text.MessageFormat; import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.MergeCommand.FastForwardMode; import org.eclipse.jgit.api.MergeCommand.FastForwardMode.Merge; import org.eclipse.jgit.api.RebaseCommand.Operation; @@ -72,6 +77,8 @@ public class PullCommand extends TransportCommand { private ContentMergeStrategy contentStrategy; + private ConflictStyle conflictStyle; + private TagOpt tagOption; private FastForwardMode fastForwardMode; @@ -361,6 +368,7 @@ public PullResult call() throws GitAPIException, .setOperation(Operation.BEGIN) .setStrategy(strategy) .setContentMergeStrategy(contentStrategy) + .setConflictStyle(getConflictStyle()) .setPreserveMerges( pullRebaseMode == BranchRebaseMode.MERGES) .call(); @@ -371,6 +379,7 @@ public PullResult call() throws GitAPIException, .setProgressMonitor(monitor) .setStrategy(strategy) .setContentMergeStrategy(contentStrategy) + .setConflictStyle(getConflictStyle()) .setFastForward(getFastForwardMode()).call(); monitor.update(1); result = new PullResult(fetchRes, remote, mergeRes); @@ -463,6 +472,25 @@ public PullCommand setContentMergeStrategy(ContentMergeStrategy strategy) { return this; } + /** + * Sets the conflict style to be used when formatting merge conflicts. + * + * @param conflictStyle + * a {@link org.eclipse.jgit.api.MergeCommand.ConflictStyle} + * @return {@code this} + * @since 7.6 + */ + public PullCommand setConflictStyle(ConflictStyle conflictStyle) { + this.conflictStyle = conflictStyle; + return this; + } + + private ConflictStyle getConflictStyle() { + return conflictStyle != null ? conflictStyle + : repo.getConfig().getEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, MERGE); + } + /** * Set the specification of annotated tag behavior during fetch * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index ae0389cc3d3..ba8461d759f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -11,6 +11,9 @@ package org.eclipse.jgit.api; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.eclipse.jgit.api.MergeCommand.ConflictStyle.MERGE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import java.io.ByteArrayOutputStream; import java.io.File; @@ -31,6 +34,7 @@ import java.util.regex.Pattern; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.RebaseResult.Status; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.CheckoutConflictException; @@ -220,6 +224,8 @@ public enum Operation { private ContentMergeStrategy contentStrategy; + private ConflictStyle conflictStyle; + private boolean preserveMerges = false; /** @@ -557,6 +563,7 @@ private RebaseResult cherryPickCommitFlattening(RevCommit commitToPick) .setReflogPrefix(REFLOG_PREFIX) .setStrategy(strategy) .setContentMergeStrategy(contentStrategy) + .setConflictStyle(getConflictStyle()) .call(); switch (cherryPickResult.getStatus()) { case FAILED: @@ -611,7 +618,8 @@ private RebaseResult cherryPickCommitPreservingMerges(RevCommit commitToPick) .setOurCommitName(ourCommitName) .setReflogPrefix(REFLOG_PREFIX) .setStrategy(strategy) - .setContentMergeStrategy(contentStrategy); + .setContentMergeStrategy(contentStrategy) + .setConflictStyle(getConflictStyle()); if (isMerge) { pickCommand.setMainlineParentNumber(1); // We write a MERGE_HEAD and later commit explicitly @@ -649,6 +657,7 @@ private RebaseResult cherryPickCommitPreservingMerges(RevCommit commitToPick) .setProgressMonitor(monitor) .setStrategy(strategy) .setContentMergeStrategy(contentStrategy) + .setConflictStyle(getConflictStyle()) .setCommit(false); for (int i = 1; i < commitToPick.getParentCount(); i++) merge.include(newParents.get(i)); @@ -1699,6 +1708,25 @@ public RebaseCommand setContentMergeStrategy(ContentMergeStrategy strategy) { return this; } + /** + * Sets the conflict style to be used when formatting merge conflicts. + * + * @param conflictStyle + * a {@link org.eclipse.jgit.api.MergeCommand.ConflictStyle} + * @return {@code this} + * @since 7.6 + */ + public RebaseCommand setConflictStyle(ConflictStyle conflictStyle) { + this.conflictStyle = conflictStyle; + return this; + } + + private ConflictStyle getConflictStyle() { + return conflictStyle != null ? conflictStyle + : repo.getConfig().getEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, MERGE); + } + /** * Whether to preserve merges during rebase * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java index 6643c836627..5a107d57ad0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java @@ -9,6 +9,9 @@ */ package org.eclipse.jgit.api; +import static org.eclipse.jgit.api.MergeCommand.ConflictStyle.MERGE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_ABBREV_STRING_LENGTH; import java.io.IOException; @@ -17,6 +20,7 @@ import java.util.List; import java.util.Map; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.MergeResult.MergeStatus; import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; import org.eclipse.jgit.api.errors.GitAPIException; @@ -74,6 +78,8 @@ public class RevertCommand extends GitCommand { private ProgressMonitor monitor = NullProgressMonitor.INSTANCE; + private ConflictStyle conflictStyle; + /** *

* Constructor for RevertCommand. @@ -138,6 +144,7 @@ public RevCommit call() throws NoMessageException, UnmergedPathsException, + srcCommit.getShortMessage(); ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); + merger.setConflictStyle(getConflictStyle()); merger.setWorkingTreeIterator(new FileTreeIterator(repo)); merger.setBase(srcCommit.getTree()); merger.setCommitNames(new String[] { @@ -344,4 +351,23 @@ public RevertCommand setInsertChangeId(boolean insertChangeId) { return this; } + /** + * Sets the conflict style to be used when formatting merge conflicts. + * + * @param conflictStyle + * a {@link org.eclipse.jgit.api.MergeCommand.ConflictStyle} + * @return {@code this} + * @since 7.6 + */ + public RevertCommand setConflictStyle(ConflictStyle conflictStyle) { + this.conflictStyle = conflictStyle; + return this; + } + + private ConflictStyle getConflictStyle() { + return conflictStyle != null ? conflictStyle + : repo.getConfig().getEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, MERGE); + } + } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java index b0b715e06b4..aa733b53a67 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java @@ -9,6 +9,9 @@ */ package org.eclipse.jgit.api; +import static org.eclipse.jgit.api.MergeCommand.ConflictStyle.MERGE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.eclipse.jgit.treewalk.TreeWalk.OperationType.CHECKOUT_OP; import java.io.IOException; @@ -17,6 +20,7 @@ import java.util.List; import java.util.Set; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.InvalidRefNameException; import org.eclipse.jgit.api.errors.JGitInternalException; @@ -76,6 +80,8 @@ public class StashApplyCommand extends GitCommand { private ContentMergeStrategy contentStrategy; + private ConflictStyle conflictStyle; + /** * Create command to apply the changes of a stashed commit * @@ -173,8 +179,7 @@ public ObjectId call() throws GitAPIException, Merger merger = strategy.newMerger(repo); boolean mergeSucceeded; - if (merger instanceof ResolveMerger) { - ResolveMerger resolveMerger = (ResolveMerger) merger; + if (merger instanceof ResolveMerger resolveMerger) { resolveMerger .setCommitNames(new String[] { "stashed HEAD", "HEAD", //$NON-NLS-1$ //$NON-NLS-2$ "stash" }); //$NON-NLS-1$ @@ -182,6 +187,7 @@ public ObjectId call() throws GitAPIException, resolveMerger .setWorkingTreeIterator(new FileTreeIterator(repo)); resolveMerger.setContentMergeStrategy(contentStrategy); + resolveMerger.setConflictStyle(getConflictStyle()); mergeSucceeded = resolveMerger.merge(headCommit, stashCommit); List modifiedByMerge = resolveMerger.getModifiedFiles(); if (!modifiedByMerge.isEmpty()) { @@ -199,12 +205,12 @@ public ObjectId call() throws GitAPIException, dco.checkout(); // Ignoring failed deletes.... if (restoreIndex) { Merger ixMerger = strategy.newMerger(repo, true); - if (ixMerger instanceof ResolveMerger) { - ResolveMerger resolveMerger = (ResolveMerger) ixMerger; + if (ixMerger instanceof ResolveMerger resolveMerger) { resolveMerger.setCommitNames(new String[] { "stashed HEAD", //$NON-NLS-1$ "HEAD", "stashed index" }); //$NON-NLS-1$//$NON-NLS-2$ resolveMerger.setBase(stashHeadCommit); resolveMerger.setContentMergeStrategy(contentStrategy); + resolveMerger.setConflictStyle(getConflictStyle()); } boolean ok = ixMerger.merge(headCommit, stashIndexCommit); if (ok) { @@ -218,8 +224,7 @@ public ObjectId call() throws GitAPIException, if (untrackedCommit != null) { Merger untrackedMerger = strategy.newMerger(repo, true); - if (untrackedMerger instanceof ResolveMerger) { - ResolveMerger resolveMerger = (ResolveMerger) untrackedMerger; + if (untrackedMerger instanceof ResolveMerger resolveMerger) { resolveMerger.setCommitNames(new String[] { "null", "HEAD", //$NON-NLS-1$//$NON-NLS-2$ "untracked files" }); //$NON-NLS-1$ // There is no common base for HEAD & untracked files @@ -230,6 +235,7 @@ public ObjectId call() throws GitAPIException, // commit. resolveMerger.setBase(null); resolveMerger.setContentMergeStrategy(contentStrategy); + resolveMerger.setConflictStyle(getConflictStyle()); } boolean ok = untrackedMerger.merge(headCommit, untrackedCommit); @@ -304,6 +310,25 @@ public StashApplyCommand setContentMergeStrategy( return this; } + /** + * Sets the conflict style to be used when formatting merge conflicts. + * + * @param conflictStyle + * a {@link org.eclipse.jgit.api.MergeCommand.ConflictStyle} + * @return {@code this} + * @since 7.6 + */ + public StashApplyCommand setConflictStyle(ConflictStyle conflictStyle) { + this.conflictStyle = conflictStyle; + return this; + } + + private ConflictStyle getConflictStyle() { + return conflictStyle != null ? conflictStyle + : repo.getConfig().getEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, MERGE); + } + /** * Whether the command should restore untracked files * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java index 54b7aa4346b..680e3e4b816 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java @@ -9,8 +9,13 @@ *******************************************************************************/ package org.eclipse.jgit.merge; +import static org.eclipse.jgit.api.MergeCommand.ConflictStyle.MERGE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; + import java.io.IOException; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.api.MergeCommand.FastForwardMode; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config.SectionParser; @@ -60,6 +65,8 @@ public static final SectionParser getParser( private final FastForwardMode fastForwardMode; + private final ConflictStyle conflictStyle; + private final boolean squash; private final boolean commit; @@ -67,12 +74,14 @@ public static final SectionParser getParser( private MergeConfig(String branch, Config config) { String[] mergeOptions = getMergeOptions(branch, config); fastForwardMode = getFastForwardMode(config, mergeOptions); + conflictStyle = getConflictStyle(config); squash = isMergeConfigOptionSet("--squash", mergeOptions); //$NON-NLS-1$ commit = !isMergeConfigOptionSet("--no-commit", mergeOptions); //$NON-NLS-1$ } private MergeConfig() { fastForwardMode = FastForwardMode.FF; + conflictStyle = ConflictStyle.MERGE; squash = false; commit = true; } @@ -86,6 +95,16 @@ public FastForwardMode getFastForwardMode() { return fastForwardMode; } + /** + * Get the configured conflict style + * + * @return the configured conflict style + * @since 7.6 + */ + public ConflictStyle getConflictStyle() { + return conflictStyle; + } + /** * Whether merges into this branch are configured to be squash merges, false * otherwise @@ -120,6 +139,11 @@ private static FastForwardMode getFastForwardMode(Config config, return ffmode; } + private ConflictStyle getConflictStyle(Config config) { + return config.getEnum(CONFIG_MERGE_SECTION, null, + CONFIG_KEY_CONFLICTSTYLE, MERGE); + } + private static boolean isMergeConfigOptionSet(String optionToLookFor, String[] mergeOptions) { for (String option : mergeOptions) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index dc96f65b878..cb825771928 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -16,9 +16,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.time.Instant.EPOCH; +import static org.eclipse.jgit.api.MergeCommand.ConflictStyle.MERGE; import static org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm.HISTOGRAM; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DIFF_SECTION; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_ALGORITHM; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONFLICTSTYLE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_MERGE_SECTION; import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; import java.io.Closeable; @@ -39,6 +42,7 @@ import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.api.MergeCommand.ConflictStyle; import org.eclipse.jgit.attributes.Attribute; import org.eclipse.jgit.attributes.Attributes; import org.eclipse.jgit.attributes.AttributesNodeProvider; @@ -831,6 +835,8 @@ public enum MergeFailureReason { */ protected MergeAlgorithm mergeAlgorithm; + private ConflictStyle conflictStyle; + /** * The {@link ContentMergeStrategy} to use for "resolve" and "recursive" * merges. @@ -870,6 +876,7 @@ protected ResolveMerger(Repository local, boolean inCore) { super(local); Config config = local.getConfig(); mergeAlgorithm = getMergeAlgorithm(config); + conflictStyle = getConflictStyle(config); commitNames = defaultCommitNames(); this.inCore = inCore; } @@ -896,6 +903,7 @@ protected ResolveMerger(Repository local) { protected ResolveMerger(ObjectInserter inserter, Config config) { super(inserter); mergeAlgorithm = getMergeAlgorithm(config); + conflictStyle = getConflictStyle(config); commitNames = defaultCommitNames(); inCore = true; } @@ -923,6 +931,23 @@ public void setContentMergeStrategy(ContentMergeStrategy strategy) { : strategy; } + /** + * Sets the conflict style to be used when formatting merge conflicts. + * + * @param conflictStyle + * a {@link org.eclipse.jgit.api.MergeCommand.ConflictStyle} + * @since 7.6 + */ + public void setConflictStyle(ConflictStyle conflictStyle) { + this.conflictStyle = conflictStyle; + } + + private ConflictStyle getConflictStyle(Config config) { + return config.getEnum(CONFIG_MERGE_SECTION, + null, + CONFIG_KEY_CONFLICTSTYLE, MERGE); + } + @Override protected boolean mergeImpl() throws IOException { return mergeTrees(mergeBase(), sourceTrees[0], sourceTrees[1], @@ -1668,8 +1693,16 @@ private TemporaryBuffer doMerge(MergeResult result) db != null ? nonNullRepo().getDirectory() : null, workTreeUpdater.getInCoreFileSizeLimit()); boolean success = false; try { - new MergeFormatter().formatMerge(buf, result, - Arrays.asList(commitNames), UTF_8); + switch (conflictStyle) { + case MERGE: + new MergeFormatter().formatMerge(buf, result, + Arrays.asList(commitNames), UTF_8); + break; + case DIFF3: + new MergeFormatter().formatMergeDiff3(buf, result, + Arrays.asList(commitNames), UTF_8); + break; + } buf.close(); success = true; } finally { From cf6fdba1614fbe4e9c6edc84ea8f8439994ca72a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Feb 2026 00:14:19 +0100 Subject: [PATCH 024/200] JGit v7.6.0.202602242313-rc1 Signed-off-by: Matthias Sohn Change-Id: Idd4e617e5ab413713cfa2beec6459c72750f70a4 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index b114e7d36f4..5b500b5843e 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 483e833a83c..12cb0305c27 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 18acf74202a..c778c5cf960 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index d9b324140f9..01bbcff25cd 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index dab8a3d8e57..457c48b8c37 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 3f9d2c121af..4c5035f4c96 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 86336e3b9eb..32b38c326a9 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index bbe279b4ccf..becc4c7f7ae 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index b4daf7dc81c..ec7688c8886 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 80b421dac5f..ebc9ff5fd96 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.ant - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.archive - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.ui - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.test - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 647c97d26e6..348f5c84a76 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 05e504ed732..19d86b81db3 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 cc6eda7801e..a30d2090c64 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.80.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 82df526a6e6..fca2b595e70 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index bfc359047b3..6cc91a81c6a 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 9b0f12f83b6..2d89967384b 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 cd65a4f2c40..d2686c08915 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 55828b2dbb8..7d04df8171f 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 e97e314c22c..7f54c660782 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 3d4256867e2..aca986c8193 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2be8efe1a96..ab8e8ae45da 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 dd507d323f5..8ab99cdefc7 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index c8d9baac5b2..0652260ef3d 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 03aae759347..775a7a07111 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: OSGI-INF/l10n/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 64d2e4eb2bb..8d7ca58de7a 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c5a9e8e2648..4b70dffaaf4 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 012f00bf72f..b1930efe69c 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: OSGI-INF/l10n/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 9c1adcb4a2d..e0ceb1601ab 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 8d6d068adcb..57232e9d987 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 bf528656d9e..e715226aa5d 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: OSGI-INF/l10n/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 cb07dc904c1..b36ff31bb24 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index fa798c8ae80..ed2c03abf6f 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 9b0f742fee6..8b40b41c2b5 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3cdda74bfd7..3025bccfe50 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 b0ee6b4beb0..abfad090e92 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 c2a8147e8ee..847f7004597 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 1b4a73b4de0..f9d7523b002 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 d79ae9a34fc..fc5a67d29ea 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 4f9de97f59b..38a8ca63632 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 44d84770ecd..a1d6d975b64 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index cdc7cf9b7bf..99128e380df 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 803606acf18..3f311cf4f90 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 c5521eea303..c8ecf5c194e 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 95ec4e95b99..52d0db90554 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 1518beb7854..aec69e55651 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 f3f10fd2ab2..001d5f18878 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 b9815d6a251..2c43eef7b47 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 1f0ad42946e..4e993b9e5c5 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 efbf3c03d15..a0047153961 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 a0f6e9263b0..5c41984d1a1 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 fef54ecbba2..8214b91dcfd 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 74daa110a44..7beef216e22 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 868aa02c2db..0ed46e6f941 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 8812d722f52..d64de36a4c8 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 5c71af5fc99..7858792456a 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 bfb53604c02..823b490b8c7 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 4eb2a6daf73..775a233f2a4 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 cc7a9d67614..7a20befa3c5 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 bd383609364..3f898dc0811 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 ab0775e3421..4d84cff5051 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 7d881a52494..d44e97b89c5 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 07f6f21f45f..6de9b996270 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 5f81b7d60d7..cc156121bde 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 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 de0a37aa8a6..a7496ee3fd5 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 0e19ea5ff81..68ed38cfbf4 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index dcb551955e6..bf77b13c176 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 041c46db7c5..80a260ba799 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 2ef72566aa4..60f9fc9b073 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.0,7.7.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 56d463f7f96..6ee43c3a586 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 9c2bf0345c7..a3052b939b4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit.ssh.apache.agent 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 d2bf5aeb258..ad4203de518 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 5a9057fe5cd..18990bf7e2b 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 7a7d7e1b84f..bf075170081 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 5ef864b3899..c9d96fddef7 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 3edf6e6ce65..402a57dcf05 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 4632a36b0bf..7296b42a617 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 70b0af03255..250565b5f3d 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 436d2510170..d0fd436817e 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.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 7cba3294642..d89535db0be 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 91caa5e818e..c2edde76a18 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 bee0f4927ee..7ca82fcb60d 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 387f1683069..6a83acabb0f 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 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 b3ecf33ca23..d7c95d983c1 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index e20c4f219c8..b6fb8474661 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 2acf0e0b343..5c066df4bdb 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 - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 15ae6efaadf..bdbad63df91 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 48db010fc9e..03532509668 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202602242313-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.202602242313-rc1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 890cb9cbf19..03591e6045c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 57849fa90ed..ed40686ac5c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.6.0-SNAPSHOT + 7.6.0.202602242313-rc1 JGit - Parent ${jgit-url} From 401eeaa9a1f81e8adc4583b4de6a75a683837a92 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Feb 2026 10:37:47 +0100 Subject: [PATCH 025/200] Prepare 7.6.0-SNAPSHOT builds Change-Id: I11220ae29457f48931a7f1f5804c8030c6db41c4 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 5b500b5843e..b114e7d36f4 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 12cb0305c27..483e833a83c 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 - 7.6.0.202602242313-rc1 + 7.6.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 c778c5cf960..18acf74202a 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 01bbcff25cd..d9b324140f9 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 457c48b8c37..dab8a3d8e57 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 - 7.6.0.202602242313-rc1 + 7.6.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 4c5035f4c96..3f9d2c121af 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 32b38c326a9..86336e3b9eb 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index becc4c7f7ae..bbe279b4ccf 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 - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index ec7688c8886..b4daf7dc81c 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index ebc9ff5fd96..80b421dac5f 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 - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.6.0.202602242313-rc1 + 7.6.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 348f5c84a76..647c97d26e6 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 19d86b81db3..05e504ed732 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 - 7.6.0.202602242313-rc1 + 7.6.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 a30d2090c64..cc6eda7801e 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.80.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 fca2b595e70..82df526a6e6 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 6cc91a81c6a..bfc359047b3 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 - 7.6.0.202602242313-rc1 + 7.6.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 2d89967384b..9b0f12f83b6 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 d2686c08915..cd65a4f2c40 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7d04df8171f..55828b2dbb8 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 - 7.6.0.202602242313-rc1 + 7.6.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 7f54c660782..e97e314c22c 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 aca986c8193..3d4256867e2 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index ab8e8ae45da..2be8efe1a96 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 - 7.6.0.202602242313-rc1 + 7.6.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 8ab99cdefc7..dd507d323f5 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 0652260ef3d..c8d9baac5b2 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 - 7.6.0.202602242313-rc1 + 7.6.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 775a7a07111..03aae759347 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 8d7ca58de7a..64d2e4eb2bb 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4b70dffaaf4..c5a9e8e2648 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 - 7.6.0.202602242313-rc1 + 7.6.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 b1930efe69c..012f00bf72f 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 e0ceb1601ab..9c1adcb4a2d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 57232e9d987..8d6d068adcb 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 - 7.6.0.202602242313-rc1 + 7.6.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 e715226aa5d..bf528656d9e 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 b36ff31bb24..cb07dc904c1 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index ed2c03abf6f..fa798c8ae80 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 - 7.6.0.202602242313-rc1 + 7.6.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 8b40b41c2b5..9b0f742fee6 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3025bccfe50..3cdda74bfd7 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 - 7.6.0.202602242313-rc1 + 7.6.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 abfad090e92..b0ee6b4beb0 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 847f7004597..c2a8147e8ee 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index f9d7523b002..1b4a73b4de0 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 - 7.6.0.202602242313-rc1 + 7.6.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 fc5a67d29ea..d79ae9a34fc 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 38a8ca63632..4f9de97f59b 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 - 7.6.0.202602242313-rc1 + 7.6.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 a1d6d975b64..44d84770ecd 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 99128e380df..cdc7cf9b7bf 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 3f311cf4f90..803606acf18 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 - 7.6.0.202602242313-rc1 + 7.6.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 c8ecf5c194e..c5521eea303 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 52d0db90554..95ec4e95b99 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 - 7.6.0.202602242313-rc1 + 7.6.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 aec69e55651..1518beb7854 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 001d5f18878..f3f10fd2ab2 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 - 7.6.0.202602242313-rc1 + 7.6.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 2c43eef7b47..b9815d6a251 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 4e993b9e5c5..1f0ad42946e 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 - 7.6.0.202602242313-rc1 + 7.6.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 a0047153961..efbf3c03d15 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 5c41984d1a1..a0f6e9263b0 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 - 7.6.0.202602242313-rc1 + 7.6.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 8214b91dcfd..fef54ecbba2 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 7beef216e22..74daa110a44 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 - 7.6.0.202602242313-rc1 + 7.6.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 0ed46e6f941..868aa02c2db 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 d64de36a4c8..8812d722f52 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 - 7.6.0.202602242313-rc1 + 7.6.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 7858792456a..5c71af5fc99 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 - 7.6.0.202602242313-rc1 + 7.6.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 823b490b8c7..bfb53604c02 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 775a233f2a4..4eb2a6daf73 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 - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.6.0.202602242313-rc1 + 7.6.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 7a20befa3c5..cc7a9d67614 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 3f898dc0811..bd383609364 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 - 7.6.0.202602242313-rc1 + 7.6.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 4d84cff5051..ab0775e3421 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 d44e97b89c5..7d881a52494 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 - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 6de9b996270..07f6f21f45f 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 - 7.6.0.202602242313-rc1 + 7.6.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 cc156121bde..5f81b7d60d7 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier 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 a7496ee3fd5..de0a37aa8a6 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 - 7.6.0.202602242313-rc1 + 7.6.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 68ed38cfbf4..0e19ea5ff81 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index bf77b13c176..dcb551955e6 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 80a260ba799..041c46db7c5 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 - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 60f9fc9b073..2ef72566aa4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.0,7.7.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 6ee43c3a586..56d463f7f96 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index a3052b939b4..9c2bf0345c7 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 ad4203de518..d2bf5aeb258 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 18990bf7e2b..5a9057fe5cd 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 - 7.6.0.202602242313-rc1 + 7.6.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 bf075170081..7a7d7e1b84f 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 c9d96fddef7..5ef864b3899 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 402a57dcf05..3edf6e6ce65 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 - 7.6.0.202602242313-rc1 + 7.6.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 7296b42a617..4632a36b0bf 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 250565b5f3d..70b0af03255 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 - 7.6.0.202602242313-rc1 + 7.6.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 d0fd436817e..436d2510170 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.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 d89535db0be..7cba3294642 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index c2edde76a18..91caa5e818e 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 - 7.6.0.202602242313-rc1 + 7.6.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 7ca82fcb60d..bee0f4927ee 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 6a83acabb0f..387f1683069 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 - 7.6.0.202602242313-rc1 + 7.6.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 d7c95d983c1..b3ecf33ca23 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index b6fb8474661..e20c4f219c8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5c066df4bdb..2acf0e0b343 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 - 7.6.0.202602242313-rc1 + 7.6.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 bdbad63df91..15ae6efaadf 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: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 03532509668..48db010fc9e 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202602242313-rc1 +Bundle-Version: 7.6.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.202602242313-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 03591e6045c..890cb9cbf19 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index ed40686ac5c..57849fa90ed 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.6.0.202602242313-rc1 + 7.6.0-SNAPSHOT JGit - Parent ${jgit-url} From 9c8ba9e35c2572efcd910ff186551b0158d8739c Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 27 Feb 2026 10:51:45 +0100 Subject: [PATCH 026/200] Bazel: Pin jcl-over-slf4j to SLF4J_VERSION rules_jvm_external resolved org.slf4j:jcl-over-slf4j to 1.7.36 via transitive dependencies, while slf4j-api and slf4j-simple are pinned to 2.0.17. This resulted in a mixed SLF4J 1.x/2.x setup on the classpath, which can lead to runtime conflicts. Add jcl-over-slf4j as an explicit artifact in maven.install to align the SLF4J bridge with the rest of the logging stack and ensure a consistent dependency graph. Test Plan: bazel query --output=build @external_deps//:org_slf4j_jcl_over_slf4j Also pin this artefact to SLF4J_VERSION in the maven build by adding a corresponding entry under dependencyManagement. Test Plan: $ mvn dependency:tree -Dincludes=org.slf4j:jcl-over-slf4j Also add this transitive dependency to the target platforms and the p2 repository. Change-Id: I1e9e15ac3b2675e624384763dc8c4212a75d656e --- MODULE.bazel | 1 + .../org.eclipse.jgit.repository/category.xml | 6 ++++++ .../org.eclipse.jgit.target/jgit-4.34.target | 8 +++++++- .../org.eclipse.jgit.target/jgit-4.35.target | 8 +++++++- .../org.eclipse.jgit.target/jgit-4.36.target | 8 +++++++- .../org.eclipse.jgit.target/jgit-4.37.target | 8 +++++++- .../org.eclipse.jgit.target/jgit-4.38.target | 8 +++++++- .../org.eclipse.jgit.target/jgit-4.39.target | 8 +++++++- .../org.eclipse.jgit.target/maven/dependencies.tpd | 5 +++++ pom.xml | 6 ++++++ 10 files changed, 60 insertions(+), 6 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index c8f5319e07c..37077bcc069 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -81,6 +81,7 @@ maven.install( "org.openjdk.jmh:jmh-core:" + JMH_VERSION, "org.openjdk.jmh:jmh-generator-annprocess:" + JMH_VERSION, "org.slf4j:slf4j-api:" + SLF4J_VERSION, + "org.slf4j:jcl-over-slf4j:" + SLF4J_VERSION, "org.slf4j:slf4j-simple:" + SLF4J_VERSION, "org.tukaani:xz:1.11", ], diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index 08294c7184b..ead448d796c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -216,6 +216,12 @@ + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 2d3f3625d00..24715ea248b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -58,6 +58,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 5ec0fcc2cc7..b53ad33c97f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -58,6 +58,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 3a8524f34df..269dd9a6d81 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -58,6 +58,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 81298424579..9474a6b6865 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -58,6 +58,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index bdaac33092f..250c5a0fbab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -58,6 +58,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 995e06b16e0..16825817d02 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -58,6 +58,12 @@ 2.0.17 jar + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 314de5d5673..d5d06dcc583 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -263,6 +263,11 @@ maven slf4j artifactId = "slf4j-simple" version = "2.0.17" } + dependency { + groupId = "org.slf4j" + artifactId = "jcl-over-slf4j" + version = "2.0.17" + } } maven xz diff --git a/pom.xml b/pom.xml index 57849fa90ed..26f0053328a 100644 --- a/pom.xml +++ b/pom.xml @@ -969,6 +969,12 @@ ${slf4j-version} + + org.slf4j + jcl-over-slf4j + ${slf4j-version} + + com.google.code.gson gson From db7dcf9ee3851c7c34a9ccabc0866a875f3d28e6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 27 Feb 2026 14:28:28 +0100 Subject: [PATCH 027/200] Add AddCommand #addFilepatterns methods for varargs and collection arguments to facilitate adding multiple patterns in a single API call. Bug: jgit-247 Change-Id: I162eacea891d45a6e8feb7d0f6b66f8addfed78f --- .../org/eclipse/jgit/api/AddCommandTest.java | 41 +++++++++++++++++++ .../src/org/eclipse/jgit/api/AddCommand.java | 32 +++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java index 226677229cc..0d87109fea4 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java @@ -27,6 +27,7 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.nio.file.Files; +import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -109,6 +110,46 @@ public void testAddExistingSingleFile() throws IOException, GitAPIException { } } + @Test + public void testAddExistingMultipleFiles() + throws IOException, GitAPIException { + File file = new File(db.getWorkTree(), "a.txt"); + FileUtils.createNewFile(file); + file = new File(db.getWorkTree(), "b.txt"); + FileUtils.createNewFile(file); + try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) { + writer.print("content"); + } + + try (Git git = new Git(db)) { + git.add().addFilepatterns("a.txt", "b.txt").call(); + + assertEquals( + "[a.txt, mode:100644, content:][b.txt, mode:100644, content:content]", + indexState(CONTENT)); + } + } + + @Test + public void testAddExistingMultipleFilesCollection() + throws IOException, GitAPIException { + File file = new File(db.getWorkTree(), "a.txt"); + FileUtils.createNewFile(file); + file = new File(db.getWorkTree(), "b.txt"); + FileUtils.createNewFile(file); + try (PrintWriter writer = new PrintWriter(file, UTF_8.name())) { + writer.print("content"); + } + + try (Git git = new Git(db)) { + git.add().addFilepatterns(List.of("a.txt", "b.txt")).call(); + + assertEquals( + "[a.txt, mode:100644, content:][b.txt, mode:100644, content:content]", + indexState(CONTENT)); + } + } + @Test public void testAddLink() throws IOException, GitAPIException { assumeTrue(db.getFS().supportsSymlinks()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java index b4d1cab5139..23bda6f1846 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java @@ -20,7 +20,9 @@ import java.text.MessageFormat; import java.time.Instant; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.Objects; import org.eclipse.jgit.api.errors.FilterFailedException; import org.eclipse.jgit.api.errors.GitAPIException; @@ -113,6 +115,36 @@ public AddCommand addFilepattern(String filepattern) { return this; } + /** + * Add paths to a file/directory whose content should be added. + * + * @param patterns + * repository-relative paths of file/directory to add (with + * / as separator) + * @return {@code this} + * @since 7.6 + */ + public AddCommand addFilepatterns(String... patterns) { + List.of(Objects.requireNonNull(patterns)).forEach(this::addFilepattern); + return this; + } + + /** + * Add paths to a file/directory whose content should be added. + * + * @param patterns + * repository-relative paths of file/directory to add (with + * / as separator) + * @return {@code this} + * @since 7.6 + */ + public AddCommand addFilepatterns(Collection patterns) { + if (patterns != null) { + patterns.forEach(this::addFilepattern); + } + return this; + } + /** * Allow clients to provide their own implementation of a FileTreeIterator * From e1fefa5863d6380d091d04e6f0d890356a218fd6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 2 Mar 2026 23:54:16 +0100 Subject: [PATCH 028/200] JGit v7.6.0.202603022253-r Signed-off-by: Matthias Sohn Change-Id: Icb47925a53355f8f9c7342f880f56643614553cb --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index b114e7d36f4..1f6e043f436 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 483e833a83c..ddbe1930fa7 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 18acf74202a..bcfce8c24a6 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index d9b324140f9..dfcaf50c8ed 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index dab8a3d8e57..420179b31be 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 3f9d2c121af..a70bdb03440 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 86336e3b9eb..625d357e473 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index bbe279b4ccf..9d4848fc437 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index b4daf7dc81c..4034687e03e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 80b421dac5f..42be6c27704 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.ant - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.archive - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.http.apache - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.http.server - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.lfs - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.pgm - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.ui - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.test - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.ant.test - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.http.test - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 647c97d26e6..12e036c94b8 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 05e504ed732..42541ee142b 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 cc6eda7801e..987170bb690 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.80.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 82df526a6e6..79d73753f50 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index bfc359047b3..0981ccf13f5 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 9b0f12f83b6..527cd11df86 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 cd65a4f2c40..d064bea3989 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 55828b2dbb8..7c19904b262 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 e97e314c22c..20dbb19f105 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 3d4256867e2..d1bb2b8a073 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2be8efe1a96..2af2273f479 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 dd507d323f5..123d6c43385 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index c8d9baac5b2..75cb8da3e78 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 03aae759347..77c22655bbe 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: OSGI-INF/l10n/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 64d2e4eb2bb..1251b4de374 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c5a9e8e2648..1241ed549d9 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 012f00bf72f..26178007140 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: OSGI-INF/l10n/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 9c1adcb4a2d..1940f9fdd11 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 8d6d068adcb..bbaa1f681e6 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 bf528656d9e..440225d7388 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: OSGI-INF/l10n/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 cb07dc904c1..7c0b1971318 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index fa798c8ae80..c9a5d35620d 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 9b0f742fee6..8e6cab94cd5 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3cdda74bfd7..596751d99e4 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 b0ee6b4beb0..13396593304 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 c2a8147e8ee..a265257cfa9 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 1b4a73b4de0..95fa20d26b2 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 d79ae9a34fc..4bf80b256af 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 4f9de97f59b..fd4ef68b6f5 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 44d84770ecd..982c6a50c78 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index cdc7cf9b7bf..fbc5350143a 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 803606acf18..03014cb3d4b 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 c5521eea303..5d2fc71f846 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 95ec4e95b99..383533ca924 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 1518beb7854..88740f24f6d 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 f3f10fd2ab2..da529523aad 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 b9815d6a251..5e332b13e56 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 1f0ad42946e..d54d6dbb172 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 efbf3c03d15..a859af42930 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 a0f6e9263b0..e92165ef807 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 fef54ecbba2..212001d5a77 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 74daa110a44..2966ac5107d 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 868aa02c2db..edb85d8cb28 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 8812d722f52..5b96a55222f 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 5c71af5fc99..6e411cc6700 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 bfb53604c02..103113cb528 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 4eb2a6daf73..2a25b3ae739 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 cc7a9d67614..c0954efd86a 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 bd383609364..1eeaa9c2320 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 ab0775e3421..bd81624e674 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 7d881a52494..bfc0bd758e0 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 07f6f21f45f..a68a6d5256e 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 5f81b7d60d7..7dcdb5a6e9e 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-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 de0a37aa8a6..3295d027644 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 0e19ea5ff81..e7d272f7aa2 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index dcb551955e6..49dab479e1e 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 041c46db7c5..871b4700143 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 2ef72566aa4..c16f6433102 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.0,7.7.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 56d463f7f96..edb47ae80ee 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 9c2bf0345c7..8465131c639 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit.ssh.apache.agent 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 d2bf5aeb258..5b47ac01028 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 5a9057fe5cd..8f67608bb53 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 7a7d7e1b84f..0ce787bfcb8 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 5ef864b3899..6892134bb8b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 3edf6e6ce65..558a33473d0 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 4632a36b0bf..6ef5017237f 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 70b0af03255..711886404ee 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 436d2510170..9656fe74104 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="[7.6.0,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.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 7cba3294642..f9f5ae0ad92 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 91caa5e818e..0646a69f9a3 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 bee0f4927ee..d0e703a12f9 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 387f1683069..70355ca22d0 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-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 b3ecf33ca23..d2253c8e26f 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index e20c4f219c8..c1bb1bdf7ee 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 2acf0e0b343..3e25e00e939 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 - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 15ae6efaadf..cb52b26e91a 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: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 48db010fc9e..1f9102e6b05 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.qualifier +Bundle-Version: 7.6.0.202603022253-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.202603022253-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 890cb9cbf19..585c64faa22 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 26f0053328a..383bc976fb0 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.6.0-SNAPSHOT + 7.6.0.202603022253-r JGit - Parent ${jgit-url} From 86ae4bd314d5dbfce6aa86a124305b8c95d8733a Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Feb 2026 14:50:20 -0800 Subject: [PATCH 029/200] DfsPackFileMidx: Pass the right pack when building single-pack midx While instantiating a single-pack midx, the code assumes that the incoming list of known packs has only the packs mentioned in the description and takes blindly the first pack in the list. This can pick the wrong pack because that list contains all known packs in the repo in no specific order. This was found out while making MidxTestUtils work with midx as input to build another midx. It needs to take plain packs instead of whatever was given to the midx and that new list doesn't necessarily have the expected pack first. Lookup the pack by pack name before passing it to the DfsPackFileSinglePack instance. Change-Id: I144f15dcaa860367093a141f29152dce6a6a6964 --- .../eclipse/jgit/internal/storage/dfs/MidxTestUtils.java | 6 +++++- .../eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java b/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java index c5210c895ff..d1e035185e8 100644 --- a/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java +++ b/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java @@ -150,8 +150,12 @@ static DfsPackFileMidx writeMultipackIndex(DfsRepository db, Arrays.asList(packs), base != null ? base.getPackDescription() : null, packConfig); db.getObjectDatabase().commitPack(List.of(desc), null); + + // "packs" argument can have a midx and its base in the list. + List allPlainPacks = MidxPackList + .create(db.getObjectDatabase().getPacks()).getAllPlainPacks(); return DfsPackFileMidx.create(DfsBlockCache.getInstance(), desc, - Arrays.asList(packs), base); + allPlainPacks, base); } record CommitObjects(RevCommit commit, RevTree tree, RevBlob blob) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java index 3c63db2fcfa..50ae998bad9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java @@ -57,7 +57,12 @@ public static DfsPackFileMidx create(DfsBlockCache cache, DfsPackDescription desc, List requiredPacks, @Nullable DfsPackFileMidx base) { if (desc.getCoveredPacks().size() == 1) { - return new DfsPackFileMidxSingle(cache, desc, requiredPacks.get(0), + String coveredPackName = desc.getCoveredPacks().get(0) + .getPackName(); + DfsPackFile coveredPack = requiredPacks.stream().filter(p -> p + .getPackDescription().getPackName().equals(coveredPackName)) + .findFirst().orElseThrow(); + return new DfsPackFileMidxSingle(cache, desc, coveredPack, base); } return new DfsPackFileMidxNPacks(cache, desc, requiredPacks, base); From 585de8e312709303fcbf98aa460c18a3ae4c67fa Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Mar 2026 14:12:10 +0100 Subject: [PATCH 030/200] Prepare 7.6.1-SNAPSHOT builds Change-Id: I1568ba4e606fe9c2ee5413d810d4d5a18679f73b --- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++--- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 42 +++--- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 44 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++--- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 32 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 88 ++++++------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 ++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 122 +++++++++--------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 116 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 549 insertions(+), 549 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 1f6e043f436..5c65d3f055b 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.ant.tasks;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.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 ddbe1930fa7..65c17a981b7 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 - 7.6.0.202603022253-r + 7.6.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 bcfce8c24a6..1189ae18b4a 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)" + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.6.0", - org.eclipse.jgit.ant.tasks;version="7.6.0"; +Export-Package: org.eclipse.jgit.ant;version="7.6.1", + org.eclipse.jgit.ant.tasks;version="7.6.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 dfcaf50c8ed..4527ac76672 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 420179b31be..70150984840 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 - 7.6.0.202603022253-r + 7.6.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 a70bdb03440..222318c36c0 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,18 +14,18 @@ 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="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.6.0"; +Export-Package: org.eclipse.jgit.archive;version="7.6.1"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.6.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.6.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 625d357e473..ea8db6be99f 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 9d4848fc437..cf805bdac1e 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 - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 4034687e03e..f67eb4d4c8d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 42be6c27704..e922fbf8c1c 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 - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.6.0.202603022253-r + 7.6.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 12e036c94b8..6e13b6385d0 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.80.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.80.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.sha1;version="[7.6.0,7.7.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.sha1;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;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 42541ee142b..6ca68db6c98 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 - 7.6.0.202603022253-r + 7.6.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 987170bb690..138ba434d07 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="[7.6.0,7.7.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.6.1,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.80.0,2.0.0)", @@ -27,5 +27,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.80.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.80.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.6.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.6.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.6.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.6.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 79d73753f50..e02a782c9a3 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 0981ccf13f5..22708765747 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 - 7.6.0.202603022253-r + 7.6.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 527cd11df86..a131f2bf637 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin @@ -27,11 +27,11 @@ Import-Package: javax.net.ssl, 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="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.6.0"; + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.6.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 d064bea3989..de4f1f51194 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7c19904b262..08a3e58d142 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 - 7.6.0.202603022253-r + 7.6.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 20dbb19f105..ec6205b485c 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.http.server;version="7.6.0", - org.eclipse.jgit.http.server.glue;version="7.6.0"; +Export-Package: org.eclipse.jgit.http.server;version="7.6.1", + org.eclipse.jgit.http.server.glue;version="7.6.1"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.6.0"; + org.eclipse.jgit.http.server.resolver;version="7.6.1"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)" + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.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 d1bb2b8a073..9e2342528bd 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2af2273f479..014144846b5 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 - 7.6.0.202603022253-r + 7.6.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 123d6c43385..babbd218f73 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -28,26 +28,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.http.server;version="[7.6.0,7.7.0)", - org.eclipse.jgit.http.server.glue;version="[7.6.0,7.7.0)", - org.eclipse.jgit.http.server.resolver;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http.apache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.http.server;version="[7.6.1,7.7.0)", + org.eclipse.jgit.http.server.glue;version="[7.6.1,7.7.0)", + org.eclipse.jgit.http.server.resolver;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http.apache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.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.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 75cb8da3e78..3e9f4560b96 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 - 7.6.0.202603022253-r + 7.6.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 77c22655bbe..c13deaa36ad 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -23,17 +23,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.http.server;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.0,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.http.server;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.6.0"; +Export-Package: org.eclipse.jgit.junit.http;version="7.6.1"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.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 1251b4de374..7dd96281de1 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 1241ed549d9..dc3461ca9ea 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 - 7.6.0.202603022253-r + 7.6.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 26178007140..48199fd83b5 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -34,16 +34,16 @@ Import-Package: org.apache.sshd.common;version="[2.17.1,2.18.0)", org.apache.sshd.server.subsystem;version="[2.17.1,2.18.0)", org.apache.sshd.sftp;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.server;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.6.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.6.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 1940f9fdd11..b092137abbb 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index bbaa1f681e6..821a9135e07 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 - 7.6.0.202603022253-r + 7.6.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 440225d7388..fefcf2ed9c9 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,38 +3,38 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.pack;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="7.6.0", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.time;version="[7.6.0,7.7.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.pack;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="7.6.1", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.time;version="[7.6.1,7.7.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.6.0"; +Export-Package: org.eclipse.jgit.junit;version="7.6.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -47,4 +47,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.6.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.6.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.6.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 7c0b1971318..314da62f725 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c9a5d35620d..f9632d64b28 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 - 7.6.0.202603022253-r + 7.6.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 8e6cab94cd5..89fd39af60f 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -27,24 +27,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.server;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.test;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.server;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.test;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.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 596751d99e4..418e535aedd 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 - 7.6.0.202603022253-r + 7.6.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 13396593304..4500e4f4293 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs.server;version="7.6.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.6.1"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.6.0"; + org.eclipse.jgit.lfs.server.fs;version="7.6.1"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.6.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.6.0"; + org.eclipse.jgit.lfs.server.internal;version="7.6.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.6.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Import-Package: com.google.gson;version="[2.8.0,3.0.0)", @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http.apache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http.apache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.slf4j;version="[1.7.0,3.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 a265257cfa9..dcc9a36a29f 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 95fa20d26b2..bb1eb07f68a 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 - 7.6.0.202603022253-r + 7.6.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 4bf80b256af..72b1723b2cc 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,29 +3,29 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", +Import-Package: org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.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="7.6.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.6.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 fd4ef68b6f5..6e98c74f22a 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 - 7.6.0.202603022253-r + 7.6.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 982c6a50c78..ab8a262a778 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs;version="7.6.0", - org.eclipse.jgit.lfs.errors;version="7.6.0", - org.eclipse.jgit.lfs.internal;version="7.6.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="7.6.0" +Export-Package: org.eclipse.jgit.lfs;version="7.6.1", + org.eclipse.jgit.lfs.errors;version="7.6.1", + org.eclipse.jgit.lfs.internal;version="7.6.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="7.6.1" Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.0,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.hooks;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.pack;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)" + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.hooks;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.pack;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index fbc5350143a..230922e55a9 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 03014cb3d4b..c80fd34efdd 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 - 7.6.0.202603022253-r + 7.6.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 5d2fc71f846..b61447a2caf 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 383533ca924..b85b05c7786 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 - 7.6.0.202603022253-r + 7.6.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 88740f24f6d..762e58ba9ad 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 - 7.6.0.202603022253-r + 7.6.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 5e332b13e56..c0af6959e62 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 - 7.6.0.202603022253-r + 7.6.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 a859af42930..66006cfbf97 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 - 7.6.0.202603022253-r + 7.6.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 212001d5a77..388cc4eb28e 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 - 7.6.0.202603022253-r + 7.6.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 edb85d8cb28..9a2a51ab61c 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 - 7.6.0.202603022253-r + 7.6.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 6e411cc6700..31e64d75226 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 - 7.6.0.202603022253-r + 7.6.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 103113cb528..09a9d137a3b 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 - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.6.0.202603022253-r + 7.6.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 c0954efd86a..8944c54ea10 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 - 7.6.0.202603022253-r + 7.6.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 bd81624e674..25cee737e9f 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 - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index a68a6d5256e..0deaf2a2e78 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 - 7.6.0.202603022253-r + 7.6.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 7dcdb5a6e9e..e8e35b5c3b1 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.0,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.0,7.7.0)", - org.eclipse.jgit.pgm;version="[7.6.0,7.7.0)", - org.eclipse.jgit.pgm.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.pgm.opt;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)", +Import-Package: org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", + org.eclipse.jgit.pgm;version="[7.6.1,7.7.0)", + org.eclipse.jgit.pgm.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.pgm.opt;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", org.hamcrest.core;bundle-version="[1.1.0,3.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 3295d027644..64a776c68bb 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 - 7.6.0.202603022253-r + 7.6.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 e7d272f7aa2..b84f517d01e 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -15,50 +15,50 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.archive;version="[7.6.0,7.7.0)", - org.eclipse.jgit.awtui;version="[7.6.0,7.7.0)", - org.eclipse.jgit.blame;version="[7.6.0,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.0,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.gitrepo;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.io;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.server;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.notes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.pack;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http.apache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.sshd;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.archive;version="[7.6.1,7.7.0)", + org.eclipse.jgit.awtui;version="[7.6.1,7.7.0)", + org.eclipse.jgit.blame;version="[7.6.1,7.7.0)", + org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.gitrepo;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.io;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.server;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.notes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.pack;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http.apache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.sshd;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.1,7.7.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="7.6.0"; +Export-Package: org.eclipse.jgit.console;version="7.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.6.0"; + org.eclipse.jgit.pgm;version="7.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -70,14 +70,14 @@ Export-Package: org.eclipse.jgit.console;version="7.6.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.6.0"; + org.eclipse.jgit.pgm.debug;version="7.6.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.6.0"; + org.eclipse.jgit.pgm.internal;version="7.6.1"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.6.0"; + org.eclipse.jgit.pgm.opt;version="7.6.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 49dab479e1e..b8dceb82b79 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 871b4700143..5cfa9425ce6 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 - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index c16f6433102..23f054fe175 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.0,7.7.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.1,7.7.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.6.0";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.6.1";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index edb47ae80ee..6143a09682d 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 8465131c639..748454adc9c 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 5b47ac01028..f99e052d549 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,22 +26,22 @@ Import-Package: org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.core;version="[2.17.1,2.18.0)", org.apache.sshd.server;version="[2.17.1,2.18.0)", org.apache.sshd.server.forward;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.sshd;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit.ssh;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.sshd;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.sshd;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit.ssh;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.sshd;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 8f67608bb53..8dbc498da9e 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 - 7.6.0.202603022253-r + 7.6.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 0ce787bfcb8..c4c1117cc98 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.6.1";x-friends:="org.eclipse.jgit.ssh.apache.test"; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -25,19 +25,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.0";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.6.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.6.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.6.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.6.0"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.6.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.6.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.6.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.6.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.6.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.6.1"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.6.0" + org.eclipse.jgit.transport.sshd.agent;version="7.6.1" Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.client;version="[2.17.1,2.18.0)", @@ -91,14 +91,14 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.apache.sshd.sftp;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.client;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.common;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.fnmatch;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.fnmatch;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.slf4j;version="[1.7.0,3.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 6892134bb8b..905c9ca60b5 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 558a33473d0..064070fc647 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 - 7.6.0.202603022253-r + 7.6.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 6ef5017237f..f13697ab7a7 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit.ssh;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit.ssh;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 711886404ee..271979f9dd8 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 - 7.6.0.202603022253-r + 7.6.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 9656fe74104..3e19f55ab61 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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="[7.6.0,7.7.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.6.1,7.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.0" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.1" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", org.slf4j;version="[1.7.0,3.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 f9f5ae0ad92..a23316257d2 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 0646a69f9a3..3c8e0b24008 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 - 7.6.0.202603022253-r + 7.6.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 d0e703a12f9..6a46e859b4c 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,66 +21,66 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.apache.commons.lang3;version="[3.17.0,4.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api;version="[7.6.0,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.archive;version="[7.6.0,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.awtui;version="[7.6.0,7.7.0)", - org.eclipse.jgit.blame;version="[7.6.0,7.7.0)", - org.eclipse.jgit.blame.cache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.0,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.0,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.events;version="[7.6.0,7.7.0)", - org.eclipse.jgit.fnmatch;version="[7.6.0,7.7.0)", - org.eclipse.jgit.gitrepo;version="[7.6.0,7.7.0)", - org.eclipse.jgit.hooks;version="[7.6.0,7.7.0)", - org.eclipse.jgit.ignore;version="[7.6.0,7.7.0)", - org.eclipse.jgit.ignore.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.diff;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.fsck;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.6.0", - org.eclipse.jgit.internal.storage.dfs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.io;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.6.0,7.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.0,7.7.0)", - org.eclipse.jgit.junit.time;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.logging;version="[7.6.0,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.notes;version="[7.6.0,7.7.0)", - org.eclipse.jgit.patch;version="[7.6.0,7.7.0)", - org.eclipse.jgit.pgm;version="[7.6.0,7.7.0)", - org.eclipse.jgit.pgm.internal;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.0,7.7.0)", - org.eclipse.jgit.storage.pack;version="[7.6.0,7.7.0)", - org.eclipse.jgit.submodule;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util.sha1;version="[7.6.0,7.7.0)", + org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.archive;version="[7.6.1,7.7.0)", + org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.awtui;version="[7.6.1,7.7.0)", + org.eclipse.jgit.blame;version="[7.6.1,7.7.0)", + org.eclipse.jgit.blame.cache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", + org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.events;version="[7.6.1,7.7.0)", + org.eclipse.jgit.fnmatch;version="[7.6.1,7.7.0)", + org.eclipse.jgit.gitrepo;version="[7.6.1,7.7.0)", + org.eclipse.jgit.hooks;version="[7.6.1,7.7.0)", + org.eclipse.jgit.ignore;version="[7.6.1,7.7.0)", + org.eclipse.jgit.ignore.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.diff;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.fsck;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.6.1", + org.eclipse.jgit.internal.storage.dfs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.io;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.6.1,7.7.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", + org.eclipse.jgit.junit.time;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.logging;version="[7.6.1,7.7.0)", + org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.notes;version="[7.6.1,7.7.0)", + org.eclipse.jgit.patch;version="[7.6.1,7.7.0)", + org.eclipse.jgit.pgm;version="[7.6.1,7.7.0)", + org.eclipse.jgit.pgm.internal;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", + org.eclipse.jgit.storage.pack;version="[7.6.1,7.7.0)", + org.eclipse.jgit.submodule;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util.sha1;version="[7.6.1,7.7.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.hamcrest.collection;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 70355ca22d0..2f9e9ee25f0 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 - 7.6.0.202603022253-r + 7.6.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 d2253c8e26f..35c36de9018 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,15 +4,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.awtui;version="7.6.0" -Import-Package: org.eclipse.jgit.errors;version="[7.6.0,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.0,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.0,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.0,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.0,7.7.0)", - org.eclipse.jgit.util;version="[7.6.0,7.7.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.6.1" +Import-Package: org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", + org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", + org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", + org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", + org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", + org.eclipse.jgit.util;version="[7.6.1,7.7.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index c1bb1bdf7ee..ec9f7f0e107 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 3e25e00e939..a362c39466a 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 - 7.6.0.202603022253-r + 7.6.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 cb52b26e91a..65c8c691062 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: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -11,8 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.6.0", - org.eclipse.jgit.api;version="7.6.0"; +Export-Package: org.eclipse.jgit.annotations;version="7.6.1", + org.eclipse.jgit.api;version="7.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -27,21 +27,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.6.0"; + org.eclipse.jgit.api.errors;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.6.0"; + org.eclipse.jgit.attributes;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.6.0"; + org.eclipse.jgit.blame;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.blame.cache, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.blame.cache;version="7.6.0"; + org.eclipse.jgit.blame.cache;version="7.6.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.diff;version="7.6.0"; + org.eclipse.jgit.diff;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.patch, @@ -49,55 +49,55 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.6.0"; + org.eclipse.jgit.dircache;version="7.6.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="7.6.0"; + org.eclipse.jgit.errors;version="7.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib", - org.eclipse.jgit.events;version="7.6.0"; + org.eclipse.jgit.events;version="7.6.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.6.0", - org.eclipse.jgit.gitrepo;version="7.6.0"; + org.eclipse.jgit.fnmatch;version="7.6.1", + org.eclipse.jgit.gitrepo;version="7.6.1"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.api.errors, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.6.0";x-internal:=true, - org.eclipse.jgit.hooks;version="7.6.0"; + org.eclipse.jgit.gitrepo.internal;version="7.6.1";x-internal:=true, + org.eclipse.jgit.hooks;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.ignore;version="7.6.0", - org.eclipse.jgit.ignore.internal;version="7.6.0"; + org.eclipse.jgit.ignore;version="7.6.1", + org.eclipse.jgit.ignore.internal;version="7.6.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.6.0"; + org.eclipse.jgit.internal;version="7.6.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.6.0"; + org.eclipse.jgit.internal.diff;version="7.6.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.6.0"; + org.eclipse.jgit.internal.diffmergetool;version="7.6.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.6.0"; + org.eclipse.jgit.internal.fsck;version="7.6.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.6.0"; + org.eclipse.jgit.internal.revwalk;version="7.6.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.6.0"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.6.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.6.0"; + org.eclipse.jgit.internal.storage.dfs;version="7.6.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="7.6.0"; + org.eclipse.jgit.internal.storage.file;version="7.6.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -109,39 +109,39 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.0", org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.apache.test, org.eclipse.jgit.ssh.jsch.test", - org.eclipse.jgit.internal.storage.io;version="7.6.0"; + org.eclipse.jgit.internal.storage.io;version="7.6.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.6.0"; + org.eclipse.jgit.internal.storage.memory;version="7.6.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.6.0"; + org.eclipse.jgit.internal.storage.midx;version="7.6.1"; x-friends:="org.eclipse.jgit.pgm, org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.6.0"; + org.eclipse.jgit.internal.storage.pack;version="7.6.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.6.0"; + org.eclipse.jgit.internal.storage.reftable;version="7.6.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="7.6.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.6.0"; + org.eclipse.jgit.internal.submodule;version="7.6.1";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.6.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.6.0"; + org.eclipse.jgit.internal.transport.http;version="7.6.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.6.0"; + org.eclipse.jgit.internal.transport.parser;version="7.6.1"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.6.0"; + org.eclipse.jgit.internal.transport.ssh;version="7.6.1"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.6.0"; + org.eclipse.jgit.internal.util;version="7.6.1"; x-friends:="org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.6.0"; + org.eclipse.jgit.lib;version="7.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -156,12 +156,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.6.0"; + org.eclipse.jgit.lib.internal;version="7.6.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.6.0", - org.eclipse.jgit.merge;version="7.6.0"; + org.eclipse.jgit.logging;version="7.6.1", + org.eclipse.jgit.merge;version="7.6.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -170,42 +170,42 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.6.0", - org.eclipse.jgit.notes;version="7.6.0"; + org.eclipse.jgit.nls;version="7.6.1", + org.eclipse.jgit.notes;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.6.0"; + org.eclipse.jgit.patch;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.6.0"; + org.eclipse.jgit.revplot;version="7.6.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib", - org.eclipse.jgit.revwalk;version="7.6.0"; + org.eclipse.jgit.revwalk;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.internal.storage.commitgraph", - org.eclipse.jgit.revwalk.filter;version="7.6.0"; + org.eclipse.jgit.revwalk.filter;version="7.6.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.6.0"; + org.eclipse.jgit.storage.file;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.6.0"; + org.eclipse.jgit.storage.pack;version="7.6.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.6.0"; + org.eclipse.jgit.submodule;version="7.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.6.0"; + org.eclipse.jgit.transport;version="7.6.1"; uses:="javax.crypto, org.eclipse.jgit.hooks, org.eclipse.jgit.util.io, @@ -218,21 +218,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.6.0"; + org.eclipse.jgit.transport.http;version="7.6.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.6.0"; + org.eclipse.jgit.transport.resolver;version="7.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.6.0"; + org.eclipse.jgit.treewalk;version="7.6.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="7.6.0"; + org.eclipse.jgit.treewalk.filter;version="7.6.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.6.0"; + org.eclipse.jgit.util;version="7.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -245,12 +245,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.6.0"; + org.eclipse.jgit.util.io;version="7.6.1"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.6.0", - org.eclipse.jgit.util.time;version="7.6.0" + org.eclipse.jgit.util.sha1;version="7.6.1", + org.eclipse.jgit.util.time;version="7.6.1" Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, javax.management, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 1f9102e6b05..f2662e0db6a 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.0.202603022253-r +Bundle-Version: 7.6.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.0.202603022253-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 585c64faa22..d30d2aebe95 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 383bc976fb0..18f8b1236ca 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.6.0.202603022253-r + 7.6.1-SNAPSHOT JGit - Parent ${jgit-url} From 42f62373217d9dcf0c8d7accc4645d7ab6183ed2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Mar 2026 14:20:21 +0100 Subject: [PATCH 031/200] Prepare 7.7.0-SNAPSHOT builds Change-Id: Ib58fa1b3b4529f6b04ca4dd4224386690094b3ed --- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++--- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 42 +++--- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 44 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++--- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 32 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 88 ++++++------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 ++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 122 +++++++++--------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 116 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 549 insertions(+), 549 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 5c65d3f055b..8b99ee9169b 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.ant.tasks;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.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 65c17a981b7..1ed2fb90785 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 - 7.6.1-SNAPSHOT + 7.7.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 1189ae18b4a..e10e3854171 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)" + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.6.1", - org.eclipse.jgit.ant.tasks;version="7.6.1"; +Export-Package: org.eclipse.jgit.ant;version="7.7.0", + org.eclipse.jgit.ant.tasks;version="7.7.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 4527ac76672..08d4b66eaf3 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 70150984840..8863da90e31 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 - 7.6.1-SNAPSHOT + 7.7.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 222318c36c0..9f4281261c3 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,18 +14,18 @@ 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="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.6.1"; +Export-Package: org.eclipse.jgit.archive;version="7.7.0"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.6.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.7.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 ea8db6be99f..88f51d14431 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index cf805bdac1e..a04e9c6350f 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 - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index f67eb4d4c8d..53d1bfdd401 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index e922fbf8c1c..b02657ff86e 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 - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.6.1-SNAPSHOT + 7.7.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 6e13b6385d0..1fc7557fbaa 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.80.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.80.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.sha1;version="[7.6.1,7.7.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.sha1;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;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 6ca68db6c98..2ed7ba3958d 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 - 7.6.1-SNAPSHOT + 7.7.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 138ba434d07..9b9474872ed 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="[7.6.1,7.7.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.80.0,2.0.0)", @@ -27,5 +27,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.80.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.80.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.80.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.6.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.6.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.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 e02a782c9a3..556d2565756 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 22708765747..e6b206344d6 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 - 7.6.1-SNAPSHOT + 7.7.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 a131f2bf637..06887836c6d 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin @@ -27,11 +27,11 @@ Import-Package: javax.net.ssl, 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="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.6.1"; + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.7.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 de4f1f51194..03c16b891b7 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 08a3e58d142..51be72e9c23 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 - 7.6.1-SNAPSHOT + 7.7.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 ec6205b485c..02059c1b715 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.http.server;version="7.6.1", - org.eclipse.jgit.http.server.glue;version="7.6.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.7.0", + org.eclipse.jgit.http.server.glue;version="7.7.0"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.6.1"; + org.eclipse.jgit.http.server.resolver;version="7.7.0"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)" + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.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 9e2342528bd..520c2fb1153 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 014144846b5..2460ea91e7c 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 - 7.6.1-SNAPSHOT + 7.7.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 babbd218f73..d19255326f9 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -28,26 +28,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.http.server;version="[7.6.1,7.7.0)", - org.eclipse.jgit.http.server.glue;version="[7.6.1,7.7.0)", - org.eclipse.jgit.http.server.resolver;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http.apache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.http.server;version="[7.7.0,7.8.0)", + org.eclipse.jgit.http.server.glue;version="[7.7.0,7.8.0)", + org.eclipse.jgit.http.server.resolver;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.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.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 3e9f4560b96..310f87f4c05 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 - 7.6.1-SNAPSHOT + 7.7.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 c13deaa36ad..fa7421aae95 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -23,17 +23,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.http.server;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.http.server;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.6.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.7.0"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.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 7dd96281de1..a913f9003de 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index dc3461ca9ea..4fc428ed766 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 - 7.6.1-SNAPSHOT + 7.7.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 48199fd83b5..04e96f9ec7d 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -34,16 +34,16 @@ Import-Package: org.apache.sshd.common;version="[2.17.1,2.18.0)", org.apache.sshd.server.subsystem;version="[2.17.1,2.18.0)", org.apache.sshd.sftp;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.server;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.6.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.7.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 b092137abbb..479ec1333be 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 821a9135e07..94397aba5f9 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 - 7.6.1-SNAPSHOT + 7.7.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 fefcf2ed9c9..78f05845141 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,38 +3,38 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.pack;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="7.6.1", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.time;version="[7.6.1,7.7.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="7.7.0", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.time;version="[7.7.0,7.8.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.6.1"; +Export-Package: org.eclipse.jgit.junit;version="7.7.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -47,4 +47,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.6.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.6.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.7.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 314da62f725..c313e01220b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index f9632d64b28..907fc47920c 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 - 7.6.1-SNAPSHOT + 7.7.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 89fd39af60f..e85207181e7 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -27,24 +27,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.server;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.test;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.server;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.test;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.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 418e535aedd..4ad6d6524f1 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 - 7.6.1-SNAPSHOT + 7.7.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 4500e4f4293..65079c689c5 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs.server;version="7.6.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.7.0"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.6.1"; + org.eclipse.jgit.lfs.server.fs;version="7.7.0"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.6.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.6.1"; + org.eclipse.jgit.lfs.server.internal;version="7.7.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.7.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Import-Package: com.google.gson;version="[2.8.0,3.0.0)", @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http.apache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.slf4j;version="[1.7.0,3.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 dcc9a36a29f..9dc895322da 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index bb1eb07f68a..73036eefecb 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 - 7.6.1-SNAPSHOT + 7.7.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 72b1723b2cc..b9df9f9e993 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,29 +3,29 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", +Import-Package: org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.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="7.6.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.7.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 6e98c74f22a..040b222cc63 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 - 7.6.1-SNAPSHOT + 7.7.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 ab8a262a778..0fe46c793ee 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs;version="7.6.1", - org.eclipse.jgit.lfs.errors;version="7.6.1", - org.eclipse.jgit.lfs.internal;version="7.6.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="7.6.1" +Export-Package: org.eclipse.jgit.lfs;version="7.7.0", + org.eclipse.jgit.lfs.errors;version="7.7.0", + org.eclipse.jgit.lfs.internal;version="7.7.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="7.7.0" Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.hooks;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.pack;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)" + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.hooks;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 230922e55a9..5ecc42bb93c 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index c80fd34efdd..19546b73995 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 - 7.6.1-SNAPSHOT + 7.7.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 b61447a2caf..0caab549108 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 b85b05c7786..a8ce2984b38 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 - 7.6.1-SNAPSHOT + 7.7.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 762e58ba9ad..e37d622a538 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 - 7.6.1-SNAPSHOT + 7.7.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 c0af6959e62..684d11994a1 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 - 7.6.1-SNAPSHOT + 7.7.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 66006cfbf97..8b28f14dfe1 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 - 7.6.1-SNAPSHOT + 7.7.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 388cc4eb28e..bb6b80a4a62 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 - 7.6.1-SNAPSHOT + 7.7.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 9a2a51ab61c..d053e0ac2a8 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 - 7.6.1-SNAPSHOT + 7.7.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 31e64d75226..9a1fd3ad202 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 - 7.6.1-SNAPSHOT + 7.7.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 09a9d137a3b..73f1ecda7b6 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 - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.6.1-SNAPSHOT + 7.7.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 8944c54ea10..edb2020cf80 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 - 7.6.1-SNAPSHOT + 7.7.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 25cee737e9f..706918f38ac 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 - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 0deaf2a2e78..2a73924bae5 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 - 7.6.1-SNAPSHOT + 7.7.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 e8e35b5c3b1..28b0ced222e 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", - org.eclipse.jgit.pgm;version="[7.6.1,7.7.0)", - org.eclipse.jgit.pgm.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.pgm.opt;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", +Import-Package: org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", + org.eclipse.jgit.pgm;version="[7.7.0,7.8.0)", + org.eclipse.jgit.pgm.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.pgm.opt;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", org.hamcrest.core;bundle-version="[1.1.0,3.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 64a776c68bb..f41d83d2cbd 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 - 7.6.1-SNAPSHOT + 7.7.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 b84f517d01e..e31d3dc49ca 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -15,50 +15,50 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.archive;version="[7.6.1,7.7.0)", - org.eclipse.jgit.awtui;version="[7.6.1,7.7.0)", - org.eclipse.jgit.blame;version="[7.6.1,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.gitrepo;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.io;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.server;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.notes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.pack;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http.apache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.sshd;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.archive;version="[7.7.0,7.8.0)", + org.eclipse.jgit.awtui;version="[7.7.0,7.8.0)", + org.eclipse.jgit.blame;version="[7.7.0,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.gitrepo;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.io;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.server;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.notes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.sshd;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.0,7.8.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="7.6.1"; +Export-Package: org.eclipse.jgit.console;version="7.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.6.1"; + org.eclipse.jgit.pgm;version="7.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -70,14 +70,14 @@ Export-Package: org.eclipse.jgit.console;version="7.6.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.6.1"; + org.eclipse.jgit.pgm.debug;version="7.7.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.6.1"; + org.eclipse.jgit.pgm.internal;version="7.7.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.6.1"; + org.eclipse.jgit.pgm.opt;version="7.7.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 b8dceb82b79..65901e06a00 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 5cfa9425ce6..659718bd8a9 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 - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 23f054fe175..1dc3728c98f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.6.1,7.7.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.6.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.7.0";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 6143a09682d..a085c046432 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 748454adc9c..4d7b7c233a8 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 f99e052d549..ae9e11e2182 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,22 +26,22 @@ Import-Package: org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.core;version="[2.17.1,2.18.0)", org.apache.sshd.server;version="[2.17.1,2.18.0)", org.apache.sshd.server.forward;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.sshd;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit.ssh;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.sshd;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.sshd;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit.ssh;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.sshd;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 8dbc498da9e..2ab6c3921f2 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 - 7.6.1-SNAPSHOT + 7.7.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 c4c1117cc98..04978ec2b78 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.6.1";x-friends:="org.eclipse.jgit.ssh.apache.test"; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -25,19 +25,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.6.1";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.6.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.6.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.6.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.6.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.6.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.6.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.7.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.7.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.7.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.7.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.7.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.6.1" + org.eclipse.jgit.transport.sshd.agent;version="7.7.0" Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.client;version="[2.17.1,2.18.0)", @@ -91,14 +91,14 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", org.apache.sshd.sftp;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.client;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.common;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.fnmatch;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.fnmatch;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.slf4j;version="[1.7.0,3.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 905c9ca60b5..fa44087d3cf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 064070fc647..18cba188b71 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 - 7.6.1-SNAPSHOT + 7.7.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 f13697ab7a7..73ef145eac6 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit.ssh;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit.ssh;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 271979f9dd8..176c91dc76b 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 - 7.6.1-SNAPSHOT + 7.7.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 3e19f55ab61..9093f859b1b 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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="[7.6.1,7.7.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.6.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", org.slf4j;version="[1.7.0,3.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 a23316257d2..4863daef6fc 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 3c8e0b24008..b8e2e4c212a 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 - 7.6.1-SNAPSHOT + 7.7.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 6a46e859b4c..36a9e4f53f0 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,66 +21,66 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.apache.commons.lang3;version="[3.17.0,4.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api;version="[7.6.1,7.7.0)", - org.eclipse.jgit.api.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.archive;version="[7.6.1,7.7.0)", - org.eclipse.jgit.attributes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.awtui;version="[7.6.1,7.7.0)", - org.eclipse.jgit.blame;version="[7.6.1,7.7.0)", - org.eclipse.jgit.blame.cache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.diff;version="[7.6.1,7.7.0)", - org.eclipse.jgit.dircache;version="[7.6.1,7.7.0)", - org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.events;version="[7.6.1,7.7.0)", - org.eclipse.jgit.fnmatch;version="[7.6.1,7.7.0)", - org.eclipse.jgit.gitrepo;version="[7.6.1,7.7.0)", - org.eclipse.jgit.hooks;version="[7.6.1,7.7.0)", - org.eclipse.jgit.ignore;version="[7.6.1,7.7.0)", - org.eclipse.jgit.ignore.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.diff;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.fsck;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.6.1", - org.eclipse.jgit.internal.storage.dfs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.io;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.6.1,7.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit;version="[7.6.1,7.7.0)", - org.eclipse.jgit.junit.time;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lfs;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.logging;version="[7.6.1,7.7.0)", - org.eclipse.jgit.merge;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.notes;version="[7.6.1,7.7.0)", - org.eclipse.jgit.patch;version="[7.6.1,7.7.0)", - org.eclipse.jgit.pgm;version="[7.6.1,7.7.0)", - org.eclipse.jgit.pgm.internal;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.file;version="[7.6.1,7.7.0)", - org.eclipse.jgit.storage.pack;version="[7.6.1,7.7.0)", - org.eclipse.jgit.submodule;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.http;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport.resolver;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.treewalk.filter;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.io;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util.sha1;version="[7.6.1,7.7.0)", + org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.archive;version="[7.7.0,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.awtui;version="[7.7.0,7.8.0)", + org.eclipse.jgit.blame;version="[7.7.0,7.8.0)", + org.eclipse.jgit.blame.cache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.events;version="[7.7.0,7.8.0)", + org.eclipse.jgit.fnmatch;version="[7.7.0,7.8.0)", + org.eclipse.jgit.gitrepo;version="[7.7.0,7.8.0)", + org.eclipse.jgit.hooks;version="[7.7.0,7.8.0)", + org.eclipse.jgit.ignore;version="[7.7.0,7.8.0)", + org.eclipse.jgit.ignore.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.diff;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.fsck;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.7.0", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.io;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.7.0,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", + org.eclipse.jgit.junit.time;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.logging;version="[7.7.0,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.notes;version="[7.7.0,7.8.0)", + org.eclipse.jgit.patch;version="[7.7.0,7.8.0)", + org.eclipse.jgit.pgm;version="[7.7.0,7.8.0)", + org.eclipse.jgit.pgm.internal;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.0,7.8.0)", + org.eclipse.jgit.submodule;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util.sha1;version="[7.7.0,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.hamcrest.collection;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 2f9e9ee25f0..92a7597b4cf 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 - 7.6.1-SNAPSHOT + 7.7.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 35c36de9018..ef66f911cff 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,15 +4,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.awtui;version="7.6.1" -Import-Package: org.eclipse.jgit.errors;version="[7.6.1,7.7.0)", - org.eclipse.jgit.lib;version="[7.6.1,7.7.0)", - org.eclipse.jgit.nls;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revplot;version="[7.6.1,7.7.0)", - org.eclipse.jgit.revwalk;version="[7.6.1,7.7.0)", - org.eclipse.jgit.transport;version="[7.6.1,7.7.0)", - org.eclipse.jgit.util;version="[7.6.1,7.7.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.7.0" +Import-Package: org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.0,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", + org.eclipse.jgit.util;version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index ec9f7f0e107..2430c2bb3d8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a362c39466a..a21d2f33ee2 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 - 7.6.1-SNAPSHOT + 7.7.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 65c8c691062..2377e269927 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: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -11,8 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.6.1", - org.eclipse.jgit.api;version="7.6.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.7.0", + org.eclipse.jgit.api;version="7.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -27,21 +27,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.6.1"; + org.eclipse.jgit.api.errors;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.6.1"; + org.eclipse.jgit.attributes;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.6.1"; + org.eclipse.jgit.blame;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.blame.cache, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.blame.cache;version="7.6.1"; + org.eclipse.jgit.blame.cache;version="7.7.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.diff;version="7.6.1"; + org.eclipse.jgit.diff;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.patch, @@ -49,55 +49,55 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.6.1"; + org.eclipse.jgit.dircache;version="7.7.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="7.6.1"; + org.eclipse.jgit.errors;version="7.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib", - org.eclipse.jgit.events;version="7.6.1"; + org.eclipse.jgit.events;version="7.7.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.6.1", - org.eclipse.jgit.gitrepo;version="7.6.1"; + org.eclipse.jgit.fnmatch;version="7.7.0", + org.eclipse.jgit.gitrepo;version="7.7.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.api.errors, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.6.1";x-internal:=true, - org.eclipse.jgit.hooks;version="7.6.1"; + org.eclipse.jgit.gitrepo.internal;version="7.7.0";x-internal:=true, + org.eclipse.jgit.hooks;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.ignore;version="7.6.1", - org.eclipse.jgit.ignore.internal;version="7.6.1"; + org.eclipse.jgit.ignore;version="7.7.0", + org.eclipse.jgit.ignore.internal;version="7.7.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.6.1"; + org.eclipse.jgit.internal;version="7.7.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.6.1"; + org.eclipse.jgit.internal.diff;version="7.7.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.6.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.7.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.6.1"; + org.eclipse.jgit.internal.fsck;version="7.7.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.6.1"; + org.eclipse.jgit.internal.revwalk;version="7.7.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.6.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.7.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.6.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.7.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="7.6.1"; + org.eclipse.jgit.internal.storage.file;version="7.7.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -109,39 +109,39 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.1", org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.apache.test, org.eclipse.jgit.ssh.jsch.test", - org.eclipse.jgit.internal.storage.io;version="7.6.1"; + org.eclipse.jgit.internal.storage.io;version="7.7.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.6.1"; + org.eclipse.jgit.internal.storage.memory;version="7.7.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.6.1"; + org.eclipse.jgit.internal.storage.midx;version="7.7.0"; x-friends:="org.eclipse.jgit.pgm, org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.6.1"; + org.eclipse.jgit.internal.storage.pack;version="7.7.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.6.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.7.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="7.6.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.6.1"; + org.eclipse.jgit.internal.submodule;version="7.7.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.7.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.6.1"; + org.eclipse.jgit.internal.transport.http;version="7.7.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.6.1"; + org.eclipse.jgit.internal.transport.parser;version="7.7.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.6.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.7.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.6.1"; + org.eclipse.jgit.internal.util;version="7.7.0"; x-friends:="org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.6.1"; + org.eclipse.jgit.lib;version="7.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -156,12 +156,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.6.1"; + org.eclipse.jgit.lib.internal;version="7.7.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.6.1", - org.eclipse.jgit.merge;version="7.6.1"; + org.eclipse.jgit.logging;version="7.7.0", + org.eclipse.jgit.merge;version="7.7.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -170,42 +170,42 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.6.1", - org.eclipse.jgit.notes;version="7.6.1"; + org.eclipse.jgit.nls;version="7.7.0", + org.eclipse.jgit.notes;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.6.1"; + org.eclipse.jgit.patch;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.6.1"; + org.eclipse.jgit.revplot;version="7.7.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib", - org.eclipse.jgit.revwalk;version="7.6.1"; + org.eclipse.jgit.revwalk;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.internal.storage.commitgraph", - org.eclipse.jgit.revwalk.filter;version="7.6.1"; + org.eclipse.jgit.revwalk.filter;version="7.7.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.6.1"; + org.eclipse.jgit.storage.file;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.6.1"; + org.eclipse.jgit.storage.pack;version="7.7.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.6.1"; + org.eclipse.jgit.submodule;version="7.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.6.1"; + org.eclipse.jgit.transport;version="7.7.0"; uses:="javax.crypto, org.eclipse.jgit.hooks, org.eclipse.jgit.util.io, @@ -218,21 +218,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.6.1"; + org.eclipse.jgit.transport.http;version="7.7.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.6.1"; + org.eclipse.jgit.transport.resolver;version="7.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.6.1"; + org.eclipse.jgit.treewalk;version="7.7.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="7.6.1"; + org.eclipse.jgit.treewalk.filter;version="7.7.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.6.1"; + org.eclipse.jgit.util;version="7.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -245,12 +245,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.6.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.6.1"; + org.eclipse.jgit.util.io;version="7.7.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.6.1", - org.eclipse.jgit.util.time;version="7.6.1" + org.eclipse.jgit.util.sha1;version="7.7.0", + org.eclipse.jgit.util.time;version="7.7.0" Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, javax.management, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index f2662e0db6a..46c35527314 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.6.1.qualifier +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.6.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index d30d2aebe95..e9b16e06934 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 18f8b1236ca..8b5938ca767 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.6.1-SNAPSHOT + 7.7.0-SNAPSHOT JGit - Parent ${jgit-url} From 0b4b374ec2b61a53265543d7b6ae44e578ebcadc Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 5 Mar 2026 11:49:03 -0800 Subject: [PATCH 032/200] MultiPackIndexLoader: report what chunk is going over size The message is misleading because what is too big is a specific chunk, not the whole index. Use a better message that is more explicit and tells what chunk is oversized and how big it is. Change-Id: Ibd6fa3388c11e099eaa79349ae2bcdc46a6a6964 --- .../resources/org/eclipse/jgit/internal/JGitText.properties | 1 + org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java | 1 + .../jgit/internal/storage/midx/MultiPackIndexLoader.java | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) 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 8889d7562c9..5dedccd5080 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -512,6 +512,7 @@ mergeToolNullError=Parameter for merge tool cannot be null. messageAndTaggerNotAllowedInUnannotatedTags = Unannotated tags cannot have a message or tagger midxChunkNeeded=midx 0x{0} chunk has not been loaded midxChunkRepeated=midx chunk id 0x{0} appears multiple times +midxChunkTooBig=chunk 0x{0} is too big (%d bytes) midxChunkUnknown=unknown midx chunk: 0x{0} minutesAgo={0} minutes ago mismatchOffset=mismatch offset for object {0} 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 1f496299f30..db4a4e2b469 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -543,6 +543,7 @@ public static JGitText get() { /***/ public String messageAndTaggerNotAllowedInUnannotatedTags; /***/ public String midxChunkNeeded; /***/ public String midxChunkRepeated; + /***/ public String midxChunkTooBig; /***/ public String midxChunkUnknown; /***/ public String minutesAgo; /***/ public String mismatchOffset; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoader.java index 4b70c2cb037..a3cb1151b27 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexLoader.java @@ -162,7 +162,8 @@ public static MultiPackIndex read(InputStream fd) if (len > Integer.MAX_VALUE - 8) { // http://stackoverflow.com/a/8381338 throw new MultiPackIndexFormatException( - JGitText.get().multiPackIndexFileIsTooLargeForJgit); + MessageFormat.format(JGitText.get().midxChunkTooBig, + chunkId, len)); } byte[] buffer = new byte[(int) len]; From 2c030eff6d7349a5915efb4bbb86246f04b582b2 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 6 Mar 2026 12:29:48 -0800 Subject: [PATCH 033/200] DfsMidxWriter: Split writing midx and its bitmaps We see some problems rereading the midx to build the bitmaps. Split bitmap writing from midx writing so we can toggle it independently. With this we can verify if the problem is that we are writing a bad midx or we are not reading it correctly. Change-Id: I3130154f6b8ce7e079e023bcf3b093f76a6a6964 --- .../internal/storage/dfs/MidxTestUtils.java | 9 ++-- .../internal/storage/dfs/DfsMidxWriter.java | 50 ++++++------------- 2 files changed, 19 insertions(+), 40 deletions(-) diff --git a/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java b/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java index d1e035185e8..c03317c08b9 100644 --- a/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java +++ b/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java @@ -148,8 +148,11 @@ static DfsPackFileMidx writeMultipackIndex(DfsRepository db, DfsPackDescription desc = DfsMidxWriter.writeMidx( NullProgressMonitor.INSTANCE, db.getObjectDatabase(), Arrays.asList(packs), - base != null ? base.getPackDescription() : null, packConfig); + base != null ? base.getPackDescription() : null); db.getObjectDatabase().commitPack(List.of(desc), null); + if (base == null) { + DfsMidxWriter.createAndAttachBitmaps(db, desc, packConfig); + } // "packs" argument can have a midx and its base in the list. List allPlainPacks = MidxPackList @@ -173,9 +176,7 @@ static List writeCommitChain(DfsRepository db, } try (TestRepository repository = new TestRepository<>( - (InMemoryRepository) db); - DfsInserter ins = (DfsInserter) db.getObjectDatabase() - .newInserter()) { + (InMemoryRepository) db)) { for (int i = 0; i < length; i++) { RevBlob blob = repository.blob("blob" + commitCounter); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java index 0cdb304be05..9691d1b0843 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java @@ -45,30 +45,6 @@ public class DfsMidxWriter { private DfsMidxWriter() { } - /** - * Create a pack with the multipack index (without bitmaps). - * - * @param pm - * a progress monitor - * @param objdb - * an object database - * @param packs - * the packs to cover - * @param base - * parent of this midx in the chain (if any). - * - * @return a pack (uncommitted) with the multipack index of the packs passed - * as parameter. - * @throws IOException - * an error opening the packs or writing the stream. - */ - public static DfsPackDescription writeMidx(ProgressMonitor pm, - DfsObjDatabase objdb, List packs, - @Nullable DfsPackDescription base) throws IOException { - return writeMidx(pm, objdb, packs, base, - new PackConfig(objdb.getRepository())); - } - /** * Create a pack with the multipack index * @@ -80,8 +56,6 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, * the packs to cover * @param base * parent of this midx in the chain (if any). - * @param packConfig - * pack config with the parameters to write bitmaps. * @return a pack (uncommitted) with the multipack index of the packs passed * as parameter. * @throws IOException @@ -89,7 +63,7 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, */ public static DfsPackDescription writeMidx(ProgressMonitor pm, DfsObjDatabase objdb, List packs, - @Nullable DfsPackDescription base, PackConfig packConfig) + @Nullable DfsPackDescription base) throws IOException { PackIndexMerger.Builder dataBuilder = PackIndexMerger.builder(); try (DfsReader ctx = objdb.newReader()) { @@ -121,18 +95,22 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, } } - // TODO(ifrade): At the moment write bitmaps only in the bottom midx. - // A single-pack midx in the base should be covering only GC. No - // need to write midx bitmaps (we will use GC bitmaps). - if (base == null && midxPackDesc.getCoveredPacks().size() > 1) { - createAndAttachBitmaps(objdb.getRepository(), midxPackDesc, - packConfig); - } - return midxPackDesc; } - private static void createAndAttachBitmaps(DfsRepository db, + /** + * Calculate bitmps for the midx and add them as a stream in the description + * + * @param db + * the repository + * @param desc + * the pack description of the midx + * @param cfg + * pack config with the parameters for the bitmaps + * @throws IOException + * an error reading from storage + */ + public static void createAndAttachBitmaps(DfsRepository db, DfsPackDescription desc, PackConfig cfg) throws IOException { DfsObjDatabase objdb = db.getObjectDatabase(); From 36cd34fcfab444b509d46f15e29035b8ed583195 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 8 Mar 2026 20:41:19 +0100 Subject: [PATCH 034/200] Update version of last JGit release to 7.6.0.202603022253-r Change-Id: I79aaa391f46d02dd1271d9b7ca1d6f66092d3591 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b5938ca767..7ceca53f3e8 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ ${commit.time.iso} - 7.5.0.202512021534-r + 7.6.0.202603022253-r 1.10.15 2.17.1 0.1.55 From 24571f682d3e8b9cb5e84bb390d34218020e2a8e Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 6 Mar 2026 23:03:09 +0100 Subject: [PATCH 035/200] Bump minimum dependency for Bouncy Castle to 1.83.0 To ensure that a p2 installer does include BC 1.83 when installing JGit in an environment that doesn't have it. Bug: jgit-249 Change-Id: I929ab92b57d1ad5010047f8f98048bfd6ca15f30 --- .../META-INF/MANIFEST.MF | 12 +++---- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 34 +++++++++---------- .../META-INF/MANIFEST.MF | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) 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 1fc7557fbaa..1b2793a3361 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -8,12 +8,12 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.80.0,2.0.0)", - org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp.operator;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp.operator.jcajce;version="[1.80.0,2.0.0)", - org.bouncycastle.util.encoders;version="[1.80.0,2.0.0)", +Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.83.0,2.0.0)", + org.bouncycastle.jce.provider;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp.operator;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp.operator.jcajce;version="[1.83.0,2.0.0)", + org.bouncycastle.util.encoders;version="[1.83.0,2.0.0)", org.eclipse.jgit.gpg.bc.internal;version="[7.7.0,7.8.0)", org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.0,7.8.0)", org.eclipse.jgit.util.sha1;version="[7.7.0,7.8.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 9b9474872ed..c039403f0d0 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -9,23 +9,23 @@ Bundle-Localization: OSGI-INF/l10n/gpg_bc Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.bouncycastle.asn1;version="[1.80.0,2.0.0)", - org.bouncycastle.asn1.x9;version="[1.80.0,2.0.0)", - org.bouncycastle.bcpg;version="[1.80.0,2.0.0)", - org.bouncycastle.bcpg.sig;version="[1.80.0,2.0.0)", - org.bouncycastle.crypto.ec;version="[1.80.0,2.0.0)", - org.bouncycastle.gpg;version="[1.80.0,2.0.0)", - org.bouncycastle.gpg.keybox;version="[1.80.0,2.0.0)", - org.bouncycastle.gpg.keybox.jcajce;version="[1.80.0,2.0.0)", - org.bouncycastle.jcajce.interfaces;version="[1.80.0,2.0.0)", - org.bouncycastle.jcajce.util;version="[1.80.0,2.0.0)", - org.bouncycastle.math.ec;version="[1.80.0,2.0.0)", - org.bouncycastle.math.field;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp.jcajce;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp.operator;version="[1.80.0,2.0.0)", - org.bouncycastle.openpgp.operator.jcajce;version="[1.80.0,2.0.0)", - org.bouncycastle.util.encoders;version="[1.80.0,2.0.0)", +Import-Package: org.bouncycastle.asn1;version="[1.83.0,2.0.0)", + org.bouncycastle.asn1.x9;version="[1.83.0,2.0.0)", + org.bouncycastle.bcpg;version="[1.83.0,2.0.0)", + org.bouncycastle.bcpg.sig;version="[1.83.0,2.0.0)", + org.bouncycastle.crypto.ec;version="[1.83.0,2.0.0)", + org.bouncycastle.gpg;version="[1.83.0,2.0.0)", + org.bouncycastle.gpg.keybox;version="[1.83.0,2.0.0)", + org.bouncycastle.gpg.keybox.jcajce;version="[1.83.0,2.0.0)", + org.bouncycastle.jcajce.interfaces;version="[1.83.0,2.0.0)", + org.bouncycastle.jcajce.util;version="[1.83.0,2.0.0)", + org.bouncycastle.math.ec;version="[1.83.0,2.0.0)", + org.bouncycastle.math.field;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp.jcajce;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp.operator;version="[1.83.0,2.0.0)", + org.bouncycastle.openpgp.operator.jcajce;version="[1.83.0,2.0.0)", + org.bouncycastle.util.encoders;version="[1.83.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test", org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 04978ec2b78..264712667b9 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -38,7 +38,7 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends: org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", org.eclipse.jgit.transport.sshd.agent;version="7.7.0" -Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)", +Import-Package: org.bouncycastle.jce.provider;version="[1.83.0,2.0.0)", org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.client;version="[2.17.1,2.18.0)", org.apache.sshd.client.auth;version="[2.17.1,2.18.0)", From 1dbac1bfd03d4e2c81e7049f3d2a03556aac562a Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 09:52:51 -0700 Subject: [PATCH 036/200] PackIndexMerger: Add progress monitor to the building process Give some visibility over the initial iteration calculating the midx headers. Change-Id: I2617eb8e7c0e618fc9378aecf8aad63e6a6a6964 --- .../storage/midx/PackIndexMerger.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index 34364465b31..dad6d66f94a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -16,6 +16,8 @@ import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MidxIterator; import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MutableEntry; import org.eclipse.jgit.lib.MutableObjectId; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.ProgressMonitor; /** * Collect the stats and offers an iterator over the union of n-pack indexes. @@ -57,6 +59,8 @@ public static class Builder { private final List packIndexes = new ArrayList<>(); + private ProgressMonitor pm = NullProgressMonitor.INSTANCE; + /** * Add a regular pack to the midx * @@ -85,6 +89,22 @@ public Builder addMidx(MidxIterator midx) { return this; } + /** + * Add a progress monitor to the build process + *

+ * Give visibility over the first iteration of the packs calculating the + * data needed for midx headers (unique object count, if large offsets + * are needed...) + * + * @param pm + * a progress monitor + * @return this builder + */ + public Builder setProgressMonitor(ProgressMonitor pm) { + this.pm = pm; + return this; + } + /** * Build the merger instance * @@ -92,7 +112,7 @@ public Builder addMidx(MidxIterator midx) { */ public PackIndexMerger build() { return new PackIndexMerger( - MidxIterators.dedup(MidxIterators.join(packIndexes))); + MidxIterators.dedup(MidxIterators.join(packIndexes)), pm); } } @@ -110,12 +130,16 @@ public static Builder builder() { * * @param midxIterator * MidxIterator built by deduping union of all pack indexes + * @param pm + * a progress monitor */ - private PackIndexMerger(MidxIterator midxIterator) { + private PackIndexMerger(MidxIterator midxIterator, ProgressMonitor pm) { this.midxIterator = midxIterator; this.packnames = midxIterator.getPackNames(); objectsPerPack = new int[packnames.size()]; + pm.beginTask("Iterating objects for midx headers", + ProgressMonitor.UNKNOWN); // Iterate for duplicates and counts that we need to build the chunk // headers. int objectCount = 0; @@ -139,10 +163,12 @@ private PackIndexMerger(MidxIterator midxIterator) { // TODO(ifrade): we can calculate the fanout table already here. // It saves an iteration over all objects for only 1Kb of memory objectsPerPack[entry.getPackId()]++; + pm.update(1); } uniqueObjectCount = objectCount; offsetsOver31BitsCount = over31bits; needsLargeOffsetsChunk = hasLargeOffsets; + pm.endTask(); } /** From 11e1fa24089c69b11bb5439a83166907b7788a34 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 15:36:20 -0700 Subject: [PATCH 037/200] MultiPackIndexWriter: Report progress writing chunks Change-Id: Ie1cf336ddf9ace51e417e1c49832e8716a6a6964 --- .../jgit/internal/storage/midx/MultiPackIndexWriter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java index 7c69b7842d4..91d08ec841f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -94,10 +94,13 @@ public Result write(ProgressMonitor monitor, OutputStream outputStream, writeHeader(out, chunkHeaders.size(), data.getPackCount()); writeChunkLookup(out, chunkHeaders); + monitor.beginTask("Writing midx chuncks", chunkHeaders.size()); WriteContext ctx = new WriteContext(out, data); for (ChunkHeader chunk : chunkHeaders) { chunk.writerFn.write(ctx); + monitor.update(1); } + monitor.endTask(); writeCheckSum(out); if (expectedSize != out.length()) { throw new IllegalStateException(String.format( From 8236fb4ba1400f81ccc3dff1a4d7b3cd2d69247f Mon Sep 17 00:00:00 2001 From: Daniele Sassoli Date: Tue, 10 Mar 2026 21:57:20 +0100 Subject: [PATCH 038/200] Allow extending TernarySearchTree TernarySearchTree is a generic implementation that could benefit from some specialised extensions, i.e. a TernarySearchTree of Ref could then allow us to expose some utility methods and additional data structures relative to refs that we can't add in the generic implementation. Make class non-final to allow subclassing. Change-Id: Ibd3c7469f8a018c37712abf5db5bcd48396d6a52 --- .../eclipse/jgit/internal/storage/memory/TernarySearchTree.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/memory/TernarySearchTree.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/memory/TernarySearchTree.java index 72434dbffeb..bc2c028189c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/memory/TernarySearchTree.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/memory/TernarySearchTree.java @@ -43,7 +43,7 @@ * type of values in this tree * @since 6.5 */ -public final class TernarySearchTree { +public class TernarySearchTree { private static final char WILDCARD = '?'; From 509b72a9ad7dd176f1000b5a8945f1e7f5ebbad5 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 09:52:51 -0700 Subject: [PATCH 039/200] pgm.MultiPackIndex: Move writing code to MidxWriter This mirrors DfsMidxWriter and paves the way to add bitmap writing. Change-Id: I1587ade397fdebbaab50de395237ddd06a6a6964 --- .../org/eclipse/jgit/pgm/MultiPackIndex.java | 28 ++------- .../internal/storage/file/MidxWriter.java | 61 +++++++++++++++++++ 2 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java index d91f7130a0e..81fc0e85281 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java @@ -13,18 +13,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; +import org.eclipse.jgit.internal.storage.file.MidxWriter; 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.midx.MultiPackIndexPrettyPrinter; -import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; -import org.eclipse.jgit.internal.storage.midx.PackIndexMerger; -import org.eclipse.jgit.internal.storage.pack.PackExt; -import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.TextProgressMonitor; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -84,22 +79,7 @@ private void writeMultiPackIndex() throws IOException { errw.println("Writing " + midx.getAbsolutePath()); ObjectDirectory odb = (ObjectDirectory) db.getObjectDatabase(); - - PackIndexMerger.Builder builder = PackIndexMerger.builder(); - for (Pack pack : odb.getPacks()) { - PackFile packFile = pack.getPackFile().create(PackExt.INDEX); - try { - builder.addPack(packFile.getName(), pack.getIndex()); - } catch (IOException e) { - throw die("Cannot open index in pack", e); - } - } - - MultiPackIndexWriter writer = new MultiPackIndexWriter(); - try (FileOutputStream out = new FileOutputStream(midxPath)) { - writer.write(NullProgressMonitor.INSTANCE, out, builder.build()); - } catch (IOException e) { - throw die("Cannot write midx " + midxPath, e); - } + MidxWriter.writeMidx(new TextProgressMonitor(errw), odb.getPacks(), + midx); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java new file mode 100644 index 00000000000..91f60b6d71f --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2026, Google LLC + * + * 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.io.FileOutputStream; +import java.io.IOException; +import java.util.Collection; +import java.util.Comparator; + +import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; +import org.eclipse.jgit.internal.storage.midx.PackIndexMerger; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.lib.ProgressMonitor; + +/** + * Helper to write multipack indexes. + */ +public class MidxWriter { + + /** + * Write a mdix over the packs + * + * @param pm + * a progress monitor + * @param packs + * packs to cover with the midx + * @param midxOut + * file to write the resulting midx + * @throws IOException + * an error reading any of the input packs or indexes + */ + public static void writeMidx(ProgressMonitor pm, Collection packs, + File midxOut) throws IOException { + PackIndexMerger.Builder builder = PackIndexMerger.builder(); + builder.setProgressMonitor(pm); + + Collection packList = packs.stream() + .sorted(Comparator.comparing(Pack::getPackName)).toList(); + pm.beginTask("Adding packs to midx", packList.size()); + for (Pack pack : packList) { + PackFile packFile = pack.getPackFile().create(PackExt.INDEX); + builder.addPack(packFile.getName(), pack.getIndex()); + pm.update(1); + } + pm.endTask(); + + MultiPackIndexWriter writer = new MultiPackIndexWriter(); + try (FileOutputStream out = new FileOutputStream( + midxOut.getAbsolutePath())) { + writer.write(pm, out, builder.build()); + } + } +} From 46b5cf0e9d978589c63f77c07e294b1132ab63cf Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 040/200] RefAdvancerWalk: Move to revwalk package We need this in the non-DFS side. Move it to a common package like revwalk. Change-Id: I829d94dadc61aa01be2fce46dfe08b7b6a6a6964 --- .../storage/dfs/RefAdvancerWalkTest.java | 1 + .../dfs => revwalk}/RefAdvancerWalk.java | 32 +++++++++++++++---- .../internal/storage/dfs/DfsMidxWriter.java | 1 + 3 files changed, 27 insertions(+), 7 deletions(-) rename org.eclipse.jgit/src/org/eclipse/jgit/internal/{storage/dfs => revwalk}/RefAdvancerWalk.java (77%) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/RefAdvancerWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/RefAdvancerWalkTest.java index 321ea01447f..728feeae982 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/RefAdvancerWalkTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/RefAdvancerWalkTest.java @@ -19,6 +19,7 @@ import java.util.Set; import java.util.stream.Collectors; +import org.eclipse.jgit.internal.revwalk.RefAdvancerWalk; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/RefAdvancerWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/revwalk/RefAdvancerWalk.java similarity index 77% rename from org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/RefAdvancerWalk.java rename to org.eclipse.jgit/src/org/eclipse/jgit/internal/revwalk/RefAdvancerWalk.java index d0d80562f5d..714ccf79a29 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/RefAdvancerWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/revwalk/RefAdvancerWalk.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -package org.eclipse.jgit.internal.storage.dfs; +package org.eclipse.jgit.internal.revwalk; import java.io.IOException; import java.util.HashSet; @@ -16,6 +16,7 @@ import org.eclipse.jgit.errors.StopWalkException; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevSort; @@ -25,21 +26,38 @@ /** * Walk from some commits and find where to they enter a pack */ -class RefAdvancerWalk { +public class RefAdvancerWalk { - private final DfsRepository db; + private final Repository db; private final InPackPredicate includeP; /** - * True when the commit is in the pack + * True when the commit is in the target set */ @FunctionalInterface - interface InPackPredicate { + public interface InPackPredicate { + /** + * Check if the commit belongs to the "pack" (target set of objects) + * + * @param c + * a commit + * @return true if the commit is in the set + * @throws IOException + * an error reading data + */ boolean test(RevCommit c) throws IOException; } - RefAdvancerWalk(DfsRepository db, InPackPredicate include) { + /** + * Constructor + * + * @param db + * a repository + * @param include + * predicate telling if a commit in the target set + */ + public RefAdvancerWalk(Repository db, InPackPredicate include) { this.db = db; this.includeP = include; } @@ -64,7 +82,7 @@ private RevWalk createRevWalk() { * @throws IOException * error browsing history */ - Set advance(List allTips) throws IOException { + public Set advance(List allTips) throws IOException { Set tipsInMidx = new HashSet<>(allTips.size()); try (RevWalk rw = createRevWalk()) { for (ObjectId tip : allTips) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java index 9691d1b0843..5c50ca4dbcc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java @@ -24,6 +24,7 @@ import java.util.function.Function; import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.internal.revwalk.RefAdvancerWalk; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; import org.eclipse.jgit.internal.storage.midx.PackIndexMerger; From a47c7efff7e6fee396b1ac2f6634243e95cae895 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 12 Mar 2026 16:49:33 -0700 Subject: [PATCH 041/200] MultiPackIndexWriter: report also the checksum in the result Checksum is needed later to write bitmaps. If we get it from the results, we do not need to re-read the midx. Change-Id: I274533e1373327e117378e5bccc18de36a6a6964 --- .../storage/midx/MultiPackIndexWriter.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java index 91d08ec841f..9bdb1fa1102 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -65,9 +65,11 @@ public class MultiPackIndexWriter { * packs) * @param packNames * packNames + * @param checksum + * checksum of the written midx */ public record Result(long bytesWritten, int objectCount, - List packNames) { + List packNames, byte[] checksum) { } /** @@ -101,7 +103,7 @@ public Result write(ProgressMonitor monitor, OutputStream outputStream, monitor.update(1); } monitor.endTask(); - writeCheckSum(out); + byte[] checksum = writeCheckSum(out); if (expectedSize != out.length()) { throw new IllegalStateException(String.format( JGitText.get().multiPackIndexUnexpectedSize, @@ -109,7 +111,7 @@ public Result write(ProgressMonitor monitor, OutputStream outputStream, Long.valueOf(out.length()))); } return new Result(expectedSize, data.getUniqueObjectCount(), - data.getPackNames()); + data.getPackNames(), checksum); } catch (InterruptedIOException e) { throw new IOException(JGitText.get().multiPackIndexWritingCancelled, e); @@ -384,13 +386,16 @@ private void writePackfileNames(WriteContext ctx) throws IOException { * * @param out * output stream used to write + * @return the checksum (same value that is written as footer of the file) * @throws IOException * error writing to the output stream */ - private void writeCheckSum(CancellableDigestOutputStream out) + private byte[] writeCheckSum(CancellableDigestOutputStream out) throws IOException { - out.write(out.getDigest()); + byte[] checksum = out.getDigest(); + out.write(checksum); out.flush(); + return checksum; } private record OffsetPosition(long offset, int position) { From 1822dcaa5be5969e749cb3f6e599914703fdc12f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 13 Mar 2026 11:04:27 +0100 Subject: [PATCH 042/200] Fix path of jgit artifacts in local maven repository in documentation for publishing a JGit release to Maven Central. Change-Id: I960ce84b153289de7234b12d7c7f67605b550516 --- tools/maven-central/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/maven-central/README.md b/tools/maven-central/README.md index d4533d9cf78..0c40598578c 100644 --- a/tools/maven-central/README.md +++ b/tools/maven-central/README.md @@ -87,7 +87,7 @@ - update the version in its `pom.xml` to the new JGit release you staged - delete all jgit artifacts from your local m2 repository ``` - $ rm -r ~/.m2/org/eclipse/jgit + $ rm -r ~/.m2/repository/org/eclipse/jgit ``` - build the jgit-built-test maven project to test if all artifacts of the new release can be downloaded and used in a build From 1e6cb59b2ab99ad8977ed3ab6c8d740bf70cdd7e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 13 Mar 2026 11:55:02 +0100 Subject: [PATCH 043/200] Update URL used to download artifacts from repo.eclipse.org This is required to adapt to the upgrade from Nexus 2 to Nexus 3. Requests to the old path are redirected to the new one, but it's better to directly use the target path. See https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/7168 Change-Id: Ia7b23909c9eafd0672b0f221e59335bfd8555190 --- tools/maven-central/download_release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/maven-central/download_release.py b/tools/maven-central/download_release.py index 4ce44bc2318..fa24b2f74ce 100755 --- a/tools/maven-central/download_release.py +++ b/tools/maven-central/download_release.py @@ -10,7 +10,7 @@ from functools import partial -BASE_REPO_URL = "https://repo.eclipse.org/content/groups/releases" +BASE_REPO_URL = "https://repo.eclipse.org/content/repositories/releases" JGIT_GROUP_ID = "org.eclipse.jgit" JGIT_PARENT_ARTIFACT_ID = "org.eclipse.jgit-parent" DOWNLOAD_DIR = "staging-deploy" From 9de1f3ce164ec7dfb4d1a5042d20c4d7e62180c0 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 12 Mar 2026 16:49:33 -0700 Subject: [PATCH 044/200] PullCommandTest: Remove unused variable ``` org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java:191: error: [UnusedVariable] This assignment to the local variable 'res' is never read. res = target.pull().call(); ^ (see https://errorprone.info/bugpattern/UnusedVariable) ``` Change-Id: I54f5caa01e316cab2f26437e117573e96a6a6964 --- .../tst/org/eclipse/jgit/api/PullCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java index 5c33f038cf1..8d6e7bcadd0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java @@ -188,7 +188,7 @@ public void testPullConflictDiff3() throws Exception { target.getRepository().getConfig().setEnum(CONFIG_MERGE_SECTION, null, CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); - res = target.pull().call(); + target.pull().call(); String sourceChangeString = "Source change\n>>>>>>> branch 'master' of " + target.getRepository().getConfig().getString("remote", From a20f4d2d2c624c1bade69132425317025856097d Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 12 Mar 2026 16:49:33 -0700 Subject: [PATCH 045/200] DfsMidxWriter: Add a param to toggle bitmap writing Recently we split writing the midx and the bitmaps in two methods to let the caller choose when to write bitmaps. This is not a good API as the bitmaps could be invoked without writing the midx (which makes no sense). Also, this complicates sharing data between both steps. Hide createAndAttachBitmaps method. Pass PackConfig as parameter to writeMidx() to indicate if we want bitmaps (null disables bitmaps). Change-Id: I147104ac4e89861adf8ee76590a70fd66a6a6964 --- .../internal/storage/dfs/MidxTestUtils.java | 5 +--- .../storage/dfs/DfsGarbageCollectorTest.java | 2 +- .../storage/dfs/MidxPackListTest.java | 2 +- .../internal/storage/dfs/DfsMidxWriter.java | 25 ++++++++----------- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java b/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java index c03317c08b9..e155f5d7187 100644 --- a/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java +++ b/org.eclipse.jgit.test/src/org/eclipse/jgit/internal/storage/dfs/MidxTestUtils.java @@ -148,11 +148,8 @@ static DfsPackFileMidx writeMultipackIndex(DfsRepository db, DfsPackDescription desc = DfsMidxWriter.writeMidx( NullProgressMonitor.INSTANCE, db.getObjectDatabase(), Arrays.asList(packs), - base != null ? base.getPackDescription() : null); + base != null ? base.getPackDescription() : null, packConfig); db.getObjectDatabase().commitPack(List.of(desc), null); - if (base == null) { - DfsMidxWriter.createAndAttachBitmaps(db, desc, packConfig); - } // "packs" argument can have a midx and its base in the list. List allPlainPacks = MidxPackList diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java index c5acb95bbbd..01eab37871a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java @@ -1498,7 +1498,7 @@ private static DfsPackFile findFirstBySource(DfsPackFile[] packs, PackSource sou private DfsPackDescription midx(List coveredPacks, DfsPackDescription base) throws IOException { DfsPackDescription midx = DfsMidxWriter.writeMidx(NULL_PM, odb, - coveredPacks, base); + coveredPacks, base, null); git.tick(1); midx.setLastModified(git.getInstant().toEpochMilli()); return midx; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java index f20ca38fb9d..c275c32741f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java @@ -327,7 +327,7 @@ private DfsPackFileMidx writeMultipackIndex(DfsPackFile[] packs, List packfiles = asList(packs); DfsPackDescription desc = DfsMidxWriter.writeMidx( NullProgressMonitor.INSTANCE, db.getObjectDatabase(), packfiles, - base != null ? base.getPackDescription() : null); + base != null ? base.getPackDescription() : null, null); db.getObjectDatabase().commitPack(List.of(desc), null); return DfsPackFileMidx.create(DfsBlockCache.getInstance(), desc, packfiles, base); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java index 5c50ca4dbcc..0c5cfe19a4c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java @@ -57,6 +57,9 @@ private DfsMidxWriter() { * the packs to cover * @param base * parent of this midx in the chain (if any). + * @param packConfig + * pack config with parameter to build bitmaps. Null to disable + * bitmaps. * @return a pack (uncommitted) with the multipack index of the packs passed * as parameter. * @throws IOException @@ -64,7 +67,7 @@ private DfsMidxWriter() { */ public static DfsPackDescription writeMidx(ProgressMonitor pm, DfsObjDatabase objdb, List packs, - @Nullable DfsPackDescription base) + @Nullable DfsPackDescription base, @Nullable PackConfig packConfig) throws IOException { PackIndexMerger.Builder dataBuilder = PackIndexMerger.builder(); try (DfsReader ctx = objdb.newReader()) { @@ -96,22 +99,16 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, } } + // TODO(ifrade): At the moment we only support bitmaps on the base + if (base == null && packConfig != null) { + createAndAttachBitmaps(objdb.getRepository(), midxPackDesc, + packConfig); + } + return midxPackDesc; } - /** - * Calculate bitmps for the midx and add them as a stream in the description - * - * @param db - * the repository - * @param desc - * the pack description of the midx - * @param cfg - * pack config with the parameters for the bitmaps - * @throws IOException - * an error reading from storage - */ - public static void createAndAttachBitmaps(DfsRepository db, + private static void createAndAttachBitmaps(DfsRepository db, DfsPackDescription desc, PackConfig cfg) throws IOException { DfsObjDatabase objdb = db.getObjectDatabase(); From 10064662210dfa4d06bb30d73628c167e92e6edb Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 12 Mar 2026 16:49:33 -0700 Subject: [PATCH 046/200] DfsMidxWriter: Use the input data instead of rereading the midx Change-Id: I09c90fdd45286214a58dc9619b0b8bb96a6a6964 --- .../internal/storage/dfs/DfsMidxWriter.java | 56 +++++++++++++++---- .../storage/midx/PackIndexMerger.java | 4 +- 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java index 0c5cfe19a4c..80a6864878a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java @@ -13,6 +13,7 @@ import static java.util.stream.Collectors.toMap; import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; import static org.eclipse.jgit.internal.storage.pack.PackExt.MULTI_PACK_INDEX; +import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import java.io.IOException; import java.util.ArrayList; @@ -26,13 +27,16 @@ import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.internal.revwalk.RefAdvancerWalk; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; import org.eclipse.jgit.internal.storage.midx.PackIndexMerger; +import org.eclipse.jgit.internal.storage.pack.ObjectToPack; import org.eclipse.jgit.internal.storage.pack.PackBitmapCalculator; import org.eclipse.jgit.internal.storage.pack.PackBitmapIndexWriter; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectIdOwnerMap; import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.storage.pack.PackConfig; @@ -77,15 +81,18 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, } } + PackIndexMerger data = dataBuilder.build(); + byte[] checksum; + DfsPackDescription midxPackDesc = objdb.newPack(GC); try (DfsOutputStream out = objdb.writeFile(midxPackDesc, MULTI_PACK_INDEX)) { MultiPackIndexWriter w = new MultiPackIndexWriter(); - MultiPackIndexWriter.Result result = w.write(pm, out, - dataBuilder.build()); + MultiPackIndexWriter.Result result = w.write(pm, out, data); midxPackDesc.addFileExt(MULTI_PACK_INDEX); midxPackDesc.setFileSize(MULTI_PACK_INDEX, result.bytesWritten()); midxPackDesc.setObjectCount(result.objectCount()); + checksum = result.checksum(); Map byName = packs.stream() .map(DfsPackFile::getPackDescription) @@ -102,6 +109,7 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, // TODO(ifrade): At the moment we only support bitmaps on the base if (base == null && packConfig != null) { createAndAttachBitmaps(objdb.getRepository(), midxPackDesc, + checksum, data, packs, packConfig); } @@ -109,12 +117,8 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, } private static void createAndAttachBitmaps(DfsRepository db, - DfsPackDescription desc, PackConfig cfg) throws IOException { - - DfsObjDatabase objdb = db.getObjectDatabase(); - // We need a DfsPackFile to reread the contents - DfsPackFileMidx midxPack = db.getObjectDatabase().createDfsPackFileMidx( - DfsBlockCache.getInstance(), desc, new ArrayList<>()); + DfsPackDescription desc, byte[] checksum, PackIndexMerger data, + List packs, PackConfig cfg) throws IOException { // TODO(ifrade): Verify we duplicate the behaviour about tags of regular // bitmapping @@ -125,14 +129,16 @@ private static void createAndAttachBitmaps(DfsRepository db, return; } - try (DfsReader ctx = objdb.newReader()) { + try (DfsReader ctx = db.getObjectDatabase().newReader()) { + ObjectIdOwnerMap byId = new ObjectIdOwnerMap<>(); + List otps = asObjectsToPack(ctx, data, packs, byId); + RefAdvancerWalk adv = new RefAdvancerWalk(db, - c -> midxPack.hasObject(ctx, c)); + c -> byId.contains(c)); Set inPack = adv.advance(allHeads); - byte[] checksum = midxPack.getChecksum(ctx); PackBitmapIndexBuilder writeBitmaps = new PackBitmapIndexBuilder( - midxPack.getLocalObjects(ctx)); + otps); int commitCount = writeBitmaps.getCommits().cardinality(); PackBitmapCalculator calculator = new PackBitmapCalculator(cfg); @@ -145,4 +151,30 @@ private static void createAndAttachBitmaps(DfsRepository db, } } + private static List asObjectsToPack(DfsReader ctx, + PackIndexMerger data, List packs, + ObjectIdOwnerMap byId) throws IOException { + long[] accPackSize = new long[packs.size()]; + for (int i = 1; i < packs.size(); i++) { + long prevValue = accPackSize[i - 1]; + accPackSize[i] = prevValue + + packs.get(i - 1).getPackDescription().getFileSize(PACK); + } + + List result = new ArrayList<>( + data.getUniqueObjectCount()); + MultiPackIndex.MidxIterator it = data.bySha1Iterator(); + while (it.hasNext()) { + MultiPackIndex.MutableEntry entry = it.next(); + int objectType = packs.get(entry.getPackId()).getObjectType(ctx, + entry.getOffset()); + ObjectToPack o = new ObjectToPack(entry.getObjectId().toObjectId(), + objectType); + o.setOffset(accPackSize[entry.getPackId()] + entry.getOffset()); + result.add(o); + byId.add(o); + } + return result; + } + } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index dad6d66f94a..8584176e566 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -176,7 +176,7 @@ private PackIndexMerger(MidxIterator midxIterator, ProgressMonitor pm) { * * @return object count of the merged index */ - int getUniqueObjectCount() { + public int getUniqueObjectCount() { return uniqueObjectCount; } @@ -244,7 +244,7 @@ int getPackCount() { * * @return an iterator in sha1 order without duplicates. */ - MidxIterator bySha1Iterator() { + public MidxIterator bySha1Iterator() { midxIterator.reset(); return midxIterator; } From c0d5111e99a9e91db000c70806f49100c72196a6 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 16 Mar 2026 10:45:56 -0700 Subject: [PATCH 047/200] MultiPackIndexWriter: Encode checksum in base64 errorprone complains about mutable arrays in records, which is reasonable. Pass the checksum as a string, encoding/decoding in base 64. Change-Id: I24059594a8aa661dc479f2cfd1d51dcd6a6a6964 --- .../org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java | 3 ++- .../jgit/internal/storage/midx/MultiPackIndexWriter.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java index 80a6864878a..6ead06d0006 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java @@ -40,6 +40,7 @@ import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.storage.pack.PackConfig; +import org.eclipse.jgit.util.Base64; /** * Create a pack with a multipack index, setting the required fields in the @@ -92,7 +93,7 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, midxPackDesc.addFileExt(MULTI_PACK_INDEX); midxPackDesc.setFileSize(MULTI_PACK_INDEX, result.bytesWritten()); midxPackDesc.setObjectCount(result.objectCount()); - checksum = result.checksum(); + checksum = Base64.decode(result.checksum()); Map byName = packs.stream() .map(DfsPackFile::getPackDescription) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java index 9bdb1fa1102..00c2a93a38e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -38,6 +38,7 @@ import org.eclipse.jgit.internal.storage.io.CancellableDigestOutputStream; import org.eclipse.jgit.internal.storage.midx.MultiPackIndex.MutableEntry; import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.util.Base64; import org.eclipse.jgit.util.NB; /** @@ -69,7 +70,7 @@ public class MultiPackIndexWriter { * checksum of the written midx */ public record Result(long bytesWritten, int objectCount, - List packNames, byte[] checksum) { + List packNames, String checksum) { } /** @@ -111,7 +112,7 @@ public Result write(ProgressMonitor monitor, OutputStream outputStream, Long.valueOf(out.length()))); } return new Result(expectedSize, data.getUniqueObjectCount(), - data.getPackNames(), checksum); + data.getPackNames(), Base64.encodeBytes(checksum)); } catch (InterruptedIOException e) { throw new IOException(JGitText.get().multiPackIndexWritingCancelled, e); From 6f8293956230ab6bb6e0227c5c064b0149a15d9c Mon Sep 17 00:00:00 2001 From: Daniele Sassoli Date: Thu, 19 Mar 2026 11:07:36 +0000 Subject: [PATCH 048/200] Add CLAUDE.md to gitignore file This mimics what was done in Gerrit with [1] to allow contributors to use a local CLAUDE.md file for Claude-based AI tools without polluting the repository with brand-specific files. [1] https://gerrit-review.googlesource.com/c/gerrit/+/562401 Change-Id: I4fa2d667dec7864a9f0eda72fbee74b9d0a79f67 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2fd172793fc..1bf6b52e82d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ target/ infer-out bazel-* +CLAUDE.md # Do not add editor- and OS-specific files like *~ (Emacs) and .DS_Store # (macOS). Instead, add them to $XDG_CONFIG_HOME/git/ignore From 161a68e035e633c20b98f06344865d08d8a145e8 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 20 Mar 2026 11:57:11 -0700 Subject: [PATCH 049/200] MultiPackIndexWriter: typo in logging (is chunks, not chuncks) Link: https://review.gerrithub.io/id/I300ea35c06a31fd16179d6d7dd8b547d6a6a6964 --- .../jgit/internal/storage/midx/MultiPackIndexWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java index 00c2a93a38e..6b54b5f33be 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -97,7 +97,7 @@ public Result write(ProgressMonitor monitor, OutputStream outputStream, writeHeader(out, chunkHeaders.size(), data.getPackCount()); writeChunkLookup(out, chunkHeaders); - monitor.beginTask("Writing midx chuncks", chunkHeaders.size()); + monitor.beginTask("Writing midx chunks", chunkHeaders.size()); WriteContext ctx = new WriteContext(out, data); for (ChunkHeader chunk : chunkHeaders) { chunk.writerFn.write(ctx); From 5ad748aee2cd7a5dc7d291f40c95085f975ab19f Mon Sep 17 00:00:00 2001 From: Terry Parker Date: Sun, 22 Mar 2026 19:17:21 +0000 Subject: [PATCH 050/200] Add timing metrics to ReceivedPackStatistics Instrument ReceivePack to collect timeNegotiating, timeReceiving, timeCheckingConnectivity, and timeProcessingCommands. Prior to this change, ReceivedPackStatistics was fully generated in the PackParser class, which is invoked in the "timeReceiving" phase. Rather than modify the public PackParser interface to return a builder, this change creates a new builder instance from the stats retrieved from PackParser and populates the new timing info in the top-level service() method. * timeNegotiating: Tracks the entire start window up through recvCommands(), including info-refs * timeReceiving: Wraps receivePack() * timeCheckingConnectivity: Wraps checkSubmodules() and checkConnectivity() * timeProcessingCommands: Captures command validation, hook execution, and reference updating Change-Id: I0686749017d2ef66da2a3a227a1c2ed4f1f1e206 --- .../eclipse/jgit/transport/ReceivePack.java | 24 ++++ .../transport/ReceivedPackStatistics.java | 131 ++++++++++++++++++ 2 files changed, 155 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index 3d9c81c90ed..0ee0ad55519 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -34,6 +34,8 @@ import java.io.OutputStream; import java.io.UncheckedIOException; import java.text.MessageFormat; +import java.time.Duration; +import java.time.Instant; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -236,6 +238,8 @@ public class ReceivePack { private PushCertificate pushCert; private ReceivedPackStatistics stats; + private long timeReceiving; + private long timeCheckingConnectivity; /** * Connectivity checker to use. @@ -1202,11 +1206,16 @@ private Map getAdvertisedOrDefaultRefs() throws IOException { */ protected void receivePackAndCheckConnectivity() throws IOException, LargeObjectException, SubmoduleValidationException { + Instant start = Instant.now(); receivePack(); + timeReceiving = Duration.between(start, Instant.now()).toMillis(); + if (needCheckConnectivity()) { checkSubmodules(); checkConnectivity(); } + timeCheckingConnectivity = Duration.between(start, Instant.now()) + .toMillis() - timeReceiving; parser = null; } @@ -2226,6 +2235,7 @@ public void receiveWithExceptionPropagation(InputStream input, } private void service() throws IOException { + Instant startNegotiating = Instant.now(); if (isBiDirectionalPipe()) { sendAdvertisedRefs(new PacketLineOutRefAdvertiser(pckOut)); pckOut.flush(); @@ -2235,6 +2245,8 @@ private void service() throws IOException { return; recvCommands(); + long timeNegotiating = Duration.between(startNegotiating, Instant.now()) + .toMillis(); if (hasCommands()) { try (PostReceiveExecutor e = new PostReceiveExecutor()) { @@ -2249,6 +2261,7 @@ private void service() throws IOException { } } + Instant startProcessing = Instant.now(); try { setAtomic(isCapabilityEnabled(CAPABILITY_ATOMIC)); @@ -2266,6 +2279,17 @@ private void service() throws IOException { } finally { unlockPack(); } + long timeProcessingCommands = Duration + .between(startProcessing, Instant.now()).toMillis(); + + ReceivedPackStatistics.Builder statsBuilder = stats != null + ? ReceivedPackStatistics.Builder.toBuilder(stats) + : new ReceivedPackStatistics.Builder(); + stats = statsBuilder.setTimeNegotiating(timeNegotiating) + .setTimeReceiving(timeReceiving) + .setTimeCheckingConnectivity(timeCheckingConnectivity) + .setTimeProcessingCommands(timeProcessingCommands) + .build(); sendStatusReport(null); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivedPackStatistics.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivedPackStatistics.java index 8887e263eab..f804c31e99d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivedPackStatistics.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivedPackStatistics.java @@ -34,6 +34,11 @@ public class ReceivedPackStatistics { private long numDeltaBlob; private long numDeltaTag; + private long timeNegotiating; + private long timeReceiving; + private long timeCheckingConnectivity; + private long timeProcessingCommands; + /** * Get number of bytes read from the input stream * @@ -155,6 +160,49 @@ public long getNumDeltaTag() { return numDeltaTag; } + /** + * Get time in milliseconds spent in the negotiation phase + * + * @return time in milliseconds spent in the negotiation phase + * @since 7.7 + */ + public long getTimeNegotiating() { + return timeNegotiating; + } + + /** + * Get time in milliseconds spent receiving the pack + * + * @return time in milliseconds spent receiving the pack + * @since 7.7 + */ + public long getTimeReceiving() { + return timeReceiving; + } + + /** + * Get time in milliseconds spent checking the connectivity of the received + * pack + * + * @return time in milliseconds spent checking the connectivity of the + * received pack + * @since 7.7 + */ + public long getTimeCheckingConnectivity() { + return timeCheckingConnectivity; + } + + /** + * Get time in milliseconds spent processing commands (validation, hooks, + * and ref updates) + * + * @return time in milliseconds spent processing commands + * @since 7.7 + */ + public long getTimeProcessingCommands() { + return timeProcessingCommands; + } + /** A builder for {@link ReceivedPackStatistics}. */ public static class Builder { private long numBytesRead; @@ -173,6 +221,39 @@ public static class Builder { private long numDeltaBlob; private long numDeltaTag; + private long timeNegotiating; + private long timeReceiving; + private long timeCheckingConnectivity; + private long timeProcessingCommands; + + /** + * Initialize from an existing ReceivedPackStatistics. + * + * @param s + * existing ReceivedPackStatistics object + * @return new Builder instance + * @since 7.7 + */ + public static Builder toBuilder(ReceivedPackStatistics s) { + Builder b = new Builder(); + b.numBytesRead = s.getNumBytesRead(); + b.numWholeCommit = s.getNumWholeCommit(); + b.numWholeTree = s.getNumWholeTree(); + b.numWholeBlob = s.getNumWholeBlob(); + b.numWholeTag = s.getNumWholeTag(); + b.numOfsDelta = s.getNumOfsDelta(); + b.numRefDelta = s.getNumRefDelta(); + b.numDeltaCommit = s.getNumDeltaCommit(); + b.numDeltaTree = s.getNumDeltaTree(); + b.numDeltaBlob = s.getNumDeltaBlob(); + b.numDeltaTag = s.getNumDeltaTag(); + b.timeNegotiating = s.getTimeNegotiating(); + b.timeReceiving = s.getTimeReceiving(); + b.timeCheckingConnectivity = s.getTimeCheckingConnectivity(); + b.timeProcessingCommands = s.getTimeProcessingCommands(); + return b; + } + /** * Set number of bytes read from the input stream * @@ -225,6 +306,52 @@ public Builder addWholeObject(int type) { return this; } + /** + * @param timeNegotiating + * time in milliseconds spent in the negotiation phase + * @return this + * @since 7.7 + */ + public Builder setTimeNegotiating(long timeNegotiating) { + this.timeNegotiating = timeNegotiating; + return this; + } + + /** + * @param timeReceiving + * time in milliseconds spent receiving the pack + * @return this + * @since 7.7 + */ + public Builder setTimeReceiving(long timeReceiving) { + this.timeReceiving = timeReceiving; + return this; + } + + /** + * @param timeCheckingConnectivity + * time in milliseconds spent checking the connectivity of + * the received pack + * @return this + * @since 7.7 + */ + public Builder setTimeCheckingConnectivity( + long timeCheckingConnectivity) { + this.timeCheckingConnectivity = timeCheckingConnectivity; + return this; + } + + /** + * @param timeProcessingCommands + * time in milliseconds spent processing commands + * @return this + * @since 7.7 + */ + public Builder setTimeProcessingCommands(long timeProcessingCommands) { + this.timeProcessingCommands = timeProcessingCommands; + return this; + } + /** * Increment offset delta * @@ -299,6 +426,10 @@ ReceivedPackStatistics build() { s.numDeltaBlob = numDeltaBlob; s.numDeltaTag = numDeltaTag; s.numObjectsDuplicated = numObjectsDuplicated; + s.timeNegotiating = timeNegotiating; + s.timeReceiving = timeReceiving; + s.timeCheckingConnectivity = timeCheckingConnectivity; + s.timeProcessingCommands = timeProcessingCommands; return s; } } From 0e8ee2ab0277e7b3fe3cfe9e8451929ed751b6c2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 16:06:41 +0100 Subject: [PATCH 051/200] Use releases p2 repo in jgit-4.39 target platform 4.39 (2026-03) was released hence we should use the releases p2 repo. Change-Id: I48a89def8d8fb4b7e91873b1c3213470443e07dc --- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.tpd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 16825817d02..ee0a8bc8658 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.tpd index 0b32b1b9cac..fb0fc7eac2a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.tpd @@ -3,6 +3,6 @@ target "jgit-4.39" with source configurePhase include "orbit/orbit-4.39.tpd" include "maven/dependencies.tpd" -location "https://download.eclipse.org/staging/2026-03/" { +location "https://download.eclipse.org/releases/2026-03/" { org.eclipse.osgi lazy } From 9ab47423c63955bd6eb4cd0c05a78f40e56bde7c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 16:10:57 +0100 Subject: [PATCH 052/200] Add jgit-4.40 target platform for next simrel 2026-06 Change-Id: I00ca0ff58d76c698b8c7711a572af0a33a885782 --- .../org.eclipse.jgit.target/jgit-4.40.target | 298 ++++++++++++++++++ .../org.eclipse.jgit.target/jgit-4.40.tpd | 8 + .../orbit/orbit-4.40.tpd | 29 ++ 3 files changed, 335 insertions(+) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.40.tpd diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target new file mode 100644 index 00000000000..abb6d83d7f2 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.tukaani + xz + 1.11 + jar + + + + + + + org.slf4j + slf4j-api + 2.0.17 + jar + + + org.slf4j + slf4j-simple + 2.0.17 + jar + + + org.slf4j + jcl-over-slf4j + 2.0.17 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.17.1 + jar + + + org.apache.sshd + sshd-sftp + 2.17.1 + jar + + + + + + + org.mockito + mockito-core + 5.21.0 + jar + + + + + + + net.java.dev.jna + jna + 5.18.1 + jar + + + net.java.dev.jna + jna-platform + 5.18.1 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.1.6 + jar + + + org.eclipse.jetty + jetty-http + 12.1.6 + jar + + + org.eclipse.jetty + jetty-io + 12.1.6 + jar + + + org.eclipse.jetty + jetty-security + 12.1.6 + jar + + + org.eclipse.jetty + jetty-server + 12.1.6 + jar + + + org.eclipse.jetty + jetty-session + 12.1.6 + jar + + + org.eclipse.jetty + jetty-util + 12.1.6 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.1.6 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + org.hamcrest + hamcrest + 3.0 + jar + + + + + + + com.google.code.gson + gson + 2.13.2 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.18.5 + jar + + + net.bytebuddy + byte-buddy-agent + 1.18.5 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.83 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.83 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.83 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.83 + jar + + + + + + + org.assertj + assertj-core + 3.27.7 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.21.0 + jar + + + org.apache.commons + commons-compress + 1.28.0 + jar + + + org.apache.commons + commons-lang3 + 3.20.0 + jar + + + commons-io + commons-io + 2.21.0 + jar + + + commons-logging + commons-logging + 1.3.5 + jar + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.tpd new file mode 100644 index 00000000000..62e9f38698d --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.tpd @@ -0,0 +1,8 @@ +target "jgit-4.40" with source configurePhase + +include "orbit/orbit-4.40.tpd" +include "maven/dependencies.tpd" + +location "https://download.eclipse.org/staging/2026-06/" { + org.eclipse.osgi lazy +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.40.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.40.tpd new file mode 100644 index 00000000000..4dbf8f304ff --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.40.tpd @@ -0,0 +1,29 @@ +target "orbit-4.40" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-06" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.hamcrest [3.0.0,3.0.0] + org.hamcrest.source [3.0.0,3.0.0] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.objectweb.asm [9.9.1,9.9.1] + org.objectweb.asm.commons [9.9.1,9.9.1] + org.objectweb.asm.util [9.9.1,9.9.1] + org.objectweb.asm.tree [9.9.1,9.9.1] + org.objectweb.asm.tree.analysis [9.9.1,9.9.1] + org.objenesis [3.5.0,3.5.0] + org.objenesis.source [3.5.0,3.5.0] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} From 559158a35d51580048fc41607cf70f59b4c3351f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 16:24:51 +0100 Subject: [PATCH 053/200] Update commons-logging to 1.3.6 Change-Id: I6ee4ef86ae237982f40eee89ccbf3e703b1f86e1 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 37077bcc069..3bce11fa867 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -47,7 +47,7 @@ maven.install( "com.jcraft:jzlib:1.1.3", "commons-codec:commons-codec:1.21.0", "commons-io:commons-io:2.21.0", - "commons-logging:commons-logging:1.3.5", + "commons-logging:commons-logging:1.3.6", "jakarta.servlet:jakarta.servlet-api:6.1.0", "junit:junit:4.13.2", "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 24715ea248b..7c2bff5c1e6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index b53ad33c97f..c7f55cce845 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 269dd9a6d81..abf78c118f5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 9474a6b6865..96b75c41b3f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 250c5a0fbab..f9afb1cb629 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index ee0a8bc8658..4c75571a25a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index abb6d83d7f2..f3e4a6d5770 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index d5d06dcc583..fdfaac5f30d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -30,7 +30,7 @@ maven apache dependency { groupId = "commons-logging" artifactId = "commons-logging" - version = "1.3.5" + version = "1.3.6" } } diff --git a/pom.xml b/pom.xml index 7ceca53f3e8..0ddb86298be 100644 --- a/pom.xml +++ b/pom.xml @@ -917,7 +917,7 @@ commons-logging commons-logging - 1.3.5 + 1.3.6 From 49dd4f22eed14158c65f438d7ef8203b335e9f8c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 16:26:35 +0100 Subject: [PATCH 054/200] Update bytebuddy to 1.18.7 Change-Id: I82e1e3a8d3e3ec91b2932d6b50e494194960bf1e --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 3bce11fa867..59821916839 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -23,7 +23,7 @@ git_repository( BOUNCYCASTLE_VERSION = "1.83" -BYTE_BUDDY_VERSION = "1.18.5" +BYTE_BUDDY_VERSION = "1.18.7" JETTY_VERSION = "12.1.6" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 7c2bff5c1e6..bb3081e5040 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index c7f55cce845..dddb3b04de5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index abf78c118f5..70ee1307ac1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 96b75c41b3f..b4f10b7b112 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index f9afb1cb629..a944846e7d5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 4c75571a25a..eb3d7f1874a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index f3e4a6d5770..f4cc900b0e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.5 + 1.18.7 jar net.bytebuddy byte-buddy-agent - 1.18.5 + 1.18.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index fdfaac5f30d..ff6421f4916 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.5" + version = "1.18.7" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.5" + version = "1.18.7" } } diff --git a/pom.xml b/pom.xml index 0ddb86298be..65c6a07894a 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 3.0 3.27.7 5.18.1 - 1.18.5 + 1.18.7 jacoco From 4405ec70040e134ade8693a4035f21521ef364d6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 16:28:32 +0100 Subject: [PATCH 055/200] Update Jetty to 12.1.7 Change-Id: Ie2f4b722b6c8b8ac5438a5d35de55b972334ef48 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.35.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.36.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.37.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.38.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.39.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.40.target | 18 +++++++++--------- .../maven/dependencies.tpd | 16 ++++++++-------- pom.xml | 2 +- 10 files changed, 73 insertions(+), 73 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 59821916839..9b3e2730c39 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -25,7 +25,7 @@ BOUNCYCASTLE_VERSION = "1.83" BYTE_BUDDY_VERSION = "1.18.7" -JETTY_VERSION = "12.1.6" +JETTY_VERSION = "12.1.7" JMH_VERSION = "1.37" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index bb3081e5040..9c9de8dfec7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index dddb3b04de5..524f389e811 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 70ee1307ac1..19940b82c84 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index b4f10b7b112..32802bdae31 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index a944846e7d5..6a9ff2b2f04 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index eb3d7f1874a..a3e318271c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index f4cc900b0e5..d314ac318b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-http - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-io - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-security - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-server - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-session - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util - 12.1.6 + 12.1.7 jar org.eclipse.jetty jetty-util-ajax - 12.1.6 + 12.1.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index ff6421f4916..a6290366f9b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.6" + version = "12.1.7" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 65c6a07894a..3791084e668 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.28.0 6.0.0 6.1.0 - 12.1.6 + 12.1.7 0.25.0 4.5.14 4.4.16 From 05c005ba7e4dc223773278aecfb0892ea875d7ac Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 16:29:52 +0100 Subject: [PATCH 056/200] Update mockito to 5.23.0 Change-Id: I88767c7719c3fc5ec58b6b3a5d17b9626c8a6e6c --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 9b3e2730c39..1ceefb32ce7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -76,7 +76,7 @@ maven.install( "org.eclipse.jetty:jetty-util:" + JETTY_VERSION, "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VERSION, "org.hamcrest:hamcrest:3.0", - "org.mockito:mockito-core:5.21.0", + "org.mockito:mockito-core:5.23.0", "org.objenesis:objenesis:3.4", "org.openjdk.jmh:jmh-core:" + JMH_VERSION, "org.openjdk.jmh:jmh-generator-annprocess:" + JMH_VERSION, diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 9c9de8dfec7..75d7105f962 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -87,7 +87,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 524f389e811..3cbbbd5a471 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -87,7 +87,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 19940b82c84..af5e59d1b2b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -87,7 +87,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 32802bdae31..8a754197f4f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -87,7 +87,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 6a9ff2b2f04..af42603b0cd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -87,7 +87,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index a3e318271c9..e36f5829bd8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -87,7 +87,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index d314ac318b7..63ec1dfdc23 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -87,7 +87,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index a6290366f9b..ab59af7633f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -225,7 +225,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.21.0" + version = "5.23.0" } } diff --git a/pom.xml b/pom.xml index 3791084e668..ab2aefe7bcd 100644 --- a/pom.xml +++ b/pom.xml @@ -1026,7 +1026,7 @@ org.mockito mockito-core - 5.21.0 + 5.23.0 From 856e29f253876327990f4922da6fea3820ed1065 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Mar 2026 16:31:02 +0100 Subject: [PATCH 057/200] Update org.tukaani:xz to 1.12 Change-Id: I610bb3367ddb39f9bd5b74fcd4f6f2788c570d0d --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 1ceefb32ce7..88acfecad7a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -83,7 +83,7 @@ maven.install( "org.slf4j:slf4j-api:" + SLF4J_VERSION, "org.slf4j:jcl-over-slf4j:" + SLF4J_VERSION, "org.slf4j:slf4j-simple:" + SLF4J_VERSION, - "org.tukaani:xz:1.11", + "org.tukaani:xz:1.12", ], duplicate_version_warning = "warn", fail_on_missing_checksum = True, diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 75d7105f962..29f585f2ad1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ org.tukaani xz - 1.11 + 1.12 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 3cbbbd5a471..0df7ac7b651 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ org.tukaani xz - 1.11 + 1.12 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index af5e59d1b2b..01d2eaafcb4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ org.tukaani xz - 1.11 + 1.12 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 8a754197f4f..ee9bee8b1ac 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ org.tukaani xz - 1.11 + 1.12 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index af42603b0cd..c6ec2870fe6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ org.tukaani xz - 1.11 + 1.12 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index e36f5829bd8..e5e2162d37e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ org.tukaani xz - 1.11 + 1.12 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 63ec1dfdc23..ba3cb984dd3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -39,7 +39,7 @@ org.tukaani xz - 1.11 + 1.12 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index ab59af7633f..b3a4aa07589 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -279,6 +279,6 @@ maven xz dependency { groupId = "org.tukaani" artifactId = "xz" - version = "1.11" + version = "1.12" } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index ab2aefe7bcd..f8dcfec7553 100644 --- a/pom.xml +++ b/pom.xml @@ -923,7 +923,7 @@ org.tukaani xz - 1.11 + 1.12 true From 39deeeb3cc7e22f00750fd610bf5d36a5bbb727e Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 16 Mar 2026 16:05:11 -0700 Subject: [PATCH 058/200] MidxWriter: write bitmaps with the midx MidxWriter is writing only the midx itself, without bitmaps. Teach this helper class to write the midx bitmaps. Link: https://review.gerrithub.io/id/I0676bc3fedff876196a43647b1cb5ed86a6a6964 --- .../org/eclipse/jgit/pgm/MultiPackIndex.java | 5 +- .../internal/storage/file/MidxWriter.java | 106 +++++++++++++++++- 2 files changed, 106 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java index 81fc0e85281..5d54417efb0 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java @@ -20,6 +20,7 @@ import org.eclipse.jgit.internal.storage.file.ObjectDirectory; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexPrettyPrinter; import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.storage.pack.PackConfig; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -79,7 +80,7 @@ private void writeMultiPackIndex() throws IOException { errw.println("Writing " + midx.getAbsolutePath()); ObjectDirectory odb = (ObjectDirectory) db.getObjectDatabase(); - MidxWriter.writeMidx(new TextProgressMonitor(errw), odb.getPacks(), - midx); + MidxWriter.writeMidx(new TextProgressMonitor(errw), db, odb.getPacks(), + midx, new PackConfig(db)); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java index 91f60b6d71f..543ceeb7e24 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java @@ -12,13 +12,31 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import org.eclipse.jgit.internal.revwalk.RefAdvancerWalk; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; import org.eclipse.jgit.internal.storage.midx.PackIndexMerger; +import org.eclipse.jgit.internal.storage.pack.ObjectToPack; +import org.eclipse.jgit.internal.storage.pack.PackBitmapCalculator; +import org.eclipse.jgit.internal.storage.pack.PackBitmapIndexWriter; import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectIdOwnerMap; import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.storage.pack.PackConfig; +import org.eclipse.jgit.util.Base64; /** * Helper to write multipack indexes. @@ -30,15 +48,20 @@ public class MidxWriter { * * @param pm * a progress monitor + * @param repo + * the repository * @param packs * packs to cover with the midx * @param midxOut * file to write the resulting midx + * @param packConfig + * config for the bitmap writing. Null to skip writing bitmaps. * @throws IOException * an error reading any of the input packs or indexes */ - public static void writeMidx(ProgressMonitor pm, Collection packs, - File midxOut) throws IOException { + public static void writeMidx(ProgressMonitor pm, Repository repo, + Collection packs, File midxOut, PackConfig packConfig) + throws IOException { PackIndexMerger.Builder builder = PackIndexMerger.builder(); builder.setProgressMonitor(pm); @@ -50,12 +73,89 @@ public static void writeMidx(ProgressMonitor pm, Collection packs, builder.addPack(packFile.getName(), pack.getIndex()); pm.update(1); } + PackIndexMerger data = builder.build(); pm.endTask(); MultiPackIndexWriter writer = new MultiPackIndexWriter(); + MultiPackIndexWriter.Result result; try (FileOutputStream out = new FileOutputStream( midxOut.getAbsolutePath())) { - writer.write(pm, out, builder.build()); + result = writer.write(pm, out, data); } + + if (packConfig != null) { + File midxOutBitmaps = new File( + midxOut.getAbsolutePath() + ".bitmaps"); + createAndAttachBitmaps(pm, repo, midxOutBitmaps, + Base64.decode(result.checksum()), data, packList, + new PackConfig(repo)); + } + } + + private static void createAndAttachBitmaps(ProgressMonitor pm, + Repository repo, File midxBitmapsOut, byte[] checksum, + PackIndexMerger data, Collection packs, PackConfig cfg) + throws IOException { + + // TODO(ifrade): Verify we duplicate the behaviour about tags of regular + // bitmapping + List allHeads = repo.getRefDatabase() + .getRefsByPrefix(Constants.R_HEADS).stream() + .map(r -> r.getObjectId()).filter(Objects::nonNull).toList(); + if (allHeads.isEmpty()) { + return; + } + + ObjectIdOwnerMap byId = new ObjectIdOwnerMap<>(); + List otps = asObjectsToPack(pm, + (WindowCursor) repo.newObjectReader(), data, + new ArrayList<>(packs), byId); + + RefAdvancerWalk adv = new RefAdvancerWalk(repo, c -> byId.contains(c)); + Set inPack = adv.advance(allHeads); + + PackBitmapIndexBuilder writeBitmaps = new PackBitmapIndexBuilder(otps); + int commitCount = writeBitmaps.getCommits().cardinality(); + + PackBitmapCalculator calculator = new PackBitmapCalculator(cfg); + // This will do ctx.getBitmapIndex() to reuse/copy previous bitmaps + calculator.calculate(repo.newObjectReader(), + NullProgressMonitor.INSTANCE, commitCount, inPack, + new HashSet<>(), writeBitmaps); + try (FileOutputStream out = new FileOutputStream( + midxBitmapsOut.getAbsolutePath())) { + PackBitmapIndexWriter pbiWriter = new PackBitmapIndexWriterV1(out); + pbiWriter.write(writeBitmaps, checksum); + } + } + + private static List asObjectsToPack(ProgressMonitor pm, + WindowCursor ctx, PackIndexMerger data, List packs, + ObjectIdOwnerMap byId) throws IOException { + long[] accPackSize = new long[packs.size()]; + for (int i = 1; i < packs.size(); i++) { + long prevValue = accPackSize[i - 1]; + accPackSize[i] = prevValue + + packs.get(i - 1).getPackFile().length(); + } + + pm.beginTask("Converting midx to ObjectsToPack", //$NON-NLS-1$ + data.getUniqueObjectCount()); + List result = new ArrayList<>( + data.getUniqueObjectCount()); + MultiPackIndex.MidxIterator it = data.bySha1Iterator(); + while (it.hasNext()) { + MultiPackIndex.MutableEntry entry = it.next(); + int objectType = packs.get(entry.getPackId()).getObjectType(ctx, + entry.getOffset()); + ObjectToPack o = new ObjectToPack(entry.getObjectId().toObjectId(), + objectType); + o.setOffset(accPackSize[entry.getPackId()] + entry.getOffset()); + result.add(o); + byId.add(o); + pm.update(1); + } + pm.endTask(); + return result; } } From 4f82a88d34234dc9c27f08ec665c9a830b1b3020 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 059/200] MultiPackIndex: write midx bitmaps from cli tool Link: https://review.gerrithub.io/id/I4b20d995f22c6b6756eec22c06d395e56a6a6964 --- .../org/eclipse/jgit/pgm/MultiPackIndex.java | 57 ++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java index 5d54417efb0..37e835a5e60 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java @@ -15,6 +15,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintWriter; +import java.util.regex.Pattern; import org.eclipse.jgit.internal.storage.file.MidxWriter; import org.eclipse.jgit.internal.storage.file.ObjectDirectory; @@ -33,6 +34,9 @@ class MultiPackIndex extends TextBuiltin { @Option(name = "--midx") private String midxPath; + @Option(name = "--bitmaps") + private boolean writeBitmaps; + /** {@inheritDoc} */ @Override protected void run() throws IOException { @@ -69,6 +73,11 @@ private void writeMultiPackIndex() throws IOException { throw die("This repository object db doesn't have packs"); } + ObjectDirectory odb = (ObjectDirectory) db.getObjectDatabase(); + if (hasLooseObjects(odb)) { + throw die("Cannot write multi-pack-index with loose objects"); + } + File midx; if (midxPath == null || midxPath.isEmpty()) { midx = new File(((ObjectDirectory) db.getObjectDatabase()) @@ -78,9 +87,53 @@ private void writeMultiPackIndex() throws IOException { } errw.println("Writing " + midx.getAbsolutePath()); + PackConfig packConfig = null; + if (writeBitmaps) { + packConfig = new PackConfig(); + packConfig.setBitmapRecentCommitSpan(1); + packConfig.setBitmapRecentCommitSpan(100); + } - ObjectDirectory odb = (ObjectDirectory) db.getObjectDatabase(); MidxWriter.writeMidx(new TextProgressMonitor(errw), db, odb.getPacks(), - midx, new PackConfig(db)); + midx, packConfig); + } + + private static final Pattern FANOUT_DIR_PATTERN = Pattern + .compile("^[0-9a-f]{2}$"); + + /** + * Checks if the repository's object directory contains any loose objects. + * + * @param objDir + * the ObjectDirectory to check. + * @return {@code true} if any loose objects are found, {@code false} + * otherwise. + */ + private static boolean hasLooseObjects(ObjectDirectory objDir) { + File objectsDir = objDir.getDirectory(); + if (objectsDir == null || !objectsDir.isDirectory()) { + return false; + } + + String[] fanoutDirNames = objectsDir.list(); + if (fanoutDirNames == null) { + return false; + } + + for (String dirName : fanoutDirNames) { + if (FANOUT_DIR_PATTERN.matcher(dirName).matches()) { + File fanoutDir = new File(objectsDir, dirName); + if (fanoutDir.isDirectory()) { + String[] objects = fanoutDir.list(); + // If the fan-out directory is not empty, we have loose + // objects. + if (objects != null && objects.length > 0) { + return true; + } + } + } + } + + return false; } } From 5f55a84f39d7d71a959ad769dd84b2cb32a1e69b Mon Sep 17 00:00:00 2001 From: Daniele Sassoli Date: Tue, 17 Feb 2026 20:17:42 -0800 Subject: [PATCH 060/200] Slightly reword prunePackExpire docs Change-Id: I2bbe8f62ec8a512aff63e7a2d4488a6102e79f2f --- Documentation/config-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index 3d4811575a1..abf78646c78 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -82,7 +82,7 @@ For details on native git options see also the official [git config documentatio | `gc.logExpiry` | `1.day.ago` | ✅ | If the file `gc.log` exists, then auto gc will print its content and exit successfully instead of running unless that file is more than `gc.logExpiry` old. | | `gc.packRefs`| `true` | ✅ | This variable determines whether JGit garbage collection will also pack refs. This can be set to `notbare` to enable it within all non-bare repos or it can be set to a boolean value. | | `gc.pruneExpire` | `2.weeks.ago` | ✅ | Grace period after which unreachable objects will be pruned. | -| `gc.prunePackExpire` | `1.hour.ago` | ⃞ | Grace period after which packfiles only containing unreachable objects will be pruned. | +| `gc.prunePackExpire` | `1.hour.ago` | ⃞ | Grace period after which packfiles containing only unreachable objects will be pruned. | | `gc.writeChangedPaths` | `false`| ⃞ | Whether bloom filter should be written to commit-graph during a gc operation. | | `gc.writeCommitGraph`| `false` | ⃞ | If true, then gc will rewrite the commit-graph file when jgit gc is run. | From a55ad1a419f3291c7b81a99df9502297864a7fcd Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 26 Mar 2026 11:21:48 +0200 Subject: [PATCH 061/200] MidxPackListTest: Use fake packs for easier test setup Link: https://review.gerrithub.io/id/I1dbb31067804cc428ddcac3cdf79c6506a6a6964 --- .../storage/dfs/MidxPackListTest.java | 514 +++++++++--------- .../internal/storage/dfs/MidxPackList.java | 12 +- 2 files changed, 259 insertions(+), 267 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java index c275c32741f..7879af9c896 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java @@ -9,341 +9,333 @@ */ package org.eclipse.jgit.internal.storage.dfs; -import static java.util.Arrays.asList; -import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; +import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; +import static org.eclipse.jgit.internal.storage.pack.PackExt.MULTI_PACK_INDEX; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import java.io.IOException; -import java.nio.charset.StandardCharsets; import java.util.Arrays; +import java.util.HashMap; import java.util.List; -import java.util.zip.Deflater; +import java.util.Map; +import java.util.Set; -import org.eclipse.jgit.junit.JGitTestUtil; -import org.eclipse.jgit.junit.TestRng; -import org.eclipse.jgit.lib.NullProgressMonitor; -import org.eclipse.jgit.lib.ObjectId; -import org.junit.Before; import org.junit.Test; public class MidxPackListTest { - InMemoryRepository db; - - @Before - public void setUp() { - db = new InMemoryRepository(new DfsRepositoryDescription("test")); - db.getObjectDatabase().setUseMultipackIndex(true); - } + PackPool packPool = new PackPool(); @Test - public void getAllPlainPacks_onlyPlain() throws IOException { - setupThreePacks(); - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - MidxPackList packList = MidxPackList.create(packs); - assertEquals(3, packList.getAllPlainPacks().size()); + public void getAllPlainPacks_onlyPlain() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + + MidxPackList packList = MidxPackList.create(a, b, c); + assertEquals(List.of(a, b, c), packList.getAllPlainPacks()); } @Test - public void getAllPlainPacks_onlyMidx() throws IOException { - setupThreePacksAndMidx(); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(1, packs.length); - MidxPackList packList = MidxPackList.create(packs); - assertEquals(3, packList.getAllPlainPacks().size()); + public void getAllPlainPacks_onlyMidx() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + + MidxPackList packList = MidxPackList.create(midx); + assertEquals(List.of(a, b, c), packList.getAllPlainPacks()); } @Test - public void getAllPlainPacks_midxPlusOne() throws IOException { - setupThreePacksAndMidx(); - writePackWithRandomBlob(60); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(2, packs.length); - MidxPackList packList = MidxPackList.create(packs); - assertEquals(4, packList.getAllPlainPacks().size()); + public void getAllPlainPacks_midxPlusOne() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + DfsPackFile d = packPool.pack("d"); + + MidxPackList packList = MidxPackList.create(d, midx); + assertEquals(List.of(d, a, b, c), packList.getAllPlainPacks()); } @Test - public void getAllPlainPacks_nestedMidx() throws IOException { - setupSixPacksThreeMidx(); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(1, packs.length); - MidxPackList packList = MidxPackList.create(packs); - assertEquals(6, packList.getAllPlainPacks().size()); + public void getAllPlainPacks_nestedMidx() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFileMidx midxBase = packPool.midx("midxBase", null, "a", "b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFile d = packPool.pack("d"); + DfsPackFileMidx midxMiddle = packPool.midx("midxMiddle", midxBase, "c", + "d"); + DfsPackFile e = packPool.pack("e"); + DfsPackFile f = packPool.pack("f"); + DfsPackFileMidx midxTip = packPool.midx("midxTip", midxMiddle, "e", + "f"); + + MidxPackList packList = MidxPackList.create(midxTip); + assertEquals(List.of(e, f, c, d, a, b), packList.getAllPlainPacks()); } @Test - public void getAllMidxPacks_onlyPlain() throws IOException { - setupThreePacks(); + public void getAllMidxPacks_onlyPlain() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); + MidxPackList packList = MidxPackList.create(a, b, c); assertEquals(0, packList.getAllMidxPacks().size()); } @Test - public void getAllMidxPacks_onlyMidx() throws IOException { - setupThreePacksAndMidx(); - - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); - assertEquals(1, packList.getAllMidxPacks().size()); + public void getAllMidxPacks_onlyMidx() { + packPool.pack("a"); + packPool.pack("b"); + packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + + MidxPackList packList = MidxPackList.create(midx); + assertEquals(List.of(midx), packList.getAllMidxPacks()); } @Test - public void getAllMidxPacks_midxPlusOne() throws IOException { - setupThreePacksAndMidx(); - writePackWithRandomBlob(60); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(2, packs.length); - MidxPackList packList = MidxPackList.create(packs); - assertEquals(1, packList.getAllMidxPacks().size()); + public void getAllMidxPacks_midxPlusOne() { + packPool.pack("a"); + packPool.pack("b"); + packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + DfsPackFile d = packPool.pack("d"); + + MidxPackList packList = MidxPackList.create(d, midx); + assertEquals(List.of(midx), packList.getAllMidxPacks()); } @Test - public void getAllMidxPacks_nestedMidx() throws IOException { - setupSixPacksThreeMidx(); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(1, packs.length); - MidxPackList packList = MidxPackList.create(packs); - assertEquals(3, packList.getAllMidxPacks().size()); + public void getAllMidxPacks_nestedMidx() { + packPool.pack("a"); + packPool.pack("b"); + DfsPackFileMidx midxBase = packPool.midx("midxBase", null, "a", "b"); + packPool.pack("c"); + packPool.pack("d"); + DfsPackFileMidx midxMiddle = packPool.midx("midxMiddle", midxBase, "c", + "d"); + packPool.pack("e"); + packPool.pack("f"); + DfsPackFileMidx midxTip = packPool.midx("midxTip", midxMiddle, "e", + "f"); + + MidxPackList packList = MidxPackList.create(midxTip); + assertEquals(List.of(midxTip, midxMiddle, midxBase), + packList.getAllMidxPacks()); } @Test - public void findAllImpactedMidx_onlyPacks() throws IOException { - setupThreePacks(); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); - assertEquals(0, packList.findAllCoveringMidxs(asList(packs)).size()); + public void findAllImpactedMidx_onlyPacks() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + + MidxPackList packList = MidxPackList.create(a, b, c); + assertEquals(Set.of(), packList.findAllCoveringMidxs(a)); + assertEquals(Set.of(), packList.findAllCoveringMidxs(b)); + assertEquals(Set.of(), packList.findAllCoveringMidxs(c)); + assertEquals(Set.of(), packList.findAllCoveringMidxs(a, b)); } @Test - public void findAllImpactedMidx_onlyMidx() throws IOException { - setupThreePacksAndMidx(); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - MidxPackList packList = MidxPackList.create(packs); - List covered = ((DfsPackFileMidx) packs[0]) - .getAllCoveredPacks(); - assertEquals(1, packList.findAllCoveringMidxs(covered.get(0)).size()); - assertEquals(1, packList.findAllCoveringMidxs(covered.get(1)).size()); - assertEquals(1, packList.findAllCoveringMidxs(covered.get(2)).size()); - - assertEquals("multiple packs covered", 1, - packList.findAllCoveringMidxs(covered.subList(0, 2)).size()); + public void findAllImpactedMidx_onlyMidx() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + + MidxPackList packList = MidxPackList.create(midx); + assertEquals(Set.of(midx), packList.findAllCoveringMidxs(a)); + assertEquals(Set.of(midx), packList.findAllCoveringMidxs(b)); + assertEquals(Set.of(midx), packList.findAllCoveringMidxs(c)); + assertEquals(Set.of(midx), packList.findAllCoveringMidxs(a, b)); } @Test - public void findAllImpactedMidx_midxPlusOne() throws IOException { - setupThreePacksAndMidx(); - writePackWithRandomBlob(60); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(2, packs.length); - - DfsPackFile uncoveredPack = packs[0]; - List coveredPacks = ((DfsPackFileMidx) packs[1]) - .getAllCoveredPacks(); - assertEquals(3, coveredPacks.size()); - - MidxPackList packList = MidxPackList.create(packs); - assertEquals("one non covered", 0, - packList.findAllCoveringMidxs(uncoveredPack).size()); - assertEquals("one and covered", 1, - packList.findAllCoveringMidxs(coveredPacks.get(1)).size()); + public void findAllImpactedMidx_midxPlusOne() { + packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + DfsPackFile d = packPool.pack("d"); + + MidxPackList packList = MidxPackList.create(d, midx); + assertEquals("one non covered", Set.of(), + packList.findAllCoveringMidxs(d)); + assertEquals("one covered", Set.of(midx), + packList.findAllCoveringMidxs(b)); assertEquals( - "two, only one covered", 1, packList - .findAllCoveringMidxs( - List.of(uncoveredPack, coveredPacks.get(2))) - .size()); + "two, only one covered", Set.of(midx), + packList.findAllCoveringMidxs(c, d)); } @Test - public void findAllImpactedMidxs_nestedMidx() throws IOException { - setupSixPacksThreeMidx(); - - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(1, packs.length); - MidxPackList packList = MidxPackList.create(packs); - List coveredPacks = ((DfsPackFileMidx) packs[0]) - .getAllCoveredPacks(); - assertEquals(6, coveredPacks.size()); - - assertEquals("one covered tip midx", 1, - packList.findAllCoveringMidxs(coveredPacks.get(0)).size()); - assertEquals("one covered middle midx", 2, - packList.findAllCoveringMidxs(coveredPacks.get(2)).size()); - assertEquals("one covered base midx", 3, - packList.findAllCoveringMidxs(coveredPacks.get(4)).size()); - assertEquals( - "multiple covered in chain", 3, packList - .findAllCoveringMidxs(List.of(coveredPacks.get(1), - coveredPacks.get(2), coveredPacks.get(5))) - .size()); + public void findAllImpactedMidxs_nestedMidx() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFileMidx midxBase = packPool.midx("midxBase", null, "a", "b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFile d = packPool.pack("d"); + DfsPackFileMidx midxMiddle = packPool.midx("midxMiddle", midxBase, "c", + "d"); + DfsPackFile e = packPool.pack("e"); + DfsPackFile f = packPool.pack("f"); + DfsPackFileMidx midxTip = packPool.midx("midxTip", midxMiddle, "e", + "f"); + + MidxPackList packList = MidxPackList.create(midxTip); + // Only tip + assertEquals(Set.of(midxTip), packList.findAllCoveringMidxs(e)); + assertEquals(Set.of(midxTip), packList.findAllCoveringMidxs(f)); + assertEquals(Set.of(midxTip), packList.findAllCoveringMidxs(e, f)); + + // Tip and middle + assertEquals(Set.of(midxTip, midxMiddle), + packList.findAllCoveringMidxs(c)); + assertEquals(Set.of(midxTip, midxMiddle), + packList.findAllCoveringMidxs(d)); + assertEquals(Set.of(midxTip, midxMiddle), + packList.findAllCoveringMidxs(c, d)); + assertEquals(Set.of(midxTip, midxMiddle), + packList.findAllCoveringMidxs(e, d)); + + // All three + assertEquals(Set.of(midxTip, midxMiddle, midxBase), + packList.findAllCoveringMidxs(a)); + assertEquals(Set.of(midxTip, midxMiddle, midxBase), + packList.findAllCoveringMidxs(b)); + assertEquals(Set.of(midxTip, midxMiddle, midxBase), + packList.findAllCoveringMidxs(a, b)); + assertEquals(Set.of(midxTip, midxMiddle, midxBase), + packList.findAllCoveringMidxs(c, a)); + assertEquals(Set.of(midxTip, midxMiddle, midxBase), + packList.findAllCoveringMidxs(f, c, b)); } @Test - public void getTopMidxPack_noMidx_null() throws IOException { - setupThreePacks(); - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); + public void getTopMidxPack_noMidx_null() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + MidxPackList packList = MidxPackList.create(a, b, c); assertNull(packList.getTopMidxPack()); } @Test - public void getTopMidxPack_oneMidx_returned() throws IOException { - DfsPackFileMidx midx = setupThreePacksAndMidx(); - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); - assertEquals(midx.getPackDescription(), - packList.getTopMidxPack().getPackDescription()); + public void getTopMidxPack_oneMidx_returned() { + packPool.pack("a"); + packPool.pack("b"); + packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + + MidxPackList packList = MidxPackList.create(midx); + assertEquals(midx, packList.getTopMidxPack()); } @Test - public void getTopMidxPack_multipleMidx_mostRecent() throws IOException { - writePackWithRandomBlob(100); - writePackWithRandomBlob(300); - writePackWithRandomBlob(50); - writePackWithRandomBlob(400); - writePackWithRandomBlob(130); - writePackWithRandomBlob(500); - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(6, packs.length); - - // midx covers first two packs - writeMultipackIndex(Arrays.copyOfRange(packs, 4, 6), null); - - // chain of midxs covering all - DfsPackFileMidx midxBase = writeMultipackIndex( - Arrays.copyOfRange(packs, 4, 6), null); - DfsPackFileMidx midxMid = writeMultipackIndex( - Arrays.copyOfRange(packs, 2, 4), midxBase); - DfsPackFileMidx chainTwo = writeMultipackIndex( - Arrays.copyOfRange(packs, 0, 2), midxMid); - - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); - assertEquals(chainTwo.getPackDescription(), - packList.getTopMidxPack().getPackDescription()); + public void getTopMidxPack_multipleMidx_mostRecent() { + packPool.pack("a"); + packPool.pack("b"); + DfsPackFileMidx midxBase = packPool.midx("midxBase", null, "a", "b"); + packPool.pack("c"); + packPool.pack("d"); + DfsPackFileMidx midxMiddle = packPool.midx("midxMiddle", midxBase, "c", + "d"); + packPool.pack("e"); + packPool.pack("f"); + DfsPackFileMidx midxTip = packPool.midx("midxTip", midxMiddle, "e", + "f"); + + MidxPackList packList = MidxPackList.create(midxTip); + assertEquals(midxTip, packList.getTopMidxPack()); } @Test - public void getPlainPacksNotCoveredBy_null_all() throws IOException { - setupThreePacks(); - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); - assertEquals(3, packList.getPlainPacksNotCoveredBy(null).size()); + public void getPlainPacksNotCoveredBy_null_all() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + MidxPackList packList = MidxPackList.create(a, b, c); + assertEquals(List.of(a, b, c), + packList.getPlainPacksNotCoveredBy(null)); } @Test public void getPlainPacksNotCoveredBy_midxCoversAll_nothing() - throws IOException { - DfsPackFileMidx midx = setupThreePacksAndMidx(); - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); - assertEquals(0, packList.getPlainPacksNotCoveredBy(midx).size()); + { + packPool.pack("a"); + packPool.pack("b"); + packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + + MidxPackList packList = MidxPackList.create(midx); + assertEquals(List.of(), packList.getPlainPacksNotCoveredBy(midx)); } @Test public void getPlainPacksNotCoveredBy_midxMissesOne_one() - throws IOException { - DfsPackFileMidx midx = setupThreePacksAndMidx(); - writePackWithBlob("getPlainPacksNotCovered_missingone" - .getBytes(StandardCharsets.UTF_8)); - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); - assertEquals(1, packList.getPlainPacksNotCoveredBy(midx).size()); + { + packPool.pack("a"); + packPool.pack("b"); + packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + DfsPackFile d = packPool.pack("d"); + MidxPackList packList = MidxPackList.create(d, midx); + assertEquals(List.of(d), packList.getPlainPacksNotCoveredBy(midx)); } @Test - public void getPlainPacksNotCoveredBy_midxChain() throws IOException { - writePackWithRandomBlob(100); - writePackWithRandomBlob(300); - writePackWithRandomBlob(50); - writePackWithRandomBlob(400); - writePackWithRandomBlob(130); - writePackWithRandomBlob(500); - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(6, packs.length); - DfsPackFileMidx midxBase = writeMultipackIndex( - Arrays.copyOfRange(packs, 4, 6), null); - DfsPackFileMidx midxMid = writeMultipackIndex( - Arrays.copyOfRange(packs, 2, 4), midxBase); - DfsPackFileMidx midxTip = writeMultipackIndex( - Arrays.copyOfRange(packs, 0, 2), midxMid); - - MidxPackList packList = MidxPackList - .create(db.getObjectDatabase().getPacks()); - assertEquals(4, packList.getPlainPacksNotCoveredBy(midxBase).size()); - assertEquals(2, packList.getPlainPacksNotCoveredBy(midxMid).size()); - assertEquals(0, packList.getPlainPacksNotCoveredBy(midxTip).size()); - } - - private void setupThreePacks() throws IOException { - writePackWithRandomBlob(100); - writePackWithRandomBlob(300); - writePackWithRandomBlob(50); - } - - private DfsPackFileMidx setupThreePacksAndMidx() throws IOException { - writePackWithRandomBlob(100); - writePackWithRandomBlob(300); - writePackWithRandomBlob(50); - return writeMultipackIndex(); - } - - private void setupSixPacksThreeMidx() throws IOException { - writePackWithRandomBlob(100); - writePackWithRandomBlob(300); - writePackWithRandomBlob(50); - writePackWithRandomBlob(400); - writePackWithRandomBlob(130); - writePackWithRandomBlob(500); - DfsPackFile[] packs = db.getObjectDatabase().getPacks(); - assertEquals(6, packs.length); - DfsPackFileMidx midxBase = writeMultipackIndex( - Arrays.copyOfRange(packs, 4, 6), null); - DfsPackFileMidx midxMid = writeMultipackIndex( - Arrays.copyOfRange(packs, 2, 4), midxBase); - writeMultipackIndex(Arrays.copyOfRange(packs, 0, 2), midxMid); - assertEquals("only top midx", 1, - db.getObjectDatabase().getPacks().length); + public void getPlainPacksNotCoveredBy_midxChain() { + packPool.pack("a"); + packPool.pack("b"); + DfsPackFileMidx midxBase = packPool.midx("midxBase", null, "a", "b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFile d = packPool.pack("d"); + DfsPackFileMidx midxMiddle = packPool.midx("midxMiddle", midxBase, "c", + "d"); + DfsPackFile e = packPool.pack("e"); + DfsPackFile f = packPool.pack("f"); + DfsPackFileMidx midxTip = packPool.midx("midxTip", midxMiddle, "e", + "f"); + + MidxPackList packList = MidxPackList.create(midxTip); + assertEquals(List.of(e, f, c, d), + packList.getPlainPacksNotCoveredBy(midxBase)); + assertEquals(List.of(e, f), + packList.getPlainPacksNotCoveredBy(midxMiddle)); + assertEquals(List.of(), packList.getPlainPacksNotCoveredBy(midxTip)); } - private DfsPackFileMidx writeMultipackIndex() throws IOException { - return writeMultipackIndex(db.getObjectDatabase().getPacks(), null); - } - - private DfsPackFileMidx writeMultipackIndex(DfsPackFile[] packs, - DfsPackFileMidx base) throws IOException { - List packfiles = asList(packs); - DfsPackDescription desc = DfsMidxWriter.writeMidx( - NullProgressMonitor.INSTANCE, db.getObjectDatabase(), packfiles, - base != null ? base.getPackDescription() : null, null); - db.getObjectDatabase().commitPack(List.of(desc), null); - return DfsPackFileMidx.create(DfsBlockCache.getInstance(), desc, - packfiles, base); - } - - private ObjectId writePackWithBlob(byte[] data) throws IOException { - DfsInserter ins = (DfsInserter) db.newObjectInserter(); - ins.setCompressionLevel(Deflater.NO_COMPRESSION); - ObjectId blobId = ins.insert(OBJ_BLOB, data); - ins.flush(); - return blobId; - } - // Do not use the size twice into the same test (it gives the same blob!) - private ObjectId writePackWithRandomBlob(int size) throws IOException { - byte[] data = new TestRng(JGitTestUtil.getName()).nextBytes(size); - return writePackWithBlob(data); + private static final class PackPool { + private static final DfsRepositoryDescription repoDesc = new DfsRepositoryDescription( + "midxpacklisttest"); + + private final Map knownPacks = new HashMap<>(); + + DfsPackFile pack(String name) { + DfsPackDescription dsc = new DfsPackDescription(repoDesc, name, GC); + DfsPackFile p = new DfsPackFile(DfsBlockCache.getInstance(), dsc); + knownPacks.put(name, p); + return p; + } + + DfsPackFileMidx midx(String name, DfsPackFileMidx base, + String... coveredPacks) { + DfsPackDescription dsc = new DfsPackDescription(repoDesc, name, GC); + dsc.addFileExt(MULTI_PACK_INDEX); + dsc.setCoveredPacks(Arrays.stream(coveredPacks).map(knownPacks::get) + .map(DfsPackFile::getPackDescription).toList()); + if (base != null) { + dsc.setMultiPackIndexBase(base.getPackDescription()); + } + return DfsPackFileMidx.create(DfsBlockCache.getInstance(), dsc, + knownPacks.values().stream().toList(), base); + } } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java index f48572550fd..a6c2b760208 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java @@ -41,14 +41,14 @@ public final class MidxPackList { * list of packs (regular or tip midxs) * @return a MidxPackList instance */ - public static MidxPackList create(DfsPackFile[] packs) { - return new MidxPackList(packs); + public static MidxPackList create(DfsPackFile... packs) { + return new MidxPackList(Arrays.asList(packs)); } private final List packs; - private MidxPackList(DfsPackFile[] packs) { - this.packs = Arrays.asList(packs); + private MidxPackList(List packs) { + this.packs = packs; } /** @@ -104,8 +104,8 @@ public List getAllMidxPacks() { * a single pack * @return all the midxs that include (directly or indirectly) the pack */ - Set findAllCoveringMidxs(DfsPackFile pack) { - return findAllCoveringMidxs(List.of(pack)); + Set findAllCoveringMidxs(DfsPackFile... pack) { + return findAllCoveringMidxs(Arrays.asList(pack)); } /** From 0b6d0373413656ca938b5f0000fe30e7a3265099 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 26 Mar 2026 11:14:42 +0200 Subject: [PATCH 062/200] MidxPackList: getAllPlainPacks returns object-lookup order For object lookup we want the most recent packs first, because we usually talk more about recent object. In midx, we want oldest packs first to choose the oldest copy of an object for duplicates. MidxPackList replaces a midx in the pack list with its covered packs, but it keep them in midx order, producing a list that is in no useful order. e.g. [INSERT, midx(GC, COMPACT)] returns [INSERT, GC, COMPACT]. Introduced the covered packs in reverse order, so the list matches the object lookup order. Then [INSERT, midx(GC, COMPACT)] becomes [INSERT, COMPACT, GC]. Link: https://review.gerrithub.io/id/I96458e5585b00d31ae6f1085412a2f5b6a6a6964 --- .../jgit/internal/storage/dfs/MidxPackListTest.java | 10 +++++----- .../jgit/internal/storage/dfs/MidxPackList.java | 11 ++++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java index 7879af9c896..217f5872b06 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java @@ -44,7 +44,7 @@ public void getAllPlainPacks_onlyMidx() { DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); MidxPackList packList = MidxPackList.create(midx); - assertEquals(List.of(a, b, c), packList.getAllPlainPacks()); + assertEquals(List.of(c, b, a), packList.getAllPlainPacks()); } @Test @@ -56,7 +56,7 @@ public void getAllPlainPacks_midxPlusOne() { DfsPackFile d = packPool.pack("d"); MidxPackList packList = MidxPackList.create(d, midx); - assertEquals(List.of(d, a, b, c), packList.getAllPlainPacks()); + assertEquals(List.of(d, c, b, a), packList.getAllPlainPacks()); } @Test @@ -74,7 +74,7 @@ public void getAllPlainPacks_nestedMidx() { "f"); MidxPackList packList = MidxPackList.create(midxTip); - assertEquals(List.of(e, f, c, d, a, b), packList.getAllPlainPacks()); + assertEquals(List.of(f, e, d, c, b, a), packList.getAllPlainPacks()); } @Test @@ -304,9 +304,9 @@ public void getPlainPacksNotCoveredBy_midxChain() { "f"); MidxPackList packList = MidxPackList.create(midxTip); - assertEquals(List.of(e, f, c, d), + assertEquals(List.of(f, e, d, c), packList.getPlainPacksNotCoveredBy(midxBase)); - assertEquals(List.of(e, f), + assertEquals(List.of(f, e), packList.getPlainPacksNotCoveredBy(midxMiddle)); assertEquals(List.of(), packList.getPlainPacksNotCoveredBy(midxTip)); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java index a6c2b760208..70c9b858fca 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java @@ -53,6 +53,11 @@ private MidxPackList(List packs) { /** * Get all plain packs in the list, either top-level or inside midxs + *

+ * Inside midx, the packs are in reverse lookup order. This code restores + * their original order. i.e. the list with packs [INSERT, midx(COMPACT-2, + * COMPACT-3), midx(GC, COMPACT-1)] becomes [INSERT, COMPACT-3, COMPACT-2, + * COMPACT-1, GC]. * * @return a list of all "real" packs in this pack list, either top level or * inside midxs. @@ -63,7 +68,11 @@ public List getAllPlainPacks() { while (!pending.isEmpty()) { DfsPackFile pack = pending.poll(); if (pack instanceof DfsPackFileMidx midxPack) { - plainPacks.addAll(midxPack.getCoveredPacks()); + // Midx order is the reverse of object lookup order + ArrayList coveredPacks = new ArrayList<>( + midxPack.getCoveredPacks()); + Collections.reverse(coveredPacks); + plainPacks.addAll(coveredPacks); if (midxPack.getMultipackIndexBase() != null) { pending.add(midxPack.getMultipackIndexBase()); } From 476d7376d7fcf3b182a859ebdf519cd400570318 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 26 Mar 2026 11:14:42 +0200 Subject: [PATCH 063/200] javadoc: Mention midx order in the javadoc Link: https://review.gerrithub.io/id/I84b5f0163ca7725de248afcc26f8f9246a6a6964 --- .../eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java | 5 +++-- .../eclipse/jgit/internal/storage/midx/PackIndexMerger.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java index 50ae998bad9..402bb24247b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidx.java @@ -90,9 +90,10 @@ protected DfsPackFileMidx(DfsBlockCache cache, DfsPackDescription desc) { public abstract DfsPackFileMidx getMultipackIndexBase(); /** - * Packs indexed by this multipack index (base NOT included) + * Packs indexed by this multipack index (base NOT included) in midx order. * - * @return packs indexed by this multipack index + * @return packs indexed by this multipack index in the order used inside + * the midx. */ public abstract List getCoveredPacks(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java index 8584176e566..9e78930c600 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -53,7 +53,8 @@ public class PackIndexMerger { /** * Builder collecting the inputs for the merger. *

- * Order matters. Packs will appear in the midx in the order they are added. + * Order matters. In case of duplicates, the merger chooses the object in + * the first pack it appears. */ public static class Builder { From 7aaf909484a27496a625a6b718a04fda604a3dc1 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 27 Mar 2026 10:53:53 +0200 Subject: [PATCH 064/200] DfsMidxWriter: Do not accept midx as input to build midx We can use a midx to build a new midx, but it breaks the bitmaps. When we calculate the "midx offsets" to order objects in the bitmap, we assume each pack is a single pack (one packId). Throw an exception if the input for the midx is another midx, until we calculate properly the midx offsets. Link: https://review.gerrithub.io/id/I325443dc3281003b29b4d8a1598b83316a6a6964 --- .../eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java index 6ead06d0006..32b4d14c3c8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsMidxWriter.java @@ -77,6 +77,13 @@ public static DfsPackDescription writeMidx(ProgressMonitor pm, PackIndexMerger.Builder dataBuilder = PackIndexMerger.builder(); try (DfsReader ctx = objdb.newReader()) { for (DfsPackFile pack : packs) { + if (pack instanceof DfsPackFileMidx) { + // asObjectsToPack assumes one packid per pack while + // calculating midx offsets. We need to fix that before + // accepting midx to build new midx. + throw new IOException( + "MIDX not supported to build new midx"); //$NON-NLS-1$ + } dataBuilder.addPack(pack.getPackDescription().getPackName(), pack.getPackIndex(ctx)); } From 06d66eb9521758452254401a00b8427e55bb8175 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 065/200] PackBitmapIndexRemapper: Do not remap if the object order is the same In midx bitmaps, the objects are ordered first by pack and then by offset. If we build a new midx adding a pack to a previous midx, the bitmaps are reusable as they are (the objects in the new pack are extra 0s in the old bitmaps). If old and new positions are the same to the old objects, discard the mapping array and return directly the old bitmap. Link: https://review.gerrithub.io/id/I78b0dae5909adfb7ab5a0e774bb870096a6a6964 --- .../storage/file/PackBitmapIndexRemapper.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java index ffbc0737ac7..4d639a3e5eb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java @@ -36,6 +36,8 @@ public class PackBitmapIndexRemapper private final BitSet inflated; private final int[] prevToNewMapping; + private final boolean reuseOldBitmapAsIs; + /** * A PackBitmapIndex that maps the positions in the prevBitmapIndex to the * ones in the newIndex. @@ -65,6 +67,7 @@ private PackBitmapIndexRemapper(PackBitmapIndex newPackIndex) { this.newPackIndex = newPackIndex; this.inflated = null; this.prevToNewMapping = null; + this.reuseOldBitmapAsIs = false; } private PackBitmapIndexRemapper( @@ -73,10 +76,18 @@ private PackBitmapIndexRemapper( this.newPackIndex = newPackIndex; inflated = new BitSet(newPackIndex.getObjectCount()); - prevToNewMapping = new int[oldPackIndex.getObjectCount()]; - for (int pos = 0; pos < prevToNewMapping.length; pos++) - prevToNewMapping[pos] = newPackIndex.findPosition( - oldPackIndex.getObject(pos)); + int[] prevToNewMappingTmp = new int[oldPackIndex.getObjectCount()]; + boolean allPositionsMatch = true; + for (int pos = 0; pos < prevToNewMappingTmp.length; pos++) { + prevToNewMappingTmp[pos] = newPackIndex + .findPosition(oldPackIndex.getObject(pos)); + if (prevToNewMappingTmp[pos] != pos) { + allPositionsMatch = false; + } + } + this.reuseOldBitmapAsIs = allPositionsMatch; + // We do not need it! + this.prevToNewMapping = allPositionsMatch ? null : prevToNewMappingTmp; } @Override @@ -169,6 +180,10 @@ public EWAHCompressedBitmap getBitmap(AnyObjectId objectId) { if (newPackIndex.findPosition(objectId) == -1) return null; + if (reuseOldBitmapAsIs) { + return oldBitmap.getBitmap(); + } + inflated.clear(); for (IntIterator i = oldBitmap.getBitmapWithoutCaching() .intIterator(); i.hasNext();) From d72c61b6cf718109376c0958bd0735f31de188b0 Mon Sep 17 00:00:00 2001 From: Federico Jeanne Date: Mon, 30 Mar 2026 16:10:57 +0200 Subject: [PATCH 066/200] [version.sh] Don't use the pager for the git diff command Human interaction is bad for automation scripts. Change-Id: Ia3f5ea583060ebfc7fd24d35956f1f31139a3cec --- tools/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/version.sh b/tools/version.sh index 75f1a6a0d93..6cc6a900a1e 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -170,4 +170,4 @@ perl -pi~ -e ' ' $(git ls-files | grep pom.xml) find . -name '*~' | xargs rm -f -git diff +git --no-pager diff From d7c138341c43a4c690d407ee8de21495abcc51d6 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 067/200] WindowCursor/Pack: Move bitmap coverage calculation to the pack The reader (WindowCursor) gets the bitmap index of each pack to decide if all objects in the pack are in the needed bitmap. This doesn't work with midx, where the pack has other nested packs. Pass the bitmap to the pack instead. Let it return a list of packs fully covered by the bitmap. This acts as before in regular packs, and lets midx return multiple packs. Change-Id: I572d9354707a185d1934662d324fad826a6a6964 --- .../jgit/internal/storage/file/Pack.java | 24 ++++++++++++++++++- .../internal/storage/file/WindowCursor.java | 15 +++++++----- 2 files changed, 32 insertions(+), 7 deletions(-) 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 8988b41b55e..f38e02b08ca 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 @@ -14,10 +14,10 @@ import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.KEEP; +import static org.eclipse.jgit.internal.storage.pack.PackExt.OBJECT_SIZE_INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.REVERSE_INDEX; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PACKED_INDEX_GIT_USE_STRONGREFS; -import static org.eclipse.jgit.internal.storage.pack.PackExt.OBJECT_SIZE_INDEX; import java.io.EOFException; import java.io.File; @@ -36,6 +36,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.Iterator; +import java.util.List; import java.util.Optional; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; @@ -61,6 +62,7 @@ import org.eclipse.jgit.internal.util.Optionally; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.BitmapIndex; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; @@ -1342,6 +1344,26 @@ void setBitmapIndexFile(PackFile bitmapIndexFile) { this.bitmapIdxFile = bitmapIndexFile; } + /** + * Return the pack if all its objects are included in the need bitmaps. + * + * @param needBitmaps + * bitmap with needed objects. Modified in this method: If a pack + * is fully included in the bitmap, the pack objects are removed + * from the bitmap. + * @return list of packs fully included in the bitmap + * @throws IOException + * an error reading the bitmap index of this pack + */ + protected List fullyIncludedIn(BitmapIndex.BitmapBuilder needBitmaps) + throws IOException { + PackBitmapIndex bitmapIndex = getBitmapIndex(); + if (needBitmaps.removeAllOrNone(bitmapIndex)) { + return Collections.singletonList(this); + } + return Collections.emptyList(); + } + private PackReverseIndex getReverseIdx() throws IOException { Optional optional = reverseIdx.getOptional(); if (optional.isPresent()) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java index 33459ef18de..cf485a47e29 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.internal.storage.file; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -26,6 +27,7 @@ import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableException; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; import org.eclipse.jgit.internal.storage.pack.CachedPack; import org.eclipse.jgit.internal.storage.pack.ObjectReuseAsIs; import org.eclipse.jgit.internal.storage.pack.ObjectToPack; @@ -35,7 +37,6 @@ import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.BitmapIndex; import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; -import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.InflaterCache; @@ -115,13 +116,15 @@ public Optional getCommitGraph() { @Override public Collection getCachedPacksAndUpdate( BitmapBuilder needBitmap) throws IOException { + List toUseAsIs = new ArrayList<>(); for (Pack pack : db.getPacks()) { - PackBitmapIndex index = pack.getBitmapIndex(); - if (needBitmap.removeAllOrNone(index)) - return Collections. singletonList( - new LocalCachedPack(Collections.singletonList(pack))); + List packs = pack.fullyIncludedIn(needBitmap); + if (packs.isEmpty()) { + continue; + } + toUseAsIs.add(new LocalCachedPack(packs)); } - return Collections.emptyList(); + return toUseAsIs; } @Override From 8b92307c8a8b61b1c22fe1b8ee447d5fd9a01e15 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 30 Mar 2026 13:31:14 +0300 Subject: [PATCH 068/200] MidxMetadataReader: Helper to read only selected fields in the midx In few cases we just need the list of packs covered by the midx, or its checksum, but not the whole midx. Offer a quick reader to get that data, skipping most of the midx reading. Change-Id: I67d442f59fafa731502e36a9fa1b471a6a6a6964 --- .../storage/midx/MidxMetadataReaderTest.java | 29 ++ .../storage/midx/MidxMetadataReader.java | 263 ++++++++++++++++++ 2 files changed, 292 insertions(+) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxMetadataReaderTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxMetadataReader.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxMetadataReaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxMetadataReaderTest.java new file mode 100644 index 00000000000..b41d6c3295f --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MidxMetadataReaderTest.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2026, Google LLC + * + * 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.midx; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; + +import org.eclipse.jgit.junit.JGitTestUtil; +import org.junit.Test; + +public class MidxMetadataReaderTest { + @Test + public void load_validFile_basic_upstream() throws Exception { + MidxMetadataReader.MidxMetadata meta = MidxMetadataReader + .read(JGitTestUtil.getTestResourceFile("multi-pack-index.v1")); + assertEquals(26, meta.packNames().size()); + + byte[] expected = new byte[] { 15, -10, -96, 97, 76, 13, -72, 95, 106, + 15, -55, -12, 18, -13, 50, 33, 120, -113, 71, -119 }; + assertArrayEquals(expected, meta.checksum()); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxMetadataReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxMetadataReader.java new file mode 100644 index 00000000000..0d8dfe4bbdb --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxMetadataReader.java @@ -0,0 +1,263 @@ +/* + * Copyright (C) 2024, GerritForge Inc. and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.CHUNK_LOOKUP_WIDTH; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_PACKNAMES; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_SIGNATURE; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.util.Base64; +import org.eclipse.jgit.util.IO; +import org.eclipse.jgit.util.NB; +import org.eclipse.jgit.util.io.SilentFileInputStream; + +/** + * Read only basic metadata from the midx without loading the whole file in + * memory. + *

+ * In some cases we need only a bit of information from the midx and we do not + * need it yet fully loaded in memory. For example: + *

    + *
  • We need the checksum of the previous midx to delete its bitmaps
    • + *
  • When opening the repo, we need the names of packs referenced by the midx + * to check they exist
    • + *
+ */ +public class MidxMetadataReader { + + /** + * Metadata useful before loading the full midx + * + * @param packNames + * list of packs in this midx (in midx order). + * @param checksumB64 + * checksum of the midx, encoded in Base64 + */ + public record MidxMetadata(List packNames, String checksumB64) { + /** + * Return the checksum as byte[] + * + * @return checksum in byte[] format + */ + public byte[] checksum() { + return Base64.decode(checksumB64); + } + } + + /** + * Open an existing MultiPackIndex file and read its metadata + * + * @param midxFile + * existing multi-pack-index to read. + * @return the metadata + * @throws FileNotFoundException + * the file does not exist. + * @throws MultiPackIndexFormatException + * MultiPackIndex file's format is different from we expected. + * @throws java.io.IOException + * the file exists but could not be read due to security errors + * or unexpected data corruption. + */ + public static MidxMetadata read(File midxFile) throws FileNotFoundException, + MultiPackIndexFormatException, IOException { + try (SilentFileInputStream fd = new SilentFileInputStream(midxFile)) { + try { + return read(fd); + } catch (MultiPackIndexFormatException fe) { + throw fe; + } catch (IOException ioe) { + throw new IOException( + MessageFormat.format(JGitText.get().unreadableMIDX, + midxFile.getAbsolutePath()), + ioe); + } + } + } + + /** + * Read metadata from an existing MultiPackIndex from a buffered stream. + * + * @param fd + * stream to read the multipack-index file from. The stream must + * be buffered as some small IOs are performed against the + * stream. The caller is responsible for closing the stream. + * @return the metadata + * @throws MultiPackIndexFormatException + * the MultiPackIndex file's format is different from we + * expected. + * @throws java.io.IOException + * the stream cannot be read. + */ + public static MidxMetadata read(InputStream fd) + throws MultiPackIndexFormatException, IOException { + byte[] hdr = new byte[12]; + IO.readFully(fd, hdr, 0, hdr.length); + + int magic = NB.decodeInt32(hdr, 0); + + if (magic != MIDX_SIGNATURE) { + throw new MultiPackIndexFormatException(JGitText.get().notAMIDX); + } + + // Check MultiPackIndex version + int v = hdr[4]; + if (v != 1) { + throw new MultiPackIndexFormatException(MessageFormat.format( + JGitText.get().unsupportedMIDXVersion, Integer.valueOf(v))); + } + + // Read the object Id version (1 byte) + // 1 => SHA-1 + // 2 => SHA-256 + // TODO: If the hash type does not match the repository's hash + // algorithm, + // the multi-pack-index file should be ignored with a warning + // presented to the user. + int commitIdVersion = hdr[5]; + if (commitIdVersion != 1) { + throw new MultiPackIndexFormatException( + JGitText.get().incorrectOBJECT_ID_LENGTH); + } + + // Read the number of "chunkOffsets" (1 byte) + int chunkCount = hdr[6]; + + // Read the number of multi-pack-index files (1 byte) + // This value is currently always zero. + // TODO populate this + // int numberOfMultiPackIndexFiles = hdr[7]; + + // Number of packfiles (4 bytes) + int packCount = NB.decodeInt32(hdr, 8); + + ChunkIndex chunkIndex = ChunkIndex.read(fd, chunkCount); + int currentPos = hdr.length + chunkIndex.getBytesRead(); + long packNamesStart = chunkIndex.getStartOffset(MIDX_CHUNKID_PACKNAMES); + long packNamesEnd = chunkIndex.getEndOffset(MIDX_CHUNKID_PACKNAMES); + + IO.skipFully(fd, packNamesStart - currentPos); + byte[] packNamesBuffer = new byte[(int) (packNamesEnd + - packNamesStart)]; + IO.readFully(fd, packNamesBuffer); + List packNames = List + .of(new String(packNamesBuffer, UTF_8).split("\u0000")); + if (packCount != packNames.size()) { + throw new MultiPackIndexFormatException(MessageFormat.format( + JGitText.get().multiPackIndexPackCountMismatch, packCount, + packNames.size())); + } + + // We should be at packNamesEnd + long endLastChunk = chunkIndex.getLastOffset(); + IO.skipFully(fd, endLastChunk - packNamesEnd); + byte[] checksum = new byte[20]; + IO.readFully(fd, checksum, 0, 20); + + return new MidxMetadata(packNames, Base64.encodeBytes(checksum)); + } + + private static final class ChunkIndex { + + private final List chunks; + + private final int byteSize; + + static ChunkIndex read(InputStream fd, int chunkCount) + throws IOException { + byte[] lookupBuffer = new byte[CHUNK_LOOKUP_WIDTH + * (chunkCount + 1)]; + + IO.readFully(fd, lookupBuffer, 0, lookupBuffer.length); + + List chunks = new ArrayList<>(chunkCount + 1); + for (int i = 0; i <= chunkCount; i++) { + // chunks[chunkCount] is just a marker, in order to record the + // length of the last chunk. + int id = NB.decodeInt32(lookupBuffer, i * 12); + long offset = NB.decodeInt64(lookupBuffer, i * 12 + 4); + chunks.add(new ChunkSegment(id, offset)); + } + return new ChunkIndex(chunks, lookupBuffer.length); + } + + private ChunkIndex(List chunks, int bytesRead) { + this.chunks = chunks; + this.byteSize = bytesRead; + } + + /** + * Bytes read from the stream while reading the chunks + * + * @return number of bytes consumed from the stream + */ + int getBytesRead() { + return byteSize; + } + + long getStartOffset(int chunkId) { + for (ChunkSegment c : chunks) { + if (c.id() == chunkId) { + return c.offset(); + } + } + throw new IllegalArgumentException("Asking for unknown chunk"); //$NON-NLS-1$ + } + + public long getEndOffset(int chunkId) { + int pos = -1; + for (int i = 0; i < chunks.size(); i++) { + if (chunks.get(i).id() == chunkId) { + pos = i; + break; + } + } + if (pos == -1) { + throw new IllegalArgumentException("Asking for unknown chunk"); //$NON-NLS-1$ + } + + return chunks.get(pos + 1).offset(); + } + + public long getLastOffset() { + return chunks.get(chunks.size() - 1).offset(); + } + } + + private record ChunkSegment(int id, long offset) { + } + + /** + * Thrown if a MultiPackIndex doesn't have the expected file format + */ + public static class MultiPackIndexFormatException extends IOException { + + private static final long serialVersionUID = 1L; + + /** + * Construct an exception. + * + * @param why + * description of the type of error. + */ + MultiPackIndexFormatException(String why) { + super(why); + } + } +} From 55890f303350e2e1ecb9ea08b9cd015c34d33186 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Mon, 30 Mar 2026 23:15:32 +0200 Subject: [PATCH 069/200] Bazel: bump to 8.6.0 and switch to pure Bzlmod Upgrade Bazel from 7.6.1 to 8.6.0 and complete the transition away from legacy WORKSPACE-based dependency resolution. Bazel 8 disables WORKSPACE by default and expects external dependencies to be provided via Bzlmod. The previous configuration explicitly re-enabled WORKSPACE via --enable_workspace, which caused evaluation of legacy repository. This change removes the legacy path and relies solely on Bzlmod: remove --enable_workspace from .bazelrc drop WORKSPACE file entirely (MODULE.bazel is now the repo root) update workspace_status.py to locate MODULE.bazel instead of WORKSPACE The Bazel version bump requires regenerating MODULE.bazel.lock to keep dependency resolution consistent with Bazel 8. While upgrading, align module dependencies with the Bazel 8 ecosystem: upgrade rules_java to 8.16.1 add bazel_features (required by newer rules_java) add rules_go 0.51.0-rc2 (transitively required via rules_android) The newer dependency graph introduces stricter Error Prone checks. Fix some violations by removing legacy /* (non-Javadoc) comments since modern IDEs automatically show javadoc of the supertype. Change-Id: I385ebce07759cb05e16d09a0109803e2d0999b28 --- .bazelrc | 5 +- .bazelversion | 2 +- MODULE.bazel | 4 +- MODULE.bazel.lock | 3036 ++--------------- WORKSPACE | 2 - .../storage/file/ReflogEntryImpl.java | 15 - .../storage/file/ReflogReaderImpl.java | 12 - .../eclipse/jgit/transport/UploadPack.java | 5 +- tools/workspace_status.py | 2 +- 9 files changed, 250 insertions(+), 2833 deletions(-) delete mode 100644 WORKSPACE diff --git a/.bazelrc b/.bazelrc index 385a71d7cb0..2142af857fe 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,7 +1,4 @@ -# TODO(davido): Migrate all dependencies from WORKSPACE to MODULE.bazel -# https://issues.gerritcodereview.com/issues/303819949 -common --enable_bzlmod --lockfile_mode=error -common --enable_workspace +common --lockfile_mode=error build --workspace_status_command="python3 ./tools/workspace_status.py" build --repository_cache=~/.gerritcodereview/bazel-cache/repository diff --git a/.bazelversion b/.bazelversion index e8be68404bc..acd405b1d62 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.6.1 +8.6.0 diff --git a/MODULE.bazel b/MODULE.bazel index 88acfecad7a..613d2d33db3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,8 @@ module(name = "jgit") -bazel_dep(name = "rules_java", version = "8.11.0") +bazel_dep(name = "rules_go", version = "0.51.0-rc2") +bazel_dep(name = "bazel_features", version = "1.39.0") +bazel_dep(name = "rules_java", version = "8.16.1") bazel_dep(name = "rules_jvm_external", version = "6.10") bazel_dep(name = "rbe_autoconfig") git_override( diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 57178519264..7faac9656cb 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,5 +1,5 @@ { - "lockFileVersion": 13, + "lockFileVersion": 24, "registryFileHashes": { "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497", "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2", @@ -11,13 +11,16 @@ "https://bcr.bazel.build/modules/abseil-cpp/20240116.1/MODULE.bazel": "37bcdb4440fbb61df6a1c296ae01b327f19e9bb521f9b8e26ec854b6f97309ed", "https://bcr.bazel.build/modules/abseil-cpp/20240116.2/MODULE.bazel": "73939767a4686cd9a520d16af5ab440071ed75cec1a876bf2fcfaf1f71987a16", "https://bcr.bazel.build/modules/abseil-cpp/20250127.0/MODULE.bazel": "d1086e248cda6576862b4b3fe9ad76a214e08c189af5b42557a6e1888812c5d5", - "https://bcr.bazel.build/modules/abseil-cpp/20250127.0/source.json": "1b996859f840d8efc7c720efc61dcf2a84b1261cb3974cbbe9b6666ebf567775", + "https://bcr.bazel.build/modules/abseil-cpp/20250127.1/MODULE.bazel": "c4a89e7ceb9bf1e25cf84a9f830ff6b817b72874088bf5141b314726e46a57c1", + "https://bcr.bazel.build/modules/abseil-cpp/20250512.1/MODULE.bazel": "d209fdb6f36ffaf61c509fcc81b19e81b411a999a934a032e10cd009a0226215", + "https://bcr.bazel.build/modules/abseil-cpp/20250814.0/MODULE.bazel": "c43c16ca2c432566cdb78913964497259903ebe8fb7d9b57b38e9f1425b427b8", + "https://bcr.bazel.build/modules/abseil-cpp/20250814.0/source.json": "b88bff599ceaf0f56c264c749b1606f8485cec3b8c38ba30f88a4df9af142861", "https://bcr.bazel.build/modules/abseil-py/2.1.0/MODULE.bazel": "5ebe5bf853769c65707e5c28f216798f7a4b1042015e6a36e6d03094d94bec8a", "https://bcr.bazel.build/modules/abseil-py/2.1.0/source.json": "0e8fc4f088ce07099c1cd6594c20c7ddbb48b4b3c0849b7d94ba94be88ff042b", "https://bcr.bazel.build/modules/apple_support/1.11.1/MODULE.bazel": "1843d7cd8a58369a444fc6000e7304425fba600ff641592161d9f15b179fb896", "https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85", - "https://bcr.bazel.build/modules/apple_support/1.15.1/source.json": "517f2b77430084c541bc9be2db63fdcbb7102938c5f64c17ee60ffda2e5cf07b", - "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef", + "https://bcr.bazel.build/modules/apple_support/1.23.1/MODULE.bazel": "53763fed456a968cf919b3240427cf3a9d5481ec5466abc9d5dc51bc70087442", + "https://bcr.bazel.build/modules/apple_support/1.23.1/source.json": "d888b44312eb0ad2c21a91d026753f330caa48a25c9b2102fae75eb2b0dcfdd2", "https://bcr.bazel.build/modules/bazel_features/1.1.0/MODULE.bazel": "cfd42ff3b815a5f39554d97182657f8c4b9719568eb7fded2b9135f084bf760b", "https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd", "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8", @@ -28,10 +31,12 @@ "https://bcr.bazel.build/modules/bazel_features/1.19.0/MODULE.bazel": "59adcdf28230d220f0067b1f435b8537dd033bfff8db21335ef9217919c7fb58", "https://bcr.bazel.build/modules/bazel_features/1.21.0/MODULE.bazel": "675642261665d8eea09989aa3b8afb5c37627f1be178382c320d1b46afba5e3b", "https://bcr.bazel.build/modules/bazel_features/1.23.0/MODULE.bazel": "fd1ac84bc4e97a5a0816b7fd7d4d4f6d837b0047cf4cbd81652d616af3a6591a", + "https://bcr.bazel.build/modules/bazel_features/1.27.0/MODULE.bazel": "621eeee06c4458a9121d1f104efb80f39d34deff4984e778359c60eaf1a8cb65", "https://bcr.bazel.build/modules/bazel_features/1.28.0/MODULE.bazel": "4b4200e6cbf8fa335b2c3f43e1d6ef3e240319c33d43d60cc0fbd4b87ece299d", "https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9", "https://bcr.bazel.build/modules/bazel_features/1.30.0/MODULE.bazel": "a14b62d05969a293b80257e72e597c2da7f717e1e69fa8b339703ed6731bec87", - "https://bcr.bazel.build/modules/bazel_features/1.30.0/source.json": "b07e17f067fe4f69f90b03b36ef1e08fe0d1f3cac254c1241a1818773e3423bc", + "https://bcr.bazel.build/modules/bazel_features/1.39.0/MODULE.bazel": "28739425c1fc283c91931619749c832b555e60bcd1010b40d8441ce0a5cf726d", + "https://bcr.bazel.build/modules/bazel_features/1.39.0/source.json": "f63cbeb4c602098484d57001e5a07d31cb02bbccde9b5e2c9bf0b29d05283e93", "https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7", "https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a", "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8", @@ -45,7 +50,8 @@ "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917", "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d", "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b", - "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/source.json": "f121b43eeefc7c29efbd51b83d08631e2347297c95aac9764a701f2a6a2bb953", + "https://bcr.bazel.build/modules/bazel_skylib/1.8.1/MODULE.bazel": "88ade7293becda963e0e3ea33e7d54d3425127e0a326e0d17da085a5f1f03ff6", + "https://bcr.bazel.build/modules/bazel_skylib/1.8.1/source.json": "7ebaefba0b03efe59cac88ed5bbc67bcf59a3eff33af937345ede2a38b2d368a", "https://bcr.bazel.build/modules/bazel_worker_api/0.0.1/MODULE.bazel": "02a13b77321773b2042e70ee5e4c5e099c8ddee4cf2da9cd420442c36938d4bd", "https://bcr.bazel.build/modules/bazel_worker_api/0.0.4/MODULE.bazel": "460aa12d01231a80cce03c548287b433b321d205b0028ae596728c35e5ee442e", "https://bcr.bazel.build/modules/bazel_worker_api/0.0.4/source.json": "d353c410d47a8b65d09fa98e83d57ebec257a2c2b9c6e42d6fda1cb25e5464a5", @@ -64,7 +70,8 @@ "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6", "https://bcr.bazel.build/modules/googletest/1.14.0/MODULE.bazel": "cfbcbf3e6eac06ef9d85900f64424708cc08687d1b527f0ef65aa7517af8118f", "https://bcr.bazel.build/modules/googletest/1.15.2/MODULE.bazel": "6de1edc1d26cafb0ea1a6ab3f4d4192d91a312fd2d360b63adaa213cd00b2108", - "https://bcr.bazel.build/modules/googletest/1.15.2/source.json": "dbdda654dcb3a0d7a8bc5d0ac5fc7e150b58c2a986025ae5bc634bb2cb61f470", + "https://bcr.bazel.build/modules/googletest/1.17.0/MODULE.bazel": "dbec758171594a705933a29fcf69293d2468c49ec1f2ebca65c36f504d72df46", + "https://bcr.bazel.build/modules/googletest/1.17.0/source.json": "38e4454b25fc30f15439c0378e57909ab1fd0a443158aa35aec685da727cd713", "https://bcr.bazel.build/modules/jsoncpp/1.9.5/MODULE.bazel": "31271aedc59e815656f5736f282bb7509a97c7ecb43e927ac1a37966e0578075", "https://bcr.bazel.build/modules/jsoncpp/1.9.6/MODULE.bazel": "2f8d20d3b7d54143213c4dfc3d98225c42de7d666011528dc8fe91591e2e17b0", "https://bcr.bazel.build/modules/jsoncpp/1.9.6/source.json": "a04756d367a2126c3541682864ecec52f92cdee80a35735a3cb249ce015ca000", @@ -75,13 +82,14 @@ "https://bcr.bazel.build/modules/package_metadata/0.0.7/source.json": "50639625e937b56115012674c797cca7a05a96b4878c87d803c13dc2b31de8a0", "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5", "https://bcr.bazel.build/modules/platforms/0.0.11/MODULE.bazel": "0daefc49732e227caa8bfa834d65dc52e8cc18a2faf80df25e8caea151a9413f", - "https://bcr.bazel.build/modules/platforms/0.0.11/source.json": "f7e188b79ebedebfe75e9e1d098b8845226c7992b307e28e1496f23112e8fc29", "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee", "https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37", "https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615", "https://bcr.bazel.build/modules/platforms/0.0.7/MODULE.bazel": "72fd4a0ede9ee5c021f6a8dd92b503e089f46c227ba2813ff183b71616034814", "https://bcr.bazel.build/modules/platforms/0.0.8/MODULE.bazel": "9f142c03e348f6d263719f5074b21ef3adf0b139ee4c5133e2aa35664da9eb2d", "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc", + "https://bcr.bazel.build/modules/platforms/1.0.0/MODULE.bazel": "f05feb42b48f1b3c225e4ccf351f367be0371411a803198ec34a389fb22aa580", + "https://bcr.bazel.build/modules/platforms/1.0.0/source.json": "f4ff1fd412e0246fd38c82328eb209130ead81d62dcd5a9e40910f867f733d96", "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7", "https://bcr.bazel.build/modules/protobuf/23.1/MODULE.bazel": "88b393b3eb4101d18129e5db51847cd40a5517a53e81216144a8c32dfeeca52a", "https://bcr.bazel.build/modules/protobuf/24.4/MODULE.bazel": "7bc7ce5f2abf36b3b7b7c8218d3acdebb9426aeb35c2257c96445756f970eb12", @@ -90,11 +98,14 @@ "https://bcr.bazel.build/modules/protobuf/27.2/MODULE.bazel": "32450b50673882e4c8c3d10a83f3bc82161b213ed2f80d17e38bece8f165c295", "https://bcr.bazel.build/modules/protobuf/29.0-rc2/MODULE.bazel": "6241d35983510143049943fc0d57937937122baf1b287862f9dc8590fc4c37df", "https://bcr.bazel.build/modules/protobuf/29.0-rc3/MODULE.bazel": "33c2dfa286578573afc55a7acaea3cada4122b9631007c594bf0729f41c8de92", + "https://bcr.bazel.build/modules/protobuf/29.0/MODULE.bazel": "319dc8bf4c679ff87e71b1ccfb5a6e90a6dbc4693501d471f48662ac46d04e4e", + "https://bcr.bazel.build/modules/protobuf/29.1/MODULE.bazel": "557c3457560ff49e122ed76c0bc3397a64af9574691cb8201b4e46d4ab2ecb95", "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0", "https://bcr.bazel.build/modules/protobuf/3.19.2/MODULE.bazel": "532ffe5f2186b69fdde039efe6df13ba726ff338c6bc82275ad433013fa10573", "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858", "https://bcr.bazel.build/modules/protobuf/31.1/MODULE.bazel": "379a389bb330b7b8c1cdf331cc90bf3e13de5614799b3b52cdb7c6f389f6b38e", - "https://bcr.bazel.build/modules/protobuf/31.1/source.json": "25af5d0219da0c0fc4d1191a24ce438e6ca7f49d2e1a94f354efeba6ef10426f", + "https://bcr.bazel.build/modules/protobuf/32.1/MODULE.bazel": "89cd2866a9cb07fee9ff74c41ceace11554f32e0d849de4e23ac55515cfada4d", + "https://bcr.bazel.build/modules/protobuf/32.1/source.json": "bd2664e90875c0cd755d1d9b7a103a4b027893ac8eafa3bba087557ffc244ad4", "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel": "88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e", "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34", "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/source.json": "6900fdc8a9e95866b8c0d4ad4aba4d4236317b5c1cd04c502df3f0d33afed680", @@ -110,6 +121,7 @@ "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647", "https://bcr.bazel.build/modules/rules_cc/0.0.10/MODULE.bazel": "ec1705118f7eaedd6e118508d3d26deba2a4e76476ada7e0e3965211be012002", "https://bcr.bazel.build/modules/rules_cc/0.0.13/MODULE.bazel": "0e8529ed7b323dad0775ff924d2ae5af7640b23553dfcd4d34344c7e7a867191", + "https://bcr.bazel.build/modules/rules_cc/0.0.14/MODULE.bazel": "5e343a3aac88b8d7af3b1b6d2093b55c347b8eefc2e7d1442f7a02dc8fea48ac", "https://bcr.bazel.build/modules/rules_cc/0.0.15/MODULE.bazel": "6704c35f7b4a72502ee81f61bf88706b54f06b3cbe5558ac17e2e14666cd5dcc", "https://bcr.bazel.build/modules/rules_cc/0.0.16/MODULE.bazel": "7661303b8fc1b4d7f532e54e9d6565771fea666fbdf839e0a86affcd02defe87", "https://bcr.bazel.build/modules/rules_cc/0.0.17/MODULE.bazel": "2ae1d8f4238ec67d7185d8861cb0a2cdf4bc608697c331b95bf990e69b62e64a", @@ -118,8 +130,10 @@ "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5", "https://bcr.bazel.build/modules/rules_cc/0.1.1/MODULE.bazel": "2f0222a6f229f0bf44cd711dc13c858dad98c62d52bd51d8fc3a764a83125513", + "https://bcr.bazel.build/modules/rules_cc/0.2.0/MODULE.bazel": "b5c17f90458caae90d2ccd114c81970062946f49f355610ed89bebf954f5783c", "https://bcr.bazel.build/modules/rules_cc/0.2.14/MODULE.bazel": "353c99ed148887ee89c54a17d4100ae7e7e436593d104b668476019023b58df8", "https://bcr.bazel.build/modules/rules_cc/0.2.14/source.json": "55d0a4587c5592fad350f6e698530f4faf0e7dd15e69d43f8d87e220c78bea54", + "https://bcr.bazel.build/modules/rules_cc/0.2.8/MODULE.bazel": "f1df20f0bf22c28192a794f29b501ee2018fa37a3862a1a2132ae2940a23a642", "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6", "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8", "https://bcr.bazel.build/modules/rules_go/0.41.0/MODULE.bazel": "55861d8e8bb0e62cbd2896f60ff303f62ffcb0eddb74ecb0e5c0cbe36fc292c8", @@ -130,18 +144,21 @@ "https://bcr.bazel.build/modules/rules_go/0.51.0-rc2/source.json": "6b5cd0b3da2bd0e6949580851db990a04af0a285f072b9a0f059424457cd8cc9", "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74", "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86", + "https://bcr.bazel.build/modules/rules_java/6.0.0/MODULE.bazel": "8a43b7df601a7ec1af61d79345c17b31ea1fedc6711fd4abfd013ea612978e39", "https://bcr.bazel.build/modules/rules_java/6.3.0/MODULE.bazel": "a97c7678c19f236a956ad260d59c86e10a463badb7eb2eda787490f4c969b963", + "https://bcr.bazel.build/modules/rules_java/6.4.0/MODULE.bazel": "e986a9fe25aeaa84ac17ca093ef13a4637f6107375f64667a15999f77db6c8f6", "https://bcr.bazel.build/modules/rules_java/6.5.2/MODULE.bazel": "1d440d262d0e08453fa0c4d8f699ba81609ed0e9a9a0f02cd10b3e7942e61e31", "https://bcr.bazel.build/modules/rules_java/7.1.0/MODULE.bazel": "30d9135a2b6561c761bd67bd4990da591e6bdc128790ce3e7afd6a3558b2fb64", "https://bcr.bazel.build/modules/rules_java/7.10.0/MODULE.bazel": "530c3beb3067e870561739f1144329a21c851ff771cd752a49e06e3dc9c2e71a", "https://bcr.bazel.build/modules/rules_java/7.12.2/MODULE.bazel": "579c505165ee757a4280ef83cda0150eea193eed3bef50b1004ba88b99da6de6", "https://bcr.bazel.build/modules/rules_java/7.2.0/MODULE.bazel": "06c0334c9be61e6cef2c8c84a7800cef502063269a5af25ceb100b192453d4ab", + "https://bcr.bazel.build/modules/rules_java/7.3.2/MODULE.bazel": "50dece891cfdf1741ea230d001aa9c14398062f2b7c066470accace78e412bc2", "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel": "a592852f8a3dd539e82ee6542013bf2cadfc4c6946be8941e189d224500a8934", "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", - "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1", - "https://bcr.bazel.build/modules/rules_java/8.11.0/MODULE.bazel": "c3d280bc5ff1038dcb3bacb95d3f6b83da8dd27bba57820ec89ea4085da767ad", "https://bcr.bazel.build/modules/rules_java/8.13.0/MODULE.bazel": "0444ebf737d144cf2bb2ccb368e7f1cce735264285f2a3711785827c1686625e", - "https://bcr.bazel.build/modules/rules_java/8.13.0/source.json": "4605c0f676b87dd9d1fabd4d743b71f04d97503bd1a79aad53f87399fb5396de", + "https://bcr.bazel.build/modules/rules_java/8.14.0/MODULE.bazel": "717717ed40cc69994596a45aec6ea78135ea434b8402fb91b009b9151dd65615", + "https://bcr.bazel.build/modules/rules_java/8.16.1/MODULE.bazel": "0f20b1cecaa8e52f60a8f071e59a20b4e3b9a67f6c56c802ea256f6face692d3", + "https://bcr.bazel.build/modules/rules_java/8.16.1/source.json": "072f8d11264edc499621be2dc9ea01d6395db5aa6f8799c034ae01a3e857f2e4", "https://bcr.bazel.build/modules/rules_java/8.3.2/MODULE.bazel": "7336d5511ad5af0b8615fdc7477535a2e4e723a357b6713af439fe8cf0195017", "https://bcr.bazel.build/modules/rules_java/8.5.1/MODULE.bazel": "d8a9e38cc5228881f7055a6079f6f7821a073df3744d441978e7a43e20226939", "https://bcr.bazel.build/modules/rules_java/8.6.0/MODULE.bazel": "9c064c434606d75a086f15ade5edb514308cccd1544c2b2a89bbac4310e41c71", @@ -149,12 +166,15 @@ "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909", "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036", + "https://bcr.bazel.build/modules/rules_jvm_external/5.3/MODULE.bazel": "bf93870767689637164657731849fb887ad086739bd5d360d90007a581d5527d", + "https://bcr.bazel.build/modules/rules_jvm_external/6.1/MODULE.bazel": "75b5fec090dbd46cf9b7d8ea08cf84a0472d92ba3585b476f44c326eda8059c4", "https://bcr.bazel.build/modules/rules_jvm_external/6.10/MODULE.bazel": "33e636ca6bc9ee0fa090a38aa33c631ded2d8cf6fead4124181d1b35dc474f7c", "https://bcr.bazel.build/modules/rules_jvm_external/6.10/source.json": "c191249787625db72616a3fb3cc2786ab57355a2e3b615402b8b3b66b0f995b7", "https://bcr.bazel.build/modules/rules_jvm_external/6.2/MODULE.bazel": "36a6e52487a855f33cb960724eb56547fa87e2c98a0474c3acad94339d7f8e99", "https://bcr.bazel.build/modules/rules_jvm_external/6.3/MODULE.bazel": "c998e060b85f71e00de5ec552019347c8bca255062c990ac02d051bb80a38df0", "https://bcr.bazel.build/modules/rules_jvm_external/6.6/MODULE.bazel": "153042249c7060536dc95b6bb9f9bb8063b8a0b0cb7acdb381bddbc2374aed55", "https://bcr.bazel.build/modules/rules_jvm_external/6.7/MODULE.bazel": "e717beabc4d091ecb2c803c2d341b88590e9116b8bf7947915eeb33aab4f96dd", + "https://bcr.bazel.build/modules/rules_kotlin/1.9.0/MODULE.bazel": "ef85697305025e5a61f395d4eaede272a5393cee479ace6686dba707de804d59", "https://bcr.bazel.build/modules/rules_kotlin/1.9.5/MODULE.bazel": "043a16a572f610558ec2030db3ff0c9938574e7dd9f58bded1bb07c0192ef025", "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/MODULE.bazel": "d269a01a18ee74d0335450b10f62c9ed81f2321d7958a2934e44272fe82dcef3", "https://bcr.bazel.build/modules/rules_kotlin/2.1.3/MODULE.bazel": "ce7def6d576aa8d3a9c6d10e13b4d157296229674371f67dbf788dae0afae3d5", @@ -172,9 +192,9 @@ "https://bcr.bazel.build/modules/rules_proto/6.0.0/MODULE.bazel": "b531d7f09f58dce456cd61b4579ce8c86b38544da75184eadaf0a7cb7966453f", "https://bcr.bazel.build/modules/rules_proto/6.0.2/MODULE.bazel": "ce916b775a62b90b61888052a416ccdda405212b6aaeb39522f7dc53431a5e73", "https://bcr.bazel.build/modules/rules_proto/7.0.2/MODULE.bazel": "bf81793bd6d2ad89a37a40693e56c61b0ee30f7a7fdbaf3eabbf5f39de47dea2", - "https://bcr.bazel.build/modules/rules_proto/7.0.2/source.json": "1e5e7260ae32ef4f2b52fd1d0de8d03b606a44c91b694d2f1afb1d3b28a48ce1", + "https://bcr.bazel.build/modules/rules_proto/7.1.0/MODULE.bazel": "002d62d9108f75bb807cd56245d45648f38275cb3a99dcd45dfb864c5d74cb96", + "https://bcr.bazel.build/modules/rules_proto/7.1.0/source.json": "39f89066c12c24097854e8f57ab8558929f9c8d474d34b2c00ac04630ad8940e", "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f", - "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7", "https://bcr.bazel.build/modules/rules_python/0.23.1/MODULE.bazel": "49ffccf0511cb8414de28321f5fcf2a31312b47c40cc21577144b7447f2bf300", "https://bcr.bazel.build/modules/rules_python/0.25.0/MODULE.bazel": "72f1506841c920a1afec76975b35312410eea3aa7b63267436bfb1dd91d2d382", "https://bcr.bazel.build/modules/rules_python/0.28.0/MODULE.bazel": "cba2573d870babc976664a912539b320cbaa7114cd3e8f053c720171cde331ed", @@ -183,8 +203,10 @@ "https://bcr.bazel.build/modules/rules_python/0.37.1/MODULE.bazel": "3faeb2d9fa0a81f8980643ee33f212308f4d93eea4b9ce6f36d0b742e71e9500", "https://bcr.bazel.build/modules/rules_python/0.37.2/MODULE.bazel": "b5ffde91410745750b6c13be1c5dc4555ef5bc50562af4a89fd77807fdde626a", "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c", + "https://bcr.bazel.build/modules/rules_python/0.40.0/MODULE.bazel": "9d1a3cd88ed7d8e39583d9ffe56ae8a244f67783ae89b60caafc9f5cf318ada7", "https://bcr.bazel.build/modules/rules_python/1.0.0/MODULE.bazel": "898a3d999c22caa585eb062b600f88654bf92efb204fa346fb55f6f8edffca43", - "https://bcr.bazel.build/modules/rules_python/1.0.0/source.json": "b0162a65c6312e45e7912e39abd1a7f8856c2c7e41ecc9b6dc688a6f6400a917", + "https://bcr.bazel.build/modules/rules_python/1.4.1/MODULE.bazel": "8991ad45bdc25018301d6b7e1d3626afc3c8af8aaf4bc04f23d0b99c938b73a6", + "https://bcr.bazel.build/modules/rules_python/1.4.1/source.json": "8ec8c90c70ccacc4de8ca1b97f599e756fb59173e898ee08b733006650057c07", "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/MODULE.bazel": "d44fec647d0aeb67b9f3b980cf68ba634976f3ae7ccd6c07d790b59b87a4f251", "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/source.json": "37c10335f2361c337c5c1f34ed36d2da70534c23088062b33a8bdaab68aa9dea", "https://bcr.bazel.build/modules/rules_shell/0.1.2/MODULE.bazel": "66e4ca3ce084b04af0b9ff05ff14cab4e5df7503973818bb91cbc6cda08d32fc", @@ -197,8 +219,10 @@ "https://bcr.bazel.build/modules/rules_swift/2.1.1/source.json": "40fc69dfaac64deddbb75bd99cdac55f4427d9ca0afbe408576a65428427a186", "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c", + "https://bcr.bazel.build/modules/stardoc/0.5.6/MODULE.bazel": "c43dabc564990eeab55e25ed61c07a1aadafe9ece96a4efabb3f8bf9063b71ef", "https://bcr.bazel.build/modules/stardoc/0.6.2/MODULE.bazel": "7060193196395f5dd668eda046ccbeacebfd98efc77fed418dbe2b82ffaa39fd", "https://bcr.bazel.build/modules/stardoc/0.7.0/MODULE.bazel": "05e3d6d30c099b6770e97da986c53bd31844d7f13d41412480ea265ac9e8079c", + "https://bcr.bazel.build/modules/stardoc/0.7.1/MODULE.bazel": "3548faea4ee5dda5580f9af150e79d0f6aea934fc60c1cc50f4efdd9420759e7", "https://bcr.bazel.build/modules/stardoc/0.7.2/MODULE.bazel": "fc152419aa2ea0f51c29583fab1e8c99ddefd5b3778421845606ee628629e0e5", "https://bcr.bazel.build/modules/stardoc/0.7.2/source.json": "58b029e5e901d6802967754adf0a9056747e8176f017cfe3607c0851f4d42216", "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/MODULE.bazel": "5e463fbfba7b1701d957555ed45097d7f984211330106ccd1352c6e0af0dcf91", @@ -207,56 +231,26 @@ "https://bcr.bazel.build/modules/upb/0.0.0-20230516-61a97ef/MODULE.bazel": "c0df5e35ad55e264160417fd0875932ee3c9dda63d9fccace35ac62f45e1b6f9", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", - "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79", "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.5/MODULE.bazel": "eec517b5bbe5492629466e11dae908d043364302283de25581e3eb944326c4ca", "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.5/source.json": "22bc55c47af97246cfc093d0acf683a7869377de362b5d1c552c2c2e16b7a806", "https://bcr.bazel.build/modules/zlib/1.3.1/MODULE.bazel": "751c9940dcfe869f5f7274e1295422a34623555916eb98c174c1e945594bf198" }, "selectedYankedVersions": {}, "moduleExtensions": { - "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": { + "@@pybind11_bazel+//:internal_configure.bzl%internal_configure_extension": { "general": { - "bzlTransitiveDigest": "ltCGFbl/LQQZXn/LEMXfKX7pGwyqNiOCHcmiQW0tmjM=", - "usagesDigest": "eXsWd8YDJDt7+F94YtjKuTAIRMWBi9JLS8hUiqynRIY=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "local_config_apple_cc_toolchains": { - "bzlFile": "@@apple_support~//crosstool:setup.bzl", - "ruleClassName": "_apple_cc_autoconf_toolchains", - "attributes": {} - }, - "local_config_apple_cc": { - "bzlFile": "@@apple_support~//crosstool:setup.bzl", - "ruleClassName": "_apple_cc_autoconf", - "attributes": {} - } - }, - "recordedRepoMappingEntries": [ - [ - "apple_support~", - "bazel_tools", - "bazel_tools" - ] - ] - } - }, - "@@pybind11_bazel~//:internal_configure.bzl%internal_configure_extension": { - "general": { - "bzlTransitiveDigest": "CyAKLVVonohnkTSqg9II/HA7M49sOlnMkgMHL3CmDuc=", - "usagesDigest": "mFrTHX5eCiNU/OIIGVHH3cOILY9Zmjqk8RQYv8o6Thk=", + "bzlTransitiveDigest": "NFQjcZF+fAvf5fDH+pqsx4JrfzP9PuHBz6S6ZutIbnw=", + "usagesDigest": "D1r3lfzMuUBFxgG8V6o0bQTLMk3GkaGOaPzw53wrwyw=", "recordedFileInputs": { - "@@pybind11_bazel~//MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34" + "@@pybind11_bazel+//MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34" }, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "pybind11": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "build_file": "@@pybind11_bazel~//:pybind11-BUILD.bazel", + "build_file": "@@pybind11_bazel+//:pybind11-BUILD.bazel", "strip_prefix": "pybind11-2.12.0", "urls": [ "https://github.com/pybind/pybind11/archive/v2.12.0.zip" @@ -266,161 +260,181 @@ }, "recordedRepoMappingEntries": [ [ - "pybind11_bazel~", + "pybind11_bazel+", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_android~//bzlmod_extensions:apksig.bzl%apksig_extension": { + "@@rules_android+//bzlmod_extensions:apksig.bzl%apksig_extension": { "general": { - "bzlTransitiveDigest": "+fNvC5PNWx1aA64JjkW33+1zGbG9xgfi70xQhxbglhY=", - "usagesDigest": "TaGkNxVMBZxl1ANdUNPmIjKrA33bO+BpI06yTlpHdos=", + "bzlTransitiveDigest": "By9qVNN7G4oL1vYOJXye7Dp/CbR2ar9oxAW8WXAVcVw=", + "usagesDigest": "xq6OVkELeJvOgYo3oY/sUBsGFbcqdV+9BYiNgSPV/po=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "apksig": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { "url": "https://android.googlesource.com/platform/tools/apksig/+archive/24e3075e68ebe17c0b529bb24bfda819db5e2f3b.tar.gz", - "build_file": "@@rules_android~//bzlmod_extensions:apksig.BUILD" + "build_file": "@@rules_android+//bzlmod_extensions:apksig.BUILD" } } }, "recordedRepoMappingEntries": [ [ - "rules_android~", + "rules_android+", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_android~//bzlmod_extensions:com_android_dex.bzl%com_android_dex_extension": { + "@@rules_android+//bzlmod_extensions:com_android_dex.bzl%com_android_dex_extension": { "general": { - "bzlTransitiveDigest": "/KJvxHLYhvSLJihEHN0e5Uzdd7OOMvpFb0BFUl1RUTs=", - "usagesDigest": "fh77SU1OUlWN5ivrGpY93+t0MipuVj89/MMUgfTpSa8=", + "bzlTransitiveDigest": "rvWbJQc8jInfIAaXIMhSOqUlwM9HVeLey6q0ISvg08Y=", + "usagesDigest": "toF8IFMu98H/VU2p1sfVC5fVXVYJunpbbmtM6tOsQXY=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "com_android_dex": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { "url": "https://android.googlesource.com/platform/dalvik/+archive/5a81c499a569731e2395f7c8d13c0e0d4e17a2b6.tar.gz", - "build_file": "@@rules_android~//bzlmod_extensions:com_android_dex.BUILD" + "build_file": "@@rules_android+//bzlmod_extensions:com_android_dex.BUILD" } } }, "recordedRepoMappingEntries": [ [ - "rules_android~", + "rules_android+", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_android~//rules/android_sdk_repository:rule.bzl%android_sdk_repository_extension": { + "@@rules_android+//rules/android_sdk_repository:rule.bzl%android_sdk_repository_extension": { "general": { "bzlTransitiveDigest": "NAy+0M15JNVEBb8Tny6t7j3lKqTnsAMjoBB6LJ+C370=", - "usagesDigest": "weZLGEpNa+fTJZ9CEljWxpN3/kuPzj/ULgebzOt2h4g=", + "usagesDigest": "g9Ur6X6qhf9a8MmY9qXU/jFjkyk/aZVBegI0yVMF0z4=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "androidsdk": { - "bzlFile": "@@rules_android~//rules/android_sdk_repository:rule.bzl", - "ruleClassName": "_android_sdk_repository", + "repoRuleId": "@@rules_android+//rules/android_sdk_repository:rule.bzl%_android_sdk_repository", "attributes": {} } }, "recordedRepoMappingEntries": [] } }, - "@@rules_apple~//apple:apple.bzl%provisioning_profile_repository_extension": { + "@@rules_apple+//apple:apple.bzl%provisioning_profile_repository_extension": { "general": { - "bzlTransitiveDigest": "OLmLOE2zg0CXXzAR24XTccdOw39pMG2gG6R1VFOgDsE=", - "usagesDigest": "cLx5XGjlbSDOpyA053y/jlr4GcaXFVTeHQic6eyG38E=", + "bzlTransitiveDigest": "LKT4eTNHatc2Ti8tCILPSTYqQAc4030bEjspG/P+3TI=", + "usagesDigest": "vsJl8Rw5NL+5Ag2wdUDoTeRF/5klkXO8545Iy7U1Q08=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_provisioning_profiles": { - "bzlFile": "@@rules_apple~//apple/internal:local_provisioning_profiles.bzl", - "ruleClassName": "provisioning_profile_repository", + "repoRuleId": "@@rules_apple+//apple/internal:local_provisioning_profiles.bzl%provisioning_profile_repository", "attributes": {} } }, "recordedRepoMappingEntries": [ [ - "apple_support~", + "apple_support+", "bazel_skylib", - "bazel_skylib~" + "bazel_skylib+" + ], + [ + "bazel_tools", + "rules_cc", + "rules_cc+" ], [ - "rules_apple~", + "rules_apple+", "bazel_skylib", - "bazel_skylib~" + "bazel_skylib+" ], [ - "rules_apple~", + "rules_apple+", "bazel_tools", "bazel_tools" ], [ - "rules_apple~", + "rules_apple+", "build_bazel_apple_support", - "apple_support~" + "apple_support+" ], [ - "rules_apple~", + "rules_apple+", "build_bazel_rules_swift", - "rules_swift~" + "rules_swift+" + ], + [ + "rules_cc+", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_cc+", + "cc_compatibility_proxy", + "rules_cc++compatibility_proxy+cc_compatibility_proxy" + ], + [ + "rules_cc+", + "rules_cc", + "rules_cc+" + ], + [ + "rules_cc++compatibility_proxy+cc_compatibility_proxy", + "rules_cc", + "rules_cc+" ], [ - "rules_swift~", + "rules_swift+", "bazel_skylib", - "bazel_skylib~" + "bazel_skylib+" ], [ - "rules_swift~", + "rules_swift+", "bazel_tools", "bazel_tools" ], [ - "rules_swift~", + "rules_swift+", "build_bazel_apple_support", - "apple_support~" + "apple_support+" ], [ - "rules_swift~", + "rules_swift+", "build_bazel_rules_swift", - "rules_swift~" + "rules_swift+" ], [ - "rules_swift~", + "rules_swift+", "build_bazel_rules_swift_local_config", - "rules_swift~~non_module_deps~build_bazel_rules_swift_local_config" + "rules_swift++non_module_deps+build_bazel_rules_swift_local_config" ] ] } }, - "@@rules_apple~//apple:extensions.bzl%non_module_deps": { + "@@rules_apple+//apple:extensions.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "LJ3bhNqfW9y6MZFgtKQoPJyUMg/aEZ8H9QXSzK1VOBk=", - "usagesDigest": "5FfEPy/Z0Y2V9RbdJRDabgADFdvlfIIrps/5XYOnMNI=", + "bzlTransitiveDigest": "4xtddSlWIQdtVNVuvOI62fJfQVETHZCVWFvYYwQHMR4=", + "usagesDigest": "M3VqFpeTCo4qmrNKGZw0dxBHvTYDrfV3cscGzlSAhQ4=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "xctestrunner": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { "urls": [ "https://github.com/google/xctestrunner/archive/b7698df3d435b6491b4b4c0f9fc7a63fbed5e3a6.tar.gz" @@ -432,24 +446,23 @@ }, "recordedRepoMappingEntries": [ [ - "rules_apple~", + "rules_apple+", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_kotlin~//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": { + "@@rules_kotlin+//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": { "general": { - "bzlTransitiveDigest": "BSndOxBXlbe5qZf1NRxf828dpEK6tM429pCnaFoUFYs=", - "usagesDigest": "Dg5Nih77FaLAipQB7wgwsAy553a3po0eNGQVTZKgCM8=", + "bzlTransitiveDigest": "HJP3wKFbPhB1mSYjJS6kbXEiP+OQxvsBdqpvyJN6I3s=", + "usagesDigest": "qTwqmKKUfWcPdvM0waG+CPWrxsbeAWVeUxavm7tEk9E=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "com_github_jetbrains_kotlin_git": { - "bzlFile": "@@rules_kotlin~//src/main/starlark/core/repositories:compiler.bzl", - "ruleClassName": "kotlin_compiler_git_repository", + "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:compiler.bzl%kotlin_compiler_git_repository", "attributes": { "urls": [ "https://github.com/JetBrains/kotlin/releases/download/v2.1.0/kotlin-compiler-2.1.0.zip" @@ -458,16 +471,14 @@ } }, "com_github_jetbrains_kotlin": { - "bzlFile": "@@rules_kotlin~//src/main/starlark/core/repositories:compiler.bzl", - "ruleClassName": "kotlin_capabilities_repository", + "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:compiler.bzl%kotlin_capabilities_repository", "attributes": { "git_repository_name": "com_github_jetbrains_kotlin_git", "compiler_version": "2.1.0" } }, "com_github_google_ksp": { - "bzlFile": "@@rules_kotlin~//src/main/starlark/core/repositories:ksp.bzl", - "ruleClassName": "ksp_compiler_plugin_repository", + "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:ksp.bzl%ksp_compiler_plugin_repository", "attributes": { "urls": [ "https://github.com/google/ksp/releases/download/2.1.0-1.0.28/artifacts.zip" @@ -477,8 +488,7 @@ } }, "com_github_pinterest_ktlint": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_file", "attributes": { "sha256": "a9f923be58fbd32670a17f0b729b1df804af882fa57402165741cb26e5440ca1", "urls": [ @@ -488,8 +498,7 @@ } }, "kotlinx_serialization_core_jvm": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_jar", + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_jar", "attributes": { "sha256": "29c821a8d4e25cbfe4f2ce96cdd4526f61f8f4e69a135f9612a34a81d93b65f1", "urls": [ @@ -498,8 +507,7 @@ } }, "kotlinx_serialization_json": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_jar", + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_jar", "attributes": { "sha256": "8c0016890a79ab5980dd520a5ab1a6738023c29aa3b6437c482e0e5fdc06dab1", "urls": [ @@ -508,8 +516,7 @@ } }, "kotlinx_serialization_json_jvm": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_jar", + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_jar", "attributes": { "sha256": "d3234179bcff1886d53d67c11eca47f7f3cf7b63c349d16965f6db51b7f3dd9a", "urls": [ @@ -520,2771 +527,208 @@ }, "recordedRepoMappingEntries": [ [ - "rules_kotlin~", + "rules_kotlin+", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_python~//python/extensions:pip.bzl%pip": { + "@@rules_python+//python/uv:uv.bzl%uv": { "general": { - "bzlTransitiveDigest": "AMoojKsX4Iw9GcO0xHbXz11GhPs9wzQ+Ua4OZ3muUzw=", - "usagesDigest": "ZVqDJcq4jlkbKBvSiotiO7ElR126/eiKOiKURsvOcoA=", - "recordedFileInputs": { - "@@rules_python~//tools/publish/requirements_linux.txt": "8175b4c8df50ae2f22d1706961884beeb54e7da27bd2447018314a175981997d", - "@@rules_python~//tools/publish/requirements_windows.txt": "7673adc71dc1a81d3661b90924d7a7c0fc998cd508b3cb4174337cef3f2de556", - "@@rules_python~//tools/publish/requirements_darwin.txt": "2994136eab7e57b083c3de76faf46f70fad130bc8e7360a7fed2b288b69e79dc" - }, + "bzlTransitiveDigest": "Xpqjnjzy6zZ90Es9Wa888ZLHhn7IsNGbph/e6qoxzw8=", + "usagesDigest": "4JapxcpS0mL3524k0TZJffAtVyuRjDHZvN9kBRxxF1U=", + "recordedFileInputs": {}, "recordedDirentsInputs": {}, - "envVariables": { - "RULES_PYTHON_REPO_DEBUG": null, - "RULES_PYTHON_REPO_DEBUG_VERBOSITY": null - }, + "envVariables": {}, "generatedRepoSpecs": { - "rules_python_publish_deps_311_backports_tarfile_py3_none_any_77e284d7": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "backports.tarfile-1.2.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "backports-tarfile==1.2.0", - "sha256": "77e284d754527b01fb1e6fa8a1afe577858ebe4e9dad8919e34c862cb399bc34", - "urls": [ - "https://files.pythonhosted.org/packages/b9/fa/123043af240e49752f1c4bd24da5053b6bd00cad78c2be53c0d1e8b975bc/backports.tarfile-1.2.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_backports_tarfile_sdist_d75e02c2": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "backports_tarfile-1.2.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "backports-tarfile==1.2.0", - "sha256": "d75e02c268746e1b8144c278978b6e98e85de6ad16f8e4b0844a154557eca991", - "urls": [ - "https://files.pythonhosted.org/packages/86/72/cd9b395f25e290e633655a100af28cb253e4393396264a98bd5f5951d50f/backports_tarfile-1.2.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_certifi_py3_none_any_922820b5": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "certifi-2024.8.30-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "certifi==2024.8.30", - "sha256": "922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8", - "urls": [ - "https://files.pythonhosted.org/packages/12/90/3c9ff0512038035f59d279fddeb79f5f1eccd8859f06d6163c58798b9487/certifi-2024.8.30-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_certifi_sdist_bec941d2": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "certifi-2024.8.30.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "certifi==2024.8.30", - "sha256": "bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9", - "urls": [ - "https://files.pythonhosted.org/packages/b0/ee/9b19140fe824b367c04c5e1b369942dd754c4c5462d5674002f75c4dedc1/certifi-2024.8.30.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_cffi_cp311_cp311_manylinux_2_17_aarch64_a1ed2dd2": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cffi-1.17.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cffi==1.17.1", - "sha256": "a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41", - "urls": [ - "https://files.pythonhosted.org/packages/2e/ea/70ce63780f096e16ce8588efe039d3c4f91deb1dc01e9c73a287939c79a6/cffi-1.17.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - ] - } - }, - "rules_python_publish_deps_311_cffi_cp311_cp311_manylinux_2_17_ppc64le_46bf4316": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cffi-1.17.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cffi==1.17.1", - "sha256": "46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1", - "urls": [ - "https://files.pythonhosted.org/packages/1c/a0/a4fa9f4f781bda074c3ddd57a572b060fa0df7655d2a4247bbe277200146/cffi-1.17.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" - ] - } - }, - "rules_python_publish_deps_311_cffi_cp311_cp311_manylinux_2_17_s390x_a24ed04c": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cffi-1.17.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cffi==1.17.1", - "sha256": "a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6", - "urls": [ - "https://files.pythonhosted.org/packages/62/12/ce8710b5b8affbcdd5c6e367217c242524ad17a02fe5beec3ee339f69f85/cffi-1.17.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl" - ] - } - }, - "rules_python_publish_deps_311_cffi_cp311_cp311_manylinux_2_17_x86_64_610faea7": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cffi-1.17.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cffi==1.17.1", - "sha256": "610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d", - "urls": [ - "https://files.pythonhosted.org/packages/ff/6b/d45873c5e0242196f042d555526f92aa9e0c32355a1be1ff8c27f077fd37/cffi-1.17.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - ] - } - }, - "rules_python_publish_deps_311_cffi_cp311_cp311_musllinux_1_1_aarch64_a9b15d49": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cffi-1.17.1-cp311-cp311-musllinux_1_1_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cffi==1.17.1", - "sha256": "a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6", - "urls": [ - "https://files.pythonhosted.org/packages/1a/52/d9a0e523a572fbccf2955f5abe883cfa8bcc570d7faeee06336fbd50c9fc/cffi-1.17.1-cp311-cp311-musllinux_1_1_aarch64.whl" - ] - } - }, - "rules_python_publish_deps_311_cffi_cp311_cp311_musllinux_1_1_x86_64_fc48c783": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cffi-1.17.1-cp311-cp311-musllinux_1_1_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cffi==1.17.1", - "sha256": "fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b", - "urls": [ - "https://files.pythonhosted.org/packages/f8/4a/34599cac7dfcd888ff54e801afe06a19c17787dfd94495ab0c8d35fe99fb/cffi-1.17.1-cp311-cp311-musllinux_1_1_x86_64.whl" - ] - } - }, - "rules_python_publish_deps_311_cffi_sdist_1c39c601": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "uv": { + "repoRuleId": "@@rules_python+//python/uv/private:uv_toolchains_repo.bzl%uv_toolchains_repo", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" + "toolchain_type": "'@@rules_python+//python/uv:uv_toolchain_type'", + "toolchain_names": [ + "none" ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "cffi-1.17.1.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cffi==1.17.1", - "sha256": "1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824", - "urls": [ - "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz" - ] + "toolchain_implementations": { + "none": "'@@rules_python+//python:none'" + }, + "toolchain_compatible_with": { + "none": [ + "@platforms//:incompatible" + ] + }, + "toolchain_target_settings": {} } - }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_macosx_10_9_universal2_0d99dd8f": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + } + }, + "recordedRepoMappingEntries": [ + [ + "rules_python+", + "platforms", + "platforms" + ] + ] + } + }, + "@@rules_swift+//swift:extensions.bzl%non_module_deps": { + "general": { + "bzlTransitiveDigest": "6axDCXf6fQoPav8hojnUBxGA0FAMqLvtpC1cRsisCdw=", + "usagesDigest": "mhACFnrdMv9Wi0Mt67bxocJqviRkDSV+Ee5Mqdj5akA=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "com_github_apple_swift_protobuf": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_universal2.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c", "urls": [ - "https://files.pythonhosted.org/packages/9c/61/73589dcc7a719582bf56aae309b6103d2762b526bffe189d635a7fcfd998/charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_universal2.whl" - ] - } - }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_macosx_10_9_x86_64_c57516e5": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" + "https://github.com/apple/swift-protobuf/archive/1.20.2.tar.gz" ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944", - "urls": [ - "https://files.pythonhosted.org/packages/77/d5/8c982d58144de49f59571f940e329ad6e8615e1e82ef84584c5eeb5e1d72/charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_x86_64.whl" - ] + "sha256": "3fb50bd4d293337f202d917b6ada22f9548a0a0aed9d9a4d791e6fbd8a246ebb", + "strip_prefix": "swift-protobuf-1.20.2/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_protobuf/BUILD.overlay" } }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_macosx_11_0_arm64_6dba5d19": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_grpc_grpc_swift": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-macosx_11_0_arm64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee", "urls": [ - "https://files.pythonhosted.org/packages/bf/19/411a64f01ee971bed3231111b69eb56f9331a769072de479eae7de52296d/charset_normalizer-3.4.0-cp311-cp311-macosx_11_0_arm64.whl" - ] - } - }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_manylinux_2_17_aarch64_bf4475b8": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" + "https://github.com/grpc/grpc-swift/archive/1.16.0.tar.gz" ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c", - "urls": [ - "https://files.pythonhosted.org/packages/4c/92/97509850f0d00e9f14a46bc751daabd0ad7765cff29cdfb66c68b6dad57f/charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - ] + "sha256": "58b60431d0064969f9679411264b82e40a217ae6bd34e17096d92cc4e47556a5", + "strip_prefix": "grpc-swift-1.16.0/", + "build_file": "@@rules_swift+//third_party:com_github_grpc_grpc_swift/BUILD.overlay" } }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_manylinux_2_17_ppc64le_ce031db0": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_docc_symbolkit": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6", "urls": [ - "https://files.pythonhosted.org/packages/e2/29/d227805bff72ed6d6cb1ce08eec707f7cfbd9868044893617eb331f16295/charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" - ] - } - }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_manylinux_2_17_s390x_8ff4e7cd": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" + "https://github.com/apple/swift-docc-symbolkit/archive/refs/tags/swift-5.10-RELEASE.tar.gz" ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea", - "urls": [ - "https://files.pythonhosted.org/packages/13/bc/87c2c9f2c144bedfa62f894c3007cd4530ba4b5351acb10dc786428a50f0/charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl" - ] + "sha256": "de1d4b6940468ddb53b89df7aa1a81323b9712775b0e33e8254fa0f6f7469a97", + "strip_prefix": "swift-docc-symbolkit-swift-5.10-RELEASE", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_docc_symbolkit/BUILD.overlay" } }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_manylinux_2_17_x86_64_3710a975": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_nio": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc", "urls": [ - "https://files.pythonhosted.org/packages/eb/5b/6f10bad0f6461fa272bfbbdf5d0023b5fb9bc6217c92bf068fa5a99820f5/charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - ] - } - }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_musllinux_1_2_aarch64_47334db7": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" + "https://github.com/apple/swift-nio/archive/2.42.0.tar.gz" ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594", - "urls": [ - "https://files.pythonhosted.org/packages/d7/a1/493919799446464ed0299c8eef3c3fad0daf1c3cd48bff9263c731b0d9e2/charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_aarch64.whl" - ] + "sha256": "e3304bc3fb53aea74a3e54bd005ede11f6dc357117d9b1db642d03aea87194a0", + "strip_prefix": "swift-nio-2.42.0/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio/BUILD.overlay" } }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_musllinux_1_2_ppc64le_f1a2f519": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_nio_http2": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365", "urls": [ - "https://files.pythonhosted.org/packages/75/d2/0ab54463d3410709c09266dfb416d032a08f97fd7d60e94b8c6ef54ae14b/charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl" - ] - } - }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_musllinux_1_2_s390x_63bc5c4a": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" + "https://github.com/apple/swift-nio-http2/archive/1.26.0.tar.gz" ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_s390x.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129", - "urls": [ - "https://files.pythonhosted.org/packages/8d/c9/27e41d481557be53d51e60750b85aa40eaf52b841946b3cdeff363105737/charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_s390x.whl" - ] + "sha256": "f0edfc9d6a7be1d587e5b403f2d04264bdfae59aac1d74f7d974a9022c6d2b25", + "strip_prefix": "swift-nio-http2-1.26.0/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_http2/BUILD.overlay" } }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_musllinux_1_2_x86_64_bcb4f8ea": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_nio_transport_services": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236", "urls": [ - "https://files.pythonhosted.org/packages/ee/44/4f62042ca8cdc0cabf87c0fc00ae27cd8b53ab68be3605ba6d071f742ad3/charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_x86_64.whl" - ] - } - }, - "rules_python_publish_deps_311_charset_normalizer_cp311_cp311_win_amd64_cee4373f": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" + "https://github.com/apple/swift-nio-transport-services/archive/1.15.0.tar.gz" ], - "filename": "charset_normalizer-3.4.0-cp311-cp311-win_amd64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27", - "urls": [ - "https://files.pythonhosted.org/packages/0b/6e/b13bd47fa9023b3699e94abf565b5a2f0b0be6e9ddac9812182596ee62e4/charset_normalizer-3.4.0-cp311-cp311-win_amd64.whl" - ] + "sha256": "f3498dafa633751a52b9b7f741f7ac30c42bcbeb3b9edca6d447e0da8e693262", + "strip_prefix": "swift-nio-transport-services-1.15.0/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_transport_services/BUILD.overlay" } }, - "rules_python_publish_deps_311_charset_normalizer_py3_none_any_fe9f97fe": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_nio_extras": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "charset_normalizer-3.4.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079", "urls": [ - "https://files.pythonhosted.org/packages/bf/9b/08c0432272d77b04803958a4598a51e2a4b51c06640af8b8f0f908c18bf2/charset_normalizer-3.4.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_charset_normalizer_sdist_223217c3": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" + "https://github.com/apple/swift-nio-extras/archive/1.4.0.tar.gz" ], - "filename": "charset_normalizer-3.4.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "charset-normalizer==3.4.0", - "sha256": "223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e", - "urls": [ - "https://files.pythonhosted.org/packages/f2/4f/e1808dc01273379acc506d18f1504eb2d299bd4131743b9fc54d7be4df1e/charset_normalizer-3.4.0.tar.gz" - ] + "sha256": "4684b52951d9d9937bb3e8ccd6b5daedd777021ef2519ea2f18c4c922843b52b", + "strip_prefix": "swift-nio-extras-1.4.0/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_extras/BUILD.overlay" } }, - "rules_python_publish_deps_311_cryptography_cp39_abi3_manylinux_2_17_aarch64_846da004": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_log": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cryptography-43.0.3-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cryptography==43.0.3", - "sha256": "846da004a5804145a5f441b8530b4bf35afbf7da70f82409f151695b127213d5", "urls": [ - "https://files.pythonhosted.org/packages/2f/78/55356eb9075d0be6e81b59f45c7b48df87f76a20e73893872170471f3ee8/cryptography-43.0.3-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - ] - } - }, - "rules_python_publish_deps_311_cryptography_cp39_abi3_manylinux_2_17_x86_64_0f996e72": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" + "https://github.com/apple/swift-log/archive/1.4.4.tar.gz" ], - "filename": "cryptography-43.0.3-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cryptography==43.0.3", - "sha256": "0f996e7268af62598f2fc1204afa98a3b5712313a55c4c9d434aef49cadc91d4", - "urls": [ - "https://files.pythonhosted.org/packages/2a/2c/488776a3dc843f95f86d2f957ca0fc3407d0242b50bede7fad1e339be03f/cryptography-43.0.3-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - ] + "sha256": "48fe66426c784c0c20031f15dc17faf9f4c9037c192bfac2f643f65cb2321ba0", + "strip_prefix": "swift-log-1.4.4/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_log/BUILD.overlay" } }, - "rules_python_publish_deps_311_cryptography_cp39_abi3_manylinux_2_28_aarch64_f7b178f1": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_nio_ssl": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cryptography-43.0.3-cp39-abi3-manylinux_2_28_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cryptography==43.0.3", - "sha256": "f7b178f11ed3664fd0e995a47ed2b5ff0a12d893e41dd0494f406d1cf555cab7", "urls": [ - "https://files.pythonhosted.org/packages/7c/04/2345ca92f7a22f601a9c62961741ef7dd0127c39f7310dffa0041c80f16f/cryptography-43.0.3-cp39-abi3-manylinux_2_28_aarch64.whl" - ] - } - }, - "rules_python_publish_deps_311_cryptography_cp39_abi3_manylinux_2_28_x86_64_c2e6fc39": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" + "https://github.com/apple/swift-nio-ssl/archive/2.23.0.tar.gz" ], - "filename": "cryptography-43.0.3-cp39-abi3-manylinux_2_28_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cryptography==43.0.3", - "sha256": "c2e6fc39c4ab499049df3bdf567f768a723a5e8464816e8f009f121a5a9f4405", - "urls": [ - "https://files.pythonhosted.org/packages/ac/25/e715fa0bc24ac2114ed69da33adf451a38abb6f3f24ec207908112e9ba53/cryptography-43.0.3-cp39-abi3-manylinux_2_28_x86_64.whl" - ] + "sha256": "4787c63f61dd04d99e498adc3d1a628193387e41efddf8de19b8db04544d016d", + "strip_prefix": "swift-nio-ssl-2.23.0/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_ssl/BUILD.overlay" } }, - "rules_python_publish_deps_311_cryptography_cp39_abi3_musllinux_1_2_aarch64_e1be4655": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_collections": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "cryptography-43.0.3-cp39-abi3-musllinux_1_2_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cryptography==43.0.3", - "sha256": "e1be4655c7ef6e1bbe6b5d0403526601323420bcf414598955968c9ef3eb7d16", "urls": [ - "https://files.pythonhosted.org/packages/21/ce/b9c9ff56c7164d8e2edfb6c9305045fbc0df4508ccfdb13ee66eb8c95b0e/cryptography-43.0.3-cp39-abi3-musllinux_1_2_aarch64.whl" - ] - } - }, - "rules_python_publish_deps_311_cryptography_cp39_abi3_musllinux_1_2_x86_64_df6b6c6d": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" + "https://github.com/apple/swift-collections/archive/1.0.4.tar.gz" ], - "filename": "cryptography-43.0.3-cp39-abi3-musllinux_1_2_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cryptography==43.0.3", - "sha256": "df6b6c6d742395dd77a23ea3728ab62f98379eff8fb61be2744d4679ab678f73", - "urls": [ - "https://files.pythonhosted.org/packages/2a/33/b3682992ab2e9476b9c81fff22f02c8b0a1e6e1d49ee1750a67d85fd7ed2/cryptography-43.0.3-cp39-abi3-musllinux_1_2_x86_64.whl" - ] + "sha256": "d9e4c8a91c60fb9c92a04caccbb10ded42f4cb47b26a212bc6b39cc390a4b096", + "strip_prefix": "swift-collections-1.0.4/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_collections/BUILD.overlay" } }, - "rules_python_publish_deps_311_cryptography_sdist_315b9001": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "com_github_apple_swift_atomics": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "cryptography-43.0.3.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "cryptography==43.0.3", - "sha256": "315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805", "urls": [ - "https://files.pythonhosted.org/packages/0d/05/07b55d1fa21ac18c3a8c79f764e2514e6f6a9698f1be44994f5adf0d29db/cryptography-43.0.3.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_docutils_py3_none_any_dafca5b9": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" + "https://github.com/apple/swift-atomics/archive/1.1.0.tar.gz" ], - "filename": "docutils-0.21.2-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "docutils==0.21.2", - "sha256": "dafca5b9e384f0e419294eb4d2ff9fa826435bf15f15b7bd45723e8ad76811b2", - "urls": [ - "https://files.pythonhosted.org/packages/8f/d7/9322c609343d929e75e7e5e6255e614fcc67572cfd083959cdef3b7aad79/docutils-0.21.2-py3-none-any.whl" - ] + "sha256": "1bee7f469f7e8dc49f11cfa4da07182fbc79eab000ec2c17bfdce468c5d276fb", + "strip_prefix": "swift-atomics-1.1.0/", + "build_file": "@@rules_swift+//third_party:com_github_apple_swift_atomics/BUILD.overlay" } }, - "rules_python_publish_deps_311_docutils_sdist_3a6b1873": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", + "build_bazel_rules_swift_index_import": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "docutils-0.21.2.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "docutils==0.21.2", - "sha256": "3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f", + "build_file": "@@rules_swift+//third_party:build_bazel_rules_swift_index_import/BUILD.overlay", + "canonical_id": "index-import-5.8", "urls": [ - "https://files.pythonhosted.org/packages/ae/ed/aefcc8cd0ba62a0560c3c18c33925362d46c6075480bfa4df87b28e169a9/docutils-0.21.2.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_idna_py3_none_any_946d195a": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" + "https://github.com/MobileNativeFoundation/index-import/releases/download/5.8.0.1/index-import.tar.gz" ], - "filename": "idna-3.10-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "idna==3.10", - "sha256": "946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", - "urls": [ - "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_idna_sdist_12f65c9b": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "idna-3.10.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "idna==3.10", - "sha256": "12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", - "urls": [ - "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_importlib_metadata_py3_none_any_45e54197": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "importlib_metadata-8.5.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "importlib-metadata==8.5.0", - "sha256": "45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b", - "urls": [ - "https://files.pythonhosted.org/packages/a0/d9/a1e041c5e7caa9a05c925f4bdbdfb7f006d1f74996af53467bc394c97be7/importlib_metadata-8.5.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_importlib_metadata_sdist_71522656": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "importlib_metadata-8.5.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "importlib-metadata==8.5.0", - "sha256": "71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7", - "urls": [ - "https://files.pythonhosted.org/packages/cd/12/33e59336dca5be0c398a7482335911a33aa0e20776128f038019f1a95f1b/importlib_metadata-8.5.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_jaraco_classes_py3_none_any_f662826b": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "jaraco.classes-3.4.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "jaraco-classes==3.4.0", - "sha256": "f662826b6bed8cace05e7ff873ce0f9283b5c924470fe664fff1c2f00f581790", - "urls": [ - "https://files.pythonhosted.org/packages/7f/66/b15ce62552d84bbfcec9a4873ab79d993a1dd4edb922cbfccae192bd5b5f/jaraco.classes-3.4.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_jaraco_classes_sdist_47a024b5": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "jaraco.classes-3.4.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "jaraco-classes==3.4.0", - "sha256": "47a024b51d0239c0dd8c8540c6c7f484be3b8fcf0b2d85c13825780d3b3f3acd", - "urls": [ - "https://files.pythonhosted.org/packages/06/c0/ed4a27bc5571b99e3cff68f8a9fa5b56ff7df1c2251cc715a652ddd26402/jaraco.classes-3.4.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_jaraco_context_py3_none_any_f797fc48": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "jaraco.context-6.0.1-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "jaraco-context==6.0.1", - "sha256": "f797fc481b490edb305122c9181830a3a5b76d84ef6d1aef2fb9b47ab956f9e4", - "urls": [ - "https://files.pythonhosted.org/packages/ff/db/0c52c4cf5e4bd9f5d7135ec7669a3a767af21b3a308e1ed3674881e52b62/jaraco.context-6.0.1-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_jaraco_context_sdist_9bae4ea5": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "jaraco_context-6.0.1.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "jaraco-context==6.0.1", - "sha256": "9bae4ea555cf0b14938dc0aee7c9f32ed303aa20a3b73e7dc80111628792d1b3", - "urls": [ - "https://files.pythonhosted.org/packages/df/ad/f3777b81bf0b6e7bc7514a1656d3e637b2e8e15fab2ce3235730b3e7a4e6/jaraco_context-6.0.1.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_jaraco_functools_py3_none_any_ad159f13": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "jaraco.functools-4.1.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "jaraco-functools==4.1.0", - "sha256": "ad159f13428bc4acbf5541ad6dec511f91573b90fba04df61dafa2a1231cf649", - "urls": [ - "https://files.pythonhosted.org/packages/9f/4f/24b319316142c44283d7540e76c7b5a6dbd5db623abd86bb7b3491c21018/jaraco.functools-4.1.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_jaraco_functools_sdist_70f7e0e2": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "jaraco_functools-4.1.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "jaraco-functools==4.1.0", - "sha256": "70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d", - "urls": [ - "https://files.pythonhosted.org/packages/ab/23/9894b3df5d0a6eb44611c36aec777823fc2e07740dabbd0b810e19594013/jaraco_functools-4.1.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_jeepney_py3_none_any_c0a454ad": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "jeepney-0.8.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "jeepney==0.8.0", - "sha256": "c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755", - "urls": [ - "https://files.pythonhosted.org/packages/ae/72/2a1e2290f1ab1e06f71f3d0f1646c9e4634e70e1d37491535e19266e8dc9/jeepney-0.8.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_jeepney_sdist_5efe48d2": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "jeepney-0.8.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "jeepney==0.8.0", - "sha256": "5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806", - "urls": [ - "https://files.pythonhosted.org/packages/d6/f4/154cf374c2daf2020e05c3c6a03c91348d59b23c5366e968feb198306fdf/jeepney-0.8.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_keyring_py3_none_any_5426f817": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "keyring-25.4.1-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "keyring==25.4.1", - "sha256": "5426f817cf7f6f007ba5ec722b1bcad95a75b27d780343772ad76b17cb47b0bf", - "urls": [ - "https://files.pythonhosted.org/packages/83/25/e6d59e5f0a0508d0dca8bb98c7f7fd3772fc943ac3f53d5ab18a218d32c0/keyring-25.4.1-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_keyring_sdist_b07ebc55": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "keyring-25.4.1.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "keyring==25.4.1", - "sha256": "b07ebc55f3e8ed86ac81dd31ef14e81ace9dd9c3d4b5d77a6e9a2016d0d71a1b", - "urls": [ - "https://files.pythonhosted.org/packages/a5/1c/2bdbcfd5d59dc6274ffb175bc29aa07ecbfab196830e0cfbde7bd861a2ea/keyring-25.4.1.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_markdown_it_py_py3_none_any_35521684": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "markdown_it_py-3.0.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "markdown-it-py==3.0.0", - "sha256": "355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1", - "urls": [ - "https://files.pythonhosted.org/packages/42/d7/1ec15b46af6af88f19b8e5ffea08fa375d433c998b8a7639e76935c14f1f/markdown_it_py-3.0.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_markdown_it_py_sdist_e3f60a94": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "markdown-it-py-3.0.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "markdown-it-py==3.0.0", - "sha256": "e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb", - "urls": [ - "https://files.pythonhosted.org/packages/38/71/3b932df36c1a044d397a1f92d1cf91ee0a503d91e470cbd670aa66b07ed0/markdown-it-py-3.0.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_mdurl_py3_none_any_84008a41": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "mdurl-0.1.2-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "mdurl==0.1.2", - "sha256": "84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", - "urls": [ - "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_mdurl_sdist_bb413d29": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "mdurl-0.1.2.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "mdurl==0.1.2", - "sha256": "bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", - "urls": [ - "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_more_itertools_py3_none_any_037b0d32": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "more_itertools-10.5.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "more-itertools==10.5.0", - "sha256": "037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef", - "urls": [ - "https://files.pythonhosted.org/packages/48/7e/3a64597054a70f7c86eb0a7d4fc315b8c1ab932f64883a297bdffeb5f967/more_itertools-10.5.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_more_itertools_sdist_5482bfef": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "more-itertools-10.5.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "more-itertools==10.5.0", - "sha256": "5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6", - "urls": [ - "https://files.pythonhosted.org/packages/51/78/65922308c4248e0eb08ebcbe67c95d48615cc6f27854b6f2e57143e9178f/more-itertools-10.5.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_macosx_10_12_x86_64_14c5a72e": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "14c5a72e9fe82aea5fe3072116ad4661af5cf8e8ff8fc5ad3450f123e4925e86", - "urls": [ - "https://files.pythonhosted.org/packages/b3/89/1daff5d9ba5a95a157c092c7c5f39b8dd2b1ddb4559966f808d31cfb67e0/nh3-0.2.18-cp37-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_macosx_10_12_x86_64_7b7c2a3c": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-macosx_10_12_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "7b7c2a3c9eb1a827d42539aa64091640bd275b81e097cd1d8d82ef91ffa2e811", - "urls": [ - "https://files.pythonhosted.org/packages/2c/b6/42fc3c69cabf86b6b81e4c051a9b6e249c5ba9f8155590222c2622961f58/nh3-0.2.18-cp37-abi3-macosx_10_12_x86_64.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_aarch64_42c64511": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "42c64511469005058cd17cc1537578eac40ae9f7200bedcfd1fc1a05f4f8c200", - "urls": [ - "https://files.pythonhosted.org/packages/45/b9/833f385403abaf0023c6547389ec7a7acf141ddd9d1f21573723a6eab39a/nh3-0.2.18-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_armv7l_0411beb0": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "0411beb0589eacb6734f28d5497ca2ed379eafab8ad8c84b31bb5c34072b7164", - "urls": [ - "https://files.pythonhosted.org/packages/05/2b/85977d9e11713b5747595ee61f381bc820749daf83f07b90b6c9964cf932/nh3-0.2.18-cp37-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_ppc64_5f36b271": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "5f36b271dae35c465ef5e9090e1fdaba4a60a56f0bb0ba03e0932a66f28b9189", - "urls": [ - "https://files.pythonhosted.org/packages/72/f2/5c894d5265ab80a97c68ca36f25c8f6f0308abac649aaf152b74e7e854a8/nh3-0.2.18-cp37-abi3-manylinux_2_17_ppc64.manylinux2014_ppc64.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_ppc64le_34c03fa7": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "34c03fa78e328c691f982b7c03d4423bdfd7da69cd707fe572f544cf74ac23ad", - "urls": [ - "https://files.pythonhosted.org/packages/ab/a7/375afcc710dbe2d64cfbd69e31f82f3e423d43737258af01f6a56d844085/nh3-0.2.18-cp37-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_s390x_19aaba96": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "19aaba96e0f795bd0a6c56291495ff59364f4300d4a39b29a0abc9cb3774a84b", - "urls": [ - "https://files.pythonhosted.org/packages/c2/a8/3bb02d0c60a03ad3a112b76c46971e9480efa98a8946677b5a59f60130ca/nh3-0.2.18-cp37-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_x86_64_de3ceed6": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "de3ceed6e661954871d6cd78b410213bdcb136f79aafe22aa7182e028b8c7307", - "urls": [ - "https://files.pythonhosted.org/packages/1b/63/6ab90d0e5225ab9780f6c9fb52254fa36b52bb7c188df9201d05b647e5e1/nh3-0.2.18-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_musllinux_1_2_aarch64_f0eca9ca": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-musllinux_1_2_aarch64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "f0eca9ca8628dbb4e916ae2491d72957fdd35f7a5d326b7032a345f111ac07fe", - "urls": [ - "https://files.pythonhosted.org/packages/a3/da/0c4e282bc3cff4a0adf37005fa1fb42257673fbc1bbf7d1ff639ec3d255a/nh3-0.2.18-cp37-abi3-musllinux_1_2_aarch64.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_musllinux_1_2_armv7l_3a157ab1": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-musllinux_1_2_armv7l.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "3a157ab149e591bb638a55c8c6bcb8cdb559c8b12c13a8affaba6cedfe51713a", - "urls": [ - "https://files.pythonhosted.org/packages/de/81/c291231463d21da5f8bba82c8167a6d6893cc5419b0639801ee5d3aeb8a9/nh3-0.2.18-cp37-abi3-musllinux_1_2_armv7l.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_musllinux_1_2_x86_64_36c95d4b": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-musllinux_1_2_x86_64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "36c95d4b70530b320b365659bb5034341316e6a9b30f0b25fa9c9eff4c27a204", - "urls": [ - "https://files.pythonhosted.org/packages/eb/61/73a007c74c37895fdf66e0edcd881f5eaa17a348ff02f4bb4bc906d61085/nh3-0.2.18-cp37-abi3-musllinux_1_2_x86_64.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_cp37_abi3_win_amd64_8ce0f819": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "nh3-0.2.18-cp37-abi3-win_amd64.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "8ce0f819d2f1933953fca255db2471ad58184a60508f03e6285e5114b6254844", - "urls": [ - "https://files.pythonhosted.org/packages/26/8d/53c5b19c4999bdc6ba95f246f4ef35ca83d7d7423e5e38be43ad66544e5d/nh3-0.2.18-cp37-abi3-win_amd64.whl" - ] - } - }, - "rules_python_publish_deps_311_nh3_sdist_94a16692": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "nh3-0.2.18.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "nh3==0.2.18", - "sha256": "94a166927e53972a9698af9542ace4e38b9de50c34352b962f4d9a7d4c927af4", - "urls": [ - "https://files.pythonhosted.org/packages/62/73/10df50b42ddb547a907deeb2f3c9823022580a7a47281e8eae8e003a9639/nh3-0.2.18.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_pkginfo_py3_none_any_889a6da2": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "pkginfo-1.10.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "pkginfo==1.10.0", - "sha256": "889a6da2ed7ffc58ab5b900d888ddce90bce912f2d2de1dc1c26f4cb9fe65097", - "urls": [ - "https://files.pythonhosted.org/packages/56/09/054aea9b7534a15ad38a363a2bd974c20646ab1582a387a95b8df1bfea1c/pkginfo-1.10.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_pkginfo_sdist_5df73835": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "pkginfo-1.10.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "pkginfo==1.10.0", - "sha256": "5df73835398d10db79f8eecd5cd86b1f6d29317589ea70796994d49399af6297", - "urls": [ - "https://files.pythonhosted.org/packages/2f/72/347ec5be4adc85c182ed2823d8d1c7b51e13b9a6b0c1aae59582eca652df/pkginfo-1.10.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_pycparser_py3_none_any_c3702b6d": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "pycparser-2.22-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "pycparser==2.22", - "sha256": "c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc", - "urls": [ - "https://files.pythonhosted.org/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_pycparser_sdist_491c8be9": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "pycparser-2.22.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "pycparser==2.22", - "sha256": "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", - "urls": [ - "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_pygments_py3_none_any_b8e6aca0": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "pygments-2.18.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "pygments==2.18.0", - "sha256": "b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a", - "urls": [ - "https://files.pythonhosted.org/packages/f7/3f/01c8b82017c199075f8f788d0d906b9ffbbc5a47dc9918a945e13d5a2bda/pygments-2.18.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_pygments_sdist_786ff802": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "pygments-2.18.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "pygments==2.18.0", - "sha256": "786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199", - "urls": [ - "https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31/pygments-2.18.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_pywin32_ctypes_py3_none_any_8a151337": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_windows_x86_64" - ], - "filename": "pywin32_ctypes-0.2.3-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "pywin32-ctypes==0.2.3", - "sha256": "8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8", - "urls": [ - "https://files.pythonhosted.org/packages/de/3d/8161f7711c017e01ac9f008dfddd9410dff3674334c233bde66e7ba65bbf/pywin32_ctypes-0.2.3-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_pywin32_ctypes_sdist_d162dc04": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "pywin32-ctypes-0.2.3.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "pywin32-ctypes==0.2.3", - "sha256": "d162dc04946d704503b2edc4d55f3dba5c1d539ead017afa00142c38b9885755", - "urls": [ - "https://files.pythonhosted.org/packages/85/9f/01a1a99704853cb63f253eea009390c88e7131c67e66a0a02099a8c917cb/pywin32-ctypes-0.2.3.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_readme_renderer_py3_none_any_2fbca89b": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "readme_renderer-44.0-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "readme-renderer==44.0", - "sha256": "2fbca89b81a08526aadf1357a8c2ae889ec05fb03f5da67f9769c9a592166151", - "urls": [ - "https://files.pythonhosted.org/packages/e1/67/921ec3024056483db83953ae8e48079ad62b92db7880013ca77632921dd0/readme_renderer-44.0-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_readme_renderer_sdist_8712034e": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "readme_renderer-44.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "readme-renderer==44.0", - "sha256": "8712034eabbfa6805cacf1402b4eeb2a73028f72d1166d6f5cb7f9c047c5d1e1", - "urls": [ - "https://files.pythonhosted.org/packages/5a/a9/104ec9234c8448c4379768221ea6df01260cd6c2ce13182d4eac531c8342/readme_renderer-44.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_requests_py3_none_any_70761cfe": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "requests-2.32.3-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "requests==2.32.3", - "sha256": "70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6", - "urls": [ - "https://files.pythonhosted.org/packages/f9/9b/335f9764261e915ed497fcdeb11df5dfd6f7bf257d4a6a2a686d80da4d54/requests-2.32.3-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_requests_sdist_55365417": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "requests-2.32.3.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "requests==2.32.3", - "sha256": "55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760", - "urls": [ - "https://files.pythonhosted.org/packages/63/70/2bf7780ad2d390a8d301ad0b550f1581eadbd9a20f896afe06353c2a2913/requests-2.32.3.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_requests_toolbelt_py2_none_any_cccfdd66": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "requests_toolbelt-1.0.0-py2.py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "requests-toolbelt==1.0.0", - "sha256": "cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06", - "urls": [ - "https://files.pythonhosted.org/packages/3f/51/d4db610ef29373b879047326cbf6fa98b6c1969d6f6dc423279de2b1be2c/requests_toolbelt-1.0.0-py2.py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_requests_toolbelt_sdist_7681a0a3": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "requests-toolbelt-1.0.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "requests-toolbelt==1.0.0", - "sha256": "7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6", - "urls": [ - "https://files.pythonhosted.org/packages/f3/61/d7545dafb7ac2230c70d38d31cbfe4cc64f7144dc41f6e4e4b78ecd9f5bb/requests-toolbelt-1.0.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_rfc3986_py2_none_any_50b1502b": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "rfc3986-2.0.0-py2.py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "rfc3986==2.0.0", - "sha256": "50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd", - "urls": [ - "https://files.pythonhosted.org/packages/ff/9a/9afaade874b2fa6c752c36f1548f718b5b83af81ed9b76628329dab81c1b/rfc3986-2.0.0-py2.py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_rfc3986_sdist_97aacf9d": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "rfc3986-2.0.0.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "rfc3986==2.0.0", - "sha256": "97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c", - "urls": [ - "https://files.pythonhosted.org/packages/85/40/1520d68bfa07ab5a6f065a186815fb6610c86fe957bc065754e47f7b0840/rfc3986-2.0.0.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_rich_py3_none_any_9836f509": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "rich-13.9.3-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "rich==13.9.3", - "sha256": "9836f5096eb2172c9e77df411c1b009bace4193d6a481d534fea75ebba758283", - "urls": [ - "https://files.pythonhosted.org/packages/9a/e2/10e9819cf4a20bd8ea2f5dabafc2e6bf4a78d6a0965daeb60a4b34d1c11f/rich-13.9.3-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_rich_sdist_bc1e01b8": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "rich-13.9.3.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "rich==13.9.3", - "sha256": "bc1e01b899537598cf02579d2b9f4a415104d3fc439313a7a2c165d76557a08e", - "urls": [ - "https://files.pythonhosted.org/packages/d9/e9/cf9ef5245d835065e6673781dbd4b8911d352fb770d56cf0879cf11b7ee1/rich-13.9.3.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_secretstorage_py3_none_any_f356e662": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "filename": "SecretStorage-3.3.3-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "secretstorage==3.3.3", - "sha256": "f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99", - "urls": [ - "https://files.pythonhosted.org/packages/54/24/b4293291fa1dd830f353d2cb163295742fa87f179fcc8a20a306a81978b7/SecretStorage-3.3.3-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_secretstorage_sdist_2403533e": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "SecretStorage-3.3.3.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "secretstorage==3.3.3", - "sha256": "2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77", - "urls": [ - "https://files.pythonhosted.org/packages/53/a4/f48c9d79cb507ed1373477dbceaba7401fd8a23af63b837fa61f1dcd3691/SecretStorage-3.3.3.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_twine_py3_none_any_215dbe7b": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "twine-5.1.1-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "twine==5.1.1", - "sha256": "215dbe7b4b94c2c50a7315c0275d2258399280fbb7d04182c7e55e24b5f93997", - "urls": [ - "https://files.pythonhosted.org/packages/5d/ec/00f9d5fd040ae29867355e559a94e9a8429225a0284a3f5f091a3878bfc0/twine-5.1.1-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_twine_sdist_9aa08251": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "twine-5.1.1.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "twine==5.1.1", - "sha256": "9aa0825139c02b3434d913545c7b847a21c835e11597f5255842d457da2322db", - "urls": [ - "https://files.pythonhosted.org/packages/77/68/bd982e5e949ef8334e6f7dcf76ae40922a8750aa2e347291ae1477a4782b/twine-5.1.1.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_urllib3_py3_none_any_ca899ca0": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "urllib3-2.2.3-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "urllib3==2.2.3", - "sha256": "ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac", - "urls": [ - "https://files.pythonhosted.org/packages/ce/d9/5f4c13cecde62396b0d3fe530a50ccea91e7dfc1ccf0e09c228841bb5ba8/urllib3-2.2.3-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_urllib3_sdist_e7d814a8": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "urllib3-2.2.3.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "urllib3==2.2.3", - "sha256": "e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9", - "urls": [ - "https://files.pythonhosted.org/packages/ed/63/22ba4ebfe7430b76388e7cd448d5478814d3032121827c12a2cc287e2260/urllib3-2.2.3.tar.gz" - ] - } - }, - "rules_python_publish_deps_311_zipp_py3_none_any_a817ac80": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "filename": "zipp-3.20.2-py3-none-any.whl", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "zipp==3.20.2", - "sha256": "a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350", - "urls": [ - "https://files.pythonhosted.org/packages/62/8b/5ba542fa83c90e09eac972fc9baca7a88e7e7ca4b221a89251954019308b/zipp-3.20.2-py3-none-any.whl" - ] - } - }, - "rules_python_publish_deps_311_zipp_sdist_bc9eb26f": { - "bzlFile": "@@rules_python~//python/private/pypi:whl_library.bzl", - "ruleClassName": "whl_library", - "attributes": { - "dep_template": "@rules_python_publish_deps//{name}:{target}", - "experimental_target_platforms": [ - "cp311_linux_aarch64", - "cp311_linux_arm", - "cp311_linux_ppc", - "cp311_linux_s390x", - "cp311_linux_x86_64", - "cp311_osx_aarch64", - "cp311_osx_x86_64", - "cp311_windows_x86_64" - ], - "extra_pip_args": [ - "--index-url", - "https://pypi.org/simple" - ], - "filename": "zipp-3.20.2.tar.gz", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "repo": "rules_python_publish_deps_311", - "requirement": "zipp==3.20.2", - "sha256": "bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29", - "urls": [ - "https://files.pythonhosted.org/packages/54/bf/5c0000c44ebc80123ecbdddba1f5dcd94a5ada602a9c225d84b5aaa55e86/zipp-3.20.2.tar.gz" - ] - } - }, - "rules_python_publish_deps": { - "bzlFile": "@@rules_python~//python/private/pypi:hub_repository.bzl", - "ruleClassName": "hub_repository", - "attributes": { - "repo_name": "rules_python_publish_deps", - "extra_hub_aliases": {}, - "whl_map": { - "backports_tarfile": "{\"rules_python_publish_deps_311_backports_tarfile_py3_none_any_77e284d7\":[{\"filename\":\"backports.tarfile-1.2.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_backports_tarfile_sdist_d75e02c2\":[{\"filename\":\"backports_tarfile-1.2.0.tar.gz\",\"version\":\"3.11\"}]}", - "certifi": "{\"rules_python_publish_deps_311_certifi_py3_none_any_922820b5\":[{\"filename\":\"certifi-2024.8.30-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_certifi_sdist_bec941d2\":[{\"filename\":\"certifi-2024.8.30.tar.gz\",\"version\":\"3.11\"}]}", - "cffi": "{\"rules_python_publish_deps_311_cffi_cp311_cp311_manylinux_2_17_aarch64_a1ed2dd2\":[{\"filename\":\"cffi-1.17.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cffi_cp311_cp311_manylinux_2_17_ppc64le_46bf4316\":[{\"filename\":\"cffi-1.17.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cffi_cp311_cp311_manylinux_2_17_s390x_a24ed04c\":[{\"filename\":\"cffi-1.17.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cffi_cp311_cp311_manylinux_2_17_x86_64_610faea7\":[{\"filename\":\"cffi-1.17.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cffi_cp311_cp311_musllinux_1_1_aarch64_a9b15d49\":[{\"filename\":\"cffi-1.17.1-cp311-cp311-musllinux_1_1_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cffi_cp311_cp311_musllinux_1_1_x86_64_fc48c783\":[{\"filename\":\"cffi-1.17.1-cp311-cp311-musllinux_1_1_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cffi_sdist_1c39c601\":[{\"filename\":\"cffi-1.17.1.tar.gz\",\"version\":\"3.11\"}]}", - "charset_normalizer": "{\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_macosx_10_9_universal2_0d99dd8f\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_universal2.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_macosx_10_9_x86_64_c57516e5\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_macosx_11_0_arm64_6dba5d19\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-macosx_11_0_arm64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_manylinux_2_17_aarch64_bf4475b8\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_manylinux_2_17_ppc64le_ce031db0\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_manylinux_2_17_s390x_8ff4e7cd\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_manylinux_2_17_x86_64_3710a975\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_musllinux_1_2_aarch64_47334db7\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_musllinux_1_2_ppc64le_f1a2f519\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_musllinux_1_2_s390x_63bc5c4a\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_s390x.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_musllinux_1_2_x86_64_bcb4f8ea\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_cp311_cp311_win_amd64_cee4373f\":[{\"filename\":\"charset_normalizer-3.4.0-cp311-cp311-win_amd64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_py3_none_any_fe9f97fe\":[{\"filename\":\"charset_normalizer-3.4.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_charset_normalizer_sdist_223217c3\":[{\"filename\":\"charset_normalizer-3.4.0.tar.gz\",\"version\":\"3.11\"}]}", - "cryptography": "{\"rules_python_publish_deps_311_cryptography_cp39_abi3_manylinux_2_17_aarch64_846da004\":[{\"filename\":\"cryptography-43.0.3-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cryptography_cp39_abi3_manylinux_2_17_x86_64_0f996e72\":[{\"filename\":\"cryptography-43.0.3-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cryptography_cp39_abi3_manylinux_2_28_aarch64_f7b178f1\":[{\"filename\":\"cryptography-43.0.3-cp39-abi3-manylinux_2_28_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cryptography_cp39_abi3_manylinux_2_28_x86_64_c2e6fc39\":[{\"filename\":\"cryptography-43.0.3-cp39-abi3-manylinux_2_28_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cryptography_cp39_abi3_musllinux_1_2_aarch64_e1be4655\":[{\"filename\":\"cryptography-43.0.3-cp39-abi3-musllinux_1_2_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cryptography_cp39_abi3_musllinux_1_2_x86_64_df6b6c6d\":[{\"filename\":\"cryptography-43.0.3-cp39-abi3-musllinux_1_2_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_cryptography_sdist_315b9001\":[{\"filename\":\"cryptography-43.0.3.tar.gz\",\"version\":\"3.11\"}]}", - "docutils": "{\"rules_python_publish_deps_311_docutils_py3_none_any_dafca5b9\":[{\"filename\":\"docutils-0.21.2-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_docutils_sdist_3a6b1873\":[{\"filename\":\"docutils-0.21.2.tar.gz\",\"version\":\"3.11\"}]}", - "idna": "{\"rules_python_publish_deps_311_idna_py3_none_any_946d195a\":[{\"filename\":\"idna-3.10-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_idna_sdist_12f65c9b\":[{\"filename\":\"idna-3.10.tar.gz\",\"version\":\"3.11\"}]}", - "importlib_metadata": "{\"rules_python_publish_deps_311_importlib_metadata_py3_none_any_45e54197\":[{\"filename\":\"importlib_metadata-8.5.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_importlib_metadata_sdist_71522656\":[{\"filename\":\"importlib_metadata-8.5.0.tar.gz\",\"version\":\"3.11\"}]}", - "jaraco_classes": "{\"rules_python_publish_deps_311_jaraco_classes_py3_none_any_f662826b\":[{\"filename\":\"jaraco.classes-3.4.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_jaraco_classes_sdist_47a024b5\":[{\"filename\":\"jaraco.classes-3.4.0.tar.gz\",\"version\":\"3.11\"}]}", - "jaraco_context": "{\"rules_python_publish_deps_311_jaraco_context_py3_none_any_f797fc48\":[{\"filename\":\"jaraco.context-6.0.1-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_jaraco_context_sdist_9bae4ea5\":[{\"filename\":\"jaraco_context-6.0.1.tar.gz\",\"version\":\"3.11\"}]}", - "jaraco_functools": "{\"rules_python_publish_deps_311_jaraco_functools_py3_none_any_ad159f13\":[{\"filename\":\"jaraco.functools-4.1.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_jaraco_functools_sdist_70f7e0e2\":[{\"filename\":\"jaraco_functools-4.1.0.tar.gz\",\"version\":\"3.11\"}]}", - "jeepney": "{\"rules_python_publish_deps_311_jeepney_py3_none_any_c0a454ad\":[{\"filename\":\"jeepney-0.8.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_jeepney_sdist_5efe48d2\":[{\"filename\":\"jeepney-0.8.0.tar.gz\",\"version\":\"3.11\"}]}", - "keyring": "{\"rules_python_publish_deps_311_keyring_py3_none_any_5426f817\":[{\"filename\":\"keyring-25.4.1-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_keyring_sdist_b07ebc55\":[{\"filename\":\"keyring-25.4.1.tar.gz\",\"version\":\"3.11\"}]}", - "markdown_it_py": "{\"rules_python_publish_deps_311_markdown_it_py_py3_none_any_35521684\":[{\"filename\":\"markdown_it_py-3.0.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_markdown_it_py_sdist_e3f60a94\":[{\"filename\":\"markdown-it-py-3.0.0.tar.gz\",\"version\":\"3.11\"}]}", - "mdurl": "{\"rules_python_publish_deps_311_mdurl_py3_none_any_84008a41\":[{\"filename\":\"mdurl-0.1.2-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_mdurl_sdist_bb413d29\":[{\"filename\":\"mdurl-0.1.2.tar.gz\",\"version\":\"3.11\"}]}", - "more_itertools": "{\"rules_python_publish_deps_311_more_itertools_py3_none_any_037b0d32\":[{\"filename\":\"more_itertools-10.5.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_more_itertools_sdist_5482bfef\":[{\"filename\":\"more-itertools-10.5.0.tar.gz\",\"version\":\"3.11\"}]}", - "nh3": "{\"rules_python_publish_deps_311_nh3_cp37_abi3_macosx_10_12_x86_64_14c5a72e\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_macosx_10_12_x86_64_7b7c2a3c\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-macosx_10_12_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_aarch64_42c64511\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_armv7l_0411beb0\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_ppc64_5f36b271\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-manylinux_2_17_ppc64.manylinux2014_ppc64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_ppc64le_34c03fa7\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_s390x_19aaba96\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_manylinux_2_17_x86_64_de3ceed6\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_musllinux_1_2_aarch64_f0eca9ca\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-musllinux_1_2_aarch64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_musllinux_1_2_armv7l_3a157ab1\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-musllinux_1_2_armv7l.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_musllinux_1_2_x86_64_36c95d4b\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-musllinux_1_2_x86_64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_cp37_abi3_win_amd64_8ce0f819\":[{\"filename\":\"nh3-0.2.18-cp37-abi3-win_amd64.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_nh3_sdist_94a16692\":[{\"filename\":\"nh3-0.2.18.tar.gz\",\"version\":\"3.11\"}]}", - "pkginfo": "{\"rules_python_publish_deps_311_pkginfo_py3_none_any_889a6da2\":[{\"filename\":\"pkginfo-1.10.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_pkginfo_sdist_5df73835\":[{\"filename\":\"pkginfo-1.10.0.tar.gz\",\"version\":\"3.11\"}]}", - "pycparser": "{\"rules_python_publish_deps_311_pycparser_py3_none_any_c3702b6d\":[{\"filename\":\"pycparser-2.22-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_pycparser_sdist_491c8be9\":[{\"filename\":\"pycparser-2.22.tar.gz\",\"version\":\"3.11\"}]}", - "pygments": "{\"rules_python_publish_deps_311_pygments_py3_none_any_b8e6aca0\":[{\"filename\":\"pygments-2.18.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_pygments_sdist_786ff802\":[{\"filename\":\"pygments-2.18.0.tar.gz\",\"version\":\"3.11\"}]}", - "pywin32_ctypes": "{\"rules_python_publish_deps_311_pywin32_ctypes_py3_none_any_8a151337\":[{\"filename\":\"pywin32_ctypes-0.2.3-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_pywin32_ctypes_sdist_d162dc04\":[{\"filename\":\"pywin32-ctypes-0.2.3.tar.gz\",\"version\":\"3.11\"}]}", - "readme_renderer": "{\"rules_python_publish_deps_311_readme_renderer_py3_none_any_2fbca89b\":[{\"filename\":\"readme_renderer-44.0-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_readme_renderer_sdist_8712034e\":[{\"filename\":\"readme_renderer-44.0.tar.gz\",\"version\":\"3.11\"}]}", - "requests": "{\"rules_python_publish_deps_311_requests_py3_none_any_70761cfe\":[{\"filename\":\"requests-2.32.3-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_requests_sdist_55365417\":[{\"filename\":\"requests-2.32.3.tar.gz\",\"version\":\"3.11\"}]}", - "requests_toolbelt": "{\"rules_python_publish_deps_311_requests_toolbelt_py2_none_any_cccfdd66\":[{\"filename\":\"requests_toolbelt-1.0.0-py2.py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_requests_toolbelt_sdist_7681a0a3\":[{\"filename\":\"requests-toolbelt-1.0.0.tar.gz\",\"version\":\"3.11\"}]}", - "rfc3986": "{\"rules_python_publish_deps_311_rfc3986_py2_none_any_50b1502b\":[{\"filename\":\"rfc3986-2.0.0-py2.py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_rfc3986_sdist_97aacf9d\":[{\"filename\":\"rfc3986-2.0.0.tar.gz\",\"version\":\"3.11\"}]}", - "rich": "{\"rules_python_publish_deps_311_rich_py3_none_any_9836f509\":[{\"filename\":\"rich-13.9.3-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_rich_sdist_bc1e01b8\":[{\"filename\":\"rich-13.9.3.tar.gz\",\"version\":\"3.11\"}]}", - "secretstorage": "{\"rules_python_publish_deps_311_secretstorage_py3_none_any_f356e662\":[{\"filename\":\"SecretStorage-3.3.3-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_secretstorage_sdist_2403533e\":[{\"filename\":\"SecretStorage-3.3.3.tar.gz\",\"version\":\"3.11\"}]}", - "twine": "{\"rules_python_publish_deps_311_twine_py3_none_any_215dbe7b\":[{\"filename\":\"twine-5.1.1-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_twine_sdist_9aa08251\":[{\"filename\":\"twine-5.1.1.tar.gz\",\"version\":\"3.11\"}]}", - "urllib3": "{\"rules_python_publish_deps_311_urllib3_py3_none_any_ca899ca0\":[{\"filename\":\"urllib3-2.2.3-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_urllib3_sdist_e7d814a8\":[{\"filename\":\"urllib3-2.2.3.tar.gz\",\"version\":\"3.11\"}]}", - "zipp": "{\"rules_python_publish_deps_311_zipp_py3_none_any_a817ac80\":[{\"filename\":\"zipp-3.20.2-py3-none-any.whl\",\"version\":\"3.11\"}],\"rules_python_publish_deps_311_zipp_sdist_bc9eb26f\":[{\"filename\":\"zipp-3.20.2.tar.gz\",\"version\":\"3.11\"}]}" - }, - "packages": [ - "backports_tarfile", - "certifi", - "charset_normalizer", - "docutils", - "idna", - "importlib_metadata", - "jaraco_classes", - "jaraco_context", - "jaraco_functools", - "keyring", - "markdown_it_py", - "mdurl", - "more_itertools", - "nh3", - "pkginfo", - "pygments", - "readme_renderer", - "requests", - "requests_toolbelt", - "rfc3986", - "rich", - "twine", - "urllib3", - "zipp" - ], - "groups": {} - } - } - }, - "moduleExtensionMetadata": { - "useAllRepos": "NO", - "reproducible": false - }, - "recordedRepoMappingEntries": [ - [ - "bazel_features~", - "bazel_features_globals", - "bazel_features~~version_extension~bazel_features_globals" - ], - [ - "bazel_features~", - "bazel_features_version", - "bazel_features~~version_extension~bazel_features_version" - ], - [ - "rules_python~", - "bazel_features", - "bazel_features~" - ], - [ - "rules_python~", - "bazel_skylib", - "bazel_skylib~" - ], - [ - "rules_python~", - "bazel_tools", - "bazel_tools" - ], - [ - "rules_python~", - "pypi__build", - "rules_python~~internal_deps~pypi__build" - ], - [ - "rules_python~", - "pypi__click", - "rules_python~~internal_deps~pypi__click" - ], - [ - "rules_python~", - "pypi__colorama", - "rules_python~~internal_deps~pypi__colorama" - ], - [ - "rules_python~", - "pypi__importlib_metadata", - "rules_python~~internal_deps~pypi__importlib_metadata" - ], - [ - "rules_python~", - "pypi__installer", - "rules_python~~internal_deps~pypi__installer" - ], - [ - "rules_python~", - "pypi__more_itertools", - "rules_python~~internal_deps~pypi__more_itertools" - ], - [ - "rules_python~", - "pypi__packaging", - "rules_python~~internal_deps~pypi__packaging" - ], - [ - "rules_python~", - "pypi__pep517", - "rules_python~~internal_deps~pypi__pep517" - ], - [ - "rules_python~", - "pypi__pip", - "rules_python~~internal_deps~pypi__pip" - ], - [ - "rules_python~", - "pypi__pip_tools", - "rules_python~~internal_deps~pypi__pip_tools" - ], - [ - "rules_python~", - "pypi__pyproject_hooks", - "rules_python~~internal_deps~pypi__pyproject_hooks" - ], - [ - "rules_python~", - "pypi__setuptools", - "rules_python~~internal_deps~pypi__setuptools" - ], - [ - "rules_python~", - "pypi__tomli", - "rules_python~~internal_deps~pypi__tomli" - ], - [ - "rules_python~", - "pypi__wheel", - "rules_python~~internal_deps~pypi__wheel" - ], - [ - "rules_python~", - "pypi__zipp", - "rules_python~~internal_deps~pypi__zipp" - ], - [ - "rules_python~", - "pythons_hub", - "rules_python~~python~pythons_hub" - ], - [ - "rules_python~~python~pythons_hub", - "python_3_10_host", - "rules_python~~python~python_3_10_host" - ], - [ - "rules_python~~python~pythons_hub", - "python_3_11_host", - "rules_python~~python~python_3_11_host" - ], - [ - "rules_python~~python~pythons_hub", - "python_3_12_host", - "rules_python~~python~python_3_12_host" - ], - [ - "rules_python~~python~pythons_hub", - "python_3_9_host", - "rules_python~~python~python_3_9_host" - ] - ] - } - }, - "@@rules_swift~//swift:extensions.bzl%non_module_deps": { - "general": { - "bzlTransitiveDigest": "vhXfCi07IAmWf5hLHcxh5xCtTwvEGrmMkOavEMD5pzs=", - "usagesDigest": "/dVEtCLqIAaLXjfRXsJupTS9pTgmYVN/tFdJlGgE5NA=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "com_github_apple_swift_protobuf": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-protobuf/archive/1.20.2.tar.gz" - ], - "sha256": "3fb50bd4d293337f202d917b6ada22f9548a0a0aed9d9a4d791e6fbd8a246ebb", - "strip_prefix": "swift-protobuf-1.20.2/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_protobuf/BUILD.overlay" - } - }, - "com_github_grpc_grpc_swift": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/grpc/grpc-swift/archive/1.16.0.tar.gz" - ], - "sha256": "58b60431d0064969f9679411264b82e40a217ae6bd34e17096d92cc4e47556a5", - "strip_prefix": "grpc-swift-1.16.0/", - "build_file": "@@rules_swift~//third_party:com_github_grpc_grpc_swift/BUILD.overlay" - } - }, - "com_github_apple_swift_docc_symbolkit": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-docc-symbolkit/archive/refs/tags/swift-5.10-RELEASE.tar.gz" - ], - "sha256": "de1d4b6940468ddb53b89df7aa1a81323b9712775b0e33e8254fa0f6f7469a97", - "strip_prefix": "swift-docc-symbolkit-swift-5.10-RELEASE", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_docc_symbolkit/BUILD.overlay" - } - }, - "com_github_apple_swift_nio": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-nio/archive/2.42.0.tar.gz" - ], - "sha256": "e3304bc3fb53aea74a3e54bd005ede11f6dc357117d9b1db642d03aea87194a0", - "strip_prefix": "swift-nio-2.42.0/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio/BUILD.overlay" - } - }, - "com_github_apple_swift_nio_http2": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-nio-http2/archive/1.26.0.tar.gz" - ], - "sha256": "f0edfc9d6a7be1d587e5b403f2d04264bdfae59aac1d74f7d974a9022c6d2b25", - "strip_prefix": "swift-nio-http2-1.26.0/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio_http2/BUILD.overlay" - } - }, - "com_github_apple_swift_nio_transport_services": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-nio-transport-services/archive/1.15.0.tar.gz" - ], - "sha256": "f3498dafa633751a52b9b7f741f7ac30c42bcbeb3b9edca6d447e0da8e693262", - "strip_prefix": "swift-nio-transport-services-1.15.0/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio_transport_services/BUILD.overlay" - } - }, - "com_github_apple_swift_nio_extras": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-nio-extras/archive/1.4.0.tar.gz" - ], - "sha256": "4684b52951d9d9937bb3e8ccd6b5daedd777021ef2519ea2f18c4c922843b52b", - "strip_prefix": "swift-nio-extras-1.4.0/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio_extras/BUILD.overlay" - } - }, - "com_github_apple_swift_log": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-log/archive/1.4.4.tar.gz" - ], - "sha256": "48fe66426c784c0c20031f15dc17faf9f4c9037c192bfac2f643f65cb2321ba0", - "strip_prefix": "swift-log-1.4.4/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_log/BUILD.overlay" - } - }, - "com_github_apple_swift_nio_ssl": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-nio-ssl/archive/2.23.0.tar.gz" - ], - "sha256": "4787c63f61dd04d99e498adc3d1a628193387e41efddf8de19b8db04544d016d", - "strip_prefix": "swift-nio-ssl-2.23.0/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_nio_ssl/BUILD.overlay" - } - }, - "com_github_apple_swift_collections": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-collections/archive/1.0.4.tar.gz" - ], - "sha256": "d9e4c8a91c60fb9c92a04caccbb10ded42f4cb47b26a212bc6b39cc390a4b096", - "strip_prefix": "swift-collections-1.0.4/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_collections/BUILD.overlay" - } - }, - "com_github_apple_swift_atomics": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "urls": [ - "https://github.com/apple/swift-atomics/archive/1.1.0.tar.gz" - ], - "sha256": "1bee7f469f7e8dc49f11cfa4da07182fbc79eab000ec2c17bfdce468c5d276fb", - "strip_prefix": "swift-atomics-1.1.0/", - "build_file": "@@rules_swift~//third_party:com_github_apple_swift_atomics/BUILD.overlay" - } - }, - "build_bazel_rules_swift_index_import": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "build_file": "@@rules_swift~//third_party:build_bazel_rules_swift_index_import/BUILD.overlay", - "canonical_id": "index-import-5.8", - "urls": [ - "https://github.com/MobileNativeFoundation/index-import/releases/download/5.8.0.1/index-import.tar.gz" - ], - "sha256": "28c1ffa39d99e74ed70623899b207b41f79214c498c603915aef55972a851a15" + "sha256": "28c1ffa39d99e74ed70623899b207b41f79214c498c603915aef55972a851a15" } }, "build_bazel_rules_swift_local_config": { - "bzlFile": "@@rules_swift~//swift/internal:swift_autoconfiguration.bzl", - "ruleClassName": "swift_autoconfiguration", + "repoRuleId": "@@rules_swift+//swift/internal:swift_autoconfiguration.bzl%swift_autoconfiguration", "attributes": {} } }, "recordedRepoMappingEntries": [ [ - "rules_swift~", + "rules_swift+", "bazel_tools", "bazel_tools" ], [ - "rules_swift~", + "rules_swift+", "build_bazel_rules_swift", - "rules_swift~" + "rules_swift+" ] ] } } - } + }, + "facts": {} } diff --git a/WORKSPACE b/WORKSPACE deleted file mode 100644 index 6ba4a023827..00000000000 --- a/WORKSPACE +++ /dev/null @@ -1,2 +0,0 @@ -# This file marks the root of the Bazel workspace. -# See MODULE.bazel for external dependencies setup. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java index 6870d7686eb..9fb7ffc9860 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java @@ -57,33 +57,21 @@ public class ReflogEntryImpl implements Serializable, ReflogEntry { } } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getOldId() - */ @Override public ObjectId getOldId() { return oldId; } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getNewId() - */ @Override public ObjectId getNewId() { return newId; } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getWho() - */ @Override public PersonIdent getWho() { return who; } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#getComment() - */ @Override public String getComment() { return comment; @@ -96,9 +84,6 @@ public String toString() { + ", " + getComment() + "]"; } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogEntry#parseCheckout() - */ @Override public CheckoutEntry parseCheckout() { if (getComment().startsWith(CheckoutEntryImpl.CHECKOUT_MOVING_FROM)) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java index f1888eb90f7..98bc108cf62 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java @@ -44,25 +44,16 @@ class ReflogReaderImpl implements ReflogReader { logName = new File(logBaseDir, Constants.L_LOGS + refname); } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getLastEntry() - */ @Override public ReflogEntry getLastEntry() throws IOException { return getReverseEntry(0); } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries() - */ @Override public List getReverseEntries() throws IOException { return getReverseEntries(Integer.MAX_VALUE); } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntry(int) - */ @Override public ReflogEntry getReverseEntry(int number) throws IOException { if (number < 0) @@ -89,9 +80,6 @@ public ReflogEntry getReverseEntry(int number) throws IOException { return null; } - /* (non-Javadoc) - * @see org.eclipse.jgit.internal.storage.file.ReflogReaader#getReverseEntries(int) - */ @Override public List getReverseEntries(int max) throws IOException { final byte[] log; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 41ab8acf057..c3b2f618cec 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -189,9 +189,12 @@ void checkWants(UploadPack up, List wants) throws PackProtocolException, IOException; } - /* + /** * {@link java.util.function.Consumer} doesn't allow throwing checked * exceptions. Define our own to propagate IOExceptions. + * + * @param + * input argument */ @FunctionalInterface private static interface IOConsumer { diff --git a/tools/workspace_status.py b/tools/workspace_status.py index 1186a4a77a6..f56120ca77a 100644 --- a/tools/workspace_status.py +++ b/tools/workspace_status.py @@ -23,7 +23,7 @@ import sys ROOT = os.path.abspath(__file__) -while not os.path.exists(os.path.join(ROOT, 'WORKSPACE')): +while not os.path.exists(os.path.join(ROOT, 'MODULE.bazel')): ROOT = os.path.dirname(ROOT) CMD = ['git', 'describe', '--always', '--match', 'v[0-9].*', '--dirty'] From e05060ae85cb7a3694251e15f3f3d6a5442e179a Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 31 Mar 2026 23:02:58 +0200 Subject: [PATCH 070/200] Bazel: Bump to 9.0.1 Upgrade Bazel to 9.0.1 and update module dependencies to versions compatible with Bazel 9. Notable updates: * rules_go 0.51.0-rc2 -> 0.60.0 * bazel_features 1.39.0 -> 1.42.1 * rules_java 8.16.1 -> 9.3.0 * add rules_android (transitive dependency of rules_jvm_external) Bazel 9 requires Java rules to be loaded explicitly from rules_java. java_library and java_binary are no longer available from the built-in definitions. Change-Id: I4e2919d23fd9f2b33215717c1bd93574d296d1a4 --- .bazelversion | 2 +- MODULE.bazel | 8 +- MODULE.bazel.lock | 908 +++++++++++++++---------- org.eclipse.jgit.ssh.apache.test/BUILD | 1 + 4 files changed, 560 insertions(+), 359 deletions(-) diff --git a/.bazelversion b/.bazelversion index acd405b1d62..37ad5c8b19d 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -8.6.0 +9.0.1 diff --git a/MODULE.bazel b/MODULE.bazel index 613d2d33db3..1257289e5d6 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,9 +1,11 @@ module(name = "jgit") -bazel_dep(name = "rules_go", version = "0.51.0-rc2") -bazel_dep(name = "bazel_features", version = "1.39.0") -bazel_dep(name = "rules_java", version = "8.16.1") +bazel_dep(name = "bazel_features", version = "1.42.1") +bazel_dep(name = "rules_android", version = "0.7.1") +bazel_dep(name = "rules_go", version = "0.60.0") +bazel_dep(name = "rules_java", version = "9.3.0") bazel_dep(name = "rules_jvm_external", version = "6.10") + bazel_dep(name = "rbe_autoconfig") git_override( module_name = "rbe_autoconfig", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 7faac9656cb..da5f7020b87 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,5 +1,5 @@ { - "lockFileVersion": 24, + "lockFileVersion": 26, "registryFileHashes": { "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497", "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2", @@ -13,16 +13,19 @@ "https://bcr.bazel.build/modules/abseil-cpp/20250127.0/MODULE.bazel": "d1086e248cda6576862b4b3fe9ad76a214e08c189af5b42557a6e1888812c5d5", "https://bcr.bazel.build/modules/abseil-cpp/20250127.1/MODULE.bazel": "c4a89e7ceb9bf1e25cf84a9f830ff6b817b72874088bf5141b314726e46a57c1", "https://bcr.bazel.build/modules/abseil-cpp/20250512.1/MODULE.bazel": "d209fdb6f36ffaf61c509fcc81b19e81b411a999a934a032e10cd009a0226215", - "https://bcr.bazel.build/modules/abseil-cpp/20250814.0/MODULE.bazel": "c43c16ca2c432566cdb78913964497259903ebe8fb7d9b57b38e9f1425b427b8", - "https://bcr.bazel.build/modules/abseil-cpp/20250814.0/source.json": "b88bff599ceaf0f56c264c749b1606f8485cec3b8c38ba30f88a4df9af142861", + "https://bcr.bazel.build/modules/abseil-cpp/20250814.1/MODULE.bazel": "51f2312901470cdab0dbdf3b88c40cd21c62a7ed58a3de45b365ddc5b11bcab2", + "https://bcr.bazel.build/modules/abseil-cpp/20250814.1/source.json": "cea3901d7e299da7320700abbaafe57a65d039f10d0d7ea601c4a66938ea4b0c", "https://bcr.bazel.build/modules/abseil-py/2.1.0/MODULE.bazel": "5ebe5bf853769c65707e5c28f216798f7a4b1042015e6a36e6d03094d94bec8a", "https://bcr.bazel.build/modules/abseil-py/2.1.0/source.json": "0e8fc4f088ce07099c1cd6594c20c7ddbb48b4b3c0849b7d94ba94be88ff042b", "https://bcr.bazel.build/modules/apple_support/1.11.1/MODULE.bazel": "1843d7cd8a58369a444fc6000e7304425fba600ff641592161d9f15b179fb896", "https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85", - "https://bcr.bazel.build/modules/apple_support/1.23.1/MODULE.bazel": "53763fed456a968cf919b3240427cf3a9d5481ec5466abc9d5dc51bc70087442", - "https://bcr.bazel.build/modules/apple_support/1.23.1/source.json": "d888b44312eb0ad2c21a91d026753f330caa48a25c9b2102fae75eb2b0dcfdd2", + "https://bcr.bazel.build/modules/apple_support/1.21.0/MODULE.bazel": "ac1824ed5edf17dee2fdd4927ada30c9f8c3b520be1b5fd02a5da15bc10bff3e", + "https://bcr.bazel.build/modules/apple_support/1.21.1/MODULE.bazel": "5809fa3efab15d1f3c3c635af6974044bac8a4919c62238cce06acee8a8c11f1", + "https://bcr.bazel.build/modules/apple_support/1.24.2/MODULE.bazel": "0e62471818affb9f0b26f128831d5c40b074d32e6dda5a0d3852847215a41ca4", + "https://bcr.bazel.build/modules/apple_support/1.24.2/source.json": "2c22c9827093250406c5568da6c54e6fdf0ef06238def3d99c71b12feb057a8d", "https://bcr.bazel.build/modules/bazel_features/1.1.0/MODULE.bazel": "cfd42ff3b815a5f39554d97182657f8c4b9719568eb7fded2b9135f084bf760b", "https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd", + "https://bcr.bazel.build/modules/bazel_features/1.10.0/MODULE.bazel": "f75e8807570484a99be90abcd52b5e1f390362c258bcb73106f4544957a48101", "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8", "https://bcr.bazel.build/modules/bazel_features/1.13.0/MODULE.bazel": "c14c33c7c3c730612bdbe14ebbb5e61936b6f11322ea95a6e91cd1ba962f94df", "https://bcr.bazel.build/modules/bazel_features/1.15.0/MODULE.bazel": "d38ff6e517149dc509406aca0db3ad1efdd890a85e049585b7234d04238e2a4d", @@ -35,9 +38,11 @@ "https://bcr.bazel.build/modules/bazel_features/1.28.0/MODULE.bazel": "4b4200e6cbf8fa335b2c3f43e1d6ef3e240319c33d43d60cc0fbd4b87ece299d", "https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9", "https://bcr.bazel.build/modules/bazel_features/1.30.0/MODULE.bazel": "a14b62d05969a293b80257e72e597c2da7f717e1e69fa8b339703ed6731bec87", - "https://bcr.bazel.build/modules/bazel_features/1.39.0/MODULE.bazel": "28739425c1fc283c91931619749c832b555e60bcd1010b40d8441ce0a5cf726d", - "https://bcr.bazel.build/modules/bazel_features/1.39.0/source.json": "f63cbeb4c602098484d57001e5a07d31cb02bbccde9b5e2c9bf0b29d05283e93", + "https://bcr.bazel.build/modules/bazel_features/1.33.0/MODULE.bazel": "8b8dc9d2a4c88609409c3191165bccec0e4cb044cd7a72ccbe826583303459f6", + "https://bcr.bazel.build/modules/bazel_features/1.36.0/MODULE.bazel": "596cb62090b039caf1cad1d52a8bc35cf188ca9a4e279a828005e7ee49a1bec3", "https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7", + "https://bcr.bazel.build/modules/bazel_features/1.42.1/MODULE.bazel": "275a59b5406ff18c01739860aa70ad7ccb3cfb474579411decca11c93b951080", + "https://bcr.bazel.build/modules/bazel_features/1.42.1/source.json": "fcd4396b2df85f64f2b3bb436ad870793ecf39180f1d796f913cc9276d355309", "https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a", "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8", "https://bcr.bazel.build/modules/bazel_skylib/1.1.1/MODULE.bazel": "1add3e7d93ff2e6998f9e118022c84d163917d912f5afafb3058e3d2f1545b5e", @@ -51,20 +56,24 @@ "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d", "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b", "https://bcr.bazel.build/modules/bazel_skylib/1.8.1/MODULE.bazel": "88ade7293becda963e0e3ea33e7d54d3425127e0a326e0d17da085a5f1f03ff6", - "https://bcr.bazel.build/modules/bazel_skylib/1.8.1/source.json": "7ebaefba0b03efe59cac88ed5bbc67bcf59a3eff33af937345ede2a38b2d368a", + "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/MODULE.bazel": "69ad6927098316848b34a9142bcc975e018ba27f08c4ff403f50c1b6e646ca67", + "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/source.json": "34a3c8bcf233b835eb74be9d628899bb32999d3e0eadef1947a0a562a2b16ffb", "https://bcr.bazel.build/modules/bazel_worker_api/0.0.1/MODULE.bazel": "02a13b77321773b2042e70ee5e4c5e099c8ddee4cf2da9cd420442c36938d4bd", "https://bcr.bazel.build/modules/bazel_worker_api/0.0.4/MODULE.bazel": "460aa12d01231a80cce03c548287b433b321d205b0028ae596728c35e5ee442e", - "https://bcr.bazel.build/modules/bazel_worker_api/0.0.4/source.json": "d353c410d47a8b65d09fa98e83d57ebec257a2c2b9c6e42d6fda1cb25e5464a5", + "https://bcr.bazel.build/modules/bazel_worker_api/0.0.8/MODULE.bazel": "396c1ef53835aafe3d42ce6619080531ee770648303731f16cfaa33fa056bf0c", + "https://bcr.bazel.build/modules/bazel_worker_api/0.0.8/source.json": "abaf8ac9d2ab2f47bda9af4c0c080ff7907378888e1f4bc62a0539dd13ba61e8", "https://bcr.bazel.build/modules/bazel_worker_java/0.0.4/MODULE.bazel": "82494a01018bb7ef06d4a17ec4cd7a758721f10eb8b6c820a818e70d669500db", - "https://bcr.bazel.build/modules/bazel_worker_java/0.0.4/source.json": "a2d30458fd86cf022c2b6331e652526fa08e17573b2f5034a9dbcacdf9c2583c", - "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84", - "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8", + "https://bcr.bazel.build/modules/bazel_worker_java/0.0.8/MODULE.bazel": "e76479eae70bd4e8f5f4c2dfc5d03ab971cfb18750246c7b3f3454c5c2ee6629", + "https://bcr.bazel.build/modules/bazel_worker_java/0.0.8/source.json": "9395c4679444bc47bf7e51a710366a4480aa371c6f6bed01868e2fabcf11acec", + "https://bcr.bazel.build/modules/buildozer/8.5.1/MODULE.bazel": "a35d9561b3fc5b18797c330793e99e3b834a473d5fbd3d7d7634aafc9bdb6f8f", + "https://bcr.bazel.build/modules/buildozer/8.5.1/source.json": "e3386e6ff4529f2442800dee47ad28d3e6487f36a1f75ae39ae56c70f0cd2fbd", "https://bcr.bazel.build/modules/gazelle/0.32.0/MODULE.bazel": "b499f58a5d0d3537f3cf5b76d8ada18242f64ec474d8391247438bf04f58c7b8", "https://bcr.bazel.build/modules/gazelle/0.33.0/MODULE.bazel": "a13a0f279b462b784fb8dd52a4074526c4a2afe70e114c7d09066097a46b3350", "https://bcr.bazel.build/modules/gazelle/0.34.0/MODULE.bazel": "abdd8ce4d70978933209db92e436deb3a8b737859e9354fb5fd11fb5c2004c8a", "https://bcr.bazel.build/modules/gazelle/0.36.0/MODULE.bazel": "e375d5d6e9a6ca59b0cb38b0540bc9a05b6aa926d322f2de268ad267a2ee74c0", "https://bcr.bazel.build/modules/gazelle/0.40.0/MODULE.bazel": "42ba5378ebe845fca43989a53186ab436d956db498acde790685fe0e8f9c6146", - "https://bcr.bazel.build/modules/gazelle/0.40.0/source.json": "1e5ef6e4d8b9b6836d93273c781e78ff829ea2e077afef7a57298040fa4f010a", + "https://bcr.bazel.build/modules/gazelle/0.47.0/MODULE.bazel": "b61bb007c4efad134aa30ee7f4a8e2a39b22aa5685f005edaa022fbd1de43ebc", + "https://bcr.bazel.build/modules/gazelle/0.47.0/source.json": "aeb2e5df14b7fb298625d75d08b9c65bdb0b56014c5eb89da9e5dd0572280ae6", "https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb", "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4", "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6", @@ -78,6 +87,8 @@ "https://bcr.bazel.build/modules/libpfm/4.11.0/MODULE.bazel": "45061ff025b301940f1e30d2c16bea596c25b176c8b6b3087e92615adbd52902", "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/MODULE.bazel": "6f7b417dcc794d9add9e556673ad25cb3ba835224290f4f848f8e2db1e1fca74", "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/source.json": "f448c6e8963fdfa7eb831457df83ad63d3d6355018f6574fb017e8169deb43a9", + "https://bcr.bazel.build/modules/package_metadata/0.0.3/MODULE.bazel": "77890552ecea9e284b5424c9de827a58099348763a4359e975c359a83d4faa83", + "https://bcr.bazel.build/modules/package_metadata/0.0.5/MODULE.bazel": "ef4f9439e3270fdd6b9fd4dbc3d2f29d13888e44c529a1b243f7a31dfbc2e8e4", "https://bcr.bazel.build/modules/package_metadata/0.0.7/MODULE.bazel": "7adb03933fc8401f495800cf4eafcff0edc6da0ff55c7db223ef69d19f689486", "https://bcr.bazel.build/modules/package_metadata/0.0.7/source.json": "50639625e937b56115012674c797cca7a05a96b4878c87d803c13dc2b31de8a0", "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5", @@ -96,6 +107,7 @@ "https://bcr.bazel.build/modules/protobuf/27.0/MODULE.bazel": "7873b60be88844a0a1d8f80b9d5d20cfbd8495a689b8763e76c6372998d3f64c", "https://bcr.bazel.build/modules/protobuf/27.1/MODULE.bazel": "703a7b614728bb06647f965264967a8ef1c39e09e8f167b3ca0bb1fd80449c0d", "https://bcr.bazel.build/modules/protobuf/27.2/MODULE.bazel": "32450b50673882e4c8c3d10a83f3bc82161b213ed2f80d17e38bece8f165c295", + "https://bcr.bazel.build/modules/protobuf/29.0-rc2.bcr.1/MODULE.bazel": "52f4126f63a2f0bbf36b99c2a87648f08467a4eaf92ba726bc7d6a500bbf770c", "https://bcr.bazel.build/modules/protobuf/29.0-rc2/MODULE.bazel": "6241d35983510143049943fc0d57937937122baf1b287862f9dc8590fc4c37df", "https://bcr.bazel.build/modules/protobuf/29.0-rc3/MODULE.bazel": "33c2dfa286578573afc55a7acaea3cada4122b9631007c594bf0729f41c8de92", "https://bcr.bazel.build/modules/protobuf/29.0/MODULE.bazel": "319dc8bf4c679ff87e71b1ccfb5a6e90a6dbc4693501d471f48662ac46d04e4e", @@ -105,7 +117,8 @@ "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858", "https://bcr.bazel.build/modules/protobuf/31.1/MODULE.bazel": "379a389bb330b7b8c1cdf331cc90bf3e13de5614799b3b52cdb7c6f389f6b38e", "https://bcr.bazel.build/modules/protobuf/32.1/MODULE.bazel": "89cd2866a9cb07fee9ff74c41ceace11554f32e0d849de4e23ac55515cfada4d", - "https://bcr.bazel.build/modules/protobuf/32.1/source.json": "bd2664e90875c0cd755d1d9b7a103a4b027893ac8eafa3bba087557ffc244ad4", + "https://bcr.bazel.build/modules/protobuf/33.4/MODULE.bazel": "114775b816b38b6d0ca620450d6b02550c60ceedfdc8d9a229833b34a223dc42", + "https://bcr.bazel.build/modules/protobuf/33.4/source.json": "555f8686b4c7d6b5ba731fbea13bf656b4bfd9a7ff629c1d9d3f6e1d6155de79", "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel": "88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e", "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34", "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/source.json": "6900fdc8a9e95866b8c0d4ad4aba4d4236317b5c1cd04c502df3f0d33afed680", @@ -115,13 +128,14 @@ "https://bcr.bazel.build/modules/re2/2024-07-02/MODULE.bazel": "0eadc4395959969297cbcf31a249ff457f2f1d456228c67719480205aa306daa", "https://bcr.bazel.build/modules/rules_android/0.1.1/MODULE.bazel": "48809ab0091b07ad0182defb787c4c5328bd3a278938415c00a7b69b50c4d3a8", "https://bcr.bazel.build/modules/rules_android/0.6.6/MODULE.bazel": "b0fb569752aab65ab1a9db0a8f6cfaf5aa1754965e17e95dcf0e4d88e192a68d", - "https://bcr.bazel.build/modules/rules_android/0.6.6/source.json": "a9d8dc2d5a102dc03269a94acc886a4cab82cdcb9ccbc77b0f665d6d17a6ae09", + "https://bcr.bazel.build/modules/rules_android/0.7.1/MODULE.bazel": "a806fc382a774252f228a40e3b11b9fcc6276f8778c7fb33e9f72937c6258363", + "https://bcr.bazel.build/modules/rules_android/0.7.1/source.json": "151440aed3f0f73a00d4ed5cec5d31f63a6fef9b95d8fab1eb1810150fa525f2", "https://bcr.bazel.build/modules/rules_apple/3.16.0/MODULE.bazel": "0d1caf0b8375942ce98ea944be754a18874041e4e0459401d925577624d3a54a", - "https://bcr.bazel.build/modules/rules_apple/3.16.0/source.json": "d8b5fe461272018cc07cfafce11fe369c7525330804c37eec5a82f84cd475366", + "https://bcr.bazel.build/modules/rules_apple/4.1.0/MODULE.bazel": "76e10fd4a48038d3fc7c5dc6e63b7063bbf5304a2e3bd42edda6ec660eebea68", + "https://bcr.bazel.build/modules/rules_apple/4.1.0/source.json": "8ee81e1708756f81b343a5eb2b2f0b953f1d25c4ab3d4a68dc02754872e80715", "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647", "https://bcr.bazel.build/modules/rules_cc/0.0.10/MODULE.bazel": "ec1705118f7eaedd6e118508d3d26deba2a4e76476ada7e0e3965211be012002", "https://bcr.bazel.build/modules/rules_cc/0.0.13/MODULE.bazel": "0e8529ed7b323dad0775ff924d2ae5af7640b23553dfcd4d34344c7e7a867191", - "https://bcr.bazel.build/modules/rules_cc/0.0.14/MODULE.bazel": "5e343a3aac88b8d7af3b1b6d2093b55c347b8eefc2e7d1442f7a02dc8fea48ac", "https://bcr.bazel.build/modules/rules_cc/0.0.15/MODULE.bazel": "6704c35f7b4a72502ee81f61bf88706b54f06b3cbe5558ac17e2e14666cd5dcc", "https://bcr.bazel.build/modules/rules_cc/0.0.16/MODULE.bazel": "7661303b8fc1b4d7f532e54e9d6565771fea666fbdf839e0a86affcd02defe87", "https://bcr.bazel.build/modules/rules_cc/0.0.17/MODULE.bazel": "2ae1d8f4238ec67d7185d8861cb0a2cdf4bc608697c331b95bf990e69b62e64a", @@ -130,9 +144,13 @@ "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5", "https://bcr.bazel.build/modules/rules_cc/0.1.1/MODULE.bazel": "2f0222a6f229f0bf44cd711dc13c858dad98c62d52bd51d8fc3a764a83125513", + "https://bcr.bazel.build/modules/rules_cc/0.1.2/MODULE.bazel": "557ddc3a96858ec0d465a87c0a931054d7dcfd6583af2c7ed3baf494407fd8d0", + "https://bcr.bazel.build/modules/rules_cc/0.1.5/MODULE.bazel": "88dfc9361e8b5ae1008ac38f7cdfd45ad738e4fa676a3ad67d19204f045a1fd8", "https://bcr.bazel.build/modules/rules_cc/0.2.0/MODULE.bazel": "b5c17f90458caae90d2ccd114c81970062946f49f355610ed89bebf954f5783c", + "https://bcr.bazel.build/modules/rules_cc/0.2.13/MODULE.bazel": "eecdd666eda6be16a8d9dc15e44b5c75133405e820f620a234acc4b1fdc5aa37", "https://bcr.bazel.build/modules/rules_cc/0.2.14/MODULE.bazel": "353c99ed148887ee89c54a17d4100ae7e7e436593d104b668476019023b58df8", - "https://bcr.bazel.build/modules/rules_cc/0.2.14/source.json": "55d0a4587c5592fad350f6e698530f4faf0e7dd15e69d43f8d87e220c78bea54", + "https://bcr.bazel.build/modules/rules_cc/0.2.17/MODULE.bazel": "1849602c86cb60da8613d2de887f9566a6d354a6df6d7009f9d04a14402f9a84", + "https://bcr.bazel.build/modules/rules_cc/0.2.17/source.json": "3832f45d145354049137c0090df04629d9c2b5493dc5c2bf46f1834040133a07", "https://bcr.bazel.build/modules/rules_cc/0.2.8/MODULE.bazel": "f1df20f0bf22c28192a794f29b501ee2018fa37a3862a1a2132ae2940a23a642", "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6", "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8", @@ -141,40 +159,38 @@ "https://bcr.bazel.build/modules/rules_go/0.46.0/MODULE.bazel": "3477df8bdcc49e698b9d25f734c4f3a9f5931ff34ee48a2c662be168f5f2d3fd", "https://bcr.bazel.build/modules/rules_go/0.50.1/MODULE.bazel": "b91a308dc5782bb0a8021ad4330c81fea5bda77f96b9e4c117b9b9c8f6665ee0", "https://bcr.bazel.build/modules/rules_go/0.51.0-rc2/MODULE.bazel": "edfc3a9cea7bedb0eaaff37b0d7817c1a4bf72b3c615580b0ffcee6c52690fd4", - "https://bcr.bazel.build/modules/rules_go/0.51.0-rc2/source.json": "6b5cd0b3da2bd0e6949580851db990a04af0a285f072b9a0f059424457cd8cc9", + "https://bcr.bazel.build/modules/rules_go/0.53.0/MODULE.bazel": "a4ed760d3ac0dbc0d7b967631a9a3fd9100d28f7d9fcf214b4df87d4bfff5f9a", + "https://bcr.bazel.build/modules/rules_go/0.59.0/MODULE.bazel": "b7e43e7414a3139a7547d1b4909b29085fbe5182b6c58cbe1ed4c6272815aeae", + "https://bcr.bazel.build/modules/rules_go/0.60.0/MODULE.bazel": "4a57ff2ffc2a3570e3c5646575c5a4b07287e91bcdac5d1f72383d51502b48cb", + "https://bcr.bazel.build/modules/rules_go/0.60.0/source.json": "1e21368c5e0c3013a110bd79a8fcff8ca46b5bcb2b561713a7273cbfcff7c464", "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74", "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86", - "https://bcr.bazel.build/modules/rules_java/6.0.0/MODULE.bazel": "8a43b7df601a7ec1af61d79345c17b31ea1fedc6711fd4abfd013ea612978e39", "https://bcr.bazel.build/modules/rules_java/6.3.0/MODULE.bazel": "a97c7678c19f236a956ad260d59c86e10a463badb7eb2eda787490f4c969b963", - "https://bcr.bazel.build/modules/rules_java/6.4.0/MODULE.bazel": "e986a9fe25aeaa84ac17ca093ef13a4637f6107375f64667a15999f77db6c8f6", "https://bcr.bazel.build/modules/rules_java/6.5.2/MODULE.bazel": "1d440d262d0e08453fa0c4d8f699ba81609ed0e9a9a0f02cd10b3e7942e61e31", "https://bcr.bazel.build/modules/rules_java/7.1.0/MODULE.bazel": "30d9135a2b6561c761bd67bd4990da591e6bdc128790ce3e7afd6a3558b2fb64", "https://bcr.bazel.build/modules/rules_java/7.10.0/MODULE.bazel": "530c3beb3067e870561739f1144329a21c851ff771cd752a49e06e3dc9c2e71a", "https://bcr.bazel.build/modules/rules_java/7.12.2/MODULE.bazel": "579c505165ee757a4280ef83cda0150eea193eed3bef50b1004ba88b99da6de6", "https://bcr.bazel.build/modules/rules_java/7.2.0/MODULE.bazel": "06c0334c9be61e6cef2c8c84a7800cef502063269a5af25ceb100b192453d4ab", - "https://bcr.bazel.build/modules/rules_java/7.3.2/MODULE.bazel": "50dece891cfdf1741ea230d001aa9c14398062f2b7c066470accace78e412bc2", "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel": "a592852f8a3dd539e82ee6542013bf2cadfc4c6946be8941e189d224500a8934", "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", "https://bcr.bazel.build/modules/rules_java/8.13.0/MODULE.bazel": "0444ebf737d144cf2bb2ccb368e7f1cce735264285f2a3711785827c1686625e", - "https://bcr.bazel.build/modules/rules_java/8.14.0/MODULE.bazel": "717717ed40cc69994596a45aec6ea78135ea434b8402fb91b009b9151dd65615", - "https://bcr.bazel.build/modules/rules_java/8.16.1/MODULE.bazel": "0f20b1cecaa8e52f60a8f071e59a20b4e3b9a67f6c56c802ea256f6face692d3", - "https://bcr.bazel.build/modules/rules_java/8.16.1/source.json": "072f8d11264edc499621be2dc9ea01d6395db5aa6f8799c034ae01a3e857f2e4", "https://bcr.bazel.build/modules/rules_java/8.3.2/MODULE.bazel": "7336d5511ad5af0b8615fdc7477535a2e4e723a357b6713af439fe8cf0195017", "https://bcr.bazel.build/modules/rules_java/8.5.1/MODULE.bazel": "d8a9e38cc5228881f7055a6079f6f7821a073df3744d441978e7a43e20226939", "https://bcr.bazel.build/modules/rules_java/8.6.0/MODULE.bazel": "9c064c434606d75a086f15ade5edb514308cccd1544c2b2a89bbac4310e41c71", "https://bcr.bazel.build/modules/rules_java/8.6.1/MODULE.bazel": "f4808e2ab5b0197f094cabce9f4b006a27766beb6a9975931da07099560ca9c2", + "https://bcr.bazel.build/modules/rules_java/9.0.3/MODULE.bazel": "1f98ed015f7e744a745e0df6e898a7c5e83562d6b759dfd475c76456dda5ccea", + "https://bcr.bazel.build/modules/rules_java/9.3.0/MODULE.bazel": "f657c72d65ac449caae9abf2e68e66c0d36f9416848c4c4903d0b3234229e7f2", + "https://bcr.bazel.build/modules/rules_java/9.3.0/source.json": "59ae7e662c3c7042b88bbb42ad12483523e234c65ebe4c51611baa43e85cb248", "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909", "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036", - "https://bcr.bazel.build/modules/rules_jvm_external/5.3/MODULE.bazel": "bf93870767689637164657731849fb887ad086739bd5d360d90007a581d5527d", - "https://bcr.bazel.build/modules/rules_jvm_external/6.1/MODULE.bazel": "75b5fec090dbd46cf9b7d8ea08cf84a0472d92ba3585b476f44c326eda8059c4", "https://bcr.bazel.build/modules/rules_jvm_external/6.10/MODULE.bazel": "33e636ca6bc9ee0fa090a38aa33c631ded2d8cf6fead4124181d1b35dc474f7c", "https://bcr.bazel.build/modules/rules_jvm_external/6.10/source.json": "c191249787625db72616a3fb3cc2786ab57355a2e3b615402b8b3b66b0f995b7", "https://bcr.bazel.build/modules/rules_jvm_external/6.2/MODULE.bazel": "36a6e52487a855f33cb960724eb56547fa87e2c98a0474c3acad94339d7f8e99", "https://bcr.bazel.build/modules/rules_jvm_external/6.3/MODULE.bazel": "c998e060b85f71e00de5ec552019347c8bca255062c990ac02d051bb80a38df0", "https://bcr.bazel.build/modules/rules_jvm_external/6.6/MODULE.bazel": "153042249c7060536dc95b6bb9f9bb8063b8a0b0cb7acdb381bddbc2374aed55", "https://bcr.bazel.build/modules/rules_jvm_external/6.7/MODULE.bazel": "e717beabc4d091ecb2c803c2d341b88590e9116b8bf7947915eeb33aab4f96dd", - "https://bcr.bazel.build/modules/rules_kotlin/1.9.0/MODULE.bazel": "ef85697305025e5a61f395d4eaede272a5393cee479ace6686dba707de804d59", + "https://bcr.bazel.build/modules/rules_jvm_external/6.9/MODULE.bazel": "07c5db05527db7744a54fcffd653e1550d40e0540207a7f7e6d0a4de5bef8274", "https://bcr.bazel.build/modules/rules_kotlin/1.9.5/MODULE.bazel": "043a16a572f610558ec2030db3ff0c9938574e7dd9f58bded1bb07c0192ef025", "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/MODULE.bazel": "d269a01a18ee74d0335450b10f62c9ed81f2321d7958a2934e44272fe82dcef3", "https://bcr.bazel.build/modules/rules_kotlin/2.1.3/MODULE.bazel": "ce7def6d576aa8d3a9c6d10e13b4d157296229674371f67dbf788dae0afae3d5", @@ -203,30 +219,34 @@ "https://bcr.bazel.build/modules/rules_python/0.37.1/MODULE.bazel": "3faeb2d9fa0a81f8980643ee33f212308f4d93eea4b9ce6f36d0b742e71e9500", "https://bcr.bazel.build/modules/rules_python/0.37.2/MODULE.bazel": "b5ffde91410745750b6c13be1c5dc4555ef5bc50562af4a89fd77807fdde626a", "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c", - "https://bcr.bazel.build/modules/rules_python/0.40.0/MODULE.bazel": "9d1a3cd88ed7d8e39583d9ffe56ae8a244f67783ae89b60caafc9f5cf318ada7", "https://bcr.bazel.build/modules/rules_python/1.0.0/MODULE.bazel": "898a3d999c22caa585eb062b600f88654bf92efb204fa346fb55f6f8edffca43", + "https://bcr.bazel.build/modules/rules_python/1.3.0/MODULE.bazel": "8361d57eafb67c09b75bf4bbe6be360e1b8f4f18118ab48037f2bd50aa2ccb13", "https://bcr.bazel.build/modules/rules_python/1.4.1/MODULE.bazel": "8991ad45bdc25018301d6b7e1d3626afc3c8af8aaf4bc04f23d0b99c938b73a6", - "https://bcr.bazel.build/modules/rules_python/1.4.1/source.json": "8ec8c90c70ccacc4de8ca1b97f599e756fb59173e898ee08b733006650057c07", + "https://bcr.bazel.build/modules/rules_python/1.6.0/MODULE.bazel": "7e04ad8f8d5bea40451cf80b1bd8262552aa73f841415d20db96b7241bd027d8", + "https://bcr.bazel.build/modules/rules_python/1.7.0/MODULE.bazel": "d01f995ecd137abf30238ad9ce97f8fc3ac57289c8b24bd0bf53324d937a14f8", + "https://bcr.bazel.build/modules/rules_python/1.7.0/source.json": "028a084b65dcf8f4dc4f82f8778dbe65df133f234b316828a82e060d81bdce32", "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/MODULE.bazel": "d44fec647d0aeb67b9f3b980cf68ba634976f3ae7ccd6c07d790b59b87a4f251", "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/source.json": "37c10335f2361c337c5c1f34ed36d2da70534c23088062b33a8bdaab68aa9dea", "https://bcr.bazel.build/modules/rules_shell/0.1.2/MODULE.bazel": "66e4ca3ce084b04af0b9ff05ff14cab4e5df7503973818bb91cbc6cda08d32fc", "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c", "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b", "https://bcr.bazel.build/modules/rules_shell/0.4.1/MODULE.bazel": "00e501db01bbf4e3e1dd1595959092c2fadf2087b2852d3f553b5370f5633592", - "https://bcr.bazel.build/modules/rules_shell/0.4.1/source.json": "4757bd277fe1567763991c4425b483477bb82e35e777a56fd846eb5cceda324a", + "https://bcr.bazel.build/modules/rules_shell/0.6.1/MODULE.bazel": "72e76b0eea4e81611ef5452aa82b3da34caca0c8b7b5c0c9584338aa93bae26b", + "https://bcr.bazel.build/modules/rules_shell/0.6.1/source.json": "20ec05cd5e592055e214b2da8ccb283c7f2a421ea0dc2acbf1aa792e11c03d0c", "https://bcr.bazel.build/modules/rules_swift/1.16.0/MODULE.bazel": "4a09f199545a60d09895e8281362b1ff3bb08bbde69c6fc87aff5b92fcc916ca", "https://bcr.bazel.build/modules/rules_swift/2.1.1/MODULE.bazel": "494900a80f944fc7aa61500c2073d9729dff0b764f0e89b824eb746959bc1046", - "https://bcr.bazel.build/modules/rules_swift/2.1.1/source.json": "40fc69dfaac64deddbb75bd99cdac55f4427d9ca0afbe408576a65428427a186", + "https://bcr.bazel.build/modules/rules_swift/2.4.0/MODULE.bazel": "1639617eb1ede28d774d967a738b4a68b0accb40650beadb57c21846beab5efd", + "https://bcr.bazel.build/modules/rules_swift/3.1.2/MODULE.bazel": "72c8f5cf9d26427cee6c76c8e3853eb46ce6b0412a081b2b6db6e8ad56267400", + "https://bcr.bazel.build/modules/rules_swift/3.1.2/source.json": "e85761f3098a6faf40b8187695e3de6d97944e98abd0d8ce579cb2daf6319a66", "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c", - "https://bcr.bazel.build/modules/stardoc/0.5.6/MODULE.bazel": "c43dabc564990eeab55e25ed61c07a1aadafe9ece96a4efabb3f8bf9063b71ef", "https://bcr.bazel.build/modules/stardoc/0.6.2/MODULE.bazel": "7060193196395f5dd668eda046ccbeacebfd98efc77fed418dbe2b82ffaa39fd", "https://bcr.bazel.build/modules/stardoc/0.7.0/MODULE.bazel": "05e3d6d30c099b6770e97da986c53bd31844d7f13d41412480ea265ac9e8079c", - "https://bcr.bazel.build/modules/stardoc/0.7.1/MODULE.bazel": "3548faea4ee5dda5580f9af150e79d0f6aea934fc60c1cc50f4efdd9420759e7", "https://bcr.bazel.build/modules/stardoc/0.7.2/MODULE.bazel": "fc152419aa2ea0f51c29583fab1e8c99ddefd5b3778421845606ee628629e0e5", "https://bcr.bazel.build/modules/stardoc/0.7.2/source.json": "58b029e5e901d6802967754adf0a9056747e8176f017cfe3607c0851f4d42216", "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/MODULE.bazel": "5e463fbfba7b1701d957555ed45097d7f984211330106ccd1352c6e0af0dcf91", - "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/source.json": "32bd87e5f4d7acc57c5b2ff7c325ae3061d5e242c0c4c214ae87e0f1c13e54cb", + "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.2/MODULE.bazel": "75aab2373a4bbe2a1260b9bf2a1ebbdbf872d3bd36f80bff058dccd82e89422f", + "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.2/source.json": "5fba48bbe0ba48761f9e9f75f92876cafb5d07c0ce059cc7a8027416de94a05b", "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", "https://bcr.bazel.build/modules/upb/0.0.0-20230516-61a97ef/MODULE.bazel": "c0df5e35ad55e264160417fd0875932ee3c9dda63d9fccace35ac62f45e1b6f9", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", @@ -239,13 +259,12 @@ "moduleExtensions": { "@@pybind11_bazel+//:internal_configure.bzl%internal_configure_extension": { "general": { - "bzlTransitiveDigest": "NFQjcZF+fAvf5fDH+pqsx4JrfzP9PuHBz6S6ZutIbnw=", + "bzlTransitiveDigest": "06cynZ1bCvvy8zHPrrDlXq+Z68xmjctHpfFxi+zEpJY=", "usagesDigest": "D1r3lfzMuUBFxgG8V6o0bQTLMk3GkaGOaPzw53wrwyw=", - "recordedFileInputs": { - "@@pybind11_bazel+//MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34" - }, - "recordedDirentsInputs": {}, - "envVariables": {}, + "recordedInputs": [ + "REPO_MAPPING:pybind11_bazel+,bazel_tools bazel_tools", + "FILE:@@pybind11_bazel+//MODULE.bazel e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34" + ], "generatedRepoSpecs": { "pybind11": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", @@ -257,23 +276,16 @@ ] } } - }, - "recordedRepoMappingEntries": [ - [ - "pybind11_bazel+", - "bazel_tools", - "bazel_tools" - ] - ] + } } }, "@@rules_android+//bzlmod_extensions:apksig.bzl%apksig_extension": { "general": { - "bzlTransitiveDigest": "By9qVNN7G4oL1vYOJXye7Dp/CbR2ar9oxAW8WXAVcVw=", - "usagesDigest": "xq6OVkELeJvOgYo3oY/sUBsGFbcqdV+9BYiNgSPV/po=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, + "bzlTransitiveDigest": "KrgiB8lWxqVdbipL9YIYOuGjS80xlZIM/EBvUg8SVd0=", + "usagesDigest": "zr/niBQ/s2fHozWAsg4vI70wAxcuFjG+QtM15qGkq9o=", + "recordedInputs": [ + "REPO_MAPPING:rules_android+,bazel_tools bazel_tools" + ], "generatedRepoSpecs": { "apksig": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", @@ -282,23 +294,16 @@ "build_file": "@@rules_android+//bzlmod_extensions:apksig.BUILD" } } - }, - "recordedRepoMappingEntries": [ - [ - "rules_android+", - "bazel_tools", - "bazel_tools" - ] - ] + } } }, "@@rules_android+//bzlmod_extensions:com_android_dex.bzl%com_android_dex_extension": { "general": { - "bzlTransitiveDigest": "rvWbJQc8jInfIAaXIMhSOqUlwM9HVeLey6q0ISvg08Y=", - "usagesDigest": "toF8IFMu98H/VU2p1sfVC5fVXVYJunpbbmtM6tOsQXY=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, + "bzlTransitiveDigest": "WYXjwqaZbEnV+ZWsKE3oDMpF5XVw8hxzet83NtyT8TM=", + "usagesDigest": "c1Y/KGGjUYCyd8zNIVTUh1bynVXRFz6xGKaSCBpQANM=", + "recordedInputs": [ + "REPO_MAPPING:rules_android+,bazel_tools bazel_tools" + ], "generatedRepoSpecs": { "com_android_dex": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", @@ -307,159 +312,29 @@ "build_file": "@@rules_android+//bzlmod_extensions:com_android_dex.BUILD" } } - }, - "recordedRepoMappingEntries": [ - [ - "rules_android+", - "bazel_tools", - "bazel_tools" - ] - ] + } } }, "@@rules_android+//rules/android_sdk_repository:rule.bzl%android_sdk_repository_extension": { "general": { - "bzlTransitiveDigest": "NAy+0M15JNVEBb8Tny6t7j3lKqTnsAMjoBB6LJ+C370=", - "usagesDigest": "g9Ur6X6qhf9a8MmY9qXU/jFjkyk/aZVBegI0yVMF0z4=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, + "bzlTransitiveDigest": "+rMrzIrv7sImYmkbXJYv+gFpTJQ79X3MpwwMLI2A+oA=", + "usagesDigest": "iEGI2aNDMkHt9LXCdViLNUUOslpiVj2DrevWWXZEFnU=", + "recordedInputs": [], "generatedRepoSpecs": { "androidsdk": { "repoRuleId": "@@rules_android+//rules/android_sdk_repository:rule.bzl%_android_sdk_repository", "attributes": {} } - }, - "recordedRepoMappingEntries": [] - } - }, - "@@rules_apple+//apple:apple.bzl%provisioning_profile_repository_extension": { - "general": { - "bzlTransitiveDigest": "LKT4eTNHatc2Ti8tCILPSTYqQAc4030bEjspG/P+3TI=", - "usagesDigest": "vsJl8Rw5NL+5Ag2wdUDoTeRF/5klkXO8545Iy7U1Q08=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "local_provisioning_profiles": { - "repoRuleId": "@@rules_apple+//apple/internal:local_provisioning_profiles.bzl%provisioning_profile_repository", - "attributes": {} - } - }, - "recordedRepoMappingEntries": [ - [ - "apple_support+", - "bazel_skylib", - "bazel_skylib+" - ], - [ - "bazel_tools", - "rules_cc", - "rules_cc+" - ], - [ - "rules_apple+", - "bazel_skylib", - "bazel_skylib+" - ], - [ - "rules_apple+", - "bazel_tools", - "bazel_tools" - ], - [ - "rules_apple+", - "build_bazel_apple_support", - "apple_support+" - ], - [ - "rules_apple+", - "build_bazel_rules_swift", - "rules_swift+" - ], - [ - "rules_cc+", - "bazel_tools", - "bazel_tools" - ], - [ - "rules_cc+", - "cc_compatibility_proxy", - "rules_cc++compatibility_proxy+cc_compatibility_proxy" - ], - [ - "rules_cc+", - "rules_cc", - "rules_cc+" - ], - [ - "rules_cc++compatibility_proxy+cc_compatibility_proxy", - "rules_cc", - "rules_cc+" - ], - [ - "rules_swift+", - "bazel_skylib", - "bazel_skylib+" - ], - [ - "rules_swift+", - "bazel_tools", - "bazel_tools" - ], - [ - "rules_swift+", - "build_bazel_apple_support", - "apple_support+" - ], - [ - "rules_swift+", - "build_bazel_rules_swift", - "rules_swift+" - ], - [ - "rules_swift+", - "build_bazel_rules_swift_local_config", - "rules_swift++non_module_deps+build_bazel_rules_swift_local_config" - ] - ] - } - }, - "@@rules_apple+//apple:extensions.bzl%non_module_deps": { - "general": { - "bzlTransitiveDigest": "4xtddSlWIQdtVNVuvOI62fJfQVETHZCVWFvYYwQHMR4=", - "usagesDigest": "M3VqFpeTCo4qmrNKGZw0dxBHvTYDrfV3cscGzlSAhQ4=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "xctestrunner": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "urls": [ - "https://github.com/google/xctestrunner/archive/b7698df3d435b6491b4b4c0f9fc7a63fbed5e3a6.tar.gz" - ], - "strip_prefix": "xctestrunner-b7698df3d435b6491b4b4c0f9fc7a63fbed5e3a6", - "sha256": "ae3a063c985a8633cb7eb566db21656f8db8eb9a0edb8c182312c7f0db53730d" - } - } - }, - "recordedRepoMappingEntries": [ - [ - "rules_apple+", - "bazel_tools", - "bazel_tools" - ] - ] + } } }, "@@rules_kotlin+//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": { "general": { - "bzlTransitiveDigest": "HJP3wKFbPhB1mSYjJS6kbXEiP+OQxvsBdqpvyJN6I3s=", + "bzlTransitiveDigest": "m2i9p9Fn+7u7WGI0mz6K5GlmmtUuwReSjDHIISY08GI=", "usagesDigest": "qTwqmKKUfWcPdvM0waG+CPWrxsbeAWVeUxavm7tEk9E=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, + "recordedInputs": [ + "REPO_MAPPING:rules_kotlin+,bazel_tools bazel_tools" + ], "generatedRepoSpecs": { "com_github_jetbrains_kotlin_git": { "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:compiler.bzl%kotlin_compiler_git_repository", @@ -524,211 +399,534 @@ ] } } - }, - "recordedRepoMappingEntries": [ - [ - "rules_kotlin+", - "bazel_tools", - "bazel_tools" - ] - ] + } } }, - "@@rules_python+//python/uv:uv.bzl%uv": { + "@@rules_python+//python/extensions:config.bzl%config": { "general": { - "bzlTransitiveDigest": "Xpqjnjzy6zZ90Es9Wa888ZLHhn7IsNGbph/e6qoxzw8=", - "usagesDigest": "4JapxcpS0mL3524k0TZJffAtVyuRjDHZvN9kBRxxF1U=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, + "bzlTransitiveDigest": "2hLgIvNVTLgxus0ZuXtleBe70intCfo0cHs8qvt6cdM=", + "usagesDigest": "ZVSXMAGpD+xzVNPuvF1IoLBkty7TROO0+akMapt1pAg=", + "recordedInputs": [ + "REPO_MAPPING:rules_python+,bazel_tools bazel_tools", + "REPO_MAPPING:rules_python+,pypi__build rules_python++config+pypi__build", + "REPO_MAPPING:rules_python+,pypi__click rules_python++config+pypi__click", + "REPO_MAPPING:rules_python+,pypi__colorama rules_python++config+pypi__colorama", + "REPO_MAPPING:rules_python+,pypi__importlib_metadata rules_python++config+pypi__importlib_metadata", + "REPO_MAPPING:rules_python+,pypi__installer rules_python++config+pypi__installer", + "REPO_MAPPING:rules_python+,pypi__more_itertools rules_python++config+pypi__more_itertools", + "REPO_MAPPING:rules_python+,pypi__packaging rules_python++config+pypi__packaging", + "REPO_MAPPING:rules_python+,pypi__pep517 rules_python++config+pypi__pep517", + "REPO_MAPPING:rules_python+,pypi__pip rules_python++config+pypi__pip", + "REPO_MAPPING:rules_python+,pypi__pip_tools rules_python++config+pypi__pip_tools", + "REPO_MAPPING:rules_python+,pypi__pyproject_hooks rules_python++config+pypi__pyproject_hooks", + "REPO_MAPPING:rules_python+,pypi__setuptools rules_python++config+pypi__setuptools", + "REPO_MAPPING:rules_python+,pypi__tomli rules_python++config+pypi__tomli", + "REPO_MAPPING:rules_python+,pypi__wheel rules_python++config+pypi__wheel", + "REPO_MAPPING:rules_python+,pypi__zipp rules_python++config+pypi__zipp" + ], "generatedRepoSpecs": { - "uv": { - "repoRuleId": "@@rules_python+//python/uv/private:uv_toolchains_repo.bzl%uv_toolchains_repo", + "rules_python_internal": { + "repoRuleId": "@@rules_python+//python/private:internal_config_repo.bzl%internal_config_repo", "attributes": { - "toolchain_type": "'@@rules_python+//python/uv:uv_toolchain_type'", - "toolchain_names": [ - "none" - ], - "toolchain_implementations": { - "none": "'@@rules_python+//python:none'" - }, - "toolchain_compatible_with": { - "none": [ - "@platforms//:incompatible" - ] - }, - "toolchain_target_settings": {} + "transition_setting_generators": {}, + "transition_settings": [] } - } - }, - "recordedRepoMappingEntries": [ - [ - "rules_python+", - "platforms", - "platforms" - ] - ] - } - }, - "@@rules_swift+//swift:extensions.bzl%non_module_deps": { - "general": { - "bzlTransitiveDigest": "6axDCXf6fQoPav8hojnUBxGA0FAMqLvtpC1cRsisCdw=", - "usagesDigest": "mhACFnrdMv9Wi0Mt67bxocJqviRkDSV+Ee5Mqdj5akA=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "com_github_apple_swift_protobuf": { + }, + "pypi__build": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-protobuf/archive/1.20.2.tar.gz" - ], - "sha256": "3fb50bd4d293337f202d917b6ada22f9548a0a0aed9d9a4d791e6fbd8a246ebb", - "strip_prefix": "swift-protobuf-1.20.2/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_protobuf/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/e2/03/f3c8ba0a6b6e30d7d18c40faab90807c9bb5e9a1e3b2fe2008af624a9c97/build-1.2.1-py3-none-any.whl", + "sha256": "75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_grpc_grpc_swift": { + "pypi__click": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/grpc/grpc-swift/archive/1.16.0.tar.gz" - ], - "sha256": "58b60431d0064969f9679411264b82e40a217ae6bd34e17096d92cc4e47556a5", - "strip_prefix": "grpc-swift-1.16.0/", - "build_file": "@@rules_swift+//third_party:com_github_grpc_grpc_swift/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl", + "sha256": "ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_docc_symbolkit": { + "pypi__colorama": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-docc-symbolkit/archive/refs/tags/swift-5.10-RELEASE.tar.gz" - ], - "sha256": "de1d4b6940468ddb53b89df7aa1a81323b9712775b0e33e8254fa0f6f7469a97", - "strip_prefix": "swift-docc-symbolkit-swift-5.10-RELEASE", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_docc_symbolkit/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", + "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_nio": { + "pypi__importlib_metadata": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-nio/archive/2.42.0.tar.gz" - ], - "sha256": "e3304bc3fb53aea74a3e54bd005ede11f6dc357117d9b1db642d03aea87194a0", - "strip_prefix": "swift-nio-2.42.0/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/2d/0a/679461c511447ffaf176567d5c496d1de27cbe34a87df6677d7171b2fbd4/importlib_metadata-7.1.0-py3-none-any.whl", + "sha256": "30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_nio_http2": { + "pypi__installer": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-nio-http2/archive/1.26.0.tar.gz" - ], - "sha256": "f0edfc9d6a7be1d587e5b403f2d04264bdfae59aac1d74f7d974a9022c6d2b25", - "strip_prefix": "swift-nio-http2-1.26.0/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_http2/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl", + "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_nio_transport_services": { + "pypi__more_itertools": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-nio-transport-services/archive/1.15.0.tar.gz" - ], - "sha256": "f3498dafa633751a52b9b7f741f7ac30c42bcbeb3b9edca6d447e0da8e693262", - "strip_prefix": "swift-nio-transport-services-1.15.0/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_transport_services/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/50/e2/8e10e465ee3987bb7c9ab69efb91d867d93959095f4807db102d07995d94/more_itertools-10.2.0-py3-none-any.whl", + "sha256": "686b06abe565edfab151cb8fd385a05651e1fdf8f0a14191e4439283421f8684", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_nio_extras": { + "pypi__packaging": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-nio-extras/archive/1.4.0.tar.gz" - ], - "sha256": "4684b52951d9d9937bb3e8ccd6b5daedd777021ef2519ea2f18c4c922843b52b", - "strip_prefix": "swift-nio-extras-1.4.0/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_extras/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/49/df/1fceb2f8900f8639e278b056416d49134fb8d84c5942ffaa01ad34782422/packaging-24.0-py3-none-any.whl", + "sha256": "2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_log": { + "pypi__pep517": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-log/archive/1.4.4.tar.gz" - ], - "sha256": "48fe66426c784c0c20031f15dc17faf9f4c9037c192bfac2f643f65cb2321ba0", - "strip_prefix": "swift-log-1.4.4/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_log/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/25/6e/ca4a5434eb0e502210f591b97537d322546e4833dcb4d470a48c375c5540/pep517-0.13.1-py3-none-any.whl", + "sha256": "31b206f67165b3536dd577c5c3f1518e8fbaf38cbc57efff8369a392feff1721", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_nio_ssl": { + "pypi__pip": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-nio-ssl/archive/2.23.0.tar.gz" - ], - "sha256": "4787c63f61dd04d99e498adc3d1a628193387e41efddf8de19b8db04544d016d", - "strip_prefix": "swift-nio-ssl-2.23.0/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_ssl/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/8a/6a/19e9fe04fca059ccf770861c7d5721ab4c2aebc539889e97c7977528a53b/pip-24.0-py3-none-any.whl", + "sha256": "ba0d021a166865d2265246961bec0152ff124de910c5cc39f1156ce3fa7c69dc", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_collections": { + "pypi__pip_tools": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-collections/archive/1.0.4.tar.gz" - ], - "sha256": "d9e4c8a91c60fb9c92a04caccbb10ded42f4cb47b26a212bc6b39cc390a4b096", - "strip_prefix": "swift-collections-1.0.4/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_collections/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/0d/dc/38f4ce065e92c66f058ea7a368a9c5de4e702272b479c0992059f7693941/pip_tools-7.4.1-py3-none-any.whl", + "sha256": "4c690e5fbae2f21e87843e89c26191f0d9454f362d8acdbd695716493ec8b3a9", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "com_github_apple_swift_atomics": { + "pypi__pyproject_hooks": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "urls": [ - "https://github.com/apple/swift-atomics/archive/1.1.0.tar.gz" - ], - "sha256": "1bee7f469f7e8dc49f11cfa4da07182fbc79eab000ec2c17bfdce468c5d276fb", - "strip_prefix": "swift-atomics-1.1.0/", - "build_file": "@@rules_swift+//third_party:com_github_apple_swift_atomics/BUILD.overlay" + "url": "https://files.pythonhosted.org/packages/ae/f3/431b9d5fe7d14af7a32340792ef43b8a714e7726f1d7b69cc4e8e7a3f1d7/pyproject_hooks-1.1.0-py3-none-any.whl", + "sha256": "7ceeefe9aec63a1064c18d939bdc3adf2d8aa1988a510afec15151578b232aa2", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "build_bazel_rules_swift_index_import": { + "pypi__setuptools": { "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", "attributes": { - "build_file": "@@rules_swift+//third_party:build_bazel_rules_swift_index_import/BUILD.overlay", - "canonical_id": "index-import-5.8", - "urls": [ - "https://github.com/MobileNativeFoundation/index-import/releases/download/5.8.0.1/index-import.tar.gz" - ], - "sha256": "28c1ffa39d99e74ed70623899b207b41f79214c498c603915aef55972a851a15" + "url": "https://files.pythonhosted.org/packages/90/99/158ad0609729111163fc1f674a5a42f2605371a4cf036d0441070e2f7455/setuptools-78.1.1-py3-none-any.whl", + "sha256": "c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "build_bazel_rules_swift_local_config": { - "repoRuleId": "@@rules_swift+//swift/internal:swift_autoconfiguration.bzl%swift_autoconfiguration", - "attributes": {} + "pypi__tomli": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl", + "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__wheel": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/7d/cd/d7460c9a869b16c3dd4e1e403cce337df165368c71d6af229a74699622ce/wheel-0.43.0-py3-none-any.whl", + "sha256": "55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__zipp": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "url": "https://files.pythonhosted.org/packages/da/55/a03fd7240714916507e1fcf7ae355bd9d9ed2e6db492595f1a67f61681be/zipp-3.18.2-py3-none-any.whl", + "sha256": "dce197b859eb796242b0622af1b8beb0a722d52aa2f57133ead08edd5bf5374e", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:py_library.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude to avoid non-determinism.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/*.pyc.*\", # During pyc creation, temp files named *.pyc.NNN are created\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } } - }, - "recordedRepoMappingEntries": [ - [ - "rules_swift+", - "bazel_tools", - "bazel_tools" - ], - [ - "rules_swift+", - "build_bazel_rules_swift", - "rules_swift+" - ] - ] + } + } + }, + "@@rules_python+//python/uv:uv.bzl%uv": { + "general": { + "bzlTransitiveDigest": "ijW9KS7qsIY+yBVvJ+Nr1mzwQox09j13DnE3iIwaeTM=", + "usagesDigest": "H8dQoNZcoqP+Mu0tHZTi4KHATzvNkM5ePuEqoQdklIU=", + "recordedInputs": [ + "REPO_MAPPING:rules_python+,bazel_tools bazel_tools", + "REPO_MAPPING:rules_python+,platforms platforms" + ], + "generatedRepoSpecs": { + "uv": { + "repoRuleId": "@@rules_python+//python/uv/private:uv_toolchains_repo.bzl%uv_toolchains_repo", + "attributes": { + "toolchain_type": "'@@rules_python+//python/uv:uv_toolchain_type'", + "toolchain_names": [ + "none" + ], + "toolchain_implementations": { + "none": "'@@rules_python+//python:none'" + }, + "toolchain_compatible_with": { + "none": [ + "@platforms//:incompatible" + ] + }, + "toolchain_target_settings": {} + } + } + } } } }, - "facts": {} + "facts": { + "@@rules_go+//go:extensions.bzl%go_sdk": { + "1.22.4": { + "aix_ppc64": [ + "go1.22.4.aix-ppc64.tar.gz", + "b9647fa9fc83a0cc5d4f092a19eaeaecf45f063a5aa7d4962fde65aeb7ae6ce1" + ], + "darwin_amd64": [ + "go1.22.4.darwin-amd64.tar.gz", + "c95967f50aa4ace34af0c236cbdb49a9a3e80ee2ad09d85775cb4462a5c19ed3" + ], + "darwin_arm64": [ + "go1.22.4.darwin-arm64.tar.gz", + "242b78dc4c8f3d5435d28a0d2cec9b4c1aa999b601fb8aa59fb4e5a1364bf827" + ], + "dragonfly_amd64": [ + "go1.22.4.dragonfly-amd64.tar.gz", + "f2fbb51af4719d3616efb482d6ed2b96579b474156f85a7ddc6f126764feec4b" + ], + "freebsd_386": [ + "go1.22.4.freebsd-386.tar.gz", + "7c54884bb9f274884651d41e61d1bc12738863ad1497e97ea19ad0e9aa6bf7b5" + ], + "freebsd_amd64": [ + "go1.22.4.freebsd-amd64.tar.gz", + "88d44500e1701dd35797619774d6dd51bf60f45a8338b0a82ddc018e4e63fb78" + ], + "freebsd_arm64": [ + "go1.22.4.freebsd-arm64.tar.gz", + "726dc093cf020277be45debf03c3b02b43c2efb3e2a5d4fba8f52579d65327dc" + ], + "freebsd_armv6l": [ + "go1.22.4.freebsd-arm.tar.gz", + "3d9efe47db142a22679aba46b1772e3900b0d87ae13bd2b3bc80dbf2ac0b2cd6" + ], + "freebsd_riscv64": [ + "go1.22.4.freebsd-riscv64.tar.gz", + "5f6b67e5e32f1d6ccb2d4dcb44934a5e2e870a877ba7443d86ec43cfc28afa71" + ], + "illumos_amd64": [ + "go1.22.4.illumos-amd64.tar.gz", + "d56ecc2f85b6418a21ef83879594d0c42ab4f65391a676bb12254870e6690d63" + ], + "linux_386": [ + "go1.22.4.linux-386.tar.gz", + "47a2a8d249a91eb8605c33bceec63aedda0441a43eac47b4721e3975ff916cec" + ], + "linux_amd64": [ + "go1.22.4.linux-amd64.tar.gz", + "ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d" + ], + "linux_arm64": [ + "go1.22.4.linux-arm64.tar.gz", + "a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771" + ], + "linux_armv6l": [ + "go1.22.4.linux-armv6l.tar.gz", + "e2b143fbacbc9cbd448e9ef41ac3981f0488ce849af1cf37e2341d09670661de" + ], + "linux_loong64": [ + "go1.22.4.linux-loong64.tar.gz", + "e2ff9436e4b34bf6926b06d97916e26d67a909a2effec17967245900f0816f1d" + ], + "linux_mips": [ + "go1.22.4.linux-mips.tar.gz", + "73f0dcc60458c4770593b05a7bc01cc0d31fc98f948c0c2334812c7a1f2fc3f1" + ], + "linux_mips64": [ + "go1.22.4.linux-mips64.tar.gz", + "417af97fc2630a647052375768be4c38adcc5af946352ea5b28613ea81ca5d45" + ], + "linux_mips64le": [ + "go1.22.4.linux-mips64le.tar.gz", + "7486e2d7dd8c98eb44df815ace35a7fe7f30b7c02326e3741bd934077508139b" + ], + "linux_mipsle": [ + "go1.22.4.linux-mipsle.tar.gz", + "69479c8aad301e459a8365b40cad1074a0dbba5defb9291669f94809c4c4be6e" + ], + "linux_ppc64": [ + "go1.22.4.linux-ppc64.tar.gz", + "dd238847e65bc3e2745caca475a5db6522a2fcf85cf6c38fc36a06642b19efd7" + ], + "linux_ppc64le": [ + "go1.22.4.linux-ppc64le.tar.gz", + "a3e5834657ef92523f570f798fed42f1f87bc18222a16815ec76b84169649ec4" + ], + "linux_riscv64": [ + "go1.22.4.linux-riscv64.tar.gz", + "56a827ff7dc6245bcd7a1e9288dffaa1d8b0fd7468562264c1523daf3b4f1b4a" + ], + "linux_s390x": [ + "go1.22.4.linux-s390x.tar.gz", + "7590c3e278e2dc6040aae0a39da3ca1eb2e3921673a7304cc34d588c45889eec" + ], + "netbsd_386": [ + "go1.22.4.netbsd-386.tar.gz", + "ddd2eebe34471a2502de6c5dad04ab27c9fc80cbde7a9ad5b3c66ecec4504e1d" + ], + "netbsd_amd64": [ + "go1.22.4.netbsd-amd64.tar.gz", + "33af79f6f935f6fbacc5d23876450b3567b79348fc065beef8e64081127dd234" + ], + "netbsd_arm64": [ + "go1.22.4.netbsd-arm64.tar.gz", + "c9a2971dec9f6d320c6f2b049b2353c6d0a2d35e87b8a4b2d78a2f0d62545f8e" + ], + "netbsd_armv6l": [ + "go1.22.4.netbsd-arm.tar.gz", + "fa3550ebd5375a70b3bcd342b5a71f4bd271dcbbfaf4eabefa2144ab5d8924b6" + ], + "openbsd_386": [ + "go1.22.4.openbsd-386.tar.gz", + "d21af022331bfdc2b5b161d616c3a1a4573d33cf7a30416ee509a8f3641deb47" + ], + "openbsd_amd64": [ + "go1.22.4.openbsd-amd64.tar.gz", + "72c0094c43f7e5722ec49c2a3e9dfa7a1123ac43a5f3a63eecf3e3795d3ff0ae" + ], + "openbsd_arm64": [ + "go1.22.4.openbsd-arm64.tar.gz", + "a7ab8d4e0b02bf06ed144ba42c61c0e93ee00f2b433415dfd4ad4b6e79f31650" + ], + "openbsd_armv6l": [ + "go1.22.4.openbsd-arm.tar.gz", + "1096831ea3c5ea3ca57d14251d9eda3786889531eb40d7d6775dcaa324d4b065" + ], + "openbsd_ppc64": [ + "go1.22.4.openbsd-ppc64.tar.gz", + "9716327c8a628358798898dc5148c49dbbeb5196bf2cbf088e550721a6e4f60b" + ], + "plan9_386": [ + "go1.22.4.plan9-386.tar.gz", + "a8dd4503c95c32a502a616ab78870a19889c9325fe9bd31eb16dd69346e4bfa8" + ], + "plan9_amd64": [ + "go1.22.4.plan9-amd64.tar.gz", + "5423a25808d76fe5aca8607a2e5ac5673abf45446b168cb5e9d8519ee9fe39a1" + ], + "plan9_armv6l": [ + "go1.22.4.plan9-arm.tar.gz", + "6af939ad583f5c85c09c53728ab7d38c3cc2b39167562d6c18a07c5c6608b370" + ], + "solaris_amd64": [ + "go1.22.4.solaris-amd64.tar.gz", + "e8cabe69c03085725afdb32a6f9998191a3e55a747b270d835fd05000d56abba" + ], + "windows_386": [ + "go1.22.4.windows-386.zip", + "aca4e2c37278a10f1c70dd0df142f7d66b50334fcee48978d409202d308d6d25" + ], + "windows_amd64": [ + "go1.22.4.windows-amd64.zip", + "26321c4d945a0035d8a5bc4a1965b0df401ff8ceac66ce2daadabf9030419a98" + ], + "windows_arm64": [ + "go1.22.4.windows-arm64.zip", + "8a2daa9ea28cbdafddc6171aefed384f4e5b6e714fb52116fe9ed25a132f37ed" + ], + "windows_armv6l": [ + "go1.22.4.windows-arm.zip", + "5fcd0671a49cecf39b41021621ee1b6e7aa1370f37122b72e80d4fd4185833b6" + ] + }, + "1.25.0": { + "aix_ppc64": [ + "go1.25.0.aix-ppc64.tar.gz", + "e5234a7dac67bc86c528fe9752fc9d63557918627707a733ab4cac1a6faed2d4" + ], + "darwin_amd64": [ + "go1.25.0.darwin-amd64.tar.gz", + "5bd60e823037062c2307c71e8111809865116714d6f6b410597cf5075dfd80ef" + ], + "darwin_arm64": [ + "go1.25.0.darwin-arm64.tar.gz", + "544932844156d8172f7a28f77f2ac9c15a23046698b6243f633b0a0b00c0749c" + ], + "dragonfly_amd64": [ + "go1.25.0.dragonfly-amd64.tar.gz", + "5ed3cf9a810a1483822538674f1336c06b51aa1b94d6d545a1a0319a48177120" + ], + "freebsd_386": [ + "go1.25.0.freebsd-386.tar.gz", + "abea5d5c6697e6b5c224731f2158fe87c602996a2a233ac0c4730cd57bf8374e" + ], + "freebsd_amd64": [ + "go1.25.0.freebsd-amd64.tar.gz", + "86e6fe0a29698d7601c4442052dac48bd58d532c51cccb8f1917df648138730b" + ], + "freebsd_arm": [ + "go1.25.0.freebsd-arm.tar.gz", + "d90b78e41921f72f30e8bbc81d9dec2cff7ff384a33d8d8debb24053e4336bfe" + ], + "freebsd_arm64": [ + "go1.25.0.freebsd-arm64.tar.gz", + "451d0da1affd886bfb291b7c63a6018527b269505db21ce6e14724f22ab0662e" + ], + "freebsd_riscv64": [ + "go1.25.0.freebsd-riscv64.tar.gz", + "7b565f76bd8bda46549eeaaefe0e53b251e644c230577290c0f66b1ecdb3cdbe" + ], + "illumos_amd64": [ + "go1.25.0.illumos-amd64.tar.gz", + "b1e1fdaab1ad25aa1c08d7a36c97d45d74b98b89c3f78c6d2145f77face54a2c" + ], + "linux_386": [ + "go1.25.0.linux-386.tar.gz", + "8c602dd9d99bc9453b3995d20ce4baf382cc50855900a0ece5de9929df4a993a" + ], + "linux_amd64": [ + "go1.25.0.linux-amd64.tar.gz", + "2852af0cb20a13139b3448992e69b868e50ed0f8a1e5940ee1de9e19a123b613" + ], + "linux_arm64": [ + "go1.25.0.linux-arm64.tar.gz", + "05de75d6994a2783699815ee553bd5a9327d8b79991de36e38b66862782f54ae" + ], + "linux_armv6l": [ + "go1.25.0.linux-armv6l.tar.gz", + "a5a8f8198fcf00e1e485b8ecef9ee020778bf32a408a4e8873371bfce458cd09" + ], + "linux_loong64": [ + "go1.25.0.linux-loong64.tar.gz", + "cab86b1cf761b1cb3bac86a8877cfc92e7b036fc0d3084123d77013d61432afc" + ], + "linux_mips": [ + "go1.25.0.linux-mips.tar.gz", + "d66b6fb74c3d91b9829dc95ec10ca1f047ef5e89332152f92e136cf0e2da5be1" + ], + "linux_mips64": [ + "go1.25.0.linux-mips64.tar.gz", + "4082e4381a8661bc2a839ff94ba3daf4f6cde20f8fb771b5b3d4762dc84198a2" + ], + "linux_mips64le": [ + "go1.25.0.linux-mips64le.tar.gz", + "70002c299ec7f7175ac2ef673b1b347eecfa54ae11f34416a6053c17f855afcc" + ], + "linux_mipsle": [ + "go1.25.0.linux-mipsle.tar.gz", + "b00a3a39eff099f6df9f1c7355bf28e4589d0586f42d7d4a394efb763d145a73" + ], + "linux_ppc64": [ + "go1.25.0.linux-ppc64.tar.gz", + "df166f33bd98160662560a72ff0b4ba731f969a80f088922bddcf566a88c1ec1" + ], + "linux_ppc64le": [ + "go1.25.0.linux-ppc64le.tar.gz", + "0f18a89e7576cf2c5fa0b487a1635d9bcbf843df5f110e9982c64df52a983ad0" + ], + "linux_riscv64": [ + "go1.25.0.linux-riscv64.tar.gz", + "c018ff74a2c48d55c8ca9b07c8e24163558ffec8bea08b326d6336905d956b67" + ], + "linux_s390x": [ + "go1.25.0.linux-s390x.tar.gz", + "34e5a2e19f2292fbaf8783e3a241e6e49689276aef6510a8060ea5ef54eee408" + ], + "netbsd_386": [ + "go1.25.0.netbsd-386.tar.gz", + "f8586cdb7aa855657609a5c5f6dbf523efa00c2bbd7c76d3936bec80aa6c0aba" + ], + "netbsd_amd64": [ + "go1.25.0.netbsd-amd64.tar.gz", + "ae8dc1469385b86a157a423bb56304ba45730de8a897615874f57dd096db2c2a" + ], + "netbsd_arm": [ + "go1.25.0.netbsd-arm.tar.gz", + "1ff7e4cc764425fc9dd6825eaee79d02b3c7cafffbb3691687c8d672ade76cb7" + ], + "netbsd_arm64": [ + "go1.25.0.netbsd-arm64.tar.gz", + "e1b310739f26724216aa6d7d7208c4031f9ff54c9b5b9a796ddc8bebcb4a5f16" + ], + "openbsd_386": [ + "go1.25.0.openbsd-386.tar.gz", + "4802a9b20e533da91adb84aab42e94aa56cfe3e5475d0550bed3385b182e69d8" + ], + "openbsd_amd64": [ + "go1.25.0.openbsd-amd64.tar.gz", + "c016cd984bebe317b19a4f297c4f50def120dc9788490540c89f28e42f1dabe1" + ], + "openbsd_arm": [ + "go1.25.0.openbsd-arm.tar.gz", + "a1e31d0bf22172ddde42edf5ec811ef81be43433df0948ece52fecb247ccfd8d" + ], + "openbsd_arm64": [ + "go1.25.0.openbsd-arm64.tar.gz", + "343ea8edd8c218196e15a859c6072d0dd3246fbbb168481ab665eb4c4140458d" + ], + "openbsd_ppc64": [ + "go1.25.0.openbsd-ppc64.tar.gz", + "694c14da1bcaeb5e3332d49bdc2b6d155067648f8fe1540c5de8f3cf8e157154" + ], + "openbsd_riscv64": [ + "go1.25.0.openbsd-riscv64.tar.gz", + "aa510ad25cf54c06cd9c70b6d80ded69cb20188ac6e1735655eef29ff7e7885f" + ], + "plan9_386": [ + "go1.25.0.plan9-386.tar.gz", + "46f8cef02086cf04bf186c5912776b56535178d4cb319cd19c9fdbdd29231986" + ], + "plan9_amd64": [ + "go1.25.0.plan9-amd64.tar.gz", + "29b34391d84095e44608a228f63f2f88113a37b74a79781353ec043dfbcb427b" + ], + "plan9_arm": [ + "go1.25.0.plan9-arm.tar.gz", + "0a047107d13ebe7943aaa6d54b1d7bbd2e45e68ce449b52915a818da715799c2" + ], + "solaris_amd64": [ + "go1.25.0.solaris-amd64.tar.gz", + "9977f9e4351984364a3b2b78f8b88bfd1d339812356d5237678514594b7d3611" + ], + "windows_386": [ + "go1.25.0.windows-386.zip", + "df9f39db82a803af0db639e3613a36681ab7a42866b1384b3f3a1045663961a7" + ], + "windows_amd64": [ + "go1.25.0.windows-amd64.zip", + "89efb4f9b30812eee083cc1770fdd2913c14d301064f6454851428f9707d190b" + ], + "windows_arm64": [ + "go1.25.0.windows-arm64.zip", + "27bab004c72b3d7bd05a69b6ec0fc54a309b4b78cc569dd963d8b3ec28bfdb8c" + ] + } + } + } } diff --git a/org.eclipse.jgit.ssh.apache.test/BUILD b/org.eclipse.jgit.ssh.apache.test/BUILD index bf796c058e3..e36f8d60bb4 100644 --- a/org.eclipse.jgit.ssh.apache.test/BUILD +++ b/org.eclipse.jgit.ssh.apache.test/BUILD @@ -6,6 +6,7 @@ load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) +load("@rules_java//java:defs.bzl", "java_library") DEPS = [ "//lib:bcpkix", From 5683cfe787c830cab4ed18dc3b4a0fd5b207825c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 1 Apr 2026 12:47:53 +0300 Subject: [PATCH 071/200] PackBitmapIndexRemapper: Throw exception with details in size mismatches We are seeing IndexOutOfBoundsExceptions in this loop while using midx bitmaps. It hints that something is wrong between bitmap lengths and object counts. Report the object count and the bitmap length in the exception. Maybe the numbers can give us a clue on where is the problem. Change-Id: I3dfe9edcc1fbf1c6624b3a05ac32d0f16a6a6964 --- .../storage/file/PackBitmapIndexRemapper.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java index 4d639a3e5eb..54100ece164 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexRemapper.java @@ -185,9 +185,19 @@ public EWAHCompressedBitmap getBitmap(AnyObjectId objectId) { } inflated.clear(); - for (IntIterator i = oldBitmap.getBitmapWithoutCaching() - .intIterator(); i.hasNext();) + EWAHCompressedBitmap oldEWAHBitmap = oldBitmap + .getBitmapWithoutCaching(); + if (oldEWAHBitmap.sizeInBits() > oldPackIndex.getObjectCount()) { + throw new IllegalStateException(String.format( + "Bitmap from old index has %d bits but index has only %d objects (new index has %d objects)", + oldEWAHBitmap.sizeInBits(), oldPackIndex.getObjectCount(), + newPackIndex.getObjectCount())); + } + + for (IntIterator i = oldEWAHBitmap.intIterator(); i.hasNext();) { inflated.set(prevToNewMapping[i.next()]); + } + bitmap = inflated.toEWAHCompressedBitmap(); bitmap.trim(); return bitmap; From 3f44108ee81f511cac4d98809a46313a756ff1c7 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 072/200] PackMidx: A Pack subclass that uses midx As we do in the DFS side, make the midx look like a pack. It can solve some calls by itself (e.g. hasObject), the rest is forwarded to the right pack. Make a subclass of pack initialized with the midx. At the moment it requires to parse/load the midx on creation to get the list of covered packs. Change-Id: I1bd21340eb853b2f2a895ecf31c19ef86a6a6964 --- .../internal/storage/file/PackMidxTest.java | 380 ++++++++++++ .../jgit/internal/storage/file/Pack.java | 59 +- .../jgit/internal/storage/file/PackMidx.java | 544 ++++++++++++++++++ .../src/org/eclipse/jgit/lib/Constants.java | 7 + 4 files changed, 982 insertions(+), 8 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackMidxTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackMidxTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackMidxTest.java new file mode 100644 index 00000000000..7a497d6457b --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackMidxTest.java @@ -0,0 +1,380 @@ +/* + * Copyright (C) 2026, Google LLC + * + * 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 java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectLoader; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.revwalk.RevBlob; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevObject; +import org.eclipse.jgit.storage.file.WindowCacheConfig; +import org.eclipse.jgit.storage.pack.PackConfig; +import org.junit.Before; +import org.junit.Test; + +public class PackMidxTest extends LocalDiskRepositoryTestCase { + private int streamThreshold = 16 * 1024; + + private final static ObjectId UNKNOWN_OBJ = ObjectId + .fromString("678668bdd3a609c6e1d7fea516e9fc1ed4f50ad2"); + + private FileRepository repo; + + private TestRepository tr; + + private WindowCursor wc; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + + WindowCacheConfig cfg = new WindowCacheConfig(); + cfg.setStreamFileThreshold(streamThreshold); + cfg.install(); + + repo = createBareRepository(); + tr = new TestRepository<>(repo); + wc = (WindowCursor) repo.newObjectReader(); + } + + @Test + public void midx_hasObject() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + assertTrue(midx.hasObject(objs.commitA)); + assertTrue(midx.hasObject(objs.commitB)); + assertTrue(midx.hasObject(objs.commitC)); + assertTrue(midx.hasObject(objs.contentsOfB)); + assertTrue(midx.hasObject(objs.contentsOfA)); + assertFalse(midx.hasObject(UNKNOWN_OBJ)); + } + + @Test + public void midx_getObjectCount() throws Exception { + createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + assertEquals(9, midx.getObjectCount()); + } + + @Test + public void midx_getObjectSize_byId() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + assertEquals(getObjectSizeFromObjectDb(objs.commitA), + midx.getObjectSize(wc, objs.commitA)); + assertEquals(getObjectSizeFromObjectDb(objs.commitB), + midx.getObjectSize(wc, objs.commitB)); + assertEquals(getObjectSizeFromObjectDb(objs.commitC), + midx.getObjectSize(wc, objs.commitC)); + assertEquals(getObjectSizeFromObjectDb(objs.contentsOfA), + midx.getObjectSize(wc, objs.contentsOfA)); + assertEquals(getObjectSizeFromObjectDb(objs.contentsOfB), + midx.getObjectSize(wc, objs.contentsOfB)); + assertEquals(-1, midx.getObjectSize(wc, UNKNOWN_OBJ)); + } + + @Test + public void midx_getObjectSize_byOffset() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + Map midxOffsets = objs.midxOffsets; + Integer offsetCommitA = midxOffsets.get(objs.commitA); + assertEquals(getObjectSizeFromObjectDb(objs.commitA), + midx.getObjectSize(wc, offsetCommitA)); + + Integer offsetCommitB = midxOffsets.get(objs.commitB); + assertEquals(getObjectSizeFromObjectDb(objs.commitB), + midx.getObjectSize(wc, offsetCommitB)); + + Integer offsetCommitC = midxOffsets.get(objs.commitC); + assertEquals(getObjectSizeFromObjectDb(objs.commitC), + midx.getObjectSize(wc, offsetCommitC)); + + Integer offsetContentsOfA = midxOffsets.get(objs.contentsOfA); + assertEquals(getObjectSizeFromObjectDb(objs.contentsOfA), + midx.getObjectSize(wc, offsetContentsOfA)); + + Integer offsetContentsOfB = midxOffsets.get(objs.contentsOfB); + assertEquals(midx.getObjectSize(wc, objs.contentsOfB), + midx.getObjectSize(wc, offsetContentsOfB)); + } + + private long getObjectSizeFromObjectDb(AnyObjectId oid) throws IOException { + return repo.getObjectDatabase().getObjectSize(wc, oid); + } + + @Test + public void midx_get_byOid() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + assertEquals("contents of a", midxGet(midx, objs.contentsOfA)); + assertEquals("contents of b", midxGet(midx, objs.contentsOfB)); + String commitContent = midxGet(midx, objs.commitB); + assertTrue(commitContent + .startsWith("tree 4ad3577dd1af1fe281a6e55d48cee2d397d570d5")); + assertTrue(commitContent + .contains("author J. Author ")); + + assertNull(midx.get(wc, UNKNOWN_OBJ)); + } + + private String midxGet(PackMidx midx, AnyObjectId oid) throws IOException { + ObjectLoader ol = midx.get(wc, oid); + return new String(ol.getCachedBytes(), UTF_8); + } + + @Test + public void midx_load_byOffset() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + Map midxOffsets = objs.midxOffsets; + assertEquals("contents of a", + midxLoad(midx, midxOffsets.get(objs.contentsOfA))); + assertEquals("contents of b", + midxLoad(midx, midxOffsets.get(objs.contentsOfB))); + String commitContent = midxLoad(midx, midxOffsets.get(objs.commitB)); + assertTrue(commitContent + .startsWith("tree 4ad3577dd1af1fe281a6e55d48cee2d397d570d5")); + assertTrue(commitContent + .contains("author J. Author ")); + } + + private String midxLoad(PackMidx midx, int pos) throws IOException { + ObjectLoader ol = midx.load(wc, pos); + return new String(ol.getCachedBytes(), UTF_8); + } + + @Test + public void midx_findObject_byOffset() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + Map midxOffsets = objs.midxOffsets; + assertEquals(objs.commitA, + midx.findObjectForOffset(midxOffsets.get(objs.commitA))); + assertEquals(objs.commitB, + midx.findObjectForOffset(midxOffsets.get(objs.commitB))); + assertEquals(objs.commitC, + midx.findObjectForOffset(midxOffsets.get(objs.commitC))); + assertEquals(objs.contentsOfA, + midx.findObjectForOffset(midxOffsets.get(objs.contentsOfA))); + assertEquals(objs.contentsOfB, + midx.findObjectForOffset(midxOffsets.get(objs.contentsOfB))); + } + + @Test + public void midx_getObjectType() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + Map midxOffsets = objs.midxOffsets; + assertEquals(Constants.OBJ_COMMIT, + midx.getObjectType(wc, midxOffsets.get(objs.commitA))); + assertEquals(Constants.OBJ_COMMIT, + midx.getObjectType(wc, midxOffsets.get(objs.commitB))); + assertEquals(Constants.OBJ_COMMIT, + midx.getObjectType(wc, midxOffsets.get(objs.commitC))); + assertEquals(Constants.OBJ_BLOB, + midx.getObjectType(wc, midxOffsets.get(objs.contentsOfA))); + assertEquals(Constants.OBJ_BLOB, + midx.getObjectType(wc, midxOffsets.get(objs.contentsOfB))); + } + + @Test + public void midx_iterator() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + Map midxOffsets = objs.midxOffsets; + Iterator it = midx.iterator(); + assertIteratorEntry(it, objs.contentsOfB, + midxOffsets.get(objs.contentsOfB)); + it.next(); + it.next(); + assertIteratorEntry(it, objs.commitB, midxOffsets.get(objs.commitB)); + assertIteratorEntry(it, objs.commitA, midxOffsets.get(objs.commitA)); + it.next(); + it.next(); + assertIteratorEntry(it, objs.contentsOfA, + midxOffsets.get(objs.contentsOfA)); + assertIteratorEntry(it, objs.commitC, midxOffsets.get(objs.commitC)); + assertFalse(it.hasNext()); + } + + private void assertIteratorEntry(Iterator it, + ObjectId oid, int offset) { + assertTrue(it.hasNext()); + PackIndex.MutableEntry next = it.next(); + assertEquals(oid, next.toObjectId()); + assertEquals(offset, next.getOffset()); + } + + @Test + public void midx_packIndex_hasObject() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + PackIndex index = midx.getIndex(); + assertTrue(index.hasObject(objs.commitA)); + assertTrue(index.hasObject(objs.commitB)); + assertTrue(index.hasObject(objs.commitC)); + assertTrue(index.hasObject(objs.contentsOfA)); + assertTrue(index.hasObject(objs.contentsOfB)); + assertFalse(index.hasObject(UNKNOWN_OBJ)); + } + + @Test + public void midx_packIndex_findPosition_getByPosition() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + PackIndex index = midx.getIndex(); + assertEquals(objs.commitA, + index.getObjectId(index.findPosition(objs.commitA))); + assertEquals(objs.commitB, + index.getObjectId(index.findPosition(objs.commitB))); + assertEquals(objs.commitC, + index.getObjectId(index.findPosition(objs.commitC))); + assertEquals(objs.contentsOfA, + index.getObjectId(index.findPosition(objs.contentsOfA))); + assertEquals(objs.contentsOfB, + index.getObjectId(index.findPosition(objs.contentsOfB))); + assertEquals(-1, index.findPosition(UNKNOWN_OBJ)); + } + + @Test + public void midx_packIndex_findOffset() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + Map offsets = objs.midxOffsets; + PackIndex index = midx.getIndex(); + assertEquals((long) offsets.get(objs.commitA), + index.findOffset(objs.commitA)); + assertEquals((long) offsets.get(objs.commitB), + index.findOffset(objs.commitB)); + assertEquals((long) offsets.get(objs.commitC), + index.findOffset(objs.commitC)); + assertEquals((long) offsets.get(objs.contentsOfA), + index.findOffset(objs.contentsOfA)); + assertEquals((long) offsets.get(objs.contentsOfB), + index.findOffset(objs.contentsOfB)); + assertEquals(-1, index.findOffset(UNKNOWN_OBJ)); + } + + @Test + public void midx_reversePackIndex_findObject() throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + List offsetOrdered = inRidxOrder(objs.midxOffsets); + PackReverseIndex ridx = midx.getReverseIdx(); + + assertFalse(offsetOrdered.isEmpty()); + for (int i = 0; i < offsetOrdered.size(); i++) { + ObjectOffset entry = offsetOrdered.get(i); + assertEquals(entry.obj().getId(), ridx.findObject(entry.offset())); + } + } + + @Test + public void midx_reversePackIndex_findPosition_findObjectByPosition() + throws Exception { + TestRepoObjects objs = createThreePacks(); + PackMidx midx = writeAndOpenMidxAllPacks(); + + List offsetOrdered = inRidxOrder(objs.midxOffsets); + PackReverseIndex ridx = midx.getReverseIdx(); + + assertFalse(offsetOrdered.isEmpty()); + for (int i = 0; i < offsetOrdered.size(); i++) { + ObjectOffset entry = offsetOrdered.get(i); + assertEquals(entry.obj(), ridx + .findObjectByPosition(ridx.findPosition(entry.offset()))); + } + } + + private PackMidx writeAndOpenMidxAllPacks() throws IOException { + Collection packs = ((ObjectDirectory) tr.getRepository() + .getObjectDatabase()).getPacks(); + assertEquals(3, packs.size()); + + File midxDest = new File(repo.getObjectDatabase().getPackDirectory(), + Constants.MIDX_FILE); + MidxWriter.writeMidx(new TextProgressMonitor(), repo, packs, midxDest, + new PackConfig(repo)); + + return new PackMidx(new Config(), midxDest, packs.stream().toList()); + + } + + private TestRepoObjects createThreePacks() throws Exception { + TestRepository.BranchBuilder branch = tr + .branch("refs/heads/main"); + RevBlob contentsOfA = tr.blob("contents of a"); + RevCommit commitA = branch.commit().add("a.txt", contentsOfA).create(); + tr.packAndPrune(); + + RevBlob contentsOfB = tr.blob("contents of b"); + RevCommit commitB = branch.commit().add("b.txt", contentsOfB).create(); + tr.packAndPrune(); + + RevCommit commitC = branch.commit().add("c.txt", "contents of c commit") + .create(); + tr.packAndPrune(); + + Map midxOffsets = Map.of(commitA, 163, commitB, 12, + commitC, 694, contentsOfA, 399, contentsOfB, 421); + + return new TestRepoObjects(commitA, commitB, commitC, contentsOfA, + contentsOfB, midxOffsets); + } + + private record TestRepoObjects(RevCommit commitA, RevCommit commitB, + RevCommit commitC, RevBlob contentsOfA, RevBlob contentsOfB, + Map midxOffsets) { + } + + private List inRidxOrder(Map objs) { + return objs.entrySet().stream() + .map(e -> new ObjectOffset(e.getKey(), e.getValue())) + .sorted(Comparator.comparing(ObjectOffset::offset)).toList(); + } + + private record ObjectOffset(RevObject obj, Integer offset) { + } +} 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 f38e02b08ca..4e299e63609 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 @@ -171,6 +171,28 @@ public Pack(Config cfg, File packFile, @Nullable PackFile bitmapIdxFile) { length = Long.MAX_VALUE; } + /** + * Set the checksum of this pack + * + * @param checksum + * the checksum + */ + protected void setPackChecksum(byte[] checksum) { + this.packChecksum = checksum; + } + + /** + * Packs covered by this pack + *

+ * For regular packs, this list is empty. For midx packs, this list has the + * names of packs indexed by the midx. + * + * @return list of packs covered by this pack. + */ + protected List getCoveredPacks() { + return Collections.emptyList(); + } + private PackIndex idx() throws IOException { Optional optional = loadedIdx.getOptional(); if (optional.isPresent()) { @@ -200,10 +222,9 @@ private synchronized PackIndex memoizeIdxIfNeeded() throws IOException { Long.valueOf(System.currentTimeMillis() - start))); } - if (packChecksum == null) { + if (packChecksum == null) { packChecksum = idx.getChecksum(); - fileSnapshot.setChecksum( - ObjectId.fromRaw(packChecksum)); + fileSnapshot.setChecksum(ObjectId.fromRaw(packChecksum)); } else if (!Arrays.equals(packChecksum, idx.getChecksum())) { throw new PackMismatchException(MessageFormat @@ -418,6 +439,7 @@ void resolve(Set matches, AbbreviatedObjectId id, int matchLimit) * packs to close */ public static void close(Set packs) { + // TODO(ifrade): purge also nested packs in midx WindowCache.purge(packs); packs.forEach(p -> p.closeIndices()); } @@ -430,7 +452,12 @@ public void close() { closeIndices(); } - private synchronized void closeIndices() { + /** + * Clear the indexes referenced in this pack. + *

+ * Subclasses override this method to clear references to any index they add + */ + protected synchronized void closeIndices() { loadedIdx = Optionally.empty(); reverseIdx = Optionally.empty(); bitmapIdx = Optionally.empty(); @@ -1318,8 +1345,8 @@ private synchronized PackBitmapIndex memoizeBitmapIndexIfNeeded() throws IOExcep return optional.get(); } try { - PackBitmapIndex idx = PackBitmapIndex.open(bitmapIdxFile, idx(), - getReverseIdx()); + PackBitmapIndex idx = PackBitmapIndex.open(bitmapIdxFile, + getIndex(), getReverseIdx()); // At this point, idx() will have set packChecksum. if (Arrays.equals(packChecksum, idx.getPackChecksum())) { bitmapIdx = optionally(idx); @@ -1364,7 +1391,14 @@ protected List fullyIncludedIn(BitmapIndex.BitmapBuilder needBitmaps) return Collections.emptyList(); } - private PackReverseIndex getReverseIdx() throws IOException { + /** + * Get the reverse index of this pack + * + * @return a reverse index + * @throws IOException + * an error loading or calculating the reverse index. + */ + protected PackReverseIndex getReverseIdx() throws IOException { Optional optional = reverseIdx.getOptional(); if (optional.isPresent()) { return optional.get(); @@ -1421,7 +1455,16 @@ public String toString() { + ObjectId.fromRaw(packChecksum).name() + "]"; } - private Optionally optionally(T element) { + /** + * Wrap the reference in an Optionally + * + * @param element + * reference + * @return Optionally with the reference inside + * @param + * the type + */ + protected Optionally optionally(T element) { return useStrongRefs ? new Optionally.Hard<>(element) : new Optionally.Soft<>(element); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java new file mode 100644 index 00000000000..672d0bca322 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java @@ -0,0 +1,544 @@ +/* + * Copyright (C) 2026, Google LLC + * + * 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 java.util.stream.Collectors.toMap; + +import java.io.File; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.zip.DataFormatException; + +import org.eclipse.jgit.errors.CorruptObjectException; +import org.eclipse.jgit.errors.LargeObjectException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.errors.PackInvalidException; +import org.eclipse.jgit.errors.PackMismatchException; +import org.eclipse.jgit.internal.storage.midx.MidxMetadataReader; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndexLoader; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackOutputStream; +import org.eclipse.jgit.internal.util.Optionally; +import org.eclipse.jgit.lib.AbbreviatedObjectId; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.BitmapIndex; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectLoader; + +/** + * A pack that uses internally a midx + * + * This pack answers what it can directly from the midx (e.g. hasObject) and + * sends to the right pack other calls (e.g. reading the actual object). + */ +public class PackMidx extends Pack { + private final List packsInIdOrder; + + private final OffsetCalculator offsetCalculator; + + private Optionally midx = Optionally.empty(); + + private volatile PackIndex idx; + + private volatile PackReverseIndex ridx; + + // TODO(ifrade): Encapsulate invalid/invalidatingCause in Pack to reuse here + private IOException invalidatingCause; + + /** + * Construct a reader for existing, pre-indexed packfiles. + * + * @param cfg + * configuration this directory consults for write settings. + * @param midxFile + * path of the .midx file holding the data. + * @param knownPacks + * packs in the repo to find the packs covered by this midx + * @throws IOException + * an error reading any of the files involved + */ + public PackMidx(Config cfg, File midxFile, List knownPacks) + throws IOException { + super(cfg, midxFile, null); + MidxMetadataReader.MidxMetadata midxMeta = MidxMetadataReader + .read(midxFile); + // Maybe we could load only the packnames chunk at this point + setPackChecksum(midxMeta.checksum()); + String[] packNames = midxMeta.packNames().toArray(new String[0]); + + Map knownPacksByName = knownPacks.stream() + .collect(toMap( + p -> p.getPackFile().create(PackExt.INDEX).getName(), + Function.identity())); + packsInIdOrder = Arrays.stream(packNames).map(knownPacksByName::get) + .filter(Objects::nonNull) + .collect(Collectors.toUnmodifiableList()); + if (packsInIdOrder.size() != packNames.length) { + throw new IOException("Midx refers to packs not in the pack list"); //$NON-NLS-1$ + } + offsetCalculator = new OffsetCalculator(packsInIdOrder.stream() + .mapToLong(p -> p.getPackFile().length()).toArray()); + + ObjectId checksumHex = ObjectId.fromRaw(midxMeta.checksum()); + File midxBitmaps = new File(midxFile.getParentFile(), String.format( + "%s-%s.bitmap", Constants.MIDX_FILE, checksumHex.name())); + if (midxBitmaps.exists()) { + setBitmapIndexFile(new PackFile(midxBitmaps)); + } + } + + /** + * Return the packs covered by this midx (in midx order) + * + * @return packs covered by this midx + */ + @Override + public List getCoveredPacks() { + return packsInIdOrder; + } + + @Override + public PackFile getPackFile() { + return super.getPackFile(); + } + + @Override + protected List fullyIncludedIn(BitmapIndex.BitmapBuilder needBitmaps) + throws IOException { + PackBitmapIndex bitmapIndex = getBitmapIndex(); + if (needBitmaps.removeAllOrNone(bitmapIndex)) { + return getCoveredPacks(); + } + return Collections.emptyList(); + } + + @Override + public PackIndex getIndex() { + if (idx == null) { + synchronized (this) { + if (idx == null) { + try { + idx = new MidxPackIndex(getMidx(), offsetCalculator); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + } + } + return idx; + } + + @Override + public PackReverseIndex getReverseIdx() { + if (ridx == null) { + synchronized (this) { + if (ridx == null) { + try { + ridx = new MidxPackReverseIndex(getMidx(), + offsetCalculator); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + } + } + return ridx; + } + + @Override + public boolean hasObjectSizeIndex() throws IOException { + return false; + } + + @Override + public long getObjectSizeIndexCount() throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public long getIndexedObjectSize(AnyObjectId id) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean hasObject(AnyObjectId id) throws IOException { + return getMidx().hasObject(id); + } + + @Override + public boolean shouldBeKept() { + return false; + } + + @Override + ObjectLoader get(WindowCursor curs, AnyObjectId id) throws IOException { + MultiPackIndex.PackOffset packOffset = getMidx().find(id); + if (packOffset == null) { + return null; + } + return packsInIdOrder.get(packOffset.getPackId()).get(curs, id); + } + + @Override + void resolve(Set matches, AbbreviatedObjectId id, int matchLimit) + throws IOException { + getMidx().resolve(matches, id, matchLimit); + } + + @Override + protected synchronized void closeIndices() { + for (Pack p : getCoveredPacks()) { + p.closeIndices(); + } + midx = Optionally.empty(); + super.closeIndices(); + } + + @Override + public Iterator iterator() { + return getIndex().iterator(); + } + + @Override + long getObjectCount() throws IOException { + return getMidx().getObjectCount(); + } + + @Override + ObjectId findObjectForOffset(long offset) throws IOException { + MultiPackIndex.PackOffset decode = offsetCalculator.decode(offset); + if (decode == null) { + return null; + } + MultiPackIndex theMidx = getMidx(); + int bitmapPosition = theMidx.findBitmapPosition(decode); + if (bitmapPosition < 0) { + throw new IllegalStateException( + "Object in midx without ridx position"); + } + + return theMidx.getObjectAtBitmapPosition(bitmapPosition); + } + + @Override + ObjectId getPackChecksum() { + try { + return ObjectId.fromRaw(getMidx().getChecksum()); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + void copyPackAsIs(PackOutputStream out, WindowCursor curs) + throws IOException { + for (Pack p : packsInIdOrder) { + p.copyPackAsIs(out, curs); + } + } + + @Override + boolean beginWindowCache() throws IOException { + boolean startedWindow = false; + for (Pack p : packsInIdOrder) { + startedWindow |= p.beginWindowCache(); + } + return startedWindow; + } + + @Override + boolean endWindowCache() { + boolean lastWindow = false; + for (Pack p : packsInIdOrder) { + lastWindow |= p.endWindowCache(); + } + return lastWindow; + } + + @Override + ByteArrayWindow read(long pos, int size) throws IOException { + MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + return packsInIdOrder.get(po.getPackId()).read(po.getOffset(), size); + } + + @Override + ByteWindow mmap(long pos, int size) throws IOException { + MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + return packsInIdOrder.get(po.getPackId()).mmap(po.getOffset(), size); + } + + @Override + ObjectLoader load(WindowCursor curs, long pos) + throws IOException, LargeObjectException { + MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + return packsInIdOrder.get(po.getPackId()).load(curs, po.getOffset()); + } + + @Override + byte[] getDeltaHeader(WindowCursor wc, long pos) + throws IOException, DataFormatException { + MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + return packsInIdOrder.get(po.getPackId()).getDeltaHeader(wc, + po.getOffset()); + } + + @Override + int getObjectType(WindowCursor curs, long pos) throws IOException { + MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + return packsInIdOrder.get(po.getPackId()).getObjectType(curs, + po.getOffset()); + } + + @Override + long getObjectSize(WindowCursor curs, AnyObjectId id) throws IOException { + MultiPackIndex.PackOffset po = getMidx().find(id); + if (po == null) { + return -1; + } + return packsInIdOrder.get(po.getPackId()).getObjectSize(curs, + po.getOffset()); + } + + @Override + long getObjectSize(WindowCursor curs, long pos) throws IOException { + MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + return packsInIdOrder.get(po.getPackId()).getObjectSize(curs, + po.getOffset()); + } + + @Override + LocalObjectRepresentation representation(WindowCursor curs, + AnyObjectId objectId) throws IOException { + MultiPackIndex.PackOffset po = getMidx().find(objectId); + if (po == null) { + return null; + } + return packsInIdOrder.get(po.getPackId()).representation(curs, + objectId); + } + + private MultiPackIndex getMidx() throws IOException { + Optional optional = midx.getOptional(); + if (optional.isPresent()) { + return optional.get(); + } + return memoizeMidxIfNeeded(); + } + + private synchronized MultiPackIndex memoizeMidxIfNeeded() + throws IOException { + if (invalid()) { + throw new PackInvalidException(getPackFile(), invalidatingCause); + } + Optional optional = midx.getOptional(); + if (optional.isPresent()) { + return optional.get(); + } + + try { + MultiPackIndex loadedMidx = MultiPackIndexLoader + .open(getPackFile()); + midx = optionally(loadedMidx); + return loadedMidx; + } catch (IOException e) { + setInvalid(); + invalidatingCause = e; + throw e; + } + } + + private static class OffsetCalculator { + private final MultiPackIndex.PackOffset mutablePo = new MultiPackIndex.PackOffset(); + + private final long[] accSizes; + + OffsetCalculator(long[] packSizes) { + accSizes = new long[packSizes.length]; + accSizes[0] = 0; + for (int i = 1; i < packSizes.length; i++) { + accSizes[i] = accSizes[i - 1] + packSizes[i - 1]; + } + } + + long encode(MultiPackIndex.PackOffset po) { + if (po == null) { + return -1; + } + return accSizes[po.getPackId()] + po.getOffset(); + } + + long encode(int packId, long offset) { + return accSizes[packId] + offset; + } + + MultiPackIndex.PackOffset decode(long totalOffset) { + if (totalOffset < 0) { + return null; + } + + for (int i = accSizes.length - 1; i >= 0; i--) { + if (totalOffset >= accSizes[i]) { + return mutablePo.setValues(i, totalOffset - accSizes[i]); + } + } + return null; + } + } + + private static class MidxPackIndex implements PackIndex { + + private final MultiPackIndex midx; + + private final OffsetCalculator offsetCalculator; + + MidxPackIndex(MultiPackIndex midx, OffsetCalculator offsetCalculator) { + this.midx = midx; + this.offsetCalculator = offsetCalculator; + } + + @Override + public Iterator iterator() { + MultiPackIndex.MidxIterator it = midx.iterator(); + return new Iterator() { + + private final MutableEntry me = new MutableEntry(); + + @Override + public boolean hasNext() { + return it.hasNext(); + } + + @Override + public MutableEntry next() { + MultiPackIndex.MutableEntry entry = it.next(); + me.idBuffer.fromObjectId(entry.getObjectId()); + me.offset = offsetCalculator.encode(entry.getPackId(), + entry.getOffset()); + return me; + } + }; + } + + @Override + public long getObjectCount() { + return midx.getObjectCount(); + } + + @Override + public long getOffset64Count() { + return 0; + } + + @Override + public ObjectId getObjectId(long nthPosition) { + if (nthPosition < 0) { + throw new IllegalArgumentException(); + } + return midx.getObjectAt((int) nthPosition); + } + + @Override + public long getOffset(long nthPosition) { + ObjectId objectAt = midx.getObjectAt((int) nthPosition); + MultiPackIndex.PackOffset packOffset = midx.find(objectAt); + return offsetCalculator.encode(packOffset); + } + + @Override + public long findOffset(AnyObjectId objId) { + MultiPackIndex.PackOffset packOffset = midx.find(objId); + return offsetCalculator.encode(packOffset); + } + + @Override + public int findPosition(AnyObjectId objId) { + return midx.findPosition(objId); + } + + @Override + public long findCRC32(AnyObjectId objId) + throws MissingObjectException, UnsupportedOperationException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean hasCRC32Support() { + return false; + } + + @Override + public void resolve(Set matches, AbbreviatedObjectId id, + int matchLimit) throws IOException { + midx.resolve(matches, id, matchLimit); + } + + @Override + public byte[] getChecksum() { + return midx.getChecksum(); + } + } + + private static final class MidxPackReverseIndex + implements PackReverseIndex { + + private final MultiPackIndex midx; + + private final OffsetCalculator offsetCalculator; + + MidxPackReverseIndex(MultiPackIndex midx, + OffsetCalculator offsetCalculator) { + this.midx = midx; + this.offsetCalculator = offsetCalculator; + } + + @Override + public void verifyPackChecksum(String packFilePath) + throws PackMismatchException { + + } + + @Override + public ObjectId findObject(long offset) { + MultiPackIndex.PackOffset po = offsetCalculator.decode(offset); + int revPos = midx.findBitmapPosition(po); + return midx.getObjectAtBitmapPosition(revPos); + } + + @Override + public long findNextOffset(long offset, long maxOffset) + throws CorruptObjectException { + throw new UnsupportedOperationException(); + } + + @Override + public int findPosition(long offset) { + MultiPackIndex.PackOffset po = offsetCalculator.decode(offset); + return midx.findBitmapPosition(po); + } + + @Override + public ObjectId findObjectByPosition(int nthPosition) { + return midx.getObjectAtBitmapPosition(nthPosition); + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 9de8392690d..5265e76a894 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -839,6 +839,13 @@ public static byte[] encode(String str) { */ public static final int COMMIT_GENERATION_NOT_COMPUTED = 0; + /** + * Name of the .git/objects/packs/multi-pack-index file. + * + * @since 7.7 + */ + public static final String MIDX_FILE = "multi-pack-index"; + private Constants() { // Hide the default constructor } From b60640724df00534a9a0c3e171a8ddb4c0ed6f9f Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 073/200] PackDirectory: Integrate Multi-Pack Index (MIDX) support Enable PackDirectory to discover and utilize the MIDX file in file-based repositories. Similar to the DFS implementation, the MIDX is integrated as a virtual pack (PackMidx) that intercepts object lookups. When the MIDX configuration is enabled, PackDirectory will: - Locate the MIDX file in the well-known 'pack' directory. - Replace relevant packs in the pack list with the PackMidx instance. - Delegate lookups (hasObject, getOffset) to the MIDX while falling back to standard packs for other operations. Change-Id: I71bab916057e6aa06f9b057a6860cec16a6a6964 --- .../storage/file/PackDirectoryTest.java | 112 ++++++++++++++++++ .../eclipse/jgit/internal/JGitText.properties | 1 + .../org/eclipse/jgit/internal/JGitText.java | 1 + .../internal/storage/file/PackDirectory.java | 65 +++++++++- 4 files changed, 173 insertions(+), 6 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackDirectoryTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackDirectoryTest.java new file mode 100644 index 00000000000..b04d31a2d7a --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackDirectoryTest.java @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2026, Google LLC. and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.file; + +import static org.eclipse.jgit.lib.Constants.MIDX_FILE; +import static org.junit.Assert.assertEquals; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.Map; + +import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.revwalk.RevBlob; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevObject; +import org.eclipse.jgit.storage.file.WindowCacheConfig; +import org.eclipse.jgit.storage.pack.PackConfig; +import org.junit.Before; +import org.junit.Test; + +public class PackDirectoryTest extends LocalDiskRepositoryTestCase { + private int streamThreshold = 16 * 1024; + + private FileRepository repo; + + private TestRepository tr; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + + WindowCacheConfig cfg = new WindowCacheConfig(); + cfg.setStreamFileThreshold(streamThreshold); + cfg.install(); + + mockSystemReader.getSystemConfig().setBoolean( + ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_MULTIPACKINDEX, true); + + repo = createBareRepository(); + tr = new TestRepository<>(repo); + } + + @Test + public void getPacks_midxReplacesCoveredPacks() throws Exception { + createThreePacks(); + Collection packs = repo.getObjectDatabase().getPacks(); + assertEquals(3, packs.size()); + writeMidxOverAllPacks(); + + // Reading now should return the midx + packs = repo.getObjectDatabase().getPacks(); + assertEquals(1, packs.size()); + + tr.branch("refs/heads/main").commit().add("more.txt", "booooo") + .create(); + tr.packAndPrune(); + + packs = repo.getObjectDatabase().getPacks(); + assertEquals(2, packs.size()); + } + + private TestRepoObjects createThreePacks() throws Exception { + TestRepository.BranchBuilder branch = tr + .branch("refs/heads/main"); + RevBlob contentsOfA = tr.blob("contents of a"); + RevCommit commitA = branch.commit().add("a.txt", contentsOfA).create(); + tr.packAndPrune(); + + RevBlob contentsOfB = tr.blob("contents of b"); + RevCommit commitB = branch.commit().add("b.txt", contentsOfB).create(); + tr.packAndPrune(); + + RevCommit commitC = branch.commit().add("c.txt", "contents of c commit") + .create(); + tr.packAndPrune(); + + Map midxOffsets = Map.of(commitA, 163, commitB, 12, + commitC, 694, contentsOfA, 399, contentsOfB, 421); + + return new TestRepoObjects(commitA, commitB, commitC, contentsOfA, + contentsOfB, midxOffsets); + } + + private record TestRepoObjects(RevCommit commitA, RevCommit commitB, + RevCommit commitC, RevBlob contentsOfA, RevBlob contentsOfB, + Map midxOffsets) { + } + + private void writeMidxOverAllPacks() throws IOException { + Collection packs = tr.getRepository().getObjectDatabase() + .getPacks(); + assertEquals(3, packs.size()); + + File midxDest = new File(repo.getObjectDatabase().getPackDirectory(), + MIDX_FILE); + MidxWriter.writeMidx(new TextProgressMonitor(), repo, packs, midxDest, + new PackConfig(repo)); + } +} 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 5dedccd5080..dca75e2d279 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -117,6 +117,7 @@ cannotMkdirObjectPath=Cannot create directory {0}/{1}: {2} cannotMoveIndexTo=Cannot move index to {0} cannotMovePackTo=Cannot move pack to {0} cannotOpenService=cannot open {0} +cannotOpenMidx=Cannot open midx at {0}: {1} cannotParseDate=The date specification "{0}" could not be parsed with the following formats: {1} cannotParseGitURIish=Cannot parse Git URI-ish cannotPullOnARepoWithState=Cannot pull into a repository with state: {0} 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 db4a4e2b469..4251f4c9807 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -147,6 +147,7 @@ public static JGitText get() { /***/ public String cannotMoveIndexTo; /***/ public String cannotMovePackTo; /***/ public String cannotOpenService; + /***/ public String cannotOpenMidx; /***/ public String cannotParseDate; /***/ public String cannotParseGitURIish; /***/ public String cannotPullOnARepoWithState; 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 872bb9e4a83..2e06f3ca726 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 @@ -13,6 +13,7 @@ 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.lib.Constants.MIDX_FILE; import java.io.File; import java.io.FileNotFoundException; @@ -20,10 +21,12 @@ import java.io.InputStream; import java.nio.file.Files; import java.text.MessageFormat; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Deque; import java.util.EnumMap; import java.util.HashMap; import java.util.HashSet; @@ -32,6 +35,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.CorruptObjectException; @@ -45,6 +49,7 @@ import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.CoreConfig; import org.eclipse.jgit.lib.CoreConfig.TrustStat; import org.eclipse.jgit.lib.ObjectId; @@ -79,6 +84,8 @@ class PackDirectory { private final TrustStat trustPackStat; + private final boolean useMidx; + /** * Initialize a reference to an on-disk 'pack' directory. * @@ -92,6 +99,8 @@ class PackDirectory { this.directory = directory; packList = new AtomicReference<>(NO_PACKS); trustPackStat = config.get(CoreConfig.KEY).getTrustPackStat(); + useMidx = config.getBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_MULTIPACKINDEX, true); } /** @@ -122,8 +131,7 @@ Collection getPacks() { list = scanPacks(list); } } while (searchPacksAgain(list)); - Pack[] packs = list.packs; - return Collections.unmodifiableCollection(Arrays.asList(packs)); + return Collections.unmodifiableCollection(Arrays.asList(list.packs)); } @Override @@ -136,7 +144,8 @@ public String toString() { * * @param objectId * identity of the object to test for existence of. - * @return {@code 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; @@ -379,7 +388,8 @@ boolean searchPacksAgain(PackList old) { case AFTER_OPEN: try (InputStream stream = Files .newInputStream(directory.toPath())) { - // open the pack directory to refresh attributes (on some NFS clients) + // open the pack directory to refresh attributes (on some NFS + // clients) } catch (IOException e) { // ignore } @@ -470,6 +480,7 @@ private PackList scanPacks(PackList original) { private PackList scanPacksImpl(PackList old) { final Map forReuse = reuseMap(old); final FileSnapshot snapshot = FileSnapshot.save(directory); + Map> packFilesByExtById = getPackFilesByExtById(); List list = new ArrayList<>(packFilesByExtById.size()); boolean foundNew = false; @@ -496,10 +507,32 @@ private PackList scanPacksImpl(PackList old) { continue; } - list.add(new Pack(config, packFile, packFilesByExt.get(BITMAP_INDEX))); + list.add(new Pack(config, packFile, + packFilesByExt.get(BITMAP_INDEX))); foundNew = true; } + PackMidx theMidx = null; + File midx = new File(directory, MIDX_FILE); + if (useMidx && midx.exists()) { + Pack oldMidx = forReuse.get(midx.getName()); + if (oldMidx != null + && !oldMidx.getFileSnapshot().isModified(midx)) { + // Reuse the previous instance + forReuse.remove(midx.getName()); + theMidx = (PackMidx) oldMidx; + } else { + try { + theMidx = new PackMidx(config, midx, list); + foundNew = true; + } catch (IOException e) { + // pass + LOG.warn(MessageFormat.format(JGitText.get().cannotOpenMidx, + midx.getAbsolutePath(), e.getMessage())); + } + } + } + // If we did not discover any new files, the modification time was not // changed, and we did not remove any files, then the set of files is // the same as the set we were given. Instead of building a new object @@ -516,6 +549,22 @@ private PackList scanPacksImpl(PackList old) { return new PackList(snapshot, NO_PACKS.packs); } + if (useMidx && theMidx != null) { + // Replace the covered packs with the midx in the list + Set coveredPackNames = theMidx.getCoveredPacks().stream() + .map(p -> p.getPackName()) + .collect(Collectors.toUnmodifiableSet()); + int packsBefore = list.size(); + list = list.stream() + .filter(p -> !coveredPackNames.contains(p.getPackName())) + .collect(Collectors.toCollection(ArrayList::new)); + int packsAfter = list.size(); + LOG.debug(String.format( + "Mangling packlist: midx replaces %d packs (list went from %d to %d packs)", //$NON-NLS-1$ + coveredPackNames.size(), packsBefore, packsAfter)); + list.add(theMidx); + } + final Pack[] r = list.toArray(new Pack[0]); Arrays.sort(r, Pack.SORT); return new PackList(snapshot, r); @@ -523,7 +572,9 @@ private PackList scanPacksImpl(PackList old) { private static Map reuseMap(PackList old) { final Map forReuse = new HashMap<>(); - for (Pack p : old.packs) { + Deque queue = new ArrayDeque<>(List.of(old.packs)); + while (!queue.isEmpty()) { + Pack p = queue.removeFirst(); if (p.invalid()) { // The pack instance is corrupted, and cannot be safely used // again. Do not include it in our reuse map. @@ -532,6 +583,8 @@ private static Map reuseMap(PackList old) { continue; } + queue.addAll(p.getCoveredPacks()); + final Pack prior = forReuse.put(p.getPackFile().getName(), p); if (prior != null) { // This should never occur. It should be impossible for us From 98a6a43dc518da202c07cd2c35788e8a8c1d5458 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 074/200] MidxWriter: Do not accept midx to build new midx The code writing bitmaps later does not understand midx yet and it would use the wrong packids. Until we fix bitmap building code, just avoid using midx as input to midx. Change-Id: I66a121192bb3736eff61141db3e519826a6a6964 --- .../org/eclipse/jgit/internal/storage/file/MidxWriter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java index 543ceeb7e24..ef58d635c8e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java @@ -69,6 +69,10 @@ public static void writeMidx(ProgressMonitor pm, Repository repo, .sorted(Comparator.comparing(Pack::getPackName)).toList(); pm.beginTask("Adding packs to midx", packList.size()); for (Pack pack : packList) { + if (pack instanceof PackMidx) { + throw new IllegalArgumentException( + "Building midx from other midx not supported yet"); + } PackFile packFile = pack.getPackFile().create(PackExt.INDEX); builder.addPack(packFile.getName(), pack.getIndex()); pm.update(1); From 3223a517467d028ab434db173933537005a8642d Mon Sep 17 00:00:00 2001 From: Sergey Zakharov Date: Mon, 22 Jul 2024 13:25:08 +0300 Subject: [PATCH 075/200] PushConnectionTest: Introducing the limitPackSize() test The limitPackSize() test verifies that the correct (expected) TooLargePackException is thrown if the ReceivePack.setMaxPackSizeLimit(long limit) method is called before pushing. The test is ignored to avoid failing the build. Will enable it in the commit fixing the bug. Change-Id: I03bba8fce95a7641116912580b0505f7aebea034 --- .../jgit/transport/PushConnectionTest.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java index 21fde3e76e7..5ab42c0f39a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java @@ -14,6 +14,7 @@ import static org.eclipse.jgit.transport.BasePackPushConnection.CAPABILITY_SIDE_BAND_64K; import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_OTHER_REASON; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.IOException; @@ -23,7 +24,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Random; +import org.eclipse.jgit.errors.TooLargePackException; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; @@ -36,6 +39,7 @@ import org.eclipse.jgit.lib.Repository; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; public class PushConnectionTest { @@ -50,6 +54,9 @@ public class PushConnectionTest { private ObjectId obj3; private String refName = "refs/tags/blob"; + private long maxPackSize = 0; // the maximum pack file size used by the + // server (0 means no limit) + @Before public void setUp() throws Exception { server = newRepo("server"); @@ -57,6 +64,9 @@ public void setUp() throws Exception { processedRefs = new ArrayList<>(); testProtocol = new TestProtocol<>(null, (Object req, Repository db) -> { ReceivePack rp = new ReceivePack(db); + if (maxPackSize > 0) { + rp.setMaxPackSizeLimit(maxPackSize); + } rp.setPreReceiveHook((ReceivePack receivePack, Collection cmds) -> { for (ReceiveCommand cmd : cmds) { @@ -169,6 +179,47 @@ public void limitCommandBytes() throws IOException { } } + @Test + @Ignore + public void limitPackSize() throws IOException { + // this maxPackSize leads to an unPackError + maxPackSize = 1; + + try (ObjectInserter ins = client.newObjectInserter()) { + // 1024 * 5 means five times the server side buffer size. We need data several + // times bigger the server side buffer size. This is necessary in order to cause + // the server buffer overflow when the client transmits data. This is necessary + // in order to enable the "JGit-Receive-Pack" thread to receive and begin + // processing data before the client is able to transfer all the data. When + // processing the first bytes of data, the server will detect that an error has + // occurred, write an error message and close the pipe. Then the client, when + // trying to write the remaining bytes, will receive a “Pipe closed” exception, + // which is what we need. The client must then check the error message from the + // server and throw an appropriate exception corresponding to that error message + // from the server. + byte[] arr = new byte[1024 * 5]; + new Random(1).nextBytes(arr); + obj2 = ins.insert(Constants.OBJ_BLOB, arr); + ins.flush(); + } + + Map updates = new HashMap<>(); + RemoteRefUpdate rru = new RemoteRefUpdate( + null, null, obj2, "refs/test/limitPackSize", + false, null, ObjectId.zeroId()); + updates.put(rru.getRemoteName(), rru); + + try (Transport tn = testProtocol.open(uri, client, "server"); + PushConnection connection = tn.openPush()) { + try { + connection.push(NullProgressMonitor.INSTANCE, updates); + fail("server did not abort"); + } catch (Exception e) { + assertTrue(e instanceof TooLargePackException); + } + } + } + @Test public void commandOrder() throws Exception { List updates = new ArrayList<>(); From d54cb2f2b93d3b3ee47fa99955b5ff908949b890 Mon Sep 17 00:00:00 2001 From: Sergey Zakharov Date: Thu, 16 May 2024 22:54:49 +0400 Subject: [PATCH 076/200] Revert "push: Report fatal server errors during pack writing" This reverts commit b57d060408bcc58b2afbce671b2e68a07e90d7d9. Reverted because that change did not work as intended. Ignore the PushConnectionTest.limitCommandBytes() test until the new fix is added. Change-Id: I687fb692aa11f6b4e1edb1c564d9eda823c0cdc6 --- .../jgit/transport/PushConnectionTest.java | 1 + .../transport/BasePackPushConnection.java | 52 +------------------ 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java index 5ab42c0f39a..c9dffbd9218 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java @@ -155,6 +155,7 @@ public void invalidCommand() throws IOException { } @Test + @Ignore public void limitCommandBytes() throws IOException { Map updates = new HashMap<>(); for (int i = 0; i < 4; i++) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java index 9a96fdcf37d..69f81192df7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java @@ -14,7 +14,6 @@ import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_ATOMIC; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.text.MessageFormat; import java.util.Collection; @@ -324,12 +323,7 @@ private void writePack(final Map refUpdates, writer.setReuseValidatingObjects(false); writer.setDeltaBaseAsOffset(capableOfsDelta); writer.preparePack(monitor, newObjects, remoteObjects); - - OutputStream packOut = out; - if (capableSideBand) { - packOut = new CheckingSideBandOutputStream(in, out); - } - writer.writePack(monitor, monitor, packOut); + writer.writePack(monitor, monitor, out); packTransferTime = writer.getStatistics().getTimeWriting(); } @@ -429,48 +423,4 @@ public List getPushOptions() { public boolean isUseBitmaps() { return useBitmaps; } - - private static class CheckingSideBandOutputStream extends OutputStream { - private final InputStream in; - private final OutputStream out; - - CheckingSideBandOutputStream(InputStream in, OutputStream out) { - this.in = in; - this.out = out; - } - - @Override - public void write(int b) throws IOException { - write(new byte[] { (byte) b }); - } - - @Override - public void write(byte[] buf, int ptr, int cnt) throws IOException { - try { - out.write(buf, ptr, cnt); - } catch (IOException e) { - throw checkError(e); - } - } - - @Override - public void flush() throws IOException { - try { - out.flush(); - } catch (IOException e) { - throw checkError(e); - } - } - - private IOException checkError(IOException e1) { - try { - in.read(); - } catch (TransportException e2) { - return e2; - } catch (IOException e2) { - return e1; - } - return e1; - } - } } From d8418048bce1f676dedead75edbd08faa9100bae Mon Sep 17 00:00:00 2001 From: Sergey Zakharov Date: Thu, 16 May 2024 23:32:55 +0400 Subject: [PATCH 077/200] push: Report fatal server errors during pack writing If the push client has requested side-band support the server can signal a fatal error parsing the pack using the error channel (3) and then hang up. This may cause the PackWriter to fail to write data onto the network socket, which throws a misleading error back up to the application and the user. During a write failure poll the input to see if the side band system can parse out an error message off channel 3. This should be fast as there will either be an error present in the buffer, or the remote will also have hung-up on the side band channel. In the case of a hang-up just rethrow the original IOException as it's a network error. Enable ignored PushConnectionTests this change is fixing. Change-Id: Ie6ca43b39f3ef5727aba9251019e587006144376 --- .../jgit/transport/PushConnectionTest.java | 3 - .../transport/BasePackPushConnection.java | 55 +++++++++++++------ 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java index c9dffbd9218..2cdca73a758 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushConnectionTest.java @@ -39,7 +39,6 @@ import org.eclipse.jgit.lib.Repository; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; public class PushConnectionTest { @@ -155,7 +154,6 @@ public void invalidCommand() throws IOException { } @Test - @Ignore public void limitCommandBytes() throws IOException { Map updates = new HashMap<>(); for (int i = 0; i < 4; i++) { @@ -181,7 +179,6 @@ public void limitCommandBytes() throws IOException { } @Test - @Ignore public void limitPackSize() throws IOException { // this maxPackSize leads to an unPackError maxPackSize = 1; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java index 69f81192df7..415c1ce9e08 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackPushConnection.java @@ -172,9 +172,11 @@ protected TransportException noRepository(Throwable cause) { * if any exception occurs. * @since 3.0 */ + @SuppressWarnings("Finally") protected void doPush(final ProgressMonitor monitor, final Map refUpdates, OutputStream outputStream) throws TransportException { + Throwable suppressedThrowable = null; try { writeCommands(refUpdates.values(), monitor, outputStream); @@ -182,28 +184,45 @@ protected void doPush(final ProgressMonitor monitor, transmitOptions(); if (writePack) writePack(refUpdates, monitor); - if (sentCommand) { - if (capableReport) - readStatusReport(refUpdates); - if (capableSideBand) { - // Ensure the data channel is at EOF, so we know we have - // read all side-band data from all channels and have a - // complete copy of the messages (if any) buffered from - // the other data channels. - // - int b = in.read(); - if (0 <= b) { - throw new TransportException(uri, MessageFormat.format( - JGitText.get().expectedEOFReceived, - Character.valueOf((char) b))); - } - } - } } catch (TransportException e) { + suppressedThrowable = e; throw e; } catch (Exception e) { - throw new TransportException(uri, e.getMessage(), e); + TransportException transportException = new TransportException(uri, e.getMessage(), e); + suppressedThrowable = transportException; + throw transportException; } finally { + try { + if (sentCommand) { + if (capableReport) { + readStatusReport(refUpdates); + } + if (capableSideBand) { + // Ensure the data channel is at EOF, so we know we have + // read all side-band data from all channels and have a + // complete copy of the messages (if any) buffered from + // the other data channels. + // + int b = in.read(); + if (0 <= b) { + throw new TransportException(uri, MessageFormat.format( + JGitText.get().expectedEOFReceived, + Character.valueOf((char) b))); + } + } + } + } catch (TransportException e) { + if (suppressedThrowable != null) { + e.addSuppressed(suppressedThrowable); + } + throw e; + } catch (Exception e) { + TransportException transportException = new TransportException(uri, e.getMessage(), e); + if (suppressedThrowable != null) { + transportException.addSuppressed(suppressedThrowable); + } + throw transportException; + } if (in instanceof SideBandInputStream) { ((SideBandInputStream) in).drainMessages(); } From 5f54bc05ac592173bbc3e6c38a05de7b94983f96 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 6 Apr 2026 15:33:46 +0200 Subject: [PATCH 078/200] Update bytebuddy to 1.18.8 Change-Id: I288796f76ffc43f530ee62eb4c3669d69ef060eb --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 613d2d33db3..24c404e4bbb 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -25,7 +25,7 @@ git_repository( BOUNCYCASTLE_VERSION = "1.83" -BYTE_BUDDY_VERSION = "1.18.7" +BYTE_BUDDY_VERSION = "1.18.8" JETTY_VERSION = "12.1.7" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 29f585f2ad1..718c1437c02 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 0df7ac7b651..8531483c417 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 01d2eaafcb4..5da6f3c2b6f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index ee9bee8b1ac..d897076e926 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index c6ec2870fe6..fc8d9261427 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index e5e2162d37e..e1f372291af 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index ba3cb984dd3..292a2cb56b4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.7 + 1.18.8 jar net.bytebuddy byte-buddy-agent - 1.18.7 + 1.18.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index b3a4aa07589..386e0042526 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.7" + version = "1.18.8" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.7" + version = "1.18.8" } } diff --git a/pom.xml b/pom.xml index f8dcfec7553..5efdc7d3cdb 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 3.0 3.27.7 5.18.1 - 1.18.7 + 1.18.8 jacoco From 6b47c561714515a32db13410baaad52fddb1912d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 6 Apr 2026 15:38:41 +0200 Subject: [PATCH 079/200] Update jetty to 12.1.8 Change-Id: I063ada69b2071388151fecbe4c75bdc462c4e3b1 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.35.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.36.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.37.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.38.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.39.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.40.target | 18 +++++++++--------- .../maven/dependencies.tpd | 16 ++++++++-------- pom.xml | 2 +- 10 files changed, 73 insertions(+), 73 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 24c404e4bbb..05a93061fbe 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,7 +27,7 @@ BOUNCYCASTLE_VERSION = "1.83" BYTE_BUDDY_VERSION = "1.18.8" -JETTY_VERSION = "12.1.7" +JETTY_VERSION = "12.1.8" JMH_VERSION = "1.37" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 718c1437c02..9a89f0215d4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 8531483c417..f4db06e888e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 5da6f3c2b6f..c78cd612107 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index d897076e926..39d758840ca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index fc8d9261427..e88003ab70f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index e1f372291af..d2e47288fa8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 292a2cb56b4..3c816475f37 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-http - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-io - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-security - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-server - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-session - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util - 12.1.7 + 12.1.8 jar org.eclipse.jetty jetty-util-ajax - 12.1.7 + 12.1.8 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 386e0042526..ed24f94ab44 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.7" + version = "12.1.8" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 5efdc7d3cdb..75c906bd887 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.28.0 6.0.0 6.1.0 - 12.1.7 + 12.1.8 0.25.0 4.5.14 4.4.16 From a71c7e21efb1fb9f80b2183f114a2d0fc692cbcd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 6 Apr 2026 21:36:49 +0200 Subject: [PATCH 080/200] JGit v7.7.0.202604061937-m1 Signed-off-by: Matthias Sohn Change-Id: I146bddd4f67f6262fd8957a61b78425336b46e92 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 8b99ee9169b..66892cd80cd 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1ed2fb90785..aecd74ff29f 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 e10e3854171..a6642ba3b01 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 08d4b66eaf3..c8aae802eae 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 8863da90e31..81837b6ef9a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 9f4281261c3..86bae34a73c 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 88f51d14431..9918a0e7cb1 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a04e9c6350f..8a143585083 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 53d1bfdd401..2b90fde1358 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index b02657ff86e..223a52451a2 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.test - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 1b2793a3361..44bdda6575f 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 2ed7ba3958d..a7bd7dc2a80 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 c039403f0d0..71dbd4cffa1 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.83.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 556d2565756..2acd3103a92 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index e6b206344d6..06c4829c2ee 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 06887836c6d..ea159942a5e 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 03c16b891b7..7c8dfde3696 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51be72e9c23..46142958fcd 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 02059c1b715..9d299b69ab1 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 520c2fb1153..8378625204c 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2460ea91e7c..5210f95dff6 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 d19255326f9..f3134fe22e9 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 310f87f4c05..e6fb89ddcc6 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 fa7421aae95..a7eef9e1530 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: OSGI-INF/l10n/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 a913f9003de..1791df2700e 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fc428ed766..c7e95e72ab6 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 04e96f9ec7d..a1753dc9671 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: OSGI-INF/l10n/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 479ec1333be..09d5eeb58f6 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 94397aba5f9..14b0d8927d0 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 78f05845141..988de8e2061 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: OSGI-INF/l10n/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 c313e01220b..bc48b43035c 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 907fc47920c..72f5fb94841 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 e85207181e7..84dd783c13d 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 4ad6d6524f1..754e1a1870a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 65079c689c5..eb2c46cad1b 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 9dc895322da..cbcbc5b90ef 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 73036eefecb..959b84cacf8 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 b9df9f9e993..424d0ca15e9 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 040b222cc63..69369faf5d0 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 0fe46c793ee..5f2469e4c22 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 5ecc42bb93c..3298f816dd1 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 19546b73995..084d66134c8 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 0caab549108..de65fde9d38 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 a8ce2984b38..adb77cbeafc 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 e37d622a538..ef0419c28f1 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 d59c8de391c..6ee3f99cbea 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 684d11994a1..e33e604e2b8 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 00a0601d333..febae089531 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 8b28f14dfe1..83b130470db 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 6e07e85c123..e45f296068a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 bb6b80a4a62..32192c38a82 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 0d91543b42d..3d3e642a144 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 d053e0ac2a8..8874a1dbc45 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 6a8c021997b..8bcc402a76a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 9a1fd3ad202..bcec55ca88c 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 73f1ecda7b6..b517c600cdd 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 c5b75923b37..ce56bb18412 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 edb2020cf80..6023fd4bf79 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 0b97560d28d..ab84effec52 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 706918f38ac..f09e0a4b6bb 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 8db7e691045..a5f0fcc095a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2a73924bae5..8b8ab631c85 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 28b0ced222e..7ef5bd0f7bf 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 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 f41d83d2cbd..8d0baf8e32a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 e31d3dc49ca..8ed5aaaee4a 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 65901e06a00..5b5966a3b08 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 659718bd8a9..f2a34306a69 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 1dc3728c98f..44dbb2b700b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index a085c046432..0e7c46cfdec 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 4d7b7c233a8..f981eed910d 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit.ssh.apache.agent 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 ae9e11e2182..090dbfd19d1 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2ab6c3921f2..3e1013e27e9 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 264712667b9..7aa9fa0e438 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 fa44087d3cf..75091f98f04 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 18cba188b71..25b564f54aa 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 73ef145eac6..b5554ac7047 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 176c91dc76b..66bedd84768 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 9093f859b1b..eddbe6851b4 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 4863daef6fc..4184d120920 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index b8e2e4c212a..a45478ebb05 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 36a9e4f53f0..8ac60b3ed3c 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 92a7597b4cf..06822b685d7 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 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 ef66f911cff..14b3399e151 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 2430c2bb3d8..b2485423e5a 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a21d2f33ee2..5609db4e027 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 - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 2377e269927..e6602d33cd1 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 46c35527314..7046ff38177 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604061937-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202604061937-m1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e9b16e06934..9e03b019f64 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 75c906bd887..74c23e317e4 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0-SNAPSHOT + 7.7.0.202604061937-m1 JGit - Parent ${jgit-url} From 8fe0aced6a4047f7ac4c2960e74dd665780bec40 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 8 Apr 2026 09:44:00 +0200 Subject: [PATCH 081/200] Prepare 7.7.0-SNAPSHOT builds Change-Id: I94aefd743e69168389500e29f4cd56000e65e07b --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 66892cd80cd..8b99ee9169b 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index aecd74ff29f..1ed2fb90785 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 - 7.7.0.202604061937-m1 + 7.7.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 a6642ba3b01..e10e3854171 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index c8aae802eae..08d4b66eaf3 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 81837b6ef9a..8863da90e31 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 - 7.7.0.202604061937-m1 + 7.7.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 86bae34a73c..9f4281261c3 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 9918a0e7cb1..88f51d14431 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 8a143585083..a04e9c6350f 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 - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 2b90fde1358..53d1bfdd401 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 223a52451a2..b02657ff86e 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 - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0.202604061937-m1 + 7.7.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 44bdda6575f..1b2793a3361 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index a7bd7dc2a80..2ed7ba3958d 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 - 7.7.0.202604061937-m1 + 7.7.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 71dbd4cffa1..c039403f0d0 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.83.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 2acd3103a92..556d2565756 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 06c4829c2ee..e6b206344d6 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 - 7.7.0.202604061937-m1 + 7.7.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 ea159942a5e..06887836c6d 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 7c8dfde3696..03c16b891b7 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 46142958fcd..51be72e9c23 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 - 7.7.0.202604061937-m1 + 7.7.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 9d299b69ab1..02059c1b715 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 8378625204c..520c2fb1153 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 5210f95dff6..2460ea91e7c 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 - 7.7.0.202604061937-m1 + 7.7.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 f3134fe22e9..d19255326f9 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index e6fb89ddcc6..310f87f4c05 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 - 7.7.0.202604061937-m1 + 7.7.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 a7eef9e1530..fa7421aae95 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 1791df2700e..a913f9003de 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c7e95e72ab6..4fc428ed766 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 - 7.7.0.202604061937-m1 + 7.7.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 a1753dc9671..04e96f9ec7d 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 09d5eeb58f6..479ec1333be 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 14b0d8927d0..94397aba5f9 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 - 7.7.0.202604061937-m1 + 7.7.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 988de8e2061..78f05845141 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 bc48b43035c..c313e01220b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 72f5fb94841..907fc47920c 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 - 7.7.0.202604061937-m1 + 7.7.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 84dd783c13d..e85207181e7 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 754e1a1870a..4ad6d6524f1 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 - 7.7.0.202604061937-m1 + 7.7.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 eb2c46cad1b..65079c689c5 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 cbcbc5b90ef..9dc895322da 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 959b84cacf8..73036eefecb 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 - 7.7.0.202604061937-m1 + 7.7.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 424d0ca15e9..b9df9f9e993 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 69369faf5d0..040b222cc63 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 - 7.7.0.202604061937-m1 + 7.7.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 5f2469e4c22..0fe46c793ee 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 3298f816dd1..5ecc42bb93c 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 084d66134c8..19546b73995 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 - 7.7.0.202604061937-m1 + 7.7.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 de65fde9d38..0caab549108 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 adb77cbeafc..a8ce2984b38 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 - 7.7.0.202604061937-m1 + 7.7.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 ef0419c28f1..e37d622a538 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 6ee3f99cbea..d59c8de391c 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 - 7.7.0.202604061937-m1 + 7.7.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 e33e604e2b8..684d11994a1 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 febae089531..00a0601d333 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 - 7.7.0.202604061937-m1 + 7.7.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 83b130470db..8b28f14dfe1 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 e45f296068a..6e07e85c123 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 - 7.7.0.202604061937-m1 + 7.7.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 32192c38a82..bb6b80a4a62 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 3d3e642a144..0d91543b42d 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 - 7.7.0.202604061937-m1 + 7.7.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 8874a1dbc45..d053e0ac2a8 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 8bcc402a76a..6a8c021997b 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 - 7.7.0.202604061937-m1 + 7.7.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 bcec55ca88c..9a1fd3ad202 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 - 7.7.0.202604061937-m1 + 7.7.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 b517c600cdd..73f1ecda7b6 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 ce56bb18412..c5b75923b37 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 - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0.202604061937-m1 + 7.7.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 6023fd4bf79..edb2020cf80 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 ab84effec52..0b97560d28d 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 - 7.7.0.202604061937-m1 + 7.7.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 f09e0a4b6bb..706918f38ac 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 a5f0fcc095a..8db7e691045 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 - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 8b8ab631c85..2a73924bae5 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 - 7.7.0.202604061937-m1 + 7.7.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 7ef5bd0f7bf..28b0ced222e 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier 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 8d0baf8e32a..f41d83d2cbd 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 - 7.7.0.202604061937-m1 + 7.7.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 8ed5aaaee4a..e31d3dc49ca 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 5b5966a3b08..65901e06a00 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index f2a34306a69..659718bd8a9 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 - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 44dbb2b700b..1dc3728c98f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 0e7c46cfdec..a085c046432 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index f981eed910d..4d7b7c233a8 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 090dbfd19d1..ae9e11e2182 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 3e1013e27e9..2ab6c3921f2 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 - 7.7.0.202604061937-m1 + 7.7.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 7aa9fa0e438..264712667b9 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 75091f98f04..fa44087d3cf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 25b564f54aa..18cba188b71 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 - 7.7.0.202604061937-m1 + 7.7.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 b5554ac7047..73ef145eac6 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 66bedd84768..176c91dc76b 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 - 7.7.0.202604061937-m1 + 7.7.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 eddbe6851b4..9093f859b1b 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 4184d120920..4863daef6fc 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index a45478ebb05..b8e2e4c212a 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 - 7.7.0.202604061937-m1 + 7.7.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 8ac60b3ed3c..36a9e4f53f0 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 06822b685d7..92a7597b4cf 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 - 7.7.0.202604061937-m1 + 7.7.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 14b3399e151..ef66f911cff 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index b2485423e5a..2430c2bb3d8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5609db4e027..a21d2f33ee2 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 - 7.7.0.202604061937-m1 + 7.7.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 e6602d33cd1..2377e269927 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: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 7046ff38177..46c35527314 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604061937-m1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202604061937-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 9e03b019f64..e9b16e06934 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 74c23e317e4..75c906bd887 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0.202604061937-m1 + 7.7.0-SNAPSHOT JGit - Parent ${jgit-url} From 26328ec4425ed07f456fe7fc3c2eee200e8f0472 Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Wed, 8 Apr 2026 13:32:18 -0500 Subject: [PATCH 082/200] pack-refs: Always add sorted trait Refs are always sorted in jgit (while reading the packed-refs or while adding new refs to it). Skip the peeled check for writing sorted trait. Change-Id: If3a54610bc51700268bc296238d9bb8bea49f932 --- org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java index 58aed82748e..a6890f5e75a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java @@ -136,12 +136,12 @@ public void writePackedRefs() throws IOException { } final StringWriter w = new StringWriter(); + w.write(RefDirectory.PACKED_REFS_HEADER); + w.write(RefDirectory.PACKED_REFS_SORTED); if (peeled) { - w.write(RefDirectory.PACKED_REFS_HEADER); w.write(RefDirectory.PACKED_REFS_PEELED); - w.write(RefDirectory.PACKED_REFS_SORTED); - w.write('\n'); } + w.write('\n'); final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH]; for (Ref r : refs) { From 9de1c59281380f512f36b800c5fc4f6fff85c00f Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Wed, 8 Apr 2026 13:42:24 -0500 Subject: [PATCH 083/200] parse-packed-refs: Check to sort only when header is not present Don't unnecesarily check if we need to sort when the packed-refs is already written with sorted trait. On a project with ~3.4million refs, pack-refs -all has shown 100ms improvement with this change. Change-Id: Ie1ad33b5615c28e866b938c636e45e65a2ed2f59 --- .../org/eclipse/jgit/internal/storage/file/RefDirectory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 9fa3ff3d9fa..a5eceb7b3f7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -1093,6 +1093,7 @@ private RefList parsePackedRefs(BufferedReader br) Ref last = null; boolean peeled = false; boolean needSort = false; + boolean isSorted = false; String p; while ((p = br.readLine()) != null) { @@ -1100,6 +1101,7 @@ private RefList parsePackedRefs(BufferedReader br) if (p.startsWith(PACKED_REFS_HEADER)) { p = p.substring(PACKED_REFS_HEADER.length()); peeled = p.contains(PACKED_REFS_PEELED); + isSorted = p.contains(PACKED_REFS_SORTED); } continue; } @@ -1128,7 +1130,7 @@ private RefList parsePackedRefs(BufferedReader br) cur = new ObjectIdRef.PeeledNonTag(PACKED, name, id); else cur = new ObjectIdRef.Unpeeled(PACKED, name, id); - if (last != null && RefComparator.compareTo(last, cur) > 0) + if (!isSorted && last != null && RefComparator.compareTo(last, cur) > 0) needSort = true; all.add(cur); last = cur; From b137d44581b2b078d9069c755a56e0a7a7315854 Mon Sep 17 00:00:00 2001 From: Terry Parker Date: Sat, 11 Apr 2026 00:24:27 +0000 Subject: [PATCH 084/200] Instrument ReceivePack to track time spent in pre-receive hooks Change-Id: I3dc8b4d7a4c24e9503319693a70eb3b8d35afd7b --- .../eclipse/jgit/transport/ReceivePack.java | 6 ++++- .../transport/ReceivedPackStatistics.java | 27 ++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index 0ee0ad55519..2d505021972 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -2262,6 +2262,7 @@ private void service() throws IOException { } Instant startProcessing = Instant.now(); + long timePreReceiveHooks = 0; try { setAtomic(isCapabilityEnabled(CAPABILITY_ATOMIC)); @@ -2270,8 +2271,10 @@ private void service() throws IOException { failPendingCommands(); } + Instant startPreReceive = Instant.now(); preReceive.onPreReceive( this, filterCommands(Result.NOT_ATTEMPTED)); + timePreReceiveHooks = Duration.between(startPreReceive, Instant.now()).toMillis(); if (atomic && anyRejects()) { failPendingCommands(); } @@ -2280,7 +2283,7 @@ private void service() throws IOException { unlockPack(); } long timeProcessingCommands = Duration - .between(startProcessing, Instant.now()).toMillis(); + .between(startProcessing, Instant.now()).toMillis() - timePreReceiveHooks; ReceivedPackStatistics.Builder statsBuilder = stats != null ? ReceivedPackStatistics.Builder.toBuilder(stats) @@ -2288,6 +2291,7 @@ private void service() throws IOException { stats = statsBuilder.setTimeNegotiating(timeNegotiating) .setTimeReceiving(timeReceiving) .setTimeCheckingConnectivity(timeCheckingConnectivity) + .setTimePreReceiveHooks(timePreReceiveHooks) .setTimeProcessingCommands(timeProcessingCommands) .build(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivedPackStatistics.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivedPackStatistics.java index f804c31e99d..39fadd69e41 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivedPackStatistics.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivedPackStatistics.java @@ -37,6 +37,7 @@ public class ReceivedPackStatistics { private long timeNegotiating; private long timeReceiving; private long timeCheckingConnectivity; + private long timePreReceiveHooks; private long timeProcessingCommands; /** @@ -193,7 +194,17 @@ public long getTimeCheckingConnectivity() { } /** - * Get time in milliseconds spent processing commands (validation, hooks, + * Get time in milliseconds spent in pre-receive hooks + * + * @return time in milliseconds spent in pre-receive hooks + * @since 7.7 + */ + public long getTimePreReceiveHooks() { + return timePreReceiveHooks; + } + + /** + * Get time in milliseconds spent processing commands (validation * and ref updates) * * @return time in milliseconds spent processing commands @@ -224,6 +235,7 @@ public static class Builder { private long timeNegotiating; private long timeReceiving; private long timeCheckingConnectivity; + private long timePreReceiveHooks; private long timeProcessingCommands; /** @@ -250,6 +262,7 @@ public static Builder toBuilder(ReceivedPackStatistics s) { b.timeNegotiating = s.getTimeNegotiating(); b.timeReceiving = s.getTimeReceiving(); b.timeCheckingConnectivity = s.getTimeCheckingConnectivity(); + b.timePreReceiveHooks = s.getTimePreReceiveHooks(); b.timeProcessingCommands = s.getTimeProcessingCommands(); return b; } @@ -341,6 +354,17 @@ public Builder setTimeCheckingConnectivity( return this; } + /** + * @param timePreReceiveHooks + * time in milliseconds spent in pre-receive hooks + * @return this + * @since 7.7 + */ + public Builder setTimePreReceiveHooks(long timePreReceiveHooks) { + this.timePreReceiveHooks = timePreReceiveHooks; + return this; + } + /** * @param timeProcessingCommands * time in milliseconds spent processing commands @@ -429,6 +453,7 @@ ReceivedPackStatistics build() { s.timeNegotiating = timeNegotiating; s.timeReceiving = timeReceiving; s.timeCheckingConnectivity = timeCheckingConnectivity; + s.timePreReceiveHooks = timePreReceiveHooks; s.timeProcessingCommands = timeProcessingCommands; return s; } From db23defdcef425d9b0f8c84550d9ef0d480edf65 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 085/200] MidxWriter: Write to tmp files and use atomic rename to commit Write the midx to a tmp file and atomically rename it to the destination file to commit the write. This is a common pattern used in git to prevent half-written files in case of trouble. Make also sure to delete the previous bitmaps Change-Id: Ifcf76a6ece513032873d9e673f10dfea6a6a6964 --- .../internal/storage/file/MidxWriterTest.java | 91 +++++++++++++++++++ .../midx/MultiPackIndexWriterTest.java | 22 +++++ .../internal/storage/file/MidxWriter.java | 79 ++++++++++++++-- 3 files changed, 184 insertions(+), 8 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/MidxWriterTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/MidxWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/MidxWriterTest.java new file mode 100644 index 00000000000..bb45d0a3633 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/MidxWriterTest.java @@ -0,0 +1,91 @@ +package org.eclipse.jgit.internal.storage.file; + +import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; +import static org.eclipse.jgit.lib.Constants.MIDX_FILE; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.OutputStreamWriter; +import java.nio.charset.StandardCharsets; + +import org.eclipse.jgit.internal.storage.midx.MultiPackIndex; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndexLoader; +import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.revwalk.RevBlob; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.storage.file.WindowCacheConfig; +import org.eclipse.jgit.storage.pack.PackConfig; +import org.junit.Before; +import org.junit.Test; + +public class MidxWriterTest extends LocalDiskRepositoryTestCase { + private int streamThreshold = 16 * 1024; + + private final static ObjectId UNKNOWN_OBJ = ObjectId + .fromString("678668bdd3a609c6e1d7fea516e9fc1ed4f50ad2"); + + private FileRepository repo; + + private TestRepository tr; + +// private WindowCursor wc; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + + WindowCacheConfig cfg = new WindowCacheConfig(); + cfg.setStreamFileThreshold(streamThreshold); + cfg.install(); + + repo = createBareRepository(); + tr = new TestRepository<>(repo); +// wc = (WindowCursor) repo.newObjectReader(); + } + + @Test + public void midx_write() throws Exception { + TestRepository.BranchBuilder branch = tr + .branch("refs/heads/main"); + RevBlob contentsOfA = tr.blob("contents of a"); + RevCommit commitA = branch.commit().add("a.txt", contentsOfA).create(); + tr.packAndPrune(); + + RevBlob contentsOfB = tr.blob("contents of b"); + RevCommit commitB = branch.commit().add("b.txt", contentsOfB).create(); + tr.packAndPrune(); + + RevCommit commitC = branch.commit().add("c.txt", "contents of c commit") + .create(); + tr.packAndPrune(); + + File midxFile = new File(repo.getObjectDatabase().getPackDirectory(), + MIDX_FILE); + assertFalse(midxFile.exists()); + MidxWriter.writeMidx( + new TextProgressMonitor(new OutputStreamWriter(System.out, + StandardCharsets.UTF_8)), + repo, repo.getObjectDatabase().getPacks(), midxFile, + new PackConfig()); + assertTrue(midxFile.exists()); + + MultiPackIndex midx = MultiPackIndexLoader.open(midxFile); + assertTrue(midx.hasObject(commitA)); + assertTrue(midx.hasObject(commitB)); + assertTrue(midx.hasObject(commitC)); + assertFalse(midx.hasObject(UNKNOWN_OBJ)); + + File midxBitmaps = new File(repo.getObjectDatabase().getPackDirectory(), + String.format("%s-%s.%s", MIDX_FILE, + ObjectId.fromRaw(midx.getChecksum()).name(), + BITMAP_INDEX.getExtension())); + assertTrue(midxBitmaps.exists()); + + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java index 1ca8aaf492e..1743fb0e06d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java @@ -174,6 +174,18 @@ public void jgit_emptyMidx() throws IOException { assertEquals(5, chunkIds.indexOf(MIDX_CHUNKID_PACKNAMES)); } + @Test + public void jgit_noPacks() throws IOException { + PackIndexMerger packs = PackIndexMerger.builder().build(); + MultiPackIndexWriter writer = new MultiPackIndexWriter(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + MultiPackIndexWriter.Result result = writer + .write(NullProgressMonitor.INSTANCE, out, packs); + assertEquals(0, result.packNames().size()); + MidxHeader header = readHeader(out); + assertEquals(0, header.packCount()); + } + private List readChunkIds(ByteArrayOutputStream out) { List chunkIds = new ArrayList<>(); byte[] raw = out.toByteArray(); @@ -193,4 +205,14 @@ private static PackIndex indexOf(IndexObject... objs) { private static IndexObject object(String name, long offset) { return new IndexObject(name, offset); } + + private record MidxHeader(int packCount) { + } + + private MidxHeader readHeader(ByteArrayOutputStream out) { + byte[] midx = out.toByteArray(); + + int packCount = NB.decodeInt32(midx, 8); + return new MidxHeader(packCount); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java index ef58d635c8e..8143bbbaa08 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java @@ -9,11 +9,15 @@ */ package org.eclipse.jgit.internal.storage.file; +import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.HashSet; import java.util.List; @@ -21,6 +25,7 @@ import java.util.Set; import org.eclipse.jgit.internal.revwalk.RefAdvancerWalk; +import org.eclipse.jgit.internal.storage.midx.MidxMetadataReader; import org.eclipse.jgit.internal.storage.midx.MultiPackIndex; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; import org.eclipse.jgit.internal.storage.midx.PackIndexMerger; @@ -37,12 +42,18 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.util.Base64; +import org.eclipse.jgit.util.FileUtils; /** * Helper to write multipack indexes. */ public class MidxWriter { + /** + * Do not build a midx if there are less than this amount of packs to cover. + */ + private static final int MIN_PACKS_FOR_MIDX = 2; + /** * Write a mdix over the packs * @@ -62,12 +73,15 @@ public class MidxWriter { public static void writeMidx(ProgressMonitor pm, Repository repo, Collection packs, File midxOut, PackConfig packConfig) throws IOException { - PackIndexMerger.Builder builder = PackIndexMerger.builder(); - builder.setProgressMonitor(pm); - Collection packList = packs.stream() + Collection packList = flattenMidxPackList(packs).stream() .sorted(Comparator.comparing(Pack::getPackName)).toList(); - pm.beginTask("Adding packs to midx", packList.size()); + if (packList.size() < MIN_PACKS_FOR_MIDX) { + return; + } + PackIndexMerger.Builder builder = PackIndexMerger.builder(); + builder.setProgressMonitor(pm); + pm.beginTask("Adding packs to midx", packList.size()); //$NON-NLS-1$ for (Pack pack : packList) { if (pack instanceof PackMidx) { throw new IllegalArgumentException( @@ -75,25 +89,60 @@ public static void writeMidx(ProgressMonitor pm, Repository repo, } PackFile packFile = pack.getPackFile().create(PackExt.INDEX); builder.addPack(packFile.getName(), pack.getIndex()); + pm.update(1); } PackIndexMerger data = builder.build(); pm.endTask(); + File oldMidxBitmaps = null; + if (midxOut.exists()) { + MidxMetadataReader.MidxMetadata midxMetadata = MidxMetadataReader + .read(midxOut); + byte[] checksum = midxMetadata.checksum(); + String midxBitmapsPath = midxOut.getAbsoluteFile() + "-" //$NON-NLS-1$ + + ObjectId.fromRaw(checksum).name() + "." //$NON-NLS-1$ + + BITMAP_INDEX.getExtension(); + File previousBitmaps = new File(midxBitmapsPath); + if (previousBitmaps.exists()) { + oldMidxBitmaps = previousBitmaps; + } + } + + String midxFilename = midxOut.getAbsolutePath(); + File midxOutTmp = new File( + midxFilename + BITMAP_INDEX.getTmpExtension()); MultiPackIndexWriter writer = new MultiPackIndexWriter(); MultiPackIndexWriter.Result result; try (FileOutputStream out = new FileOutputStream( - midxOut.getAbsolutePath())) { + midxOutTmp.getAbsolutePath())) { result = writer.write(pm, out, data); } + File midxOutBitmaps = new File(midxOut.getAbsoluteFile() + "-" //$NON-NLS-1$ + + ObjectId.fromRaw(Base64.decode(result.checksum())).name() + + "." + BITMAP_INDEX.getExtension()); + File midxOutBitmapsTmp = null; if (packConfig != null) { - File midxOutBitmaps = new File( - midxOut.getAbsolutePath() + ".bitmaps"); - createAndAttachBitmaps(pm, repo, midxOutBitmaps, + midxOutBitmapsTmp = new File(midxOut.getAbsolutePath() + "-" //$NON-NLS-1$ + + ObjectId.fromRaw(Base64.decode(result.checksum())).name() + + BITMAP_INDEX.getTmpExtension()); + createAndAttachBitmaps(pm, repo, midxOutBitmapsTmp, Base64.decode(result.checksum()), data, packList, new PackConfig(repo)); } + + FileUtils.rename(midxOutTmp.getAbsoluteFile(), + midxOut.getAbsoluteFile(), StandardCopyOption.ATOMIC_MOVE); + if (midxOutBitmapsTmp != null) { + FileUtils.rename(midxOutBitmapsTmp.getAbsoluteFile(), + midxOutBitmaps.getAbsoluteFile(), + StandardCopyOption.ATOMIC_MOVE); + } + + if (oldMidxBitmaps != null && !oldMidxBitmaps.equals(midxOutBitmaps)) { + FileUtils.delete(oldMidxBitmaps); + } } private static void createAndAttachBitmaps(ProgressMonitor pm, @@ -162,4 +211,18 @@ private static List asObjectsToPack(ProgressMonitor pm, pm.endTask(); return result; } + + static List flattenMidxPackList(Collection packs) { + List output = new ArrayList<>(); + for (Pack p : packs) { + List coveredPacks = new ArrayList<>(p.getCoveredPacks()); + if (coveredPacks.isEmpty()) { + output.add(p); + } else { + Collections.reverse(coveredPacks); + output.addAll(coveredPacks); + } + } + return Collections.unmodifiableList(output); + } } From ce36c6cbed0e882537118d75398d0b9becf703b0 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Mar 2026 10:27:14 -0700 Subject: [PATCH 086/200] MidxMetadataReader: add private constructor and adjust method visibility Fixes suggested by code style analyzer. a. Private constructor as this is a class only with static methods and we do not want instances. b. Methods are not really public (as the class is not) Change-Id: I3a3d502b388cbc413acec827740f306b6a6a6964 --- .../jgit/internal/storage/midx/MidxMetadataReader.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxMetadataReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxMetadataReader.java index 0d8dfe4bbdb..26c0bb47eb1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxMetadataReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MidxMetadataReader.java @@ -42,6 +42,9 @@ */ public class MidxMetadataReader { + private MidxMetadataReader() { + } + /** * Metadata useful before loading the full midx * @@ -220,7 +223,7 @@ long getStartOffset(int chunkId) { throw new IllegalArgumentException("Asking for unknown chunk"); //$NON-NLS-1$ } - public long getEndOffset(int chunkId) { + long getEndOffset(int chunkId) { int pos = -1; for (int i = 0; i < chunks.size(); i++) { if (chunks.get(i).id() == chunkId) { @@ -235,7 +238,7 @@ public long getEndOffset(int chunkId) { return chunks.get(pos + 1).offset(); } - public long getLastOffset() { + long getLastOffset() { return chunks.get(chunks.size() - 1).offset(); } } From f9d5dcfb096f3b9853fea4bb1b403cc2566215cc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 15 Apr 2026 17:03:49 +0200 Subject: [PATCH 087/200] orbit: update org.apache.ant to 1.10.17.v20260410-1000 Change-Id: Ie16e4305f30d1398c5dd9269d189303836cc8afa --- .../org.eclipse.jgit.target/jgit-4.34.target | 2 +- .../org.eclipse.jgit.target/jgit-4.35.target | 2 +- .../org.eclipse.jgit.target/jgit-4.36.target | 2 +- .../org.eclipse.jgit.target/jgit-4.37.target | 2 +- .../org.eclipse.jgit.target/jgit-4.38.target | 2 +- .../org.eclipse.jgit.target/jgit-4.39.target | 2 +- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +++--- .../org.eclipse.jgit.target/orbit/orbit-4.40.tpd | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 9a89f0215d4..2b3d6e09bde 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index f4db06e888e..6f5cd872e25 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index c78cd612107..fc518360cb6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 39d758840ca..c5146666b80 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index e88003ab70f..87c5844fa12 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index d2e47288fa8..79d5e0733f9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 3c816475f37..dc484ded8d9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,15 +1,15 @@ - + - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.40.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.40.tpd index 4dbf8f304ff..4ce74f7c696 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.40.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.40.tpd @@ -6,8 +6,8 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] - org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant [1.10.17.v20260410-1000,1.10.17.v20260410-1000] + org.apache.ant.source [1.10.17.v20260410-1000,1.10.17.v20260410-1000] org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] From d89e45b2e08385354cf52c7c8db9c9d335d4b077 Mon Sep 17 00:00:00 2001 From: Terry Parker Date: Thu, 16 Apr 2026 05:41:33 +0000 Subject: [PATCH 088/200] Make the PackParser.needNewObjectIds method public Change-Id: I320ffcf102c54226cef0b832325c67895be4dbf7 --- .../src/org/eclipse/jgit/transport/PackParser.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java index e1f2b19ce5d..e842f47f66d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java @@ -254,7 +254,13 @@ public void setNeedNewObjectIds(boolean b) { newObjectIds = null; } - private boolean needNewObjectIds() { + /** + * Whether the parser is configured to keep track of new objects. + * + * @return {@code true} if new objects are tracked, {@code false} otherwise. + * @since 7.7 + */ + public boolean needNewObjectIds() { return newObjectIds != null; } From 3770397396cccfade928dae12e3217e8e51c7d69 Mon Sep 17 00:00:00 2001 From: Terry Parker Date: Mon, 6 Apr 2026 18:10:52 +0000 Subject: [PATCH 089/200] Add new TreeWalkConnectivityChecker Introduce a new TreeWalk-based connectivity checker that avoids object allocations that occur when doing graph coloring via ObjectWalks. Data analysis shows that the work done by FullConnectivityChecker varies based on the relationship the new pack's parent commit(s) to current branch tips. 1) When a current branch tip is a direct parent, the object walk colors O(objects in the new pack) nodes 2) When a current branch tip has a shared parent, the object walk colors O(tree objects in checkout) nodes 3) Otherwise, the object walk colors O(all objects in checkout) nodes Large repositories like the Chromium monorepo cause ObjectWalk-based checkers to take >10s for cases 2 and 3. Initial benchmarking shows the TreeWalk-based checker achieves 60x performance improvement for case 3. Note that this checker requires that PackParser records the new objects in the pack. It will throw an IllegalState exception if PackParser.needNewObjectIds() returns false. Change-Id: I149d62f13691fa14d4a3a8e899311a6abd3adea0 --- .../TreeWalkConnectivityCheckerTest.java | 972 ++++++++++++++++++ .../TreeWalkConnectivityChecker.java | 423 ++++++++ 2 files changed, 1395 insertions(+) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityCheckerTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityChecker.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityCheckerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityCheckerTest.java new file mode 100644 index 00000000000..284c56ee29e --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityCheckerTest.java @@ -0,0 +1,972 @@ +/* + * Copyright (C) 2026, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.transport.connectivity; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; +import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.CommitBuilder; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectIdSubclassMap; +import org.eclipse.jgit.lib.ObjectInserter; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.lib.TreeFormatter; +import org.eclipse.jgit.revwalk.RevBlob; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.transport.ConnectivityChecker.ConnectivityCheckInfo; +import org.eclipse.jgit.transport.PackParser; +import org.eclipse.jgit.transport.ReceiveCommand; +import org.eclipse.jgit.treewalk.TreeWalk; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import jdk.jfr.Recording; +import jdk.jfr.consumer.RecordingFile; + +/** Tests for {@link TreeWalkConnectivityChecker}. */ +public class TreeWalkConnectivityCheckerTest { + @Rule + public MockitoRule rule = MockitoJUnit.rule(); + + private TestRepository tr; + + private TreeWalkConnectivityChecker checker; + + private ConnectivityCheckInfo info; + + private Set haves; + + private CountingProgressMonitor pm = new CountingProgressMonitor(); + + private static class CountingProgressMonitor implements ProgressMonitor { + private long objectsCheckedCount = 0; + + @Override + public void start(int totalTasks) { + // noop + } + + @Override + public void beginTask(String title, int totalWork) { + // noop + } + + @Override + public void update(int completed) { + objectsCheckedCount += completed; + } + + @Override + public void endTask() { + // noop + } + + @Override + public boolean isCancelled() { + return false; + } + + @Override + public void showDuration(boolean show) { + // noop + } + + public long getObjectsCheckedCount() { + return objectsCheckedCount; + } + + public void reset() { + objectsCheckedCount = 0; + } + } + + @Mock + private PackParser parser; + + @Before + @SuppressWarnings("boxing") + public void setUp() throws Exception { + tr = new TestRepository<>( + new InMemoryRepository(new DfsRepositoryDescription("test"))); + checker = new TreeWalkConnectivityChecker(); + info = new ConnectivityCheckInfo(); + info.setRepository(tr.getRepository()); + info.setWalk(tr.getRevWalk()); + info.setParser(parser); + when(parser.needNewObjectIds()).thenReturn(true); + haves = new HashSet<>(); + pm.reset(); + } + + @Test + public void testFailureMissingParent() throws Exception { + ObjectId missingParentId = ObjectId + .fromString("0123456789abcdef0123456789abcdef01234567"); + + RevCommit newCommit = createCommitWithParent(missingParentId); + + setupSingleReceiveCommand(ObjectId.zeroId(), newCommit.getId()); + mockNewPackObjects(newCommit); + + // MOE thrown within RevWalk.next() when emitting newCommit, count isn't + // updated + runCheckAndExpectMissingObject(missingParentId, 0); + } + + @Test + public void testFailureMissingParentChain() throws Exception { + ObjectId missingParentId = ObjectId + .fromString("0123456789abcdef0123456789abcdef01234567"); + + RevCommit commit1 = createCommitWithParent(missingParentId); + RevCommit commit2 = createCommitWithParent(commit1); + + setupSingleReceiveCommand(ObjectId.zeroId(), commit2.getId()); + mockNewPackObjects(commit1, commit2); + + runCheckAndExpectMissingObject(missingParentId, 1); + } + + @Test + public void testFailureMissingParentMultipleBranches() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + ObjectId missingParentId = ObjectId + .fromString("0123456789abcdef0123456789abcdef01234567"); + + RevCommit newCommit1 = tr.commit().parent(base).create(); + RevCommit newCommit2 = createCommitWithParent(missingParentId); + + ReceiveCommand cmd1 = new ReceiveCommand(base, newCommit1, + "refs/heads/branch1"); + ReceiveCommand cmd2 = new ReceiveCommand(ObjectId.zeroId(), newCommit2, + "refs/heads/branch2"); + + info.setCommands(Arrays.asList(cmd1, cmd2)); + + mockNewPackObjects(newCommit1, newCommit2); + + runCheckAndExpectMissingObject(missingParentId, 1); + } + + @Test + public void testFailureMissingBlob() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + // Create a missing blob ID that is not in DB or pack + ObjectId missingBlobId = ObjectId + .fromString("0123456789abcdef0123456789abcdef01234567"); + RevBlob missingBlob = tr.getRevWalk().lookupBlob(missingBlobId); + + RevCommit newCommit = tr.commit().parent(base).add("foo", missingBlob) + .create(); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + runCheckAndExpectMissingObject(missingBlobId, 4); + } + + @Test + public void testFailureMissingSubtree() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + ObjectId missingTreeId = ObjectId + .fromString("0123456789abcdef0123456789abcdef01234568"); + + RevBlob blob = tr.blob("content"); + + TreeFormatter formatter = new TreeFormatter(); + formatter.append("file", FileMode.REGULAR_FILE, blob); + formatter.append("dir", FileMode.TREE, missingTreeId); + + try (ObjectInserter inserter = tr.getRepository().newObjectInserter()) { + ObjectId rootTreeId = inserter.insert(formatter); + + CommitBuilder cb = new CommitBuilder(); + cb.setTreeId(rootTreeId); + cb.setAuthor(new PersonIdent("Author", "author@example.com")); + cb.setCommitter( + new PersonIdent("Committer", "committer@example.com")); + cb.setMessage("Commit with missing subtree"); + cb.setParentIds(base.getId()); + + ObjectId commitId = inserter.insert(cb); + inserter.flush(); + + RevCommit newCommit = tr.getRevWalk().parseCommit(commitId); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree(), blob); + + runCheckAndExpectMissingObject(missingTreeId, 4); + } + } + + @Test + public void testFailureUnreachableParentCommit() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevCommit secretCommit = tr.commit().create(); + RevCommit newCommit = tr.commit().parent(secretCommit).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + runCheckAndExpectMissingObject(secretCommit.getId(), 3); + } + + @Test + public void testMultipleBranchesUnreachableParent() throws Exception { + // base2 & new2 have newer timestamps + RevCommit base1 = tr.commit().create(); + RevCommit new1 = tr.commit().parent(base1).create(); + RevCommit base2 = tr.commit().create(); + RevCommit new2 = tr.commit().parent(base2).create(); + + tr.branch("refs/heads/base1").update(base1); + haves.add(base1); + + ReceiveCommand cmd1 = new ReceiveCommand(base1, new1, "refs/heads/b1"); + ReceiveCommand cmd2 = new ReceiveCommand(base2, new2, "refs/heads/b2"); + + info.setCommands(Arrays.asList(cmd1, cmd2)); + mockNewPackObjects(new1, new1.getTree(), new2, new2.getTree()); + + runCheckAndExpectMissingObject(base2, 5); + + // Verify order doesn't matter - reset state and swap order + setUp(); + + // base2 & new2 have newer timestamps + base1 = tr.commit().create(); + new1 = tr.commit().parent(base1).create(); + base2 = tr.commit().create(); + new2 = tr.commit().parent(base2).create(); + + tr.branch("refs/heads/base2").update(base2); + haves.add(base2); + + cmd1 = new ReceiveCommand(base1, new1, "refs/heads/b1"); + cmd2 = new ReceiveCommand(base2, new2, "refs/heads/b2"); + + info.setCommands(Arrays.asList(cmd2, cmd1)); + mockNewPackObjects(new1, new1.getTree(), new2, new2.getTree()); + + runCheckAndExpectMissingObject(base1, 5); + } + + @Test + public void testThinPackFailureUnreachableDeltaBase() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob deltafiledBlob = tr.blob("simulated delta blob"); + RevBlob missingBase = tr.getRevWalk().lookupBlob(ObjectId + .fromString("0123456789abcdef0123456789abcdef01234567")); + RevCommit newCommit = tr.commit().parent(base) + .add("foo", deltafiledBlob).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), newCommit); + mockNewPackObjects(newCommit, newCommit.getTree(), deltafiledBlob); + + ObjectIdSubclassMap baseObjectIds = new ObjectIdSubclassMap<>(); + baseObjectIds.add(missingBase); + when(parser.getBaseObjectIds()).thenReturn(baseObjectIds); + info.setCheckObjects(true); + + runCheckAndExpectMissingObject(missingBase.getId(), 2); + } + + @Test + public void testSuccessMatchingParent() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + // Create a new commit in the pack that explicitly matches the base tree + ObjectId newCommitId = tr.unparsedCommit(1, base.getTree(), + base.getId()); + RevCommit newCommit = tr.getRevWalk().parseCommit(newCommitId); + + setupSingleReceiveCommand(base.getId(), newCommitId); + mockNewPackObjects(newCommit); + runCheckAndAssertCount(4); + } + + @Test + public void testSuccessWithDifferentBlob() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob blob = tr.blob("hello"); + RevCommit newCommit = tr.commit().parent(base).add("foo", blob) + .create(); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree(), blob); + + runCheckAndAssertCount(4); + } + + @Test + public void testSuccessNoReachabilityCheckWhenParentsInHaves() + throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevCommit currentHaves = base; + for (int i = 0; i < 250; i++) { + currentHaves = tr.commit().parent(currentHaves).create(); + haves.add(currentHaves.getId()); + } + + RevBlob blob = tr.blob("hello"); + RevCommit newCommit = tr.commit().parent(base).add("foo", blob) + .create(); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit); + + runCheckAndAssertCount(4); + } + + /** + * Test with a large flat tree to measure objects checked. + * + * 

{@code
+	 * [Existing DB]               [Received Pack]
+	 *      base <------------------- newCommit
+	 *        |                          |
+	 *      root_tree                 root_tree (differs)
+	 *        |                          |
+	 *        +- file0                   +- file0 (differs)
+	 *        +- file1                   +- file1 (differs)
+	 *        +- file2                   +- file2 (differs)
+	 *        +- file3                   +- file3 (differs)
+	 *        +- file4                   +- file4 (differs)
+	 *        +- file5                   +- file5 (shared)
+	 *        +- ...                     +- ...
+	 *        `- file99                  `- file99 (shared)
+	 * }
+ */ + @Test + public void testLargeFlatTree() throws Exception { + TestRepository.CommitBuilder cb = tr.commit(); + for (int i = 0; i < 100; i++) { + cb.add("file" + i, tr.blob("content" + i)); + } + RevCommit base = cb.create(); + haves.add(base.getId()); + + TestRepository.CommitBuilder cbNew = tr.commit().parent(base); + List allNewObjects = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + RevBlob b = tr.blob("new content " + i); + cbNew.add("file" + i, b); + allNewObjects.add(b); + } + RevCommit newCommit = cbNew.create(); + allNewObjects.add(newCommit); + allNewObjects.add(newCommit.getTree()); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(allNewObjects); + + runCheckAndAssertCount(4); + } + + @Test + public void testGitlink() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + ObjectId submoduleCommitId = ObjectId + .fromString("0123456789abcdef0123456789abcdef01234567"); + + TreeFormatter formatter = new TreeFormatter(); + formatter.append("submodule", FileMode.GITLINK, submoduleCommitId); + + try (ObjectInserter inserter = tr.getRepository().newObjectInserter()) { + ObjectId rootTreeId = inserter.insert(formatter); + + CommitBuilder cb = new CommitBuilder(); + cb.setTreeId(rootTreeId); + cb.setAuthor(new PersonIdent("Author", "author@example.com")); + cb.setCommitter( + new PersonIdent("Committer", "committer@example.com")); + cb.setMessage("Commit with gitlink"); + cb.setParentIds(base.getId()); + + ObjectId commitId = inserter.insert(cb); + inserter.flush(); + + RevCommit newCommit = tr.getRevWalk().parseCommit(commitId); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + // Should not fail gitlink identifier not being in the local + // database + runCheckAndAssertCount(4); + } + } + + @Test + public void testZeroParents() throws Exception { + RevBlob blob = tr.blob("content"); + RevCommit rootCommit = tr.commit().add("file1", blob).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), rootCommit.getId()); + mockNewPackObjects(rootCommit, rootCommit.getTree(), blob); + + runCheckAndAssertCount(2); + } + + @Test + public void testMultipleParents() throws Exception { + RevCommit parent1 = tr.commit().add("file1", tr.blob("content1")) + .create(); + RevCommit parent2 = tr.commit().add("file2", tr.blob("content2")) + .create(); + haves.add(parent1.getId()); + haves.add(parent2.getId()); + + RevCommit mergeCommit = tr.commit().parent(parent1).parent(parent2) + .add("file3", tr.blob("content3")).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), mergeCommit.getId()); + mockNewPackObjects(mergeCommit, mergeCommit.getTree()); + + runCheckAndAssertCount(6); + } + + @Test + public void testChainedCommitsInPack() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevCommit c1 = tr.commit().parent(base).create(); + RevCommit c2 = tr.commit().parent(c1).create(); + + setupSingleReceiveCommand(base.getId(), c2.getId()); + mockNewPackObjects(c1, c2, c1.getTree(), c2.getTree()); + + runCheckAndAssertCount(7); + } + + @Test + public void testSuccessReachableParentCommit() throws Exception { + RevCommit base = tr.commit().create(); + RevCommit reachableCommit = tr.commit().parent(base).create(); + haves.add(reachableCommit.getId()); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + runCheckAndAssertCount(5); + } + + @Test + public void testSuccessFallbackToFullRefDatabase() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevCommit newRootCommit = tr.commit().create(); + tr.branch("refs/heads/unconnected").update(newRootCommit); + + RevCommit newCommit = tr.commit().parent(newRootCommit).create(); + + info.setCommands(Collections.singletonList(new ReceiveCommand( + ObjectId.zeroId(), newCommit.getId(), "refs/heads/master"))); + mockNewPackObjects(newCommit, newCommit.getTree()); + runCheckAndAssertCount(5); + } + + @Test + public void testSuccessWithDeletion() throws Exception { + RevBlob blob = tr.blob("hello"); + RevCommit base = tr.commit().add("foo", blob).create(); + haves.add(base.getId()); + + // Create a new commit that deletes "foo" + RevCommit newCommit = tr.commit().parent(base).rm("foo").create(); + + info.setCommands(Collections.singletonList(new ReceiveCommand( + base.getId(), newCommit.getId(), "refs/heads/master"))); + + mockNewPackObjects(newCommit, newCommit.getTree()); + + runCheckAndAssertCount(4); + } + + @Test + public void testDeleteCommandIgnored() throws Exception { + RevCommit base = tr.commit().create(); + tr.branch("refs/heads/master").update(base); + + ReceiveCommand cmd = new ReceiveCommand(base.getId(), ObjectId.zeroId(), + "refs/heads/master", ReceiveCommand.Type.DELETE); + + info.setCommands(Collections.singletonList(cmd)); + + runCheckAndAssertCount(0); + } + + @Test + public void testMultipleCommands() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob blob1 = tr.blob("content1"); + RevCommit newCommit1 = tr.commit().parent(base).add("foo1", blob1) + .create(); + + RevBlob blob2 = tr.blob("content2"); + RevCommit newCommit2 = tr.commit().parent(base).add("foo2", blob2) + .create(); + + ReceiveCommand cmd1 = new ReceiveCommand(base.getId(), + newCommit1.getId(), "refs/heads/branch1"); + ReceiveCommand cmd2 = new ReceiveCommand(base.getId(), + newCommit2.getId(), "refs/heads/branch2"); + + info.setCommands(Arrays.asList(cmd1, cmd2)); + + mockNewPackObjects(newCommit1, newCommit1.getTree(), blob1, newCommit2, + newCommit2.getTree(), blob2); + + runCheckAndAssertCount(7); + } + + @Test + public void testThinPackSuccess() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob baseBlob = tr.blob("base blob content"); + haves.add(baseBlob.getId()); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + ObjectIdSubclassMap baseObjectIds = new ObjectIdSubclassMap<>(); + baseObjectIds.add(baseBlob.getId()); + when(parser.getBaseObjectIds()).thenReturn(baseObjectIds); + info.setCheckObjects(true); + + runCheckAndAssertCount(4); + } + + @Test + public void testMultipleCommandsDifferentParents() throws Exception { + RevCommit base1 = tr.commit().create(); + RevCommit base2 = tr.commit().create(); + tr.branch("refs/heads/base1").update(base1); + tr.branch("refs/heads/base2").update(base2); + haves.add(base1.getId()); + haves.add(base2.getId()); + + RevBlob blob1 = tr.blob("content1"); + RevCommit newCommit1 = tr.commit().parent(base1).add("foo1", blob1) + .create(); + + RevBlob blob2 = tr.blob("content2"); + RevCommit newCommit2 = tr.commit().parent(base2).add("foo2", blob2) + .create(); + + ReceiveCommand cmd1 = new ReceiveCommand(base1.getId(), + newCommit1.getId(), "refs/heads/branch1"); + ReceiveCommand cmd2 = new ReceiveCommand(base2.getId(), + newCommit2.getId(), "refs/heads/branch2"); + + info.setCommands(Arrays.asList(cmd1, cmd2)); + + mockNewPackObjects(newCommit1, newCommit1.getTree(), blob1, newCommit2, + newCommit2.getTree(), blob2); + + runCheckAndAssertCount(8); + } + + /** + * Test case with a deep and wide tree structure. Modifying a file 5 levels + * deep should only check the trees along that path. + * + * 
{@code
+	 * [Existing DB]               [Received Pack]
+	 *      base <------------------- newCommit
+	 *        |                          |
+	 *      root_tree                 root_tree (differs)
+	 *        |                          |
+	 *        +- A                       +- A (differs)
+	 *        |  +- C                    |  +- C (differs)
+	 *        |  |  +- I                 |  |  +- I (differs)
+	 *        |  |  |  +- J              |  |  |  +- J (differs)
+	 *        |  |  |  |  +- K           |  |  |  |  +- K (differs)
+	 *        |  |  |  |  |  +- L        |  |  |  |  |  +- L (differs)
+	 *        |  |  |  |  |  |  +- M     |  |  |  |  |  |  +- M (differs)
+	 *        |  |  |  |  |  |  |  `- 1  |  |  |  |  |  |  |  `- 1 (differs)
+	 *        |  +- D                    |  +- D (shared)
+	 *        |     `- 2                 |     `- 2 (shared)
+	 *        +- B                       +- B (shared)
+	 *           +- E                    |  +- E (shared)
+	 *           |  `- 3                 |     `- 3 (shared)
+	 *           +- F                    |  +- F (shared)
+	 *           |  `- 4                 |     `- 4 (shared)
+	 *           +- G                    |  +- G (shared)
+	 *           |  `- 5                 |     `- 5 (shared)
+	 *           +- H                    |  +- H (shared)
+	 *              `- 6                 |     `- 6 (shared)
+	 * }
+ */ + @Test + public void testDeepTreeSuccess() throws Exception { + // Create base with deep and wide structure + TestRepository.CommitBuilder cb = tr.commit(); + cb.add("A/C/I/J/K/L/M/1", tr.blob("content1")); + cb.add("A/D/2", tr.blob("content2")); + cb.add("B/E/3", tr.blob("content3")); + cb.add("B/F/4", tr.blob("content4")); + cb.add("B/G/5", tr.blob("content5")); + cb.add("B/H/6", tr.blob("content6")); + RevCommit base = cb.create(); + haves.add(base.getId()); + + RevCommit currentHaves = base; + for (int i = 0; i < 250; i++) { + currentHaves = tr.commit().parent(currentHaves).create(); + haves.add(currentHaves.getId()); + } + + // Create new commit modifying file at end of deep path + RevBlob newBlob = tr.blob("new content"); + RevCommit newCommit = tr.commit().parent(base) + .add("A/C/I/J/K/L/M/000", newBlob).create(); + + info.setCommands(Collections.singletonList(new ReceiveCommand( + base.getId(), newCommit.getId(), "refs/heads/master"))); + + List allNewObjects = new ArrayList<>(); + allNewObjects.add(newCommit); + allNewObjects.add(newCommit.getTree()); + allNewObjects.add(newBlob); + try (TreeWalk tw = new TreeWalk(tr.getRepository())) { + tw.setRecursive(false); + tw.addTree(newCommit.getTree()); + String[] pathSegments = { "A", "C", "I", "J", "K", "L", "M" }; + for (String segment : pathSegments) { + while (tw.next()) { + if (tw.getNameString().equals(segment)) { + allNewObjects.add(tw.getObjectId(0)); + tw.enterSubtree(); + break; + } + } + } + } + mockNewPackObjects(allNewObjects); + + runCheckAndAssertCount(18); + } + + /** + * Compare the efficiency of the TreeWalk checker vs. iterative vs. full + * checkers. Initial JFR results on this test: + *
    + *
  • TreeWalk Checker: 22 checked objects, 25 JFR allocations
    • + *
  • Iterative Checker: 14 checked objects, 41 JFR allocations
    • + *
  • Full Checker: 264 checked objects, 147 JFR allocations
    • + *
+ * + * 
{@code
+	 * [Existing DB]               [Received Pack]
+	 *      base <------------------- newCommit
+	 *        |                          |
+	 *      root_tree                 root_tree (differs)
+	 *        |                          |
+	 *        +- A                       +- A (differs)
+	 *        |  +- C                    |  +- C (differs)
+	 *        |  |  +- I                 |  |  +- I (differs)
+	 *        |  |  |  +- J              |  |  |  +- J (differs)
+	 *        |  |  |  |  +- K           |  |  |  |  +- K (differs)
+	 *        |  |  |  |  |  +- L        |  |  |  |  |  +- L (differs)
+	 *        |  |  |  |  |  |  +- M     |  |  |  |  |  |  +- M (differs)
+	 *        |  |  |  |  |  |  |  `- 1  |  |  |  |  |  |  |  `- 1 (differs)
+	 *        |  +- D                    |  +- D (shared)
+	 *        |     `- 2                 |     `- 2 (shared)
+	 *        +- B                       +- B (differs)
+	 *           +- E                    |  +- E (shared)
+	 *           |  `- 3                 |     `- 3 (shared)
+	 *           +- F                    |  +- F (shared)
+	 *           |  `- 4                 |     `- 4 (shared)
+	 *           +- G                    |  +- G (shared)
+	 *           |  `- 5                 |     `- 5 (shared)
+	 *           +- H                    |  +- H (differs)
+	 *              `- 6                 |     `- 6 (differs)
+	 * }
+ */ + @Test + public void testDeepTreePerformance() throws Exception { + // Create base with deep and wide structure + TestRepository.CommitBuilder cb = tr.commit(); + cb.add("A/C/I/J/K/L/M/1", tr.blob("content1")); + cb.add("A/D/2", tr.blob("content2")); + cb.add("B/E/3", tr.blob("content3")); + cb.add("B/F/4", tr.blob("content4")); + cb.add("B/G/5", tr.blob("content5")); + cb.add("B/H/6", tr.blob("content6")); + + RevCommit base = cb.create(); + haves.add(base.getId()); + RevCommit currentHaves = base; + for (int i = 0; i < 250; i++) { + currentHaves = tr.commit().parent(currentHaves).create(); + haves.add(currentHaves.getId()); + } + + // Create new commit modifying file at end of deep path + RevBlob newBlob = tr.blob("new content"); + RevCommit newCommit = tr.commit().parent(base) + .add("A/C/I/J/K/L/M/1", newBlob).add("B/H/6", newBlob).create(); + + info.setCommands(Collections.singletonList(new ReceiveCommand( + base.getId(), newCommit.getId(), "refs/heads/new_change"))); + + ObjectIdSubclassMap newObjectIds = new ObjectIdSubclassMap<>(); + newObjectIds.add(newCommit); + newObjectIds.add(newCommit.getTree()); + newObjectIds.add(newBlob); + try (TreeWalk tw = new TreeWalk(tr.getRepository())) { + tw.setRecursive(false); + tw.addTree(newCommit.getTree()); + String[] pathSegments = { "A", "C", "I", "J", "K", "L", "M" }; + for (String segment : pathSegments) { + while (tw.next()) { + if (tw.getNameString().equals(segment)) { + newObjectIds.add(tw.getObjectId(0)); + tw.enterSubtree(); + break; + } + } + } + } + try (TreeWalk tw = new TreeWalk(tr.getRepository())) { + tw.setRecursive(false); + tw.addTree(newCommit.getTree()); + while (tw.next()) { + if (tw.getNameString().equals("B")) { + newObjectIds.add(tw.getObjectId(0)); + tw.enterSubtree(); + while (tw.next()) { + if (tw.getNameString().equals("H")) { + newObjectIds.add(tw.getObjectId(0)); + break; + } + } + break; + } + } + } + when(parser.getNewObjectIds()).thenReturn(newObjectIds); + + TreeWalkConnectivityChecker scChecker = new TreeWalkConnectivityChecker(); + + long scJfrCount = 0; + try (Recording r = new Recording()) { + r.enable("jdk.ObjectAllocationInNewTLAB"); + r.enable("jdk.ObjectAllocationOutsideTLAB"); + r.start(); + + for (int i = 0; i < 1000; i++) { + try (RevWalk rw = new RevWalk(info.getRepository())) { + info.setWalk(rw); + pm.reset(); + scChecker.checkConnectivity(info, haves, pm); + } + } + + r.stop(); + Path p = Files.createTempFile("sc_jfr", ".jfr"); + r.dump(p); + try (RecordingFile file = new RecordingFile(p)) { + while (file.hasMoreEvents()) { + file.readEvent(); + scJfrCount++; + } + } + Files.delete(p); + } + long scCount = pm.getObjectsCheckedCount(); + + // Run IterativeConnectivityChecker + IterativeConnectivityChecker icChecker = new IterativeConnectivityChecker( + new FullConnectivityChecker()); + + long icJfrCount = 0; + try (jdk.jfr.Recording r = new jdk.jfr.Recording()) { + r.enable("jdk.ObjectAllocationInNewTLAB"); + r.enable("jdk.ObjectAllocationOutsideTLAB"); + r.start(); + + for (int i = 0; i < 1000; i++) { + try (RevWalk rw = new RevWalk(info.getRepository())) { + info.setWalk(rw); + pm.reset(); + icChecker.checkConnectivity(info, haves, pm); + } + } + + r.stop(); + Path p = Files.createTempFile("ic_jfr_deep", ".jfr"); + r.dump(p); + try (jdk.jfr.consumer.RecordingFile file = new jdk.jfr.consumer.RecordingFile( + p)) { + while (file.hasMoreEvents()) { + jdk.jfr.consumer.RecordedEvent event = file.readEvent(); + if (event.getEventType().getName() + .startsWith("jdk.ObjectAllocation")) { + icJfrCount++; + } + } + } + Files.delete(p); + } + long icCount = pm.getObjectsCheckedCount(); + + // Run FullConnectivityChecker + FullConnectivityChecker fcChecker = new FullConnectivityChecker(); + + long fcJfrCount = 0; + try (Recording r = new Recording()) { + r.enable("jdk.ObjectAllocationInNewTLAB"); + r.enable("jdk.ObjectAllocationOutsideTLAB"); + r.start(); + + for (int i = 0; i < 1000; i++) { + try (RevWalk rw = new RevWalk(info.getRepository())) { + info.setWalk(rw); + pm.reset(); + fcChecker.checkConnectivity(info, haves, pm); + } + } + + r.stop(); + Path p = Files.createTempFile("fc_jfr", ".jfr"); + r.dump(p); + try (RecordingFile file = new RecordingFile(p)) { + while (file.hasMoreEvents()) { + file.readEvent(); + fcJfrCount++; + } + } + Files.delete(p); + } + long fcCount = pm.getObjectsCheckedCount(); + + System.out.println("TreeWalk Checked Objects: " + scCount); + System.out.println("TreeWalk JFR allocations: " + scJfrCount); + System.out.println("Iterative Checked Objects: " + icCount); + System.out.println("Iterative JFR allocations: " + icJfrCount); + System.out.println("Full Checked Objects: " + fcCount); + System.out.println("Full JFR allocations: " + fcJfrCount); + + assertEquals(22, scCount); + assertEquals(14, icCount); + assertEquals(264, fcCount); + + assertTrue( + "TreeWalkConnectivityChecker should produce fewer JFR allocation events. Expected " + + scJfrCount + " < " + fcJfrCount, + scJfrCount < fcJfrCount); + } + + private void setupSingleReceiveCommand(ObjectId oldId, ObjectId newId) { + info.setCommands(Collections.singletonList( + new ReceiveCommand(oldId, newId, "refs/heads/master"))); + } + + private void mockNewPackObjects(ObjectId... ids) { + mockNewPackObjects(Arrays.asList(ids)); + } + + private void mockNewPackObjects(Collection ids) { + ObjectIdSubclassMap map = new ObjectIdSubclassMap<>(); + for (ObjectId id : ids) { + map.add(id); + } + when(parser.getNewObjectIds()).thenReturn(map); + } + + private void runCheckAndAssertCount(int expectedCount) throws IOException { + checker.checkConnectivity(info, haves, pm); + assertEquals(expectedCount, pm.getObjectsCheckedCount()); + } + + private void runCheckAndExpectMissingObject(ObjectId expectedMissingId, + int expectedCount) throws IOException { + try { + checker.checkConnectivity(info, haves, pm); + fail("Expected MissingObjectException"); + } catch (MissingObjectException e) { + assertEquals(expectedMissingId, e.getObjectId()); + assertEquals(expectedCount, pm.getObjectsCheckedCount()); + } + } + + private RevCommit createCommitWithParent(ObjectId parentId) + throws Exception { + CommitBuilder cb = new CommitBuilder(); + cb.setTreeId(tr.tree().getId()); + cb.setParentId(parentId); + cb.setAuthor(new PersonIdent("Author", "author@example.com", + tr.getInstant(), tr.getTimeZoneId())); + cb.setCommitter(new PersonIdent("Committer", "committer@example.com", + tr.getInstant(), tr.getTimeZoneId())); + cb.setMessage("Commit with specific parent"); + + try (ObjectInserter ins = tr.getRepository().newObjectInserter()) { + ObjectId id = ins.insert(cb); + ins.flush(); + return tr.getRevWalk().parseCommit(id); + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityChecker.java new file mode 100644 index 00000000000..8c667df0491 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityChecker.java @@ -0,0 +1,423 @@ +/* + * Copyright (C) 2026, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.transport.connectivity; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; + +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectIdSubclassMap; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.ObjectReachabilityChecker; +import org.eclipse.jgit.revwalk.ObjectWalk; +import org.eclipse.jgit.revwalk.ReachabilityChecker; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevObject; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.transport.ConnectivityChecker; +import org.eclipse.jgit.transport.ReceiveCommand; +import org.eclipse.jgit.treewalk.TreeWalk; + +/** + * A connectivity checker that avoids the object allocations that occur when + * doing standard graph coloring via {@code ObjectWalk}. + * + * {@code TreeWalkConnectivityChecker} requires the {@code PackParser} to report + * new objects in the pack, and will fail immediately if that is not configured. + * + * The {@code ObjectWalk}-based algorithm marks objects interesting and + * uninteresting and parses new subtrees and blobs to propagate those states. + * Each propagation of state to a child node requires a Java object allocation. + * This algorithm is closer to the diff algorithm. It parses tree objects at + * common paths and compares hash values in those trees. Objects only need to be + * created for subtrees that differ. + * + * The tree connectivity part of this algorithm always creates O(commits + tree + * objects in the new pack) Java objects, independent of where the parent commit + * is in the graph, and independent of the number of references. (Caveat, it + * does a standard reachability check if a parent commit is not in advertised + * "haves", and a standard object reachability check for any base objects + * referenced in a thin pack.) The {@code ObjectWalk}-based algorithm is + * equivalent to this algorithm when the parents of new commits are all in the + * advertised "haves", creating O(commit + tree objects in the new pack) Java + * objects. It is much less efficient otherwise, creating either O(tree objects + * in checkout) or O(all objects in checkout) Java objects. + * + * This algorithm first validates that the commits in the commands (new branch + * tips) are connected. Starting with those commits, it walks back until a + * commit not in the pack is found, or until a commit with no parents is found. + * If a parent commit id is not in the database, connectivity fails. If the + * parent commit is in the database and was present in the "haves" advertised + * for the client, it moves on to verifying tree connectivity. Otherwise, it + * performs a reachability check to make sure the client has access to the + * unadvertised parent commit, and proceeds to verifying tree connectivity if + * that succeeds. + * + * Tree connectivity is verified for every commit in the receive pack that was + * visited when checking commit connectivity. For each commit, get its root tree + * and the root trees of its parents. For each path segment in the child + * commit's root tree, do the following (includes recursing into differing + * subtrees, where the same actions are applied): + *
    + *
  • if a blob or subtree's id is identical to one of the parent's blob or + * subtree's ids, continue/li> + *
  • if a new blob id is not present in the database, connectivity fails
    • + *
  • if a new subtree id is present in the pack, traverse into the subtree to + * continue the check, performing the same actions in this list
    • + *
  • if the new subtree id is not in the pack but is present in the database, + * continue/li> + *
  • if the new subtree id is not in either the pack or the database, + * connectivity fails
    • + *
+ */ +public class TreeWalkConnectivityChecker implements ConnectivityChecker { + private ObjectIdSubclassMap objectsInPack; + + private Set advertisedHaves; + + @Override + public void checkConnectivity(ConnectivityCheckInfo connectivityCheckInfo, + Set haves, ProgressMonitor pm) throws IOException { + + if (!connectivityCheckInfo.getParser().needNewObjectIds()) { + throw new IllegalStateException( + "PackParser.setNeedNewObjectIds(true) must be set"); //$NON-NLS-1$ + } + + Repository repo = connectivityCheckInfo.getRepository(); + RevWalk rw = connectivityCheckInfo.getWalk(); + this.objectsInPack = connectivityCheckInfo.getParser() + .getNewObjectIds(); + this.advertisedHaves = haves; + + Set nonAdvertisedParentCommitsOutsidePack = new HashSet<>(); + List newCommitsToVerify = extractCommitsToVerify(rw, repo, + connectivityCheckInfo.getCommands(), + nonAdvertisedParentCommitsOutsidePack, pm); + + /* + * This class underreports the full set of objects parsed and does not + * advance the progress monitor in the checkReachability() and + * checkThinPackBases() methods. These methods invoke {@code + * ReachabilityChecker} and @{code ObjectReachabilityChecker}, neither + * of which take a progress monitor. Pushes are generally based on + * commits near branch tips, so the checkers normally do minimal walks. + * Setup for these checkers involves at a minimum marking all "haves" as + * starts, so we capture that in the progress monitor. + */ + if (!nonAdvertisedParentCommitsOutsidePack.isEmpty()) { + pm.update(advertisedHaves.size()); + checkReachability(rw, repo, nonAdvertisedParentCommitsOutsidePack); + } + + checkThinPackBases(rw, connectivityCheckInfo); + + verifyTreeConnectivity(rw, repo, newCommitsToVerify, + connectivityCheckInfo.isCheckObjects(), pm); + } + + /** + * Extracts commits that need to be verified and identifies parent commits + * outside the pack. + * + * @param rw + * the RevWalk to use + * @param repo + * the repository + * @param commands + * the receive commands + * @param nonAdvertisedParentCommitsOutsidePack + * set to populate with parent commits outside the pack and not + * in the advertised set (haves) + * @param pm + * progress monitor + * @return list of new commits in the pack that require verification + * @throws IOException + * if an I/O error occurs + */ + private List extractCommitsToVerify(RevWalk rw, Repository repo, + List commands, + Set nonAdvertisedParentCommitsOutsidePack, + ProgressMonitor pm) throws IOException { + + List newCommitsToVerify = new ArrayList<>(); + + // Gather new commits from the receive commands + for (ReceiveCommand cmd : commands) { + if (cmd.getType() != ReceiveCommand.Type.DELETE + && !advertisedHaves.contains(cmd.getNewId())) { + rw.markStart(rw.parseCommit(cmd.getNewId())); + } + } + + // Walk commits in the receive pack, recording both commits in the pack + // and parent commits outside the pack + RevCommit commit; + while ((commit = rw.next()) != null) { + pm.update(1); + if (objectsInPack.contains(commit)) { + newCommitsToVerify.add(commit); + } else { + // Commit not in pack, check object database + if (!repo.getObjectDatabase().has(commit)) { + throw new MissingObjectException(commit.getId(), + Constants.TYPE_COMMIT); + } + // Advertised parents are reachable, only track non-advertised + if (!advertisedHaves.contains(commit.getId())) { + nonAdvertisedParentCommitsOutsidePack.add(commit); + } + rw.markUninteresting(commit); + } + } + + return newCommitsToVerify; + } + + /** + * Performs reachability checks for parent commits outside the pack. + * + * @param rw + * the RevWalk to use + * @param repo + * the repository + * @param nonAdvertisedParentCommitsOutsidePack + * parent commits to check visibility for + * @throws IOException + * if an I/O error occurs + */ + private void checkReachability(RevWalk rw, Repository repo, + Set nonAdvertisedParentCommitsOutsidePack) + throws IOException { + + try { + // First try with the smaller set of advertised haves + ReachabilityChecker checker = rw.getObjectReader() + .createReachabilityChecker(rw); + Stream starterCommits = advertisedHaves.stream() + .map(id -> rw.lookupCommit(id)); + + Optional unreachable = checker.areAllReachable( + nonAdvertisedParentCommitsOutsidePack, starterCommits); + + if (unreachable.isPresent()) { + // Fallback to check against full ref database + Stream allRefCommits = repo.getRefDatabase() + .getRefs().stream() + .map(ref -> rw.lookupCommit(ref.getObjectId())); + unreachable = checker.areAllReachable( + nonAdvertisedParentCommitsOutsidePack, allRefCommits); + if (unreachable.isPresent()) { + throw new MissingObjectException(unreachable.get().getId(), + Constants.TYPE_COMMIT); + } + } + } catch (UncheckedIOException e) { + throw e.getCause(); + } + } + + /** + * Validates that base objects referenced in a thin pack are reachable. + * + * @param rw + * the RevWalk to use + * @param connectivityCheckInfo + * the connectivity check info + * @throws IOException + * if an I/O error occurs + */ + private void checkThinPackBases(RevWalk rw, + ConnectivityCheckInfo connectivityCheckInfo) throws IOException { + + if (!connectivityCheckInfo.isCheckObjects()) { + return; + } + ObjectIdSubclassMap baseObjectIds = connectivityCheckInfo + .getParser().getBaseObjectIds(); + + try (ObjectWalk ow = new ObjectWalk(rw.getObjectReader())) { + ObjectReachabilityChecker checker = rw.getObjectReader() + .createObjectReachabilityChecker(ow); + + List targetObjs = StreamSupport + .stream(baseObjectIds.spliterator(), false) + .map(id -> parseAnyUnchecked(ow, id)) + .collect(Collectors.toList()); + + // First try with the smaller set of advertised haves + Stream starterObjs = advertisedHaves.stream() + .map(id -> parseAnyUnchecked(ow, id)) + .filter(Objects::nonNull); + + Optional unreachable = checker + .areAllReachable(targetObjs, starterObjs); + if (unreachable.isPresent()) { + // Fallback to check against full ref database + Stream allRefCommits = connectivityCheckInfo + .getRepository().getRefDatabase().getRefs().stream() + .map(ref -> rw.lookupCommit(ref.getObjectId())); + unreachable = checker.areAllReachable(targetObjs, + allRefCommits); + if (unreachable.isPresent()) { + throw new MissingObjectException(unreachable.get().getId(), + Constants.TYPE_COMMIT); + } + } + } catch (UncheckedIOException e) { + throw e.getCause(); + } + } + + /** + * Verifies tree connectivity for the new commits. + * + * @param rw + * the RevWalk to use + * @param repo + * the repository + * @param newCommitsToVerify + * commits to verify + * @param checkObjects + * whether to check objects + * @param pm + * progress monitor + * @throws IOException + * if an I/O error occurs + */ + private void verifyTreeConnectivity(RevWalk rw, Repository repo, + List newCommitsToVerify, boolean checkObjects, + ProgressMonitor pm) throws IOException { + + for (RevCommit c : newCommitsToVerify) { + verifyTreeConnectivityForCommit(c, rw, repo, checkObjects, pm); + } + } + + /** + * Verifies tree connectivity for a single commit. + * + * @param c + * the commit + * @param rw + * the RevWalk to use + * @param repo + * the repository + * @param checkObjects + * whether to check objects + * @param pm + * progress monitor + * @throws IOException + * if an I/O error occurs + */ + private void verifyTreeConnectivityForCommit(RevCommit c, RevWalk rw, + Repository repo, boolean checkObjects, ProgressMonitor pm) + throws IOException { + try (TreeWalk tw = new TreeWalk(rw.getObjectReader())) { + tw.setRecursive(false); + tw.addTree(c.getTree()); + pm.update(1); + for (RevCommit p : c.getParents()) { + tw.addTree(p.getTree()); + pm.update(1); + } + + while (tw.next()) { + if (tw.getFileMode(0) == FileMode.MISSING) { + continue; // Object deleted or moved + } + + if (tw.getFileMode(0) == FileMode.GITLINK) { + continue; // Skip submodule entries + } + + ObjectId newObjId = tw.getObjectId(0); + if (matchesAnyParent(tw, newObjId)) { + continue; // matched via object ids + } + + if (!tw.isSubtree()) { + /* + * Blob case. objectsInPack are already in the object + * database, but the map lookup is faster than the database + * search, so try the map lookup first. + */ + if (!objectsInPack.contains(newObjId) && (checkObjects + || !repo.getObjectDatabase().has(newObjId))) { + throw new MissingObjectException(newObjId, + tw.getFileMode(0).getObjectType()); + } + } else { + // Subtree case + if (objectsInPack.contains(newObjId)) { + tw.enterSubtree(); + pm.update(1 + c.getParentCount()); + } else if (checkObjects + || !repo.getObjectDatabase().has(newObjId)) { + throw new MissingObjectException(newObjId, + FileMode.TREE.getObjectType()); + } + } // Else object is in the database + } + } + } + + /** + * Parses an object, throwing UncheckedIOException on failure. For use with + * streams. + * + * @param rw + * the RevWalk to use + * @param id + * the object ID + * @return the parsed object + */ + private static RevObject parseAnyUnchecked(RevWalk rw, ObjectId id) { + try { + return rw.parseAny(id); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + /** + * Checks if the new object ID matches any parent tree's object ID at the + * current path. + * + * @param tw + * the TreeWalk + * @param newObjId + * the new object ID + * @return true if matches any parent + */ + private static boolean matchesAnyParent(TreeWalk tw, ObjectId newObjId) { + for (int i = 1; i < tw.getTreeCount(); i++) { + if (tw.getFileMode(i) != FileMode.MISSING + && newObjId.equals(tw.getObjectId(i))) { + return true; + } + } + return false; + } + +} From b7bd2124c043aee04c7b806d1a3d3ad91d131ca0 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 18 Apr 2026 17:51:54 +0200 Subject: [PATCH 090/200] [ssh] Reject host certificates if the certified key is revoked Certificates were already rejected if the CA key was not found or revoked. But it's also possible that the certificate is completely valid but the certified key itself is listed as revoked. Change-Id: Ib488d7eaffa760e991ff0c46f13dfd11a20831e6 --- .../sshd/OpenSshServerKeyDatabaseTest.java | 45 ++++++++++++++++++- .../sshd/OpenSshServerKeyDatabase.java | 41 +++++++++++++++-- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java index 6b61821a0f1..ff6eb2badc6 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java @@ -28,6 +28,7 @@ import org.apache.sshd.common.SshConstants; import org.apache.sshd.common.cipher.ECCurves; import org.apache.sshd.common.config.keys.KeyUtils; +import org.apache.sshd.common.config.keys.OpenSshCertificate; import org.apache.sshd.common.config.keys.PublicKeyEntry; import org.apache.sshd.common.util.security.SecurityUtils; import org.eclipse.jgit.annotations.NonNull; @@ -58,7 +59,8 @@ public class OpenSshServerKeyDatabaseTest { private static PublicKey ec256; private static PublicKey ec384; private static PublicKey caKey; - private static PublicKey certificate; + + private static OpenSshCertificate certificate; @BeforeClass public static void initKeys() throws Exception { @@ -179,7 +181,7 @@ public void testCaKeyNotConsidered() throws Exception { } @Test - public void testkeyPlainAndCa() throws Exception { + public void testKeyPlainAndCa() throws Exception { Files.write(knownHosts, List.of( "localhost,127.0.0.1 " + PublicKeyEntry.toString(rsa1024), "some.other.com " + PublicKeyEntry.toString(ec384), @@ -191,8 +193,47 @@ public void testkeyPlainAndCa() throws Exception { new KnownHostsConfig(), null)); } + @Test + public void testCaIsPlain() throws Exception { + Files.write(knownHosts, List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384), + "localhost,127.0.0.1 " + PublicKeyEntry.toString(caKey))); + // caKey not marked as cert-authorithy + assertFalse(database.accept("localhost", LOCAL, certificate, + new KnownHostsConfig(), null)); + } + + @Test + public void testRevokedCa() throws Exception { + Files.write(knownHosts, + List.of("localhost,127.0.0.1 " + + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384), + "@revoked localhost,127.0.0.1 " + + PublicKeyEntry.toString(caKey))); + assertFalse(database.accept("localhost", LOCAL, certificate, + new KnownHostsConfig(), null)); + } + + @Test + public void testRevokedCertifiedKey() throws Exception { + Files.write(knownHosts, + List.of("localhost,127.0.0.1 " + + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384), + "@cert-authority localhost,127.0.0.1 " + + PublicKeyEntry.toString(caKey), + "@revoked localhost,127.0.0.1 " + PublicKeyEntry + .toString(certificate.getCertPubKey()))); + assertFalse(database.accept("localhost", LOCAL, certificate, + new KnownHostsConfig(), null)); + } + @Test public void testLookupCertificate() throws Exception { + Files.write(knownHosts, List.of("@cert-authority localhost,127.0.0.1 " + + PublicKeyEntry.toString(caKey))); List keys = database.lookup("localhost", LOCAL, new KnownHostsConfig()); // Certificates or CA keys are not reported via lookup. diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java index acb77c5bb76..7300a44fb8e 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java @@ -210,10 +210,26 @@ public boolean accept(@NonNull String connectAddress, @NonNull Configuration config, CredentialsProvider provider) { List filesToUse = getFilesToUse(config); AskUser ask = new AskUser(config, provider); - HostEntryPair[] modified = { null }; - Path path = null; Collection candidates = getCandidates(connectAddress, remoteAddress); + if (acceptKey(remoteAddress, candidates, serverKey, filesToUse, config, + ask)) { + if (serverKey instanceof OpenSshCertificate certificate) { + if (isRevoked(remoteAddress, candidates, filesToUse, + certificate.getCertPubKey(), ask)) { + return false; + } + } + return true; + } + return false; + } + + private boolean acceptKey(InetSocketAddress remoteAddress, + Collection candidates, PublicKey serverKey, + List filesToUse, Configuration config, AskUser ask) { + HostEntryPair[] modified = { null }; + Path path = null; for (HostKeyFile file : filesToUse) { HostEntryPair lastModified = modified[0]; try { @@ -285,7 +301,26 @@ private static boolean isCertificateAuthority(KnownHostEntry entry) { return MARKER_CA.equals(entry.getMarker()); } - private boolean find(Collection candidates, + private static boolean isRevoked(InetSocketAddress remoteAddress, + Collection candidates, + List filesToUse, PublicKey serverKey, AskUser ask) { + HostEntryPair[] dummy = { null }; + for (HostKeyFile file : filesToUse) { + try { + if (find(candidates, serverKey, file.get(), dummy)) { + // It's definitely not revoked. + return false; + } + } catch (RevokedKeyException e) { + ask.revokedKey(remoteAddress, serverKey, file.getPath()); + return true; + } + } + // Not found, so it is not revoked + return false; + } + + private static boolean find(Collection candidates, PublicKey serverKey, List entries, HostEntryPair[] modified) throws RevokedKeyException { PublicKey keyToCheck = serverKey; From 02b34dc857a7a80fcf26b6d0a37a9592c7da7586 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 15 Apr 2026 17:04:44 +0200 Subject: [PATCH 091/200] Update bouncycastle to 1.84 also update the minimum version in MANIFEST.MF files to ensure we use the latest version to avoid issue jgit-249 reoccurs. Change-Id: Ice1238fd4632828b96bedae7c560eadd19563e76 --- MODULE.bazel | 2 +- .../META-INF/MANIFEST.MF | 12 +++---- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 34 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.34.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.40.target | 10 +++--- .../maven/dependencies.tpd | 8 ++--- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 2 +- 13 files changed, 65 insertions(+), 65 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 05a93061fbe..0d4662828e2 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -23,7 +23,7 @@ git_repository( remote = "https://gerrit.googlesource.com/bazlets", ) -BOUNCYCASTLE_VERSION = "1.83" +BOUNCYCASTLE_VERSION = "1.84" BYTE_BUDDY_VERSION = "1.18.8" 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 1b2793a3361..d9d1b0f1103 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -8,12 +8,12 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.83.0,2.0.0)", - org.bouncycastle.jce.provider;version="[1.83.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.83.0,2.0.0)", - org.bouncycastle.openpgp.operator;version="[1.83.0,2.0.0)", - org.bouncycastle.openpgp.operator.jcajce;version="[1.83.0,2.0.0)", - org.bouncycastle.util.encoders;version="[1.83.0,2.0.0)", +Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.84.0,2.0.0)", + org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.84.0,2.0.0)", + org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)", + org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", + org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", org.eclipse.jgit.gpg.bc.internal;version="[7.7.0,7.8.0)", org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.0,7.8.0)", org.eclipse.jgit.util.sha1;version="[7.7.0,7.8.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index c039403f0d0..d6d826cd010 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -9,23 +9,23 @@ Bundle-Localization: OSGI-INF/l10n/gpg_bc Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.bouncycastle.asn1;version="[1.83.0,2.0.0)", - org.bouncycastle.asn1.x9;version="[1.83.0,2.0.0)", - org.bouncycastle.bcpg;version="[1.83.0,2.0.0)", - org.bouncycastle.bcpg.sig;version="[1.83.0,2.0.0)", - org.bouncycastle.crypto.ec;version="[1.83.0,2.0.0)", - org.bouncycastle.gpg;version="[1.83.0,2.0.0)", - org.bouncycastle.gpg.keybox;version="[1.83.0,2.0.0)", - org.bouncycastle.gpg.keybox.jcajce;version="[1.83.0,2.0.0)", - org.bouncycastle.jcajce.interfaces;version="[1.83.0,2.0.0)", - org.bouncycastle.jcajce.util;version="[1.83.0,2.0.0)", - org.bouncycastle.math.ec;version="[1.83.0,2.0.0)", - org.bouncycastle.math.field;version="[1.83.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.83.0,2.0.0)", - org.bouncycastle.openpgp.jcajce;version="[1.83.0,2.0.0)", - org.bouncycastle.openpgp.operator;version="[1.83.0,2.0.0)", - org.bouncycastle.openpgp.operator.jcajce;version="[1.83.0,2.0.0)", - org.bouncycastle.util.encoders;version="[1.83.0,2.0.0)", +Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)", + org.bouncycastle.asn1.x9;version="[1.84.0,2.0.0)", + org.bouncycastle.bcpg;version="[1.84.0,2.0.0)", + org.bouncycastle.bcpg.sig;version="[1.84.0,2.0.0)", + org.bouncycastle.crypto.ec;version="[1.84.0,2.0.0)", + org.bouncycastle.gpg;version="[1.84.0,2.0.0)", + org.bouncycastle.gpg.keybox;version="[1.84.0,2.0.0)", + org.bouncycastle.gpg.keybox.jcajce;version="[1.84.0,2.0.0)", + org.bouncycastle.jcajce.interfaces;version="[1.84.0,2.0.0)", + org.bouncycastle.jcajce.util;version="[1.84.0,2.0.0)", + org.bouncycastle.math.ec;version="[1.84.0,2.0.0)", + org.bouncycastle.math.field;version="[1.84.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.84.0,2.0.0)", + org.bouncycastle.openpgp.jcajce;version="[1.84.0,2.0.0)", + org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)", + org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", + org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test", org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 2b3d6e09bde..9f231d139ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcprov-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcpkix-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcutil-jdk18on - 1.83 + 1.84 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 6f5cd872e25..345a39ce495 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcprov-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcpkix-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcutil-jdk18on - 1.83 + 1.84 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index fc518360cb6..9d1aa8a5107 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcprov-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcpkix-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcutil-jdk18on - 1.83 + 1.84 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index c5146666b80..d89a1ba8afa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcprov-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcpkix-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcutil-jdk18on - 1.83 + 1.84 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 87c5844fa12..4d7ff1787cf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcprov-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcpkix-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcutil-jdk18on - 1.83 + 1.84 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 79d5e0733f9..1155365c185 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcprov-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcpkix-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcutil-jdk18on - 1.83 + 1.84 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index dc484ded8d9..d494040c004 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcprov-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcpkix-jdk18on - 1.83 + 1.84 jar org.bouncycastle bcutil-jdk18on - 1.83 + 1.84 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index ed24f94ab44..3ada4c5b2e2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -69,22 +69,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.83" + version = "1.84" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.83" + version = "1.84" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.83" + version = "1.84" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.83" + version = "1.84" } } diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 264712667b9..5cff8a866d3 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -38,7 +38,7 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends: org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", org.eclipse.jgit.transport.sshd.agent;version="7.7.0" -Import-Package: org.bouncycastle.jce.provider;version="[1.83.0,2.0.0)", +Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.client;version="[2.17.1,2.18.0)", org.apache.sshd.client.auth;version="[2.17.1,2.18.0)", diff --git a/pom.xml b/pom.xml index 75c906bd887..a9dd3de00ce 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 2.0.17 3.12.0 2.13.2 - 1.83 + 1.84 4.9.8.2 3.9.0 3.6.0 From ebf860ed6e100c360e98ce7fbc7dda6e8051f88b Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 21 Apr 2026 14:23:45 -0700 Subject: [PATCH 092/200] DfsPackCompactor: add a pre-commit hook to plug midx calculation The compactor commits its packs, then we calculate the midx and commit it. Doing this in two transactions is asking for trouble as e.g. packs could be deleted by a GC while writing the midx. We want to commit midx with the resulting compact packs. Add a hook to DfsPackCompactor so we can plug extra functionality before committing packs, like calculating the midx. Change-Id: I471fff63d0b6184384322e2c7860ba7b6a6a6964 --- .../storage/dfs/DfsPackCompactor.java | 70 ++++++++++++++++++- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java index 8860cce0382..fbe641ec51d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Set; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.file.PackIndex; @@ -78,6 +79,62 @@ public class DfsPackCompactor { private RevFlag added; private RevFlag isBase; + /** + * Hook invoked after the compact calculation is done, but before committing + * the resulting packs. + *

+ * The hook implementations must not modify the incoming collections. + * Instead, they should return any extra packs to commit or remove in a + * {@link Packs} record, which the caller will combine with the calculated + * results. + */ + public interface PreCommitHook { + /** + * Extra packs to commit and remove as result of the hook execution. + * + * @param toCommit + * packs that this hook wants to add to the compactor + * transaction + * @param toRemove + * packs that this hook wants to remove in the compactor + * transaction + */ + record Packs(List toCommit, + List toRemove) { + } + + /** + * Apply the hook. + * + * @param newPacks + * new packs created by this compaction. Read only. + * @param removedPacks + * packs that are being replaced by this compaction. Read + * only. + * @return Packs containing extra packs to commit and remove, or null if + * none. + * @throws IOException + * an error occurred in the hook. + */ + @Nullable + Packs apply(List newPacks, + Set removedPacks) throws IOException; + } + + private PreCommitHook preCommitHook; + + /** + * Set the pre-commit hook. + * + * @param hook + * pre-commit hook. + * @return {@code this} + */ + public DfsPackCompactor setPreCommitHook(PreCommitHook hook) { + this.preCommitHook = hook; + return this; + } + /** * Initialize a pack compactor. * @@ -196,8 +253,15 @@ public void compact(ProgressMonitor pm) throws IOException { } compactPacks(ctx, pm); - List commit = getNewPacks(); - Collection remove = toPrune(); + List commit = new ArrayList<>(getNewPacks()); + Set remove = toPrune(); + if (preCommitHook != null) { + PreCommitHook.Packs extra = preCommitHook.apply(commit, remove); + if (extra != null) { + commit.addAll(extra.toCommit()); + remove.addAll(extra.toRemove()); + } + } if (!commit.isEmpty() || !remove.isEmpty()) { objdb.commitPack(commit, remove); } @@ -318,7 +382,7 @@ public List getNewPackStatistics() { : Collections.emptyList(); } - private Collection toPrune() { + private Set toPrune() { Set packs = new HashSet<>(); for (DfsPackFile pack : srcPacks) { packs.add(pack.getPackDescription()); From c3c676c08e8d6a6d0413e2522bc120bfe05625bf Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 21 Apr 2026 15:26:24 -0700 Subject: [PATCH 093/200] DfsObjDatabase: Make createDfsPackFile public The implementations of DfsPackCompactor.PreReceiveHook need this method to open the new DfsPackDescriptions. Change-Id: I228ac3d9b356d14ca12ee91b7be76b4e6a6a6964 --- .../org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java index fc6596e843f..3f457f27c1c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java @@ -677,7 +677,7 @@ private PackList scanPacksImpl(PackList old) throws IOException { * pack description * @return the dfs packfile */ - protected DfsPackFile createDfsPackFile(DfsBlockCache cache, + public DfsPackFile createDfsPackFile(DfsBlockCache cache, DfsPackDescription dsc) { return new DfsPackFile(cache, dsc); } From 23bec76f5be8e774d274f6c93239990b2619d0bf Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Tue, 21 Apr 2026 23:28:07 +0000 Subject: [PATCH 094/200] ReceivePack: make getClientShallowCommits protected This allows classes extending ReceivePack to check if there were any shallow commits in the push. Change-Id: Ia829a84ebe7d3d264a8d09d5274958814e752256 --- .../src/org/eclipse/jgit/transport/ReceivePack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index 2d505021972..d036e1a3ff8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -1108,7 +1108,7 @@ public long getPackSize() { * that define the client's shallow boundary. Empty set if the * client is earlier than Git 1.9, or is a full clone. */ - private Set getClientShallowCommits() { + protected Set getClientShallowCommits() { return clientShallowCommits; } From 08212048ea16f25e7f748072a162a7ae77c21b87 Mon Sep 17 00:00:00 2001 From: Terry Parker Date: Wed, 22 Apr 2026 05:17:35 +0000 Subject: [PATCH 095/200] TreeWalkConnectivityChecker: Support non-commit objects in refs Running in shadow mode in production turned up the case of the reference database containing references to annotated tags and other non-commit objects. Fixed that and added tests. Change-Id: I7f1029e2512c96500658d9556d7c7d7c2753c817 --- .../TreeWalkConnectivityCheckerTest.java | 157 ++++++++++++++++++ .../TreeWalkConnectivityChecker.java | 30 +++- 2 files changed, 184 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityCheckerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityCheckerTest.java index 284c56ee29e..371f876204e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityCheckerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityCheckerTest.java @@ -40,6 +40,7 @@ import org.eclipse.jgit.lib.TreeFormatter; import org.eclipse.jgit.revwalk.RevBlob; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevTag; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.ConnectivityChecker.ConnectivityCheckInfo; import org.eclipse.jgit.transport.PackParser; @@ -517,9 +518,73 @@ public void testSuccessFallbackToFullRefDatabase() throws Exception { info.setCommands(Collections.singletonList(new ReceiveCommand( ObjectId.zeroId(), newCommit.getId(), "refs/heads/master"))); mockNewPackObjects(newCommit, newCommit.getTree()); + runCheckAndAssertCount(5); } + @Test + public void testCheckReachabilityWithBlobInHaves() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob blob = tr.blob("blob content"); + haves.add(blob.getId()); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + runCheckAndAssertCount(4); + } + + @Test + public void testCheckReachabilityWithAnnotatedTagInHaves() + throws Exception { + RevCommit base = tr.commit().create(); + + RevTag tag = tr.tag("my-tag", base); + haves.add(tag.getId()); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + runCheckAndAssertCount(5); + } + + @Test + public void testCheckReachabilityWithBlobInRefs() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob blob = tr.blob("blob content"); + tr.update("refs/tags/my-blob", blob); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + runCheckAndAssertCount(4); + } + + @Test + public void testCheckReachabilityWithAnnotatedTagInRefs() throws Exception { + RevCommit base = tr.commit().create(); + + RevTag tag = tr.tag("my-tag", base); + tr.update("refs/tags/my-tag", tag); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(ObjectId.zeroId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + runCheckAndAssertCount(4); + } + @Test public void testSuccessWithDeletion() throws Exception { RevBlob blob = tr.blob("hello"); @@ -597,6 +662,98 @@ public void testThinPackSuccess() throws Exception { runCheckAndAssertCount(4); } + @Test + public void testThinPackWithBlobInHaves() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob baseBlob = tr.blob("base blob content"); + + RevBlob unrelatedBlob = tr.blob("unrelated blob content"); + haves.add(unrelatedBlob.getId()); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + ObjectIdSubclassMap baseObjectIds = new ObjectIdSubclassMap<>(); + baseObjectIds.add(baseBlob.getId()); + when(parser.getBaseObjectIds()).thenReturn(baseObjectIds); + info.setCheckObjects(true); + + runCheckAndAssertCount(4); + } + + @Test + public void testThinPackWithSignedTagInHaves() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob baseBlob = tr.blob("base blob content"); + + RevTag tag = tr.tag("my-tag", base); + haves.add(tag.getId()); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + ObjectIdSubclassMap baseObjectIds = new ObjectIdSubclassMap<>(); + baseObjectIds.add(baseBlob.getId()); + when(parser.getBaseObjectIds()).thenReturn(baseObjectIds); + info.setCheckObjects(true); + + runCheckAndAssertCount(4); + } + + @Test + public void testThinPackWithBlobInRefs() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob baseBlob = tr.blob("base blob content"); + + RevBlob unrelatedBlob = tr.blob("unrelated blob content"); + tr.update("refs/tags/my-blob", unrelatedBlob); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + ObjectIdSubclassMap baseObjectIds = new ObjectIdSubclassMap<>(); + baseObjectIds.add(baseBlob.getId()); + when(parser.getBaseObjectIds()).thenReturn(baseObjectIds); + info.setCheckObjects(true); + + runCheckAndAssertCount(4); + } + + @Test + public void testThinPackWithAnnotatedTagInRefs() throws Exception { + RevCommit base = tr.commit().create(); + haves.add(base.getId()); + + RevBlob baseBlob = tr.blob("base blob content"); + + RevTag tag = tr.tag("my-tag", base); + tr.update("refs/tags/my-tag", tag); + + RevCommit newCommit = tr.commit().parent(base).create(); + + setupSingleReceiveCommand(base.getId(), newCommit.getId()); + mockNewPackObjects(newCommit, newCommit.getTree()); + + ObjectIdSubclassMap baseObjectIds = new ObjectIdSubclassMap<>(); + baseObjectIds.add(baseBlob.getId()); + when(parser.getBaseObjectIds()).thenReturn(baseObjectIds); + info.setCheckObjects(true); + + runCheckAndAssertCount(4); + } + @Test public void testMultipleCommandsDifferentParents() throws Exception { RevCommit base1 = tr.commit().create(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityChecker.java index 8c667df0491..cfe6bcf42b0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityChecker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/connectivity/TreeWalkConnectivityChecker.java @@ -21,6 +21,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; @@ -215,7 +216,7 @@ private void checkReachability(RevWalk rw, Repository repo, ReachabilityChecker checker = rw.getObjectReader() .createReachabilityChecker(rw); Stream starterCommits = advertisedHaves.stream() - .map(id -> rw.lookupCommit(id)); + .map(id -> parseCommitOrNull(rw, id)).filter(Objects::nonNull); Optional unreachable = checker.areAllReachable( nonAdvertisedParentCommitsOutsidePack, starterCommits); @@ -224,7 +225,8 @@ private void checkReachability(RevWalk rw, Repository repo, // Fallback to check against full ref database Stream allRefCommits = repo.getRefDatabase() .getRefs().stream() - .map(ref -> rw.lookupCommit(ref.getObjectId())); + .map(ref -> parseCommitOrNull(rw, ref.getObjectId())) + .filter(Objects::nonNull); unreachable = checker.areAllReachable( nonAdvertisedParentCommitsOutsidePack, allRefCommits); if (unreachable.isPresent()) { @@ -276,7 +278,8 @@ private void checkThinPackBases(RevWalk rw, // Fallback to check against full ref database Stream allRefCommits = connectivityCheckInfo .getRepository().getRefDatabase().getRefs().stream() - .map(ref -> rw.lookupCommit(ref.getObjectId())); + .map(ref -> parseAnyUnchecked(ow, ref.getObjectId())) + .filter(Objects::nonNull); unreachable = checker.areAllReachable(targetObjs, allRefCommits); if (unreachable.isPresent()) { @@ -400,6 +403,27 @@ private static RevObject parseAnyUnchecked(RevWalk rw, ObjectId id) { } } + /** + * Parses an object as a commit, peeling tags if necessary. Returns null if + * the object is not a commit or cannot be peeled to a commit. Throws + * UncheckedIOException on other I/O failures. For use with streams. + * + * @param rw + * the RevWalk to use + * @param id + * the object ID + * @return the parsed commit, or null + */ + private static RevCommit parseCommitOrNull(RevWalk rw, ObjectId id) { + try { + return rw.parseCommit(id); + } catch (IncorrectObjectTypeException e) { + return null; + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + /** * Checks if the new object ID matches any parent tree's object ID at the * current path. From a17c4aa421c99bbc248750635cf8a9a527081bfb Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 23 Apr 2026 08:31:13 +0200 Subject: [PATCH 096/200] ReceivePack: Add missing @since tag for new API method Change-Id: I3251799d8361666e000ea089798f8d8575b70cd7 --- org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index d036e1a3ff8..8b05d4155a9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -1107,6 +1107,7 @@ public long getPackSize() { * @return if the client is a shallow repository, the list of edge commits * that define the client's shallow boundary. Empty set if the * client is earlier than Git 1.9, or is a full clone. + * @since 7.7 */ protected Set getClientShallowCommits() { return clientShallowCommits; From 505ef1488bb31e300438424e8ca8845d1b3092ab Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Wed, 8 Apr 2026 13:48:12 -0500 Subject: [PATCH 097/200] pack-refs: Correctly define peeled trait cgit defines the peeled trait accordingly: References under "refs/tags/", if they *can* be peeled, *are* peeled in this file. References outside of "refs/tags/" are probably not peeled even if they could have been, but if we find a peeled value for such a reference we will use it. Correct the parsing to have missing refs/tags/ check to be defined as PeeledNonTag. Change-Id: I70ea453ecc89cebef488c64e64f1e70526a003b3 --- .../jgit/internal/storage/file/RefDirectoryTest.java | 6 +++--- .../jgit/internal/storage/file/RefDirectory.java | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java index 6552bac8af6..609e8a3f03a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java @@ -997,16 +997,16 @@ public void testGetRefs_PackedWithPeeled() throws IOException { final Ref tag = all.get("refs/tags/v1.0"); assertEquals(A, master.getObjectId()); - assertTrue(master.isPeeled()); + assertFalse(master.isPeeled()); assertNull(master.getPeeledObjectId()); assertEquals(B, other.getObjectId()); - assertTrue(other.isPeeled()); + assertFalse(other.isPeeled()); assertNull(other.getPeeledObjectId()); assertSame(master, head.getTarget()); assertEquals(A, head.getObjectId()); - assertTrue(head.isPeeled()); + assertFalse(head.isPeeled()); assertNull(head.getPeeledObjectId()); assertEquals(v1_0, tag.getObjectId()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index a5eceb7b3f7..d9b0c5b5475 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -118,7 +118,7 @@ public class RefDirectory extends RefDatabase { /** Magic string denoting the header of a packed-refs file. */ public static final String PACKED_REFS_HEADER = "# pack-refs with:"; //$NON-NLS-1$ - /** If in the header, denotes the file has peeled data. */ + /** If in the header, denotes the file has peeled data for (refs/tags/...). */ public static final String PACKED_REFS_PEELED = " peeled"; //$NON-NLS-1$ /** If in the header, denotes the file has sorted data. */ @@ -1126,12 +1126,14 @@ private RefList parsePackedRefs(BufferedReader br) ObjectId id = ObjectId.fromString(p.substring(0, sp)); String name = copy(p, sp + 1, p.length()); ObjectIdRef cur; - if (peeled) + if (peeled && name.startsWith(R_TAGS)) { cur = new ObjectIdRef.PeeledNonTag(PACKED, name, id); - else + } else { cur = new ObjectIdRef.Unpeeled(PACKED, name, id); - if (!isSorted && last != null && RefComparator.compareTo(last, cur) > 0) + } + if (!isSorted && last != null && RefComparator.compareTo(last, cur) > 0) { needSort = true; + } all.add(cur); last = cur; } From f23d73e2cf565f3fbafdabbb225b722ba9eacbd4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 28 Apr 2026 14:01:41 +0200 Subject: [PATCH 098/200] RefDirectory#refreshPathToLooseRef: also refresh loose ref itself We observed that newly generated Gerrit auth tokens weren't visible on all pods in an HA deployment of k8s-gerrit. I debugged resolving loose user refs with core.trustStat = after_open and found that we refresh the attributes of all the directories above a loose ref by opening an inputstream but we don't do this on the loose ref itself. It looks like this could cause the issue we observed. In the example I debugged it was the user ref refs/users/00/10000000 and I found that the attributes of the directories refs/ refs/users/ refs/users/00 were refreshed but the loose ref itself refs/users/00/10000000 was not refreshed. Fix this by also opening the ref's file itself if refreshing its parent directories succeeded. Change-Id: I37aaca2a1f448ca9a1caa325a0c18952cc023121 --- .../jgit/internal/storage/file/RefDirectory.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 9fa3ff3d9fa..cbf3566652f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -1320,6 +1320,7 @@ class LooseItems { * path of a loose ref relative to the repository root */ void refreshPathToLooseRef(Path refPath) { + boolean failed = false; for (int i = 1; i < refPath.getNameCount(); i++) { File dir = fileFor(refPath.subpath(0, i).toString()); // Use Files.newInputStream(Path) as it is consistent with other @@ -1328,7 +1329,16 @@ void refreshPathToLooseRef(Path refPath) { try (InputStream stream = Files.newInputStream(dir.toPath())) { // open the dir to refresh attributes (on some NFS clients) } catch (IOException e) { - break; // loose ref may not exist + failed = true; + break; // directory may not exist + } + } + if (!failed) { + try (InputStream stream = Files.newInputStream(refPath)) { + // open the loose ref to refresh attributes (on some NFS + // clients) + } catch (IOException e) { + // loose ref may not exist } } } From 804e29be9384917b9e15c96f0f92520f66732316 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 28 Apr 2026 14:01:41 +0200 Subject: [PATCH 099/200] RefDirectory#refreshPathToLooseRef: also refresh loose ref itself We observed that newly generated Gerrit auth tokens weren't visible on all pods in an HA deployment of k8s-gerrit. I debugged resolving loose user refs with core.trustStat = after_open and found that we refresh the attributes of all the directories above a loose ref by opening an inputstream but we don't do this on the loose ref itself. It looks like this could cause the issue we observed. In the example I debugged it was the user ref refs/users/00/10000000 and I found that the attributes of the directories refs/ refs/users/ refs/users/00 were refreshed but the loose ref itself refs/users/00/10000000 was not refreshed. Fix this by also opening the ref's file itself if refreshing its parent directories succeeded. Change-Id: I37aaca2a1f448ca9a1caa325a0c18952cc023121 (cherry picked from commit f23d73e2cf565f3fbafdabbb225b722ba9eacbd4) --- .../jgit/internal/storage/file/RefDirectory.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 52deac8eb38..c93d176e35c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -1297,6 +1297,7 @@ class LooseItems { * path of a loose ref relative to the repository root */ void refreshPathToLooseRef(Path refPath) { + boolean failed = false; for (int i = 1; i < refPath.getNameCount(); i++) { File dir = fileFor(refPath.subpath(0, i).toString()); // Use Files.newInputStream(Path) as it is consistent with other @@ -1305,7 +1306,16 @@ void refreshPathToLooseRef(Path refPath) { try (InputStream stream = Files.newInputStream(dir.toPath())) { // open the dir to refresh attributes (on some NFS clients) } catch (IOException e) { - break; // loose ref may not exist + failed = true; + break; // directory may not exist + } + } + if (!failed) { + try (InputStream stream = Files.newInputStream(refPath)) { + // open the loose ref to refresh attributes (on some NFS + // clients) + } catch (IOException e) { + // loose ref may not exist } } } From 60c64e8c4493f20bbe81d37b05e494e9aaa81826 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 Apr 2026 21:12:01 +0200 Subject: [PATCH 100/200] JGit v7.7.0.202604291911-m2 Signed-off-by: Matthias Sohn Change-Id: I3e9b1952410cee37d13680911ba49021388ec123 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 8b99ee9169b..413fa0d0c4d 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1ed2fb90785..ca38521f5ba 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 e10e3854171..0deb8843154 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 08d4b66eaf3..76ba8e8ecc5 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 8863da90e31..6cc897dfa03 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 9f4281261c3..38ec09fb394 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 88f51d14431..841ea3f9586 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a04e9c6350f..49ba8ab10db 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 53d1bfdd401..b5935486188 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index b02657ff86e..1c4e25c8bc6 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.test - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 d9d1b0f1103..377d356a4b5 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 2ed7ba3958d..b994f74a29a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 d6d826cd010..10992977dfd 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 556d2565756..85650ff9385 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index e6b206344d6..cbfac74618b 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 06887836c6d..edebddd0e98 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 03c16b891b7..1a2eeed73aa 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51be72e9c23..5535dcb79e2 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 02059c1b715..8b357eeaf3f 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 520c2fb1153..d40b1831a2d 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2460ea91e7c..b93069b1ce7 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 d19255326f9..71935d93c28 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 310f87f4c05..d1924116b2a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 fa7421aae95..b8c3616d782 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: OSGI-INF/l10n/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 a913f9003de..78ad121f821 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fc428ed766..3fd2a7fb249 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 04e96f9ec7d..d1e902f3e02 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: OSGI-INF/l10n/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 479ec1333be..7e66594d508 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 94397aba5f9..845ad2a24c3 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 78f05845141..3238e2465ac 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: OSGI-INF/l10n/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 c313e01220b..72a44ccb6df 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 907fc47920c..00dd98394f4 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 e85207181e7..9a451633dd6 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 4ad6d6524f1..933cc4de168 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 65079c689c5..05c1d9d49c4 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 9dc895322da..25a6f699492 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 73036eefecb..e8ad6cecba3 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 b9df9f9e993..1bd85dbb516 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 040b222cc63..0d9203f365e 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 0fe46c793ee..9471505827f 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 5ecc42bb93c..5954067e4f5 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 19546b73995..67f7a2122e7 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 0caab549108..4758cb94935 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 a8ce2984b38..bc1f3ac54b6 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 e37d622a538..9dd0c96143f 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 d59c8de391c..6daf8c8fc94 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 684d11994a1..26c97bc911b 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 00a0601d333..3309a72e4d3 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 8b28f14dfe1..1d45aecb0da 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 6e07e85c123..d3840c6979e 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 bb6b80a4a62..2b95f30553c 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 0d91543b42d..58ec98bfd99 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 d053e0ac2a8..c9ffbdccd6d 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 6a8c021997b..18b9f2f4796 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 9a1fd3ad202..877635739f1 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 73f1ecda7b6..ce8f30e4d56 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 c5b75923b37..a93fee3a40b 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 edb2020cf80..0d6a69dfb03 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 0b97560d28d..0888e6c69f4 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 706918f38ac..d77659c4972 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 8db7e691045..891e5a65e4b 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2a73924bae5..59ca12d4967 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 28b0ced222e..67596bfc59e 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 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 f41d83d2cbd..46c2a313d20 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 e31d3dc49ca..a39f65e945d 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 65901e06a00..ebd3f725b3c 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 659718bd8a9..35805c89db0 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 1dc3728c98f..839c506b133 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index a085c046432..8348e94cfc5 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 4d7b7c233a8..04ca76515f7 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit.ssh.apache.agent 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 ae9e11e2182..399794f6ab9 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2ab6c3921f2..d2e51e95e2d 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 5cff8a866d3..168def991f0 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 fa44087d3cf..314c888bb1f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 18cba188b71..affc3cbe89a 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 73ef145eac6..00972079f0e 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 176c91dc76b..b0e0602f460 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 9093f859b1b..9f192a7c4f8 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 4863daef6fc..3c199ff7d22 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index b8e2e4c212a..aef6055157f 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 36a9e4f53f0..7d9e543fea5 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 92a7597b4cf..dfc934c4ee3 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 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 ef66f911cff..4e55a276a7d 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 2430c2bb3d8..1e0d3b99f85 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a21d2f33ee2..d5e6522f3d6 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 - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 2377e269927..52372e2b235 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 46c35527314..cd632054e64 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202604291911-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202604291911-m2";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e9b16e06934..b002972c923 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index a9dd3de00ce..4f8be8b7e95 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0-SNAPSHOT + 7.7.0.202604291911-m2 JGit - Parent ${jgit-url} From a11c519848277527d6094e29fa3d5f3335e4e7fa Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 29 Apr 2026 02:43:38 -0400 Subject: [PATCH 101/200] gitrepo: update git-repo URL in javadocs Change-Id: I5d2b06c27fbbd83f9d54bdb83e040a8212da02ed --- .../src/org/eclipse/jgit/gitrepo/ManifestParser.java | 2 +- org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java | 2 +- org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java index 58b4d3dc56a..12ba893c602 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java @@ -44,7 +44,7 @@ /** * Repo XML manifest parser. * - * @see git-repo project page + * @see git-repo project page * @since 4.0 */ public class ManifestParser extends DefaultHandler { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index be77fca459c..392ca926772 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -58,7 +58,7 @@ * work in git submodule, so we'll skip all the sub projects * ("foo/bar" in the example) while converting. * - * @see git-repo project page + * @see git-repo project page * @since 3.4 */ public class RepoCommand extends GitCommand { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index 2630da34e05..07eb12de5ee 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -27,7 +27,7 @@ /** * The representation of a repo sub project. * - * @see git-repo project page + * @see git-repo project page * @since 4.0 */ public class RepoProject implements Comparable { From f573569a2601ad9d0453d956a75dfa33600aca24 Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Wed, 8 Apr 2026 15:46:44 -0500 Subject: [PATCH 102/200] pack-refs: Fix buggy way of marking peeled trait Only the first peeled ref was considered when marking the packed-refs file as peeled. Correct it to include the peeled trait if it is a new packed-refs file or if that trait was previously specified. RefWriter class is marked deprecated and continue to have this buggy behavior since it provides a cleaner upgrade path by not changing anything for existing users depending on it. Users should migrate to use new PackedRefsWriter class which also optimizes to apply all the traits before writing. The other upgrade options considered were: 1. Update the writePackedRefs method to fix the bug and only add the "sorted" trait. This prevents exposing the "peeled" trait to users, though it may introduce performance penalties since future reads can no longer assume refs/tags are peeled and may need to check. 2. Fix the writePackedRefs method so it ensures all refs/tags are peeled. This adds a performance cost for the callers. If there is a later agreement, we can implement them as follow up changes. Change-Id: Ia4d5b4eb44f82ff3a422d3e871be19db3c231095 --- .../storage/file/RefDirectoryTest.java | 72 +++++- .../storage/file/PackedBatchRefUpdate.java | 2 +- .../internal/storage/file/RefDirectory.java | 70 ++++-- .../org/eclipse/jgit/lib/PackedRefsTrait.java | 46 ++++ .../eclipse/jgit/lib/PackedRefsWriter.java | 224 ++++++++++++++++++ .../src/org/eclipse/jgit/lib/RefWriter.java | 159 +++---------- .../transport/WalkRemoteObjectDatabase.java | 3 +- 7 files changed, 425 insertions(+), 151 deletions(-) create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsTrait.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsWriter.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java index 609e8a3f03a..2f85a2e13a0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java @@ -46,6 +46,7 @@ import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.PackedRefsTrait; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Ref.Storage; import org.eclipse.jgit.lib.RefDatabase; @@ -71,6 +72,8 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase { private RevTag v1_0; + private RevTag v2_0; + @Override @Before public void setUp() throws Exception { @@ -85,7 +88,8 @@ public void refDirectorySetup() throws Exception { repo = new TestRepository<>(diskRepo); A = repo.commit().create(); B = repo.commit(repo.getRevWalk().parseCommit(A)); - v1_0 = repo.tag("v1_0", B); + v1_0 = repo.tag("v1_0", A); + v2_0 = repo.tag("v2_0", B); repo.getRevWalk().parseBody(v1_0); } @@ -1063,6 +1067,72 @@ public void test_repack() throws Exception { assertEquals(v0_1.getId(), all.get("refs/tags/v0.1").getObjectId()); } + @Test + public void testNewPackFileHasAllTraits()throws Exception { + writeLooseRef("refs/heads/master", B); + + PackRefsCommand packRefsCommand = new PackRefsCommand(diskRepo); + packRefsCommand.setAll(true); + packRefsCommand.call(); + + File packedRefsFile = new File(diskRepo.getCommonDirectory(), Constants.PACKED_REFS); + + String content = read(packedRefsFile); + String firstLine = content.split("\n")[0]; + assertTrue("packed-refs should have header with sorted", + firstLine.contains(" sorted")); + assertTrue("packed-refs should have header with peeled", + firstLine.contains(" peeled")); + } + + @Test + public void autoPeelAnyUnpeeledTags() throws Exception { + writePackedRefs("# pack-refs with: sorted \n" + + v1_0.name() + " refs/tags/peeled\n" + + "^" + v1_0.getObject().name() + "\n" + + v2_0.name() + " refs/tags/unpeeled" + ); + + writeLooseRef("refs/tags/other", B); + + PackRefsCommand packRefsCommand = new PackRefsCommand(diskRepo); + packRefsCommand.setAll(true); + packRefsCommand.call(); + + File packedRefsFile = new File(diskRepo.getCommonDirectory(), Constants.PACKED_REFS); + String content = read(packedRefsFile); + String firstLine = content.split("\n")[0]; + assertTrue("packed-refs should have peeled trait", firstLine.contains(" peeled")); + + assertTrue(refdir.getPackedRefs().traits().contains(PackedRefsTrait.PEELED)); + assertTrue(refdir.getPackedRefs().get("refs/tags/peeled").isPeeled()); + assertTrue(refdir.getPackedRefs().get("refs/tags/unpeeled").isPeeled()); + } + + @Test + public void preservePeeledTraitIfPreviouslyPeeled() throws Exception { + writePackedRefs("# pack-refs with: sorted peeled\n" + + v1_0.name() + " refs/tags/peeled\n" + + "^" + v1_0.getObject().name() + "\n" + ); + + writeLooseRef("refs/tags/unpeeled-loose", v2_0); + + PackRefsCommand packRefsCommand = new PackRefsCommand(diskRepo); + packRefsCommand.setAll(true); + packRefsCommand.call(); + + File packedRefsFile = new File(diskRepo.getCommonDirectory(), Constants.PACKED_REFS); + String content = read(packedRefsFile); + String firstLine = content.split("\n")[0]; + assertTrue("packed-refs should have peeled trait", firstLine.contains(" peeled")); + + assertTrue(refdir.getPackedRefs().traits().contains(PackedRefsTrait.PEELED)); + assertTrue(refdir.getPackedRefs().get("refs/tags/peeled").isPeeled()); + // new loose ref/tags/.. ares peeled + assertTrue(refdir.getPackedRefs().get("refs/tags/unpeeled-loose").isPeeled()); + } + @Test public void testPackedRefsHeaderWithSorted() throws Exception { writeLooseRef("refs/heads/master", A); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java index 4b5566e113a..f33fe0b3b87 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackedBatchRefUpdate.java @@ -178,7 +178,7 @@ public void execute(RevWalk walk, ProgressMonitor monitor, return; } refdb.commitPackedRefs(packedRefsLock, newRefs, oldPackedList, - true); + true, oldPackedList.traits()); } catch (LockFailedException e) { lockFailure(pending.get(0), pending); return; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index d9b0c5b5475..52624e71098 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -46,6 +46,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -71,12 +72,13 @@ import org.eclipse.jgit.lib.CoreConfig.TrustStat; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef; +import org.eclipse.jgit.lib.PackedRefsTrait; +import org.eclipse.jgit.lib.PackedRefsWriter; import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefComparator; import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.RefUpdate; -import org.eclipse.jgit.lib.RefWriter; import org.eclipse.jgit.lib.ReflogReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.SymbolicRef; @@ -118,12 +120,6 @@ public class RefDirectory extends RefDatabase { /** Magic string denoting the header of a packed-refs file. */ public static final String PACKED_REFS_HEADER = "# pack-refs with:"; //$NON-NLS-1$ - /** If in the header, denotes the file has peeled data for (refs/tags/...). */ - public static final String PACKED_REFS_PEELED = " peeled"; //$NON-NLS-1$ - - /** If in the header, denotes the file has sorted data. */ - public static final String PACKED_REFS_SORTED = " sorted"; //$NON-NLS-1$ - @SuppressWarnings("boxing") private static final List RETRY_SLEEP_MS = Collections.unmodifiableList(Arrays.asList(0, 100, 200, 400, 800, 1600)); @@ -726,7 +722,8 @@ void delete(RefDirectoryUpdate update) throws IOException { packed = getLockedPackedRefs(lck); int idx = packed.find(name); if (0 <= idx) { - commitPackedRefs(lck, packed.remove(idx), packed, true); + commitPackedRefs(lck, packed.remove(idx), packed, true, + packed.traits); } } @@ -827,7 +824,13 @@ private void pack(Collection refs, } // The new content for packed-refs is collected. Persist it. - commitPackedRefs(lck, newPacked, oldPacked,false); + commitPackedRefs(lck, newPacked, oldPacked, false, + // If all packed-refs content is new, start with all + // traits. + oldPacked.isEmpty() + ? EnumSet.of(PackedRefsTrait.SORTED, + PackedRefsTrait.PEELED) + : oldPacked.traits); // Now delete the loose refs which are now packed for (String refName : refs) { @@ -1066,9 +1069,7 @@ private PackedRefList readPackedRefs() throws IOException { new DigestInputStream( new FileInputStream(f), digest), UTF_8))) { - return new NonEmptyPackedRefList(parsePackedRefs(br), - snapshot, - ObjectId.fromRaw(digest.digest())); + return parsePackedRefs(br, snapshot, digest); } }); return result != null ? result : NO_PACKED_REFS; @@ -1087,8 +1088,8 @@ void compareAndSetPackedRefs(PackedRefList curList, PackedRefList newList) { } } - private RefList parsePackedRefs(BufferedReader br) - throws IOException { + private NonEmptyPackedRefList parsePackedRefs(BufferedReader br, + FileSnapshot snapshot, MessageDigest digest) throws IOException { RefList.Builder all = new RefList.Builder<>(); Ref last = null; boolean peeled = false; @@ -1100,8 +1101,8 @@ private RefList parsePackedRefs(BufferedReader br) if (p.charAt(0) == '#') { if (p.startsWith(PACKED_REFS_HEADER)) { p = p.substring(PACKED_REFS_HEADER.length()); - peeled = p.contains(PACKED_REFS_PEELED); - isSorted = p.contains(PACKED_REFS_SORTED); + peeled = p.contains(PackedRefsTrait.PEELED.value()); + isSorted = p.contains(PackedRefsTrait.SORTED.value()); } continue; } @@ -1140,7 +1141,14 @@ private RefList parsePackedRefs(BufferedReader br) if (needSort) all.sort(); - return all.toRefList(); + + EnumSet traits = EnumSet.noneOf(PackedRefsTrait.class); + traits.add(PackedRefsTrait.SORTED); + if (peeled) { + traits.add(PackedRefsTrait.PEELED); + } + return new NonEmptyPackedRefList(all.toRefList(), snapshot, + ObjectId.fromRaw(digest.digest()), traits); } private static String copy(String src, int off, int end) { @@ -1149,10 +1157,10 @@ private static String copy(String src, int off, int end) { return new StringBuilder(end - off).append(src, off, end).toString(); } - void commitPackedRefs(final LockFile lck, final RefList refs, - final PackedRefList oldPackedList, boolean changed) - throws IOException { - new RefWriter(refs) { + void commitPackedRefs(final LockFile lck, final RefList refsList, + final PackedRefList oldPackedList, boolean changed, + EnumSet traits) throws IOException { + new PackedRefsWriter(refsList.asList(), traits, this) { @Override protected void writeFile(String name, byte[] content) throws IOException { @@ -1177,7 +1185,8 @@ protected void writeFile(String name, byte[] content) byte[] digest = Constants.newMessageDigest().digest(content); PackedRefList newPackedList = new NonEmptyPackedRefList( - refs, lck.getCommitSnapshot(), ObjectId.fromRaw(digest)); + asRefList(), lck.getCommitSnapshot(), + ObjectId.fromRaw(digest), traits); packedRefs.compareAndSet(oldPackedList, newPackedList); if (changed) { modCnt.incrementAndGet(); @@ -1531,19 +1540,27 @@ static void sleep(long ms) throws InterruptedIOException { static class PackedRefList extends RefList { private final ObjectId id; + private final EnumSet traits; PackedRefList() { - this(RefList.emptyList(), ObjectId.zeroId()); + this(RefList.emptyList(), ObjectId.zeroId(), + EnumSet.noneOf(PackedRefsTrait.class)); } - protected PackedRefList(RefList src, ObjectId id) { + protected PackedRefList(RefList src, ObjectId id, + EnumSet traits) { super(src); this.id = id; + this.traits = traits.clone(); } public boolean shouldRefresh() throws IOException { return true; } + + public EnumSet traits() { + return traits.clone(); + } } private static final PackedRefList NO_PACKED_REFS = new PackedRefList(); @@ -1551,8 +1568,9 @@ public boolean shouldRefresh() throws IOException { private class NonEmptyPackedRefList extends PackedRefList { private final FileSnapshot snapshot; - private NonEmptyPackedRefList(RefList src, FileSnapshot s, ObjectId id) { - super(src, id); + private NonEmptyPackedRefList(RefList src, FileSnapshot s, + ObjectId id, EnumSet traits) { + super(src, id, traits); snapshot = s; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsTrait.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsTrait.java new file mode 100644 index 00000000000..09967189eab --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsTrait.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2026, Nvidia + * + * 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.lib; + +/** + * Headers defined on the packed-refs file. + * + * @since 7.7 + */ +public enum PackedRefsTrait { + /** If in the header, denotes the file has sorted data. */ + SORTED(" sorted"), //$NON-NLS-1$ + /** + * If in the header, denotes the file has peeled data for (refs/tags/...). + */ + PEELED(" peeled"), //$NON-NLS-1$ + /** + * If in the header, denotes the file has peeled data for all the refs which + * are peelable. + */ + FULLY_PEELED(" fully-peeled"); //$NON-NLS-1$ + + private final String value; + + PackedRefsTrait(String value) { + this.value = value; + } + + /** + * Gives the string representation of trait like it appears in packed-refs + * header + * + * @return String representation of the trait. + */ + public String value() { + return value; + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsWriter.java new file mode 100644 index 00000000000..c402c24b15d --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsWriter.java @@ -0,0 +1,224 @@ +/* + * Copyright (C) 2008, Charles O'Farrell + * Copyright (C) 2009-2010, Google Inc. + * Copyright (C) 2009, Robin Rosenberg + * Copyright (C) 2008, Shawn O. Pearce and others + * Copyright (C) 2026, Nvidia + * + * 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.lib; + +import static org.eclipse.jgit.lib.Constants.R_TAGS; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import org.eclipse.jgit.internal.storage.file.RefDirectory; +import org.eclipse.jgit.util.RefList; + +/** + * Writes out refs to {@link org.eclipse.jgit.lib.Constants#PACKED_REFS} file by + * computing and applying all the missing traits for optimized reads. + * + * @since 7.7 + */ +public abstract class PackedRefsWriter { + /** Refs to be written. */ + protected Collection refs; + + /** Traits that are applicable to the refs. */ + protected final EnumSet traits; + + /** + *

+ * Constructor for PackedRefsWriter. + *

+ * + * @param refs + * the complete set of references. This should have been computed + * by applying updates to the advertised refs already discovered. + * @param traits + * traits that are applicable to the refs. If any traits are + * missing, they would be applied before writing, but the + * specified traits are not re-computed/checked. + * @param refDb + * refDb where the packed-refs file should be written. + * + * @throws IOException + * if it is not able to peel any of the tags. + * @since 7.7 + */ + public PackedRefsWriter(Collection refs, + EnumSet traits, RefDatabase refDb) + throws IOException { + this(refs, traits); + applyMissingTraits(refDb); + } + + /** + *

+ * Constructor for PackedRefsWriter. + *

+ * + *

+ * Stores the provided refs and traits without applying any missing traits. + * Intended for use by subclasses that manage trait application themselves. + *

+ * + * @param refs + * the complete set of references. This should have been computed + * by applying updates to the advertised refs already discovered. + * @param traits + * traits that are applicable to the refs. + */ + protected PackedRefsWriter(Collection refs, + EnumSet traits) { + this.refs = refs; + this.traits = traits; + } + + /** + * Rebuild the {@link org.eclipse.jgit.lib.Constants#INFO_REFS}. + *

+ * This method rebuilds the contents of the + * {@link org.eclipse.jgit.lib.Constants#INFO_REFS} file to match the passed + * list of references. + * + * @throws java.io.IOException + * writing is not supported, or attempting to write the file + * failed, possibly due to permissions or remote disk full, etc. + */ + public void writeInfoRefs() throws IOException { + final StringWriter w = new StringWriter(); + final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH]; + for (Ref r : refs) { + if (Constants.HEAD.equals(r.getName())) { + // Historically HEAD has never been published through + // the INFO_REFS file. This is a mistake, but its the + // way things are. + // + continue; + } + + ObjectId objectId = r.getObjectId(); + if (objectId == null) { + // Symrefs to unborn branches aren't advertised in the info/refs + // file. + continue; + } + objectId.copyTo(tmp, w); + w.write('\t'); + w.write(r.getName()); + w.write('\n'); + + ObjectId peeledObjectId = r.getPeeledObjectId(); + if (peeledObjectId != null) { + peeledObjectId.copyTo(tmp, w); + w.write('\t'); + w.write(r.getName()); + w.write("^{}\n"); //$NON-NLS-1$ + } + } + writeFile(Constants.INFO_REFS, Constants.encode(w.toString())); + } + + /** + * Rebuild the {@link org.eclipse.jgit.lib.Constants#PACKED_REFS} file. + *

+ * This method rebuilds the contents of the + * {@link org.eclipse.jgit.lib.Constants#PACKED_REFS} file to match the + * passed list of references, including only those refs that have a storage + * type of {@link org.eclipse.jgit.lib.Ref.Storage#PACKED}. + * + * @throws java.io.IOException + * writing is not supported, or attempting to write the file + * failed, possibly due to permissions or remote disk full, etc. + */ + public void writePackedRefs() throws IOException { + final StringWriter w = new StringWriter(); + w.write(RefDirectory.PACKED_REFS_HEADER); + for (PackedRefsTrait t : traits) { + w.write(t.value()); + } + w.write('\n'); + + final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH]; + for (Ref r : refs) { + if (r.getStorage() != Ref.Storage.PACKED) + continue; + + ObjectId objectId = r.getObjectId(); + if (objectId == null) { + // A packed ref cannot be a symref, let alone a symref + // to an unborn branch. + throw new NullPointerException(); + } + objectId.copyTo(tmp, w); + w.write(' '); + w.write(r.getName()); + w.write('\n'); + + ObjectId peeledObjectId = r.getPeeledObjectId(); + if (peeledObjectId != null) { + w.write('^'); + peeledObjectId.copyTo(tmp, w); + w.write('\n'); + } + } + writeFile(Constants.PACKED_REFS, Constants.encode(w.toString())); + } + + /** + * Access the new refs after all the necessary traits were applied. + * + * @return refs with all the traits applied + */ + public RefList asRefList() { + RefList.Builder builder = new RefList.Builder<>(this.refs.size()); + for (Ref each : refs) { + builder.add(each); + } + return builder.toRefList(); + } + + /** + * Handles actual writing of ref files to the git repository, which may + * differ slightly depending on the destination and transport. + * + * @param file + * path to ref file. + * @param content + * byte content of file to be written. + * @throws java.io.IOException + * if an IO error occurred + */ + protected abstract void writeFile(String file, byte[] content) + throws IOException; + + private void applyMissingTraits(RefDatabase refDb) throws IOException { + if (!traits.contains(PackedRefsTrait.SORTED)) { + refs = RefComparator.sort(refs); + traits.add(PackedRefsTrait.SORTED); + } + + if (!traits.contains(PackedRefsTrait.PEELED)) { + Collection peeledRefs = new ArrayList<>(); + for (Ref ref : refs) { + if (!ref.isPeeled() && ref.getName().startsWith(R_TAGS)) { + ref = refDb.peel(ref); + } + peeledRefs.add(ref); + } + refs = peeledRefs; + traits.add(PackedRefsTrait.PEELED); + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java index a6890f5e75a..ffa8e09090d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java @@ -13,12 +13,10 @@ package org.eclipse.jgit.lib; -import java.io.IOException; -import java.io.StringWriter; import java.util.Collection; +import java.util.EnumSet; import java.util.Map; -import org.eclipse.jgit.internal.storage.file.RefDirectory; import org.eclipse.jgit.util.RefList; import org.eclipse.jgit.util.RefMap; @@ -28,158 +26,75 @@ * * This class is abstract as the writing of the files must be handled by the * caller. This is because it is used by transport classes as well. + * + * @deprecated since 7.7 + * + * Contains a bug in trait handling; retained for backward compatibility + * and will be removed in the next version. Use {@link PackedRefsWriter} + * instead. */ -public abstract class RefWriter { - - private final Collection refs; +@Deprecated(since = "7.7") +public abstract class RefWriter extends PackedRefsWriter { /** - *

Constructor for RefWriter.

+ *

+ * Constructor for RefWriter. + *

* * @param refs * the complete set of references. This should have been computed * by applying updates to the advertised refs already discovered. */ + @Deprecated(since = "7.7") public RefWriter(Collection refs) { - this.refs = RefComparator.sort(refs); + super(RefComparator.sort(refs), EnumSet.of(PackedRefsTrait.SORTED)); + if (containsAnyPeeledRef(this.refs)) { + this.traits.add(PackedRefsTrait.PEELED); + } } /** - *

Constructor for RefWriter.

+ *

+ * Constructor for RefWriter. + *

* * @param refs * the complete set of references. This should have been computed * by applying updates to the advertised refs already discovered. */ + @Deprecated(since = "7.7") public RefWriter(Map refs) { - if (refs instanceof RefMap) - this.refs = refs.values(); - else - this.refs = RefComparator.sort(refs.values()); + super(refs instanceof RefMap ? refs.values() + : RefComparator.sort(refs.values()), + EnumSet.of(PackedRefsTrait.SORTED)); + if (containsAnyPeeledRef(this.refs)) { + this.traits.add(PackedRefsTrait.PEELED); + } } /** - *

Constructor for RefWriter.

+ *

+ * Constructor for RefWriter. + *

* * @param refs * the complete set of references. This should have been computed * by applying updates to the advertised refs already discovered. */ + @Deprecated(since = "7.7") public RefWriter(RefList refs) { - this.refs = refs.asList(); - } - - /** - * Rebuild the {@link org.eclipse.jgit.lib.Constants#INFO_REFS}. - *

- * This method rebuilds the contents of the - * {@link org.eclipse.jgit.lib.Constants#INFO_REFS} file to match the passed - * list of references. - * - * @throws java.io.IOException - * writing is not supported, or attempting to write the file - * failed, possibly due to permissions or remote disk full, etc. - */ - public void writeInfoRefs() throws IOException { - final StringWriter w = new StringWriter(); - final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH]; - for (Ref r : refs) { - if (Constants.HEAD.equals(r.getName())) { - // Historically HEAD has never been published through - // the INFO_REFS file. This is a mistake, but its the - // way things are. - // - continue; - } - - ObjectId objectId = r.getObjectId(); - if (objectId == null) { - // Symrefs to unborn branches aren't advertised in the info/refs - // file. - continue; - } - objectId.copyTo(tmp, w); - w.write('\t'); - w.write(r.getName()); - w.write('\n'); - - ObjectId peeledObjectId = r.getPeeledObjectId(); - if (peeledObjectId != null) { - peeledObjectId.copyTo(tmp, w); - w.write('\t'); - w.write(r.getName()); - w.write("^{}\n"); //$NON-NLS-1$ - } + super(refs.asList(), EnumSet.of(PackedRefsTrait.SORTED)); + if (containsAnyPeeledRef(this.refs)) { + this.traits.add(PackedRefsTrait.PEELED); } - writeFile(Constants.INFO_REFS, Constants.encode(w.toString())); } - /** - * Rebuild the {@link org.eclipse.jgit.lib.Constants#PACKED_REFS} file. - *

- * This method rebuilds the contents of the - * {@link org.eclipse.jgit.lib.Constants#PACKED_REFS} file to match the - * passed list of references, including only those refs that have a storage - * type of {@link org.eclipse.jgit.lib.Ref.Storage#PACKED}. - * - * @throws java.io.IOException - * writing is not supported, or attempting to write the file - * failed, possibly due to permissions or remote disk full, etc. - */ - public void writePackedRefs() throws IOException { - boolean peeled = false; + private boolean containsAnyPeeledRef(Collection refs) { for (Ref r : refs) { if (r.getStorage().isPacked() && r.isPeeled()) { - peeled = true; - break; - } - } - - final StringWriter w = new StringWriter(); - w.write(RefDirectory.PACKED_REFS_HEADER); - w.write(RefDirectory.PACKED_REFS_SORTED); - if (peeled) { - w.write(RefDirectory.PACKED_REFS_PEELED); - } - w.write('\n'); - - final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH]; - for (Ref r : refs) { - if (r.getStorage() != Ref.Storage.PACKED) - continue; - - ObjectId objectId = r.getObjectId(); - if (objectId == null) { - // A packed ref cannot be a symref, let alone a symref - // to an unborn branch. - throw new NullPointerException(); - } - objectId.copyTo(tmp, w); - w.write(' '); - w.write(r.getName()); - w.write('\n'); - - ObjectId peeledObjectId = r.getPeeledObjectId(); - if (peeledObjectId != null) { - w.write('^'); - peeledObjectId.copyTo(tmp, w); - w.write('\n'); + return true; } } - writeFile(Constants.PACKED_REFS, Constants.encode(w.toString())); + return false; } - - /** - * Handles actual writing of ref files to the git repository, which may - * differ slightly depending on the destination and transport. - * - * @param file - * path to ref file. - * @param content - * byte content of file to be written. - * @throws java.io.IOException - * if an IO error occurred - */ - protected abstract void writeFile(String file, byte[] content) - throws IOException; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java index 38c86a6ed04..5b520902410 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java @@ -30,6 +30,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef; +import org.eclipse.jgit.lib.PackedRefsTrait; import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.util.IO; @@ -403,7 +404,7 @@ private void readPackedRefsImpl(final Map avail, if (line.charAt(0) == '#') { if (line.startsWith(RefDirectory.PACKED_REFS_HEADER)) { line = line.substring(RefDirectory.PACKED_REFS_HEADER.length()); - peeled = line.contains(RefDirectory.PACKED_REFS_PEELED); + peeled = line.contains(PackedRefsTrait.PEELED.value()); } continue; } From 2ababeaca7bb38e69b8bd96354b7c927735959c4 Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Thu, 29 Jan 2026 12:43:36 -0600 Subject: [PATCH 103/200] pack-refs: Add fully-peeled flag packed-refs are already fully peeled by jgit when written. But that trait is not written to the file. Preserve fully peeled trait when it is already present so that cgit doesn't do extra work. Add coverage to verify header contents and peeled tag state. Change-Id: I6529dedefff07a7131f5d406c1adf813ac2b953a --- .../storage/file/RefDirectoryTest.java | 44 +++++++++++++++++++ .../internal/storage/file/RefDirectory.java | 13 ++++-- .../eclipse/jgit/lib/PackedRefsWriter.java | 25 +++++++---- 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java index 2f85a2e13a0..4dc40df52ca 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java @@ -1083,6 +1083,8 @@ public void testNewPackFileHasAllTraits()throws Exception { firstLine.contains(" sorted")); assertTrue("packed-refs should have header with peeled", firstLine.contains(" peeled")); + assertTrue("packed-refs should have header with fully-peeled", + firstLine.contains(" fully-peeled")); } @Test @@ -1103,6 +1105,8 @@ public void autoPeelAnyUnpeeledTags() throws Exception { String content = read(packedRefsFile); String firstLine = content.split("\n")[0]; assertTrue("packed-refs should have peeled trait", firstLine.contains(" peeled")); + assertTrue("packed-refs should have fully-peeled trait", + firstLine.contains(" fully-peeled")); assertTrue(refdir.getPackedRefs().traits().contains(PackedRefsTrait.PEELED)); assertTrue(refdir.getPackedRefs().get("refs/tags/peeled").isPeeled()); @@ -1187,6 +1191,46 @@ public void testPackedRefsUnsortedGetsSorted() throws Exception { ); } + @Test + public void preserveFullyPeeledTraitIfPreviouslyFullyPeeled() throws Exception { + writePackedRefs("# pack-refs with: sorted fully-peeled\n" + + v1_0.name() + " refs/other/peeled\n" + + "^" + v1_0.getObject().name() + "\n" + ); + + writeLooseRef("refs/other/unpeeled-loose", v2_0); + + PackRefsCommand packRefsCommand = new PackRefsCommand(diskRepo); + packRefsCommand.setAll(true); + packRefsCommand.call(); + + File packedRefsFile = new File(diskRepo.getCommonDirectory(), Constants.PACKED_REFS); + String content = read(packedRefsFile); + String firstLine = content.split("\n")[0]; + assertTrue("packed-refs should have fully-peeled trait", + firstLine.contains(" fully-peeled")); + + assertTrue(refdir.getPackedRefs().traits().contains(PackedRefsTrait.PEELED)); + assertTrue(refdir.getPackedRefs().get("refs/other/peeled").isPeeled()); + // new loose refs ares peeled + assertTrue(refdir.getPackedRefs().get("refs/other/unpeeled-loose").isPeeled()); + } + + @Test + public void testPackRefsPeelsTagOutsideTagsNamespace() throws Exception { + writeLooseRef("refs/other/tag-v1.0", v1_0); + + PackRefsCommand packRefsCommand = new PackRefsCommand(diskRepo); + packRefsCommand.setAll(true); + packRefsCommand.call(); + + Ref tag = refdir.getPackedRefs().get("refs/other/tag-v1.0"); + + assertNotNull("tag ref should be packed", tag); + assertTrue("tag should be peeled", tag.isPeeled()); + assertEquals(v1_0.getObject(), tag.getPeeledObjectId()); + } + @Test public void testFindRef_EmptyDatabase() throws IOException { Ref r; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 52624e71098..4d2023fde19 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -829,7 +829,8 @@ private void pack(Collection refs, // traits. oldPacked.isEmpty() ? EnumSet.of(PackedRefsTrait.SORTED, - PackedRefsTrait.PEELED) + PackedRefsTrait.PEELED, + PackedRefsTrait.FULLY_PEELED) : oldPacked.traits); // Now delete the loose refs which are now packed @@ -1093,6 +1094,7 @@ private NonEmptyPackedRefList parsePackedRefs(BufferedReader br, RefList.Builder all = new RefList.Builder<>(); Ref last = null; boolean peeled = false; + boolean fullyPeeled = false; boolean needSort = false; boolean isSorted = false; @@ -1103,6 +1105,7 @@ private NonEmptyPackedRefList parsePackedRefs(BufferedReader br, p = p.substring(PACKED_REFS_HEADER.length()); peeled = p.contains(PackedRefsTrait.PEELED.value()); isSorted = p.contains(PackedRefsTrait.SORTED.value()); + fullyPeeled = p.contains(PackedRefsTrait.FULLY_PEELED.value()); } continue; } @@ -1127,7 +1130,7 @@ private NonEmptyPackedRefList parsePackedRefs(BufferedReader br, ObjectId id = ObjectId.fromString(p.substring(0, sp)); String name = copy(p, sp + 1, p.length()); ObjectIdRef cur; - if (peeled && name.startsWith(R_TAGS)) { + if (fullyPeeled || (peeled && name.startsWith(R_TAGS))) { cur = new ObjectIdRef.PeeledNonTag(PACKED, name, id); } else { cur = new ObjectIdRef.Unpeeled(PACKED, name, id); @@ -1144,9 +1147,13 @@ private NonEmptyPackedRefList parsePackedRefs(BufferedReader br, EnumSet traits = EnumSet.noneOf(PackedRefsTrait.class); traits.add(PackedRefsTrait.SORTED); - if (peeled) { + if (fullyPeeled || peeled) { traits.add(PackedRefsTrait.PEELED); } + if (fullyPeeled) { + traits.add(PackedRefsTrait.FULLY_PEELED); + } + return new NonEmptyPackedRefList(all.toRefList(), snapshot, ObjectId.fromRaw(digest.digest()), traits); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsWriter.java index c402c24b15d..f198782d203 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackedRefsWriter.java @@ -209,16 +209,25 @@ private void applyMissingTraits(RefDatabase refDb) throws IOException { traits.add(PackedRefsTrait.SORTED); } - if (!traits.contains(PackedRefsTrait.PEELED)) { - Collection peeledRefs = new ArrayList<>(); - for (Ref ref : refs) { - if (!ref.isPeeled() && ref.getName().startsWith(R_TAGS)) { - ref = refDb.peel(ref); - } + if (traits.contains(PackedRefsTrait.FULLY_PEELED)) { + // fully-peeled implies peeled. + traits.add(PackedRefsTrait.PEELED); + return; + } + + Collection peeledRefs = new ArrayList<>(); + for (Ref ref : refs) { + if (ref.isPeeled() || (traits.contains(PackedRefsTrait.PEELED) + && ref.getName().startsWith(R_TAGS))) { + // trust refs/tags/... when caller provides peeled trait. peeledRefs.add(ref); + } else { + peeledRefs.add(refDb.peel(ref)); } - refs = peeledRefs; - traits.add(PackedRefsTrait.PEELED); } + + refs = peeledRefs; + traits.add(PackedRefsTrait.PEELED); + traits.add(PackedRefsTrait.FULLY_PEELED); } } From 6b6d7449f169b300b0b7476a2c43dd5e0d7c1a4d Mon Sep 17 00:00:00 2001 From: Ric Harris Date: Wed, 8 Apr 2026 20:37:20 +0100 Subject: [PATCH 104/200] PullResult: Improve toString by implementing for children. Add toString for FetchResult and RebaseResult which are relied on by PullResult. Also added toString to Status to aid logging/debugging. Bug: jgit-256 Change-Id: I35ff4918d59938490f429238948c43c5726947a1 --- .../org/eclipse/jgit/api/RebaseResult.java | 30 ++++++++++++++++++ .../src/org/eclipse/jgit/api/Status.java | 31 +++++++++++++++++++ .../eclipse/jgit/transport/FetchResult.java | 22 +++++++++++++ 3 files changed, 83 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java index 2aa64df46fb..370fae86780 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java @@ -9,6 +9,7 @@ */ package org.eclipse.jgit.api; +import java.util.EnumSet; import java.util.List; import java.util.Map; @@ -303,4 +304,33 @@ public List getUncommittedChanges() { return uncommittedChanges; } + @SuppressWarnings("nls") + @Override + public String toString() { + StringBuilder sb = new StringBuilder("RebaseResult["); + sb.append(status); + switch (status) { + case CONFLICTS: + sb.append(" Conflicts: "); + sb.append(conflicts.size()); + break; + case STOPPED: + sb.append(" At commit : "); + sb.append(currentCommit); + break; + case FAILED: + sb.append(" Failed Paths : "); + sb.append(failingPaths.size()); + sb.append(", reasons "); + sb.append(EnumSet.copyOf(failingPaths.values())); + break; + case UNCOMMITTED_CHANGES: + sb.append(" Uncommitted Changes :"); + sb.append(uncommittedChanges.size()); + break; + default: + } + sb.append("]"); + return sb.toString(); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java index f01158fa79b..0633b23157c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java @@ -195,4 +195,35 @@ public Set getUncommittedChanges() { uncommittedChanges.addAll(diff.getConflicting()); return uncommittedChanges; } + + @SuppressWarnings("nls") + @Override + public String toString() { + if (isClean()) { + return "Working tree is clean"; + } + + StringBuilder sb = new StringBuilder("Git Status [\n"); + + appendSection(sb, "Added", diff.getAdded()); + appendSection(sb, "Modified", diff.getModified()); + appendSection(sb, "Removed", diff.getRemoved()); + appendSection(sb, "Changed", diff.getChanged()); + appendSection(sb, "Missing", diff.getMissing()); + appendSection(sb, "Conflicting", diff.getConflicting()); + appendSection(sb, "Untracked", diff.getUntracked()); + sb.append("]"); + return sb.toString().trim(); + } + + @SuppressWarnings("nls") + private void appendSection(StringBuilder sb, String sectionName, + Set sectionCollection) { + if (!sectionCollection.isEmpty()) { + sb.append(sectionName); + sb.append(" : "); + sb.append(sectionCollection.size()); + sb.append("\n"); + } + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchResult.java index c55fb21d949..49cf5502583 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchResult.java @@ -63,4 +63,26 @@ public void addSubmodule(String path, FetchResult result) { public Map submoduleResults() { return Collections.unmodifiableMap(submodules); } + + @SuppressWarnings("nls") + @Override + public String toString() { + StringBuilder sb = new StringBuilder("FetchResult["); + sb.append("ref updates: "); + sb.append(forMerge.size()); + if (!submodules.isEmpty()) { + sb.append(","); + sb.append("submodules: "); + sb.append(submodules.size()); + } + String messages = getMessages(); + if (!messages.isEmpty()) { + sb.append(","); + sb.append("messages: "); + sb.append(messages.substring(0, + Math.min(100, messages.length()) - 1)); + } + sb.append("]"); + return sb.toString(); + } } From 2b2c724a0a132262787543ac1bed9623b7563aaa Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 3 May 2026 17:55:26 +0200 Subject: [PATCH 105/200] Prepare 7.7.0-SNAPSHOT builds Change-Id: I0fc78c6cc1bfc5215bb3734fb6ef3edb6dbe55a7 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 413fa0d0c4d..8b99ee9169b 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index ca38521f5ba..1ed2fb90785 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 - 7.7.0.202604291911-m2 + 7.7.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 0deb8843154..e10e3854171 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 76ba8e8ecc5..08d4b66eaf3 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 6cc897dfa03..8863da90e31 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 - 7.7.0.202604291911-m2 + 7.7.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 38ec09fb394..9f4281261c3 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 841ea3f9586..88f51d14431 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 49ba8ab10db..a04e9c6350f 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 - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index b5935486188..53d1bfdd401 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 1c4e25c8bc6..b02657ff86e 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 - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0.202604291911-m2 + 7.7.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 377d356a4b5..d9d1b0f1103 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index b994f74a29a..2ed7ba3958d 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 - 7.7.0.202604291911-m2 + 7.7.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 10992977dfd..d6d826cd010 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 85650ff9385..556d2565756 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index cbfac74618b..e6b206344d6 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 - 7.7.0.202604291911-m2 + 7.7.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 edebddd0e98..06887836c6d 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 1a2eeed73aa..03c16b891b7 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 5535dcb79e2..51be72e9c23 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 - 7.7.0.202604291911-m2 + 7.7.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 8b357eeaf3f..02059c1b715 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 d40b1831a2d..520c2fb1153 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index b93069b1ce7..2460ea91e7c 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 - 7.7.0.202604291911-m2 + 7.7.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 71935d93c28..d19255326f9 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index d1924116b2a..310f87f4c05 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 - 7.7.0.202604291911-m2 + 7.7.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 b8c3616d782..fa7421aae95 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 78ad121f821..a913f9003de 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 3fd2a7fb249..4fc428ed766 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 - 7.7.0.202604291911-m2 + 7.7.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 d1e902f3e02..04e96f9ec7d 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 7e66594d508..479ec1333be 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 845ad2a24c3..94397aba5f9 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 - 7.7.0.202604291911-m2 + 7.7.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 3238e2465ac..78f05845141 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 72a44ccb6df..c313e01220b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 00dd98394f4..907fc47920c 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 - 7.7.0.202604291911-m2 + 7.7.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 9a451633dd6..e85207181e7 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 933cc4de168..4ad6d6524f1 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 - 7.7.0.202604291911-m2 + 7.7.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 05c1d9d49c4..65079c689c5 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 25a6f699492..9dc895322da 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index e8ad6cecba3..73036eefecb 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 - 7.7.0.202604291911-m2 + 7.7.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 1bd85dbb516..b9df9f9e993 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 0d9203f365e..040b222cc63 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 - 7.7.0.202604291911-m2 + 7.7.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 9471505827f..0fe46c793ee 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 5954067e4f5..5ecc42bb93c 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 67f7a2122e7..19546b73995 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 - 7.7.0.202604291911-m2 + 7.7.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 4758cb94935..0caab549108 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 bc1f3ac54b6..a8ce2984b38 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 - 7.7.0.202604291911-m2 + 7.7.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 9dd0c96143f..e37d622a538 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 6daf8c8fc94..d59c8de391c 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 - 7.7.0.202604291911-m2 + 7.7.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 26c97bc911b..684d11994a1 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 3309a72e4d3..00a0601d333 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 - 7.7.0.202604291911-m2 + 7.7.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 1d45aecb0da..8b28f14dfe1 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 d3840c6979e..6e07e85c123 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 - 7.7.0.202604291911-m2 + 7.7.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 2b95f30553c..bb6b80a4a62 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 58ec98bfd99..0d91543b42d 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 - 7.7.0.202604291911-m2 + 7.7.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 c9ffbdccd6d..d053e0ac2a8 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 18b9f2f4796..6a8c021997b 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 - 7.7.0.202604291911-m2 + 7.7.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 877635739f1..9a1fd3ad202 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 - 7.7.0.202604291911-m2 + 7.7.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 ce8f30e4d56..73f1ecda7b6 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 a93fee3a40b..c5b75923b37 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 - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0.202604291911-m2 + 7.7.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 0d6a69dfb03..edb2020cf80 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 0888e6c69f4..0b97560d28d 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 - 7.7.0.202604291911-m2 + 7.7.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 d77659c4972..706918f38ac 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 891e5a65e4b..8db7e691045 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 - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 59ca12d4967..2a73924bae5 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 - 7.7.0.202604291911-m2 + 7.7.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 67596bfc59e..28b0ced222e 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier 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 46c2a313d20..f41d83d2cbd 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 - 7.7.0.202604291911-m2 + 7.7.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 a39f65e945d..e31d3dc49ca 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index ebd3f725b3c..65901e06a00 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 35805c89db0..659718bd8a9 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 - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 839c506b133..1dc3728c98f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 8348e94cfc5..a085c046432 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 04ca76515f7..4d7b7c233a8 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 399794f6ab9..ae9e11e2182 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index d2e51e95e2d..2ab6c3921f2 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 - 7.7.0.202604291911-m2 + 7.7.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 168def991f0..5cff8a866d3 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 314c888bb1f..fa44087d3cf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index affc3cbe89a..18cba188b71 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 - 7.7.0.202604291911-m2 + 7.7.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 00972079f0e..73ef145eac6 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index b0e0602f460..176c91dc76b 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 - 7.7.0.202604291911-m2 + 7.7.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 9f192a7c4f8..9093f859b1b 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 3c199ff7d22..4863daef6fc 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index aef6055157f..b8e2e4c212a 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 - 7.7.0.202604291911-m2 + 7.7.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 7d9e543fea5..36a9e4f53f0 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index dfc934c4ee3..92a7597b4cf 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 - 7.7.0.202604291911-m2 + 7.7.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 4e55a276a7d..ef66f911cff 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 1e0d3b99f85..2430c2bb3d8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d5e6522f3d6..a21d2f33ee2 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 - 7.7.0.202604291911-m2 + 7.7.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 52372e2b235..2377e269927 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: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index cd632054e64..46c35527314 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202604291911-m2 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202604291911-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index b002972c923..e9b16e06934 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 4f8be8b7e95..a9dd3de00ce 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0.202604291911-m2 + 7.7.0-SNAPSHOT JGit - Parent ${jgit-url} From 5b298ebe23794afcce3205925d3538e41d9afa86 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 1 May 2026 18:07:33 +0100 Subject: [PATCH 106/200] Add regression test on non-forced fetch and local updates When a non-forced fetch is executed concurrently with a local ref update, the operation should fail with a REJECTED reason if the fetched ref is not a fast-forward update of the locally updated ref. This is a preparation work for the fix of fetch concurrency with local ref-updates, for ensuring the non-regression of existing not-forced fetch operations. Bug: jgit-252 Change-Id: I2a9b444a04a06d5a034a940abb0603f50e23c45a --- .../jgit/transport/TestProtocolTest.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java index 51e09e09a07..657a93ba1b3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java @@ -26,9 +26,13 @@ import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.pack.PackStatistics; import org.eclipse.jgit.transport.BasePackFetchConnection.FetchConfig; import org.eclipse.jgit.transport.resolver.ReceivePackFactory; @@ -258,6 +262,50 @@ public void testReceivePackFactory() throws Exception { } } + @Test + public void nonForcedFetchRejectedWithConcurrentLocalRefUpdate() + throws Exception { + String localRef = Constants.R_HEADS + "localfoo"; + String remoteBranchName = "remotefoo"; + String nonForcedRemoteRef = Constants.R_HEADS + remoteBranchName; + + try (Repository repository = local.getRepository(); + Git git = new Git(repository); + RevWalk revWalk = local.getRevWalk()) { + RefSpec nonForcedFetchRefSpec = new RefSpec( + nonForcedRemoteRef + ":" + localRef); + RevCommit oldLocalCommit = remote.branch(remoteBranchName) + .commit().add("base.txt", "base").create(); + + git.fetch().setRemote(registerDefaultTestProtocol().toString()).setRefSpecs(nonForcedFetchRefSpec) + .call(); + assertEquals(oldLocalCommit, repository.exactRef(localRef).getObjectId()); + + RevCommit updatedLocalCommit = local.commit() + .parent(revWalk.parseCommit(oldLocalCommit)) + .add("local.txt", "new").create(); + RevCommit remoteCommit = remote.commit().parent(oldLocalCommit) + .add("remote.txt", "remote").create(); + remote.update(remoteBranchName, remoteCommit); + + URIish uri = registerTestProtocolUpdatingRef(localRef, updatedLocalCommit); + + FetchResult result = git.fetch().setRemote(uri.toString()) + .setRefSpecs(nonForcedFetchRefSpec).call(); + + // Fetch has been rejected (non-ff) + TrackingRefUpdate update = result.getTrackingRefUpdate(localRef); + assertEquals(RefUpdate.Result.REJECTED, update.getResult()); + + // Fetched object has been downloaded + assertTrue(repository.getObjectDatabase() + .has(remoteCommit)); + // ... but the local ref has not been altered + assertEquals(updatedLocalCommit, + repository.exactRef(localRef).getObjectId()); + } + } + private TestProtocol registerDefault() { return registerProto(new DefaultUpload(), new DefaultReceive()); } @@ -269,4 +317,22 @@ private TestProtocol registerProto(UploadPackFactory upf, Transport.register(proto); return proto; } + + private URIish registerTestProtocolUpdatingRef(String refName, T objectId) { + TestProtocol proto = registerProto((User req, Repository db) -> { + try { + local.update(refName, objectId); + } catch (Exception e) { + throw new AssertionError("Cannot update local ref " + refName, + e); + } + return new UploadPack(db); + }, new DefaultReceive()); + return proto.register(new User("user"), remote.getRepository()); + } + + private URIish registerDefaultTestProtocol() { + TestProtocol setupProto = registerDefault(); + return setupProto.register(new User("user"), remote.getRepository()); + } } From 89db89e6e28420aada8a10ce5d3d444cd0267a78 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 20 Apr 2026 11:58:12 -0700 Subject: [PATCH 107/200] MidxWriter: List instead of Collection and method references Fixing minor warnings on this file: * Variable type can use a more specific type to convey more information to callers. (Use List instead of Collection) * Use method reference instead of lambda Change-Id: I21875deef9c8697d37795971d8e34f6a6a6a6964 --- .../org/eclipse/jgit/internal/storage/file/MidxWriter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java index 8143bbbaa08..ce610c139f7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/MidxWriter.java @@ -38,6 +38,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdOwnerMap; import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.storage.pack.PackConfig; @@ -74,7 +75,7 @@ public static void writeMidx(ProgressMonitor pm, Repository repo, Collection packs, File midxOut, PackConfig packConfig) throws IOException { - Collection packList = flattenMidxPackList(packs).stream() + List packList = flattenMidxPackList(packs).stream() .sorted(Comparator.comparing(Pack::getPackName)).toList(); if (packList.size() < MIN_PACKS_FOR_MIDX) { return; @@ -154,7 +155,7 @@ private static void createAndAttachBitmaps(ProgressMonitor pm, // bitmapping List allHeads = repo.getRefDatabase() .getRefsByPrefix(Constants.R_HEADS).stream() - .map(r -> r.getObjectId()).filter(Objects::nonNull).toList(); + .map(Ref::getObjectId).filter(Objects::nonNull).toList(); if (allHeads.isEmpty()) { return; } @@ -164,7 +165,7 @@ private static void createAndAttachBitmaps(ProgressMonitor pm, (WindowCursor) repo.newObjectReader(), data, new ArrayList<>(packs), byId); - RefAdvancerWalk adv = new RefAdvancerWalk(repo, c -> byId.contains(c)); + RefAdvancerWalk adv = new RefAdvancerWalk(repo, byId::contains); Set inPack = adv.advance(allHeads); PackBitmapIndexBuilder writeBitmaps = new PackBitmapIndexBuilder(otps); From 189b33dcbfd39fcfb3a671dcb323d29418b86875 Mon Sep 17 00:00:00 2001 From: Fabio Ponciroli Date: Tue, 5 May 2026 14:50:31 +0200 Subject: [PATCH 108/200] FetchProcess: Report lock failure when destination ref changes Snapshot local refs before opening the fetch connection so `TrackingRefUpdate`s use the value populated when the fetch starts as their expected old object ID. Before this change, local refs were loaded lazily while processing "wants". If another process changed or created the destination ref after the fetch started but before that lazy read, JGit used the newer local value as the expected old object ID. The final ref update could then succeed and overwrite the concurrent local change. Load the local ref snapshot before the remote fetch connection is opened. Concurrent destination ref changes now make the expected old object ID differ from the current ref value, causing the update to report LOCK_FAILURE instead of clobbering the newer local ref. The tests trigger the race condition by using TestProtocol.registerProto(...) with a custom UploadPackFactory. The factory updates the local destination ref immediately before returning the UploadPack, which places the concurrent local change after FetchProcess starts but before it finishes building the TrackingRefUpdate. Bug: jgit-252 Change-Id: Ib46363251862a7018c60bd4c36f003d267f354d5 --- .../jgit/transport/TestProtocolTest.java | 116 +++++++++++++++++- .../eclipse/jgit/transport/FetchProcess.java | 39 +++++- 2 files changed, 146 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java index 657a93ba1b3..29d080b764e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java @@ -32,6 +32,7 @@ import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevTag; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.pack.PackStatistics; import org.eclipse.jgit.transport.BasePackFetchConnection.FetchConfig; @@ -116,6 +117,106 @@ public void testFetch() throws Exception { } } + @Test + public void fetchReportsLockFailureWhenAutoFollowTagIsCreated() + throws Exception { + String tagName = "foo"; + String tagRef = "refs/tags/" + tagName; + String remoteBranchName = "remotefoo"; + String forcedRemoteRef = "+refs/heads/" + remoteBranchName; + + RevCommit localCommit = local.commit().add("local.txt", "new").create(); + RevCommit remoteCommit = remote.branch(remoteBranchName).commit() + .add("remote.txt", "remote").create(); + RevTag remoteTag = remote.tag("foo", remoteCommit); + remote.update(tagRef, remoteTag); + + URIish uri = registerTestProtocolUpdatingRef((repo) -> repo.lightweightTag(tagName, localCommit)); + + + try (Git git = new Git(local.getRepository())) { + FetchResult result = git.fetch().setRemote(uri.toString()) + .setRefSpecs(new RefSpec(forcedRemoteRef + + ":refs/remotes/origin/" + remoteBranchName)) + .setTagOpt(TagOpt.AUTO_FOLLOW).call(); + + TrackingRefUpdate update = result.getTrackingRefUpdate(tagRef); + assertEquals(RefUpdate.Result.LOCK_FAILURE, update.getResult()); + // Tag hasn't been clobbered... + assertEquals(localCommit, + local.getRepository().exactRef(tagRef).getObjectId()); + // ...however the object has been downloaded + assertTrue(local.getRepository().getObjectDatabase() + .has(remoteCommit)); + } + } + + @Test + public void fetchReportsLockFailureWhenDestinationRefChanges() + throws Exception { + String localBranchName = "localfoo"; + String localRef = "refs/heads/" + localBranchName; + String remoteBranchName = "remotefoo"; + String forcedRemoteRef = "+refs/heads/" + remoteBranchName; + + RevCommit oldLocalCommit = local.branch(localBranchName).commit() + .add("local.txt", "old").create(); + RevCommit newLocalCommit = local.commit().parent(oldLocalCommit) + .add("local.txt", "new").create(); + RevCommit remoteCommit = remote.branch(remoteBranchName).commit() + .add("remote.txt", "remote").create(); + + URIish uri = registerTestProtocolUpdatingRef((repo) -> repo.update(localBranchName, newLocalCommit)); + + try (Git git = new Git(local.getRepository())) { + FetchResult result = git.fetch().setRemote(uri.toString()) + .setRefSpecs( + new RefSpec(forcedRemoteRef + ":" + localRef)) + .call(); + + TrackingRefUpdate update = result.getTrackingRefUpdate(localRef); + assertEquals(RefUpdate.Result.LOCK_FAILURE, update.getResult()); + // Ref hasn't been clobbered... + assertEquals(newLocalCommit, + local.getRepository().exactRef(localRef).getObjectId()); + // ...however the object has been downloaded + assertTrue(local.getRepository().getObjectDatabase() + .has(remoteCommit)); + } + } + + @Test + public void fetchReportsLockFailureWhenDestinationRefIsCreated() + throws Exception { + String localBranchName = "localfoo"; + String localRef = "refs/heads/" + localBranchName; + String remoteBranchName = "remotefoo"; + String forcedRemoteRef = "+refs/heads/" + remoteBranchName; + + RevCommit newLocalCommit = local.commit().add("local.txt", "new") + .create(); + RevCommit remoteCommit = remote.branch(remoteBranchName).commit() + .add("remote.txt", "remote").create(); + + URIish uri = registerTestProtocolUpdatingRef((repo) -> repo.update(localBranchName, newLocalCommit)); + + try (Git git = new Git(local.getRepository())) { + FetchResult result = git.fetch().setRemote(uri.toString()) + .setRefSpecs( + new RefSpec(forcedRemoteRef + ":" + localRef)) + .call(); + + TrackingRefUpdate update = result.getTrackingRefUpdate(localRef); + assertEquals(RefUpdate.Result.LOCK_FAILURE, update.getResult()); + // Ref hasn't been clobbered... + assertEquals(newLocalCommit, + local.getRepository().exactRef(localRef).getObjectId()); + // ...however the object has been downloaded + assertTrue(local.getRepository().getObjectDatabase() + .has(remoteCommit)); + } + } + @Test public void testPush() throws Exception { ObjectId master = local.branch("master").commit().create(); @@ -288,8 +389,7 @@ public void nonForcedFetchRejectedWithConcurrentLocalRefUpdate() .add("remote.txt", "remote").create(); remote.update(remoteBranchName, remoteCommit); - URIish uri = registerTestProtocolUpdatingRef(localRef, updatedLocalCommit); - + URIish uri = registerTestProtocolUpdatingRef((repo) -> repo.update(localRef, updatedLocalCommit)); FetchResult result = git.fetch().setRemote(uri.toString()) .setRefSpecs(nonForcedFetchRefSpec).call(); @@ -318,13 +418,17 @@ private TestProtocol registerProto(UploadPackFactory upf, return proto; } - private URIish registerTestProtocolUpdatingRef(String refName, T objectId) { + @FunctionalInterface + interface TestRepositoryUpdateFunc { + void call(TestRepository repository) throws Exception; + } + + private URIish registerTestProtocolUpdatingRef(TestRepositoryUpdateFunc repositoryUpdateFunc) { TestProtocol proto = registerProto((User req, Repository db) -> { try { - local.update(refName, objectId); + repositoryUpdateFunc.call(local); } catch (Exception e) { - throw new AssertionError("Cannot update local ref " + refName, - e); + throw new AssertionError("Cannot update local ref", e); } return new UploadPack(db); }, new DefaultReceive()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java index c510194ee6a..e4304426f03 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java @@ -139,6 +139,18 @@ private void executeImp(final ProgressMonitor monitor, final TagOpt tagopt = transport.getTagOpt(); String getTags = (tagopt == TagOpt.NO_TAGS) ? null : Constants.R_TAGS; String getHead = null; + // Snapshot local refs before opening the fetch connection when the + // fetch has positive refspecs or may run AUTO_FOLLOW. Those are the + // paths that can later create TrackingRefUpdates from this fetch and + // need a stable expected-old-id baseline to turn concurrent local ref + // changes into LOCK_FAILURE. + // + // Skip the snapshot for the remaining cases to avoid an unnecessary + // local ref scan when this fetch cannot reach those update paths. + if (!toFetch.isEmpty() || tagopt == TagOpt.AUTO_FOLLOW) { + localRefs(); + } + try { // If we don't have a HEAD yet, we're cloning and need to get the // upstream HEAD, too. @@ -235,10 +247,23 @@ else if (tagopt == TagOpt.FETCH_TAGS) addUpdateBatchCommands(result, batch); for (ReceiveCommand cmd : batch.getCommands()) { cmd.updateType(walk); - if (cmd.getType() == UPDATE_NONFASTFORWARD - && cmd instanceof TrackingRefUpdate.Command - && !((TrackingRefUpdate.Command) cmd).canForceUpdate()) + if (!(cmd instanceof TrackingRefUpdate.Command) + || ((TrackingRefUpdate.Command) cmd).canForceUpdate()) { + continue; + } + + ObjectId currentId = currentObjectId(cmd.getRefName()); + // The initial type check used the ref value snapshotted when + // the fetch started. If the local ref moved since then, + // re-check the non-fast-forward against the current ref before + // executing the batch so non-forced rejects remain REJECTED + // instead of surfacing as LOCK_FAILURE. + ReceiveCommand refreshedCmd = new ReceiveCommand(currentId, + cmd.getNewId(), cmd.getRefName()); + refreshedCmd.updateType(walk); + if (refreshedCmd.getType() == UPDATE_NONFASTFORWARD) { cmd.setResult(REJECTED_NONFASTFORWARD); + } } if (transport.isDryRun()) { for (ReceiveCommand cmd : batch.getCommands()) { @@ -574,6 +599,14 @@ private Map localRefs() throws TransportException { return localRefs; } + private ObjectId currentObjectId(String refName) throws IOException { + Ref current = transport.local.exactRef(refName); + if (current == null) { + return ObjectId.zeroId(); + } + return current.getObjectId(); + } + private void deleteStaleTrackingRefs(FetchResult result, BatchRefUpdate batch) throws IOException { Set processed = new HashSet<>(); From 0a90d00b2be07d73ff16dd7d3a200bf13bdccb54 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 5 May 2026 16:39:19 -0700 Subject: [PATCH 109/200] DfsPackCompacterTest: Add test for compacting only data in a pack The compactor receives independently data (DfsPackFile) and reftables (DfsReftable) for compaction. In storage, both things can be in the same physical pack, and that pack should only be deleted if ALL its contents have been compacted. The compactor do the right thing in toPrune(), but we didn't have a test covering it. Add one. Change-Id: Id74c8f32b5f0bb625f7e8f04a986f4b86a6a6964 --- .../storage/dfs/DfsPackCompacterTest.java | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackCompacterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackCompacterTest.java index 84505a8ad82..7f430412fca 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackCompacterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackCompacterTest.java @@ -24,12 +24,17 @@ import java.util.Optional; import java.util.zip.Deflater; +import org.eclipse.jgit.internal.storage.reftable.ReftableConfig; import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.TestRng; +import org.eclipse.jgit.lib.BatchRefUpdate; import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.transport.ReceiveCommand; import org.junit.Before; import org.junit.Test; @@ -164,12 +169,75 @@ public void testPrunePack() throws Exception { assertTrue(odb.has(o2)); } + @Test + public void testPrunePack_packIncludedOnlyForRefs() throws Exception { + String MAIN = "refs/heads/main"; + String DEV = "refs/heads/dev"; + ObjectId o1 = writePackWithRandomBlob(200); + writeRef(MAIN, ObjectId.zeroId(), o1); + compact(); // Creates one pack with objects and reftables + assertEquals(1, odb.listPacks().size()); + DfsPackDescription combinedPack = odb.listPacks().get(0); + + ObjectId o2 = writePackWithRandomBlob(100); + ObjectId o3 = writePackWithRandomBlob(140); + writeRef(DEV, ObjectId.zeroId(), o2); + + DfsPackCompactor compactor = new DfsPackCompactor(repo); + compactor.setReftableConfig(new ReftableConfig()); + // Add combinedPack for refs but not for data + Arrays.stream(repo.getObjectDatabase().getReftables()) + .forEach(compactor::add); + Arrays.stream(repo.getObjectDatabase().getPacks()) + .filter(p -> !p.getPackDescription().equals(combinedPack)) + .forEach(compactor::add); + compactor.compact(NullProgressMonitor.INSTANCE); + + assertTrue(odb.has(o1)); + assertTrue(odb.has(o2)); + assertTrue(odb.has(o3)); + assertEquals(o1, repo.getRefDatabase().findRef(MAIN).getObjectId()); + assertEquals(o2, repo.getRefDatabase().findRef(DEV).getObjectId()); + } + + @Test + public void testPrunePack_packIncludedOnlyForObjects() throws Exception { + String MAIN = "refs/heads/main"; + String DEV = "refs/heads/dev"; + ObjectId o1 = writePackWithRandomBlob(200); + writeRef(MAIN, ObjectId.zeroId(), o1); + compact(); // Creates one pack with objects and reftables + assertEquals(1, odb.listPacks().size()); + DfsPackDescription combinedPack = odb.listPacks().get(0); + + ObjectId o2 = writePackWithRandomBlob(100); + ObjectId o3 = writePackWithRandomBlob(140); + writeRef(DEV, ObjectId.zeroId(), o2); + + DfsPackCompactor compactor = new DfsPackCompactor(repo); + compactor.setReftableConfig(new ReftableConfig()); + // Add combinedPack for objects but not for refs + Arrays.stream(repo.getObjectDatabase().getReftables()) + .filter(p -> !p.getPackDescription().equals(combinedPack)) + .forEach(compactor::add); + Arrays.stream(repo.getObjectDatabase().getPacks()) + .forEach(compactor::add); + compactor.compact(NullProgressMonitor.INSTANCE); + + assertTrue(odb.has(o1)); + assertTrue(odb.has(o2)); + assertTrue(odb.has(o3)); + assertEquals(o1, repo.getRefDatabase().findRef(MAIN).getObjectId()); + assertEquals(o2, repo.getRefDatabase().findRef(DEV).getObjectId()); + } + private TestRepository.CommitBuilder commit() { return git.commit(); } private void compact() throws IOException { DfsPackCompactor compactor = new DfsPackCompactor(repo); + compactor.setReftableConfig(new ReftableConfig()); DfsObjDatabase objdb = repo.getObjectDatabase(); for (DfsPackFile pack : objdb.getPacks()) { DfsPackDescription d = pack.getPackDescription(); @@ -179,6 +247,9 @@ private void compact() throws IOException { compactor.exclude(pack); } } + + Arrays.stream(repo.getObjectDatabase().getReftables()) + .forEach(compactor::add); compactor.compact(null); odb.clearCache(); } @@ -202,4 +273,19 @@ private ObjectId writePackWithRandomBlob(int size) throws IOException { byte[] data = new TestRng(JGitTestUtil.getName()).nextBytes(size); return writePackWithBlob(data); } + + // RefDb does "compactDuringCommit". This only creates a new pack at the + // beginning or after compact. + private void writeRef(String name, ObjectId oldValue, ObjectId newValue) + throws IOException { + BatchRefUpdate batchRefUpdate = repo.getRefDatabase().newBatchUpdate(); + // We move the ref between blobs, it is always non fast-forward + batchRefUpdate.setAllowNonFastForwards(true); + batchRefUpdate.addCommand(new ReceiveCommand(oldValue, newValue, name)); + try (RevWalk rw = new RevWalk(repo)) { + batchRefUpdate.execute(rw, NullProgressMonitor.INSTANCE); + assertEquals(ReceiveCommand.Result.OK, + batchRefUpdate.getCommands().get(0).getResult()); + } + } } From 1ac5210cbe8aa5d5ca2fc19d4f7c1fa18a8bf59e Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 3 May 2026 12:38:15 +0200 Subject: [PATCH 110/200] TestProtocolTest: Cover additional fetch edge cases Add regression tests covering additional fetch update scenarios, including concurrent destination ref updates and non-fast-forward rejections. Cover forced fetches where the destination ref is deleted or already points to the fetched object, both of which should report LOCK_FAILURE because the ref no longer matches the expected old object ID. Cover non-forced fetches where the concurrent update is still fast-forwardable, which should also report LOCK_FAILURE, and where the current ref is unchanged but the incoming update is non-fast-forward, which should report REJECTED. Bug: jgit-252 Change-Id: I676f2dd5447fa44a525f96f7fce9aa5cf6760dbf --- .../jgit/transport/TestProtocolTest.java | 139 ++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java index 29d080b764e..2a026763189 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TestProtocolTest.java @@ -406,6 +406,145 @@ public void nonForcedFetchRejectedWithConcurrentLocalRefUpdate() } } + @Test + public void forcedFetchReportsLockFailureWhenDestinationRefIsDeleted() + throws Exception { + String localBranchName = "localfoo"; + String localRef = Constants.R_HEADS + localBranchName; + String remoteBranchName = "remotefoo"; + String forcedRemoteRef = "+" + Constants.R_HEADS + remoteBranchName; + + local.branch(localBranchName).commit() + .add("local.txt", "old").create(); + RevCommit remoteCommit = remote.branch(remoteBranchName).commit() + .add("remote.txt", "remote").create(); + + URIish uri = registerTestProtocolUpdatingRef((repo) -> { + RefUpdate refUpdate = repo.getRepository().updateRef(localRef); + refUpdate.setForceUpdate(true); + refUpdate.delete(); + }); + + try (Git git = new Git(local.getRepository())) { + FetchResult result = git.fetch() + .setRemote(uri.toString()) + .setRefSpecs(new RefSpec(forcedRemoteRef + ":" + localRef)) + .call(); + + TrackingRefUpdate update = result.getTrackingRefUpdate(localRef); + assertEquals(RefUpdate.Result.LOCK_FAILURE, update.getResult()); + assertNull(local.getRepository().exactRef(localRef)); + assertTrue(local.getRepository().getObjectDatabase() + .has(remoteCommit)); + } + } + + @Test + public void forcedFetchReportsLockFailureWhenDestinationRefAlreadyHasNewId() + throws Exception { + String localBranchName = "localfoo"; + String localRef = Constants.R_HEADS + localBranchName; + String remoteBranchName = "remotefoo"; + String forcedRemoteRef = "+" + Constants.R_HEADS + remoteBranchName; + String tmpRef = Constants.R_HEADS + "tmp"; + + RevCommit oldLocalCommit = local.branch(localBranchName).commit() + .add("local.txt", "old").create(); + RevCommit remoteCommit = remote.branch(remoteBranchName).commit() + .add("remote.txt", "remote").create(); + + try (Git git = new Git(local.getRepository())) { + // Pre-fetch the remote object into the local object database so the + // simulated concurrent local update can point at it. + git.fetch().setRemote(registerDefaultTestProtocol().toString()) + .setRefSpecs(new RefSpec(forcedRemoteRef + ":" + tmpRef)) + .call(); + + local.update(localRef, oldLocalCommit); + + URIish uri = registerTestProtocolUpdatingRef( + (repo) -> repo.update(localRef, remoteCommit)); + + FetchResult result = git.fetch().setRemote(uri.toString()) + .setRefSpecs(new RefSpec(forcedRemoteRef + ":" + localRef)) + .call(); + + TrackingRefUpdate update = result.getTrackingRefUpdate(localRef); + assertEquals(RefUpdate.Result.LOCK_FAILURE, update.getResult()); + assertEquals(remoteCommit, + local.getRepository().exactRef(localRef).getObjectId()); + } + } + + @Test + public void nonForcedFetchReportsLockFailureWhenConcurrentUpdateIsFastForward() + throws Exception { + String localBranchName = "localfoo"; + String localRef = Constants.R_HEADS + localBranchName; + String remoteBranchName = "remotefoo"; + String nonForcedRemoteRef = Constants.R_HEADS + remoteBranchName; + String tmpRef = "refs/heads/tmp"; + + RevCommit baseCommit = remote.branch(remoteBranchName).commit() + .add("base.txt", "base").create(); + RevCommit updatedLocalCommit = remote.commit().parent(baseCommit) + .add("local.txt", "local").create(); + RevCommit remoteCommit = remote.commit().parent(updatedLocalCommit) + .add("remote.txt", "remote").create(); + remote.update(remoteBranchName, remoteCommit); + + try (Git git = new Git(local.getRepository())) { + git.fetch().setRemote(registerDefaultTestProtocol().toString()) + .setRefSpecs(new RefSpec(nonForcedRemoteRef + ":" + tmpRef)) + .call(); + + local.update(localRef, baseCommit); + + URIish uri = registerTestProtocolUpdatingRef( + (repo) -> repo.update(localRef, updatedLocalCommit)); + + FetchResult result = git.fetch().setRemote(uri.toString()) + .setRefSpecs(new RefSpec(nonForcedRemoteRef + ":" + localRef)) + .call(); + + TrackingRefUpdate update = result.getTrackingRefUpdate(localRef); + assertEquals(RefUpdate.Result.LOCK_FAILURE, update.getResult()); + assertEquals(updatedLocalCommit, + local.getRepository().exactRef(localRef).getObjectId()); + assertTrue(local.getRepository().getObjectDatabase() + .has(remoteCommit)); + } + } + + @Test + public void nonForcedFetchRejectedWhenCurrentRefUnchangedButNonFastForward() + throws Exception { + String localBranchName = "localfoo"; + String localRef = Constants.R_HEADS + localBranchName; + String remoteBranchName = "remotefoo"; + String nonForcedRemoteRef = Constants.R_HEADS + remoteBranchName; + + RevCommit localCommit = local.branch(localBranchName).commit() + .add("local.txt", "local").create(); + RevCommit remoteCommit = remote.branch(remoteBranchName).commit() + .add("remote.txt", "remote").create(); + + try (Git git = new Git(local.getRepository())) { + FetchResult result = git.fetch() + .setRemote(registerDefaultTestProtocol().toString()) + .setRefSpecs( + new RefSpec(nonForcedRemoteRef + ":" + localRef)) + .call(); + + TrackingRefUpdate update = result.getTrackingRefUpdate(localRef); + assertEquals(RefUpdate.Result.REJECTED, update.getResult()); + assertEquals(localCommit, + local.getRepository().exactRef(localRef).getObjectId()); + assertTrue(local.getRepository().getObjectDatabase() + .has(remoteCommit)); + } + } + private TestProtocol registerDefault() { return registerProto(new DefaultUpload(), new DefaultReceive()); } From e629e9e490b30c47ccbd4e0595ab7ace86595150 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 4 May 2026 14:36:02 -0700 Subject: [PATCH 111/200] DfsPackFileMidx tests: Compare byte[] for checksum We cannot precalculate the checkum of the midx, because it includes the file names and these change between tests. The test validates that the first 4 bytes are not the header (MIDX), so at least we are not reading from the beginning of the buffer. It compares 4 bytes independently and we run the risk of finding them by chance in the actual checksum. Compare the 4 bytes as array, so we fail only if the 4 of them match. Change-Id: Id26a7722bb564670db68dc3102b38f8b6a6a6964 --- .../internal/storage/dfs/DfsPackFileMidxNPacksTest.java | 8 +++----- .../internal/storage/dfs/DfsPackFileMidxSingleTest.java | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacksTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacksTest.java index 0f0e113b649..5e2251fc5d2 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacksTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxNPacksTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; @@ -1054,10 +1053,9 @@ public void getChecksum() throws Exception { byte[] checksum = midx.getChecksum(ctx); assertNotNull(checksum); assertEquals(20, checksum.length); - assertNotEquals('M', checksum[0]); - assertNotEquals('I', checksum[1]); - assertNotEquals('D', checksum[2]); - assertNotEquals('X', checksum[3]); + + byte[] mdixHeader = { 'M', 'I', 'D', 'X' }; + assertFalse(Arrays.equals(mdixHeader, 0, 4, checksum, 0, 4)); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxSingleTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxSingleTest.java index aa2ddca2a0c..39724164cf7 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxSingleTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileMidxSingleTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; @@ -1023,10 +1022,9 @@ public void getChecksum() throws Exception { byte[] checksum = midx.getChecksum(ctx); assertNotNull(checksum); assertEquals(20, checksum.length); - assertNotEquals('M', checksum[0]); - assertNotEquals('I', checksum[1]); - assertNotEquals('D', checksum[2]); - assertNotEquals('X', checksum[3]); + + byte[] mdixHeader = { 'M', 'I', 'D', 'X' }; + assertFalse(Arrays.equals(mdixHeader, 0, 4, checksum, 0, 4)); } } From 7ee50b61a2284f216fb51fcb961722a013563630 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 4 May 2026 14:36:02 -0700 Subject: [PATCH 112/200] DfsPackCompactor: Accept DfsPackDescription as input DfsPackFile keeps a reference to its index and keeps it alive until compact is done. With DfsPackDescriptions, we can create the DfsPackFile on demand and discard it as soon as we are done with it. This helps to reduce peak memory consumption when compacting lots of packs. Accept DfsPackDescriptions as input. Callers can use the compactor with DfsPackFile/DfsReftables OR with DfsPackDescriptions, but not both. Change-Id: I40ee21eaf080dab5458242fcaf43e2d16a6a6964 --- .../storage/dfs/DfsPackCompactor.java | 177 +++++++++++------- 1 file changed, 112 insertions(+), 65 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java index fbe641ec51d..722c7ec1833 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java @@ -20,11 +20,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -64,8 +64,11 @@ */ public class DfsPackCompactor { private final DfsRepository repo; - private final List srcPacks; - private final List srcReftables; + + private final List inputDescsPacks; + + private final List inputDescsReftables; + private final List exclude; private final List prune; @@ -143,8 +146,8 @@ public DfsPackCompactor setPreCommitHook(PreCommitHook hook) { */ public DfsPackCompactor(DfsRepository repository) { repo = repository; - srcPacks = new ArrayList<>(); - srcReftables = new ArrayList<>(); + inputDescsPacks = new ArrayList<>(); + inputDescsReftables = new ArrayList<>(); exclude = new ArrayList<>(4); prune = new ArrayList<>(); } @@ -175,8 +178,7 @@ public DfsPackCompactor setReftableConfig(ReftableConfig cfg) { * @return {@code this} */ public DfsPackCompactor add(DfsPackFile pack) { - srcPacks.add(pack); - return this; + return addPack(pack.getPackDescription()); } /** @@ -187,7 +189,54 @@ public DfsPackCompactor add(DfsPackFile pack) { * @return {@code this} */ public DfsPackCompactor add(DfsReftable table) { - srcReftables.add(table); + return addReftable(table.getPackDescription()); + } + + /** + * Add a pack to be compacted + *

+ * This adds the objects in the pack to the compaction. If the description + * has reftables, they are ignored. Caller must explicitely call + * {@link #addReftable(DfsPackDescription)} with the same description to + * include them. + *

+ * This method creates DfsPackFile instances when needed and can close them + * as soon as is done with them. This reduces the peak memory while + * processing many files. + * + * @param desc + * a pack description to combine. + * @return {@code this} + * @since 7.7 + */ + public DfsPackCompactor addPack(DfsPackDescription desc) { + if (!desc.hasFileExt(PACK)) { + throw new IllegalArgumentException( + "Adding for pack compaction a pack without data"); + } + inputDescsPacks.add(desc); + return this; + } + + /** + * Add a reftable to be compacted. + *

+ * This adds the reftables in the pack to the compaction. If the description + * has pack data (objects), they are ignored. Caller must explicitely call + * {@link #addPack(DfsPackDescription)} with the same description to include + * them. + * + * @param desc + * a pack description to combine. + * @return {@code this} + * @since 7.7 + */ + public DfsPackCompactor addReftable(DfsPackDescription desc) { + if (!desc.hasFileExt(REFTABLE)) { + throw new IllegalArgumentException( + "Adding for reftable compaction a pack without reftables"); + } + inputDescsReftables.add(desc); return this; } @@ -248,7 +297,7 @@ public void compact(ProgressMonitor pm) throws IOException { DfsObjDatabase objdb = repo.getObjectDatabase(); try (DfsReader ctx = objdb.newReader()) { - if (reftableConfig != null && !srcReftables.isEmpty()) { + if (reftableConfig != null && !inputDescsReftables.isEmpty()) { compactReftables(ctx); } compactPacks(ctx, pm); @@ -313,18 +362,24 @@ private long estimatePackSize() { // Include the final pack file header and trailer size here and ignore // the same from individual pack files. long size = 32; - for (DfsPackFile pack : srcPacks) { - size += pack.getPackDescription().getFileSize(PACK) - 32; + for (DfsPackDescription desc : inputDescsPacks) { + if (desc.hasFileExt(PACK)) { + size += desc.getFileSize(PACK) - 32; + } } return size; } private void compactReftables(DfsReader ctx) throws IOException { DfsObjDatabase objdb = repo.getObjectDatabase(); - Collections.sort(srcReftables, objdb.reftableComparator()); + Collections.sort(inputDescsReftables, + DfsPackDescription.reftableComparator()); + List tables = inputDescsReftables.stream() + .map(desc -> new DfsReftable(DfsBlockCache.getInstance(), desc)) + .collect(Collectors.toList()); initOutDesc(objdb); - try (DfsReftableStack stack = DfsReftableStack.open(ctx, srcReftables); + try (DfsReftableStack stack = DfsReftableStack.open(ctx, tables); DfsOutputStream out = objdb.writeFile(outDesc, REFTABLE)) { ReftableCompactor compact = new ReftableCompactor(out); compact.addAll(stack.readers()); @@ -348,14 +403,11 @@ private void initOutDesc(DfsObjDatabase objdb) throws IOException { * @return all of the source packs that fed into this compaction. */ public Collection getSourcePacks() { - Set src = new HashSet<>(); - for (DfsPackFile pack : srcPacks) { - src.add(pack.getPackDescription()); - } - for (DfsReftable table : srcReftables) { - src.add(table.getPackDescription()); - } - return src; + HashSet all = new HashSet<>( + inputDescsPacks.size() + inputDescsReftables.size()); + all.addAll(inputDescsPacks); + all.addAll(inputDescsReftables); + return all; } /** @@ -383,15 +435,8 @@ public List getNewPackStatistics() { } private Set toPrune() { - Set packs = new HashSet<>(); - for (DfsPackFile pack : srcPacks) { - packs.add(pack.getPackDescription()); - } - - Set reftables = new HashSet<>(); - for (DfsReftable table : srcReftables) { - reftables.add(table.getPackDescription()); - } + Set packs = new HashSet<>(inputDescsPacks); + Set reftables = new HashSet<>(inputDescsReftables); for (Iterator i = packs.iterator(); i.hasNext();) { DfsPackDescription d = i.next(); @@ -418,49 +463,20 @@ private Set toPrune() { private void addObjectsToPack(PackWriter pw, DfsReader ctx, ProgressMonitor pm) throws IOException, IncorrectObjectTypeException { - // Sort packs by description ordering, this places newer packs before - // older packs, allowing the PackWriter to be handed newer objects - // first and older objects last. - Collections.sort( - srcPacks, - Comparator.comparing( - DfsPackFile::getPackDescription, - DfsPackDescription.objectLookupComparator())); - rw = new RevWalk(ctx); added = rw.newFlag("ADDED"); //$NON-NLS-1$ isBase = rw.newFlag("IS_BASE"); //$NON-NLS-1$ List baseObjects = new BlockList<>(); pm.beginTask(JGitText.get().countingObjects, ProgressMonitor.UNKNOWN); - for (DfsPackFile src : srcPacks) { - List want = toInclude(src, ctx); - if (want.isEmpty()) - continue; - - PackReverseIndex rev = src.getReverseIdx(ctx); - DfsObjectRepresentation rep = new DfsObjectRepresentation(src); - for (ObjectIdWithOffset id : want) { - int type = src.getObjectType(ctx, id.offset); - RevObject obj = rw.lookupAny(id, type); - if (obj.has(added)) - continue; - pm.update(1); - pw.addObject(obj); - obj.add(added); - - src.fillRepresentation(rep, id.offset, ctx, rev); - if (rep.getFormat() != PACK_DELTA) - continue; - - RevObject base = rw.lookupAny(rep.getDeltaBase(), type); - if (!base.has(added) && !base.has(isBase)) { - baseObjects.add(base); - base.add(isBase); - } - } + inputDescsPacks.sort(DfsPackDescription.objectLookupComparator()); + for (DfsPackDescription desc : inputDescsPacks) { + DfsPackFile src = repo.getObjectDatabase() + .createDfsPackFile(DfsBlockCache.getInstance(), desc); + addObjectFromPack(pw, ctx, pm, src, baseObjects); } + for (RevObject obj : baseObjects) { if (!obj.has(added)) { pm.update(1); @@ -471,6 +487,37 @@ private void addObjectsToPack(PackWriter pw, DfsReader ctx, pm.endTask(); } + private void addObjectFromPack(PackWriter pw, DfsReader ctx, + ProgressMonitor pm, DfsPackFile src, List baseObjects) + throws IOException { + List want = toInclude(src, ctx); + if (want.isEmpty()) + return; + + PackReverseIndex rev = src.getReverseIdx(ctx); + DfsObjectRepresentation rep = new DfsObjectRepresentation(src); + for (ObjectIdWithOffset id : want) { + int type = src.getObjectType(ctx, id.offset); + RevObject obj = rw.lookupAny(id, type); + if (obj.has(added)) + continue; + + pm.update(1); + pw.addObject(obj); + obj.add(added); + + src.fillRepresentation(rep, id.offset, ctx, rev); + if (rep.getFormat() != PACK_DELTA) + continue; + + RevObject base = rw.lookupAny(rep.getDeltaBase(), type); + if (!base.has(added) && !base.has(isBase)) { + baseObjects.add(base); + base.add(isBase); + } + } + } + private List toInclude(DfsPackFile src, DfsReader ctx) throws IOException { PackIndex srcIdx = src.getPackIndex(ctx); From a32f71a9d2567df68a180d41c2c2c02a6409412d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 12 May 2026 09:50:30 +0200 Subject: [PATCH 113/200] Update python used to deploy release to maven central to 3.14 Change-Id: I589c2aca206688219b268af51f4c2611dedb28ff --- tools/maven-central/Pipfile | 3 +-- tools/maven-central/Pipfile.lock | 5 ++--- tools/maven-central/README.md | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/maven-central/Pipfile b/tools/maven-central/Pipfile index cffba46d165..7a9156308db 100644 --- a/tools/maven-central/Pipfile +++ b/tools/maven-central/Pipfile @@ -13,5 +13,4 @@ flake8 = "*" black = "*" [requires] -python_version = "3.12" -python_full_version = "3.12.9" +python_version = "3.14" diff --git a/tools/maven-central/Pipfile.lock b/tools/maven-central/Pipfile.lock index e5663989796..beb39267ff6 100644 --- a/tools/maven-central/Pipfile.lock +++ b/tools/maven-central/Pipfile.lock @@ -1,12 +1,11 @@ { "_meta": { "hash": { - "sha256": "096165cac35064650a41e592a40a9d1e13ae4022a1f6d43582534f1c3bf0dbf9" + "sha256": "eef4e49b353bc5c56c2157cd596a54cb1cf3531900a2b5f73aae64648cd93001" }, "pipfile-spec": 6, "requires": { - "python_full_version": "3.12.9", - "python_version": "3.12" + "python_version": "3.14" }, "sources": [ { diff --git a/tools/maven-central/README.md b/tools/maven-central/README.md index 0c40598578c..821a61cb152 100644 --- a/tools/maven-central/README.md +++ b/tools/maven-central/README.md @@ -4,7 +4,7 @@ - you need to be a Eclipse JGit committer - install [jreleaser CLI](https://jreleaser.org/guide/latest/install.html) -- install [python 3.12](https://www.python.org/) +- install [python 3.14](https://www.python.org/) - install [pipenv](https://pipenv.pypa.io/en/latest/installation.html) we use below to setup a python virtualenv - we sign release tags and Maven artifacts using GPG. Follow [Git Tools - Signing Your Work](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) @@ -61,7 +61,7 @@ - prepare virtualenv for `download_release.py`: ``` $ cd tools/maven-central - $ pipenv --python 3.12 + $ pipenv --python 3.14 $ pipenv sync ``` - download a JGit release from repo.eclipse.org and create artifact signature files (`.asc`) From 87b09ec388f056c8b4ed9708d0713808511c83ef Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 12 May 2026 10:01:53 +0200 Subject: [PATCH 114/200] Update urllib3 to at least 2.7.0 to fix CVE-2026-44432 See https://github.com/advisories/GHSA-mf9v-mfxr-j63j Change-Id: I7293790fb36fffe72de495a1ea8bba4e9af793b0 --- tools/maven-central/Pipfile | 1 + tools/maven-central/Pipfile.lock | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/maven-central/Pipfile b/tools/maven-central/Pipfile index 7a9156308db..e34443d2a64 100644 --- a/tools/maven-central/Pipfile +++ b/tools/maven-central/Pipfile @@ -7,6 +7,7 @@ name = "pypi" requests = "*" argparse = "*" pyyaml = "*" +urllib3 = ">=2.7.0" [dev-packages] flake8 = "*" diff --git a/tools/maven-central/Pipfile.lock b/tools/maven-central/Pipfile.lock index beb39267ff6..5839d925ef6 100644 --- a/tools/maven-central/Pipfile.lock +++ b/tools/maven-central/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "eef4e49b353bc5c56c2157cd596a54cb1cf3531900a2b5f73aae64648cd93001" + "sha256": "28027cc52a42a1b801f3df250feac187373bed2c18fa6ddb4415dd6436ea4f2f" }, "pipfile-spec": 6, "requires": { @@ -250,11 +250,12 @@ }, "urllib3": { "hashes": [ - "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed", - "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4" + "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", + "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897" ], - "markers": "python_version >= '3.9'", - "version": "==2.6.3" + "index": "pypi", + "markers": "python_version >= '3.10'", + "version": "==2.7.0" } }, "develop": { From fd2ecea73aa3d392974c9a20bdb8b5b582af3f17 Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Tue, 12 May 2026 18:39:38 +0000 Subject: [PATCH 115/200] BitmappedObjectReachabilityChecker: Optimize filtering `remainingTargets` is already reduced incrementally after each iteration, so checking against the cumulative `seen` bitmap repeatedly is redundant. Filtering only against the newly visited objects preserves behavior while avoiding unnecessary checks. This reduced ACL check time on a repository with ~85 million objects from ~10 hours to ~5 hours. Change-Id: I00d960c79dea6178d07031e89f4045c2f1a3d145 --- .../internal/revwalk/BitmappedObjectReachabilityChecker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/revwalk/BitmappedObjectReachabilityChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/revwalk/BitmappedObjectReachabilityChecker.java index d8056490aa4..31d17ad2f22 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/revwalk/BitmappedObjectReachabilityChecker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/revwalk/BitmappedObjectReachabilityChecker.java @@ -69,7 +69,7 @@ public Optional areAllReachable(Collection targets, true); seen = seen == null ? visited : seen.or(visited); - remainingTargets.removeIf(seen::contains); + remainingTargets.removeIf(visited::contains); if (remainingTargets.isEmpty()) { return Optional.empty(); } From a7ef2f5cc6bc83ee9a6eef61daeb2d0bcdfec540 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 20 Apr 2026 12:13:04 -0700 Subject: [PATCH 116/200] PackMidx: Style fixes like unused throws Minor style fixes reported by analyzers: Remove unnecessary override. Remove throws of exceptions that are not thrown. Avoid RuntimeException (using UncheckedIOException instead) Change-Id: I9cefb1edb696f6ac4cd1b22cec1cb45a6a6a6964 --- .../jgit/internal/storage/file/PackMidx.java | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java index 672d0bca322..94c3deb8db9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java @@ -23,14 +23,10 @@ import java.util.Optional; import java.util.Set; import java.util.function.Function; -import java.util.stream.Collectors; import java.util.zip.DataFormatException; -import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.LargeObjectException; -import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.PackInvalidException; -import org.eclipse.jgit.errors.PackMismatchException; import org.eclipse.jgit.internal.storage.midx.MidxMetadataReader; import org.eclipse.jgit.internal.storage.midx.MultiPackIndex; import org.eclipse.jgit.internal.storage.midx.MultiPackIndexLoader; @@ -47,7 +43,7 @@ /** * A pack that uses internally a midx - * + *

* This pack answers what it can directly from the midx (e.g. hasObject) and * sends to the right pack other calls (e.g. reading the actual object). */ @@ -92,7 +88,7 @@ public PackMidx(Config cfg, File midxFile, List knownPacks) Function.identity())); packsInIdOrder = Arrays.stream(packNames).map(knownPacksByName::get) .filter(Objects::nonNull) - .collect(Collectors.toUnmodifiableList()); + .toList(); if (packsInIdOrder.size() != packNames.length) { throw new IOException("Midx refers to packs not in the pack list"); //$NON-NLS-1$ } @@ -117,11 +113,6 @@ public List getCoveredPacks() { return packsInIdOrder; } - @Override - public PackFile getPackFile() { - return super.getPackFile(); - } - @Override protected List fullyIncludedIn(BitmapIndex.BitmapBuilder needBitmaps) throws IOException { @@ -171,7 +162,7 @@ public boolean hasObjectSizeIndex() throws IOException { } @Override - public long getObjectSizeIndexCount() throws IOException { + public long getObjectSizeIndexCount() { throw new UnsupportedOperationException(); } @@ -245,7 +236,7 @@ ObjectId getPackChecksum() { try { return ObjectId.fromRaw(getMidx().getChecksum()); } catch (IOException e) { - throw new RuntimeException(e); + throw new UncheckedIOException(e); } } @@ -278,12 +269,18 @@ boolean endWindowCache() { @Override ByteArrayWindow read(long pos, int size) throws IOException { MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + if (po == null) { + throw new IllegalArgumentException("Invalid offset " + pos); + } return packsInIdOrder.get(po.getPackId()).read(po.getOffset(), size); } @Override ByteWindow mmap(long pos, int size) throws IOException { MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + if (po == null) { + throw new IllegalArgumentException("Invalid offset " + pos); + } return packsInIdOrder.get(po.getPackId()).mmap(po.getOffset(), size); } @@ -291,6 +288,9 @@ ByteWindow mmap(long pos, int size) throws IOException { ObjectLoader load(WindowCursor curs, long pos) throws IOException, LargeObjectException { MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + if (po == null) { + throw new IllegalArgumentException("Invalid offset " + pos); + } return packsInIdOrder.get(po.getPackId()).load(curs, po.getOffset()); } @@ -298,6 +298,9 @@ ObjectLoader load(WindowCursor curs, long pos) byte[] getDeltaHeader(WindowCursor wc, long pos) throws IOException, DataFormatException { MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + if (po == null) { + throw new IllegalArgumentException("Invalid offset " + pos); + } return packsInIdOrder.get(po.getPackId()).getDeltaHeader(wc, po.getOffset()); } @@ -305,6 +308,9 @@ byte[] getDeltaHeader(WindowCursor wc, long pos) @Override int getObjectType(WindowCursor curs, long pos) throws IOException { MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + if (po == null) { + throw new IllegalArgumentException("Invalid offset " + pos); + } return packsInIdOrder.get(po.getPackId()).getObjectType(curs, po.getOffset()); } @@ -322,6 +328,9 @@ long getObjectSize(WindowCursor curs, AnyObjectId id) throws IOException { @Override long getObjectSize(WindowCursor curs, long pos) throws IOException { MultiPackIndex.PackOffset po = offsetCalculator.decode(pos); + if (po == null) { + throw new IllegalArgumentException("Invalid offset " + pos); + } return packsInIdOrder.get(po.getPackId()).getObjectSize(curs, po.getOffset()); } @@ -419,7 +428,7 @@ private static class MidxPackIndex implements PackIndex { @Override public Iterator iterator() { MultiPackIndex.MidxIterator it = midx.iterator(); - return new Iterator() { + return new Iterator<>() { private final MutableEntry me = new MutableEntry(); @@ -477,7 +486,7 @@ public int findPosition(AnyObjectId objId) { @Override public long findCRC32(AnyObjectId objId) - throws MissingObjectException, UnsupportedOperationException { + throws UnsupportedOperationException { throw new UnsupportedOperationException(); } @@ -488,7 +497,7 @@ public boolean hasCRC32Support() { @Override public void resolve(Set matches, AbbreviatedObjectId id, - int matchLimit) throws IOException { + int matchLimit) { midx.resolve(matches, id, matchLimit); } @@ -512,9 +521,7 @@ private static final class MidxPackReverseIndex } @Override - public void verifyPackChecksum(String packFilePath) - throws PackMismatchException { - + public void verifyPackChecksum(String packFilePath) { } @Override @@ -525,8 +532,7 @@ public ObjectId findObject(long offset) { } @Override - public long findNextOffset(long offset, long maxOffset) - throws CorruptObjectException { + public long findNextOffset(long offset, long maxOffset) { throw new UnsupportedOperationException(); } From 39f918d5cf4f2543ed0c93778e8664654b76e354 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 20 Apr 2026 12:25:51 -0700 Subject: [PATCH 117/200] Pack/PackMidx: mark as @Nullable methods that deserve it Reported by analyzers in the PackMidx. Added the annotations also to the superclass. Change-Id: I4aeff18a2376d6a490a817e18c3a632c6a6a6964 --- .../src/org/eclipse/jgit/internal/storage/file/Pack.java | 2 ++ .../src/org/eclipse/jgit/internal/storage/file/PackMidx.java | 4 ++++ 2 files changed, 6 insertions(+) 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 4e299e63609..7aaf81798f4 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 @@ -421,6 +421,7 @@ public boolean shouldBeKept() { * @throws IOException * the pack file or the index could not be read. */ + @Nullable ObjectLoader get(WindowCursor curs, AnyObjectId id) throws IOException { final long offset = idx().findOffset(id); @@ -1272,6 +1273,7 @@ long getObjectSize(WindowCursor curs, long pos) } } + @Nullable LocalObjectRepresentation representation(final WindowCursor curs, final AnyObjectId objectId) throws IOException { final long pos = idx().findOffset(objectId); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java index 94c3deb8db9..7bf187fe6d1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackMidx.java @@ -25,6 +25,7 @@ import java.util.function.Function; import java.util.zip.DataFormatException; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.errors.PackInvalidException; import org.eclipse.jgit.internal.storage.midx.MidxMetadataReader; @@ -182,6 +183,7 @@ public boolean shouldBeKept() { } @Override + @Nullable ObjectLoader get(WindowCursor curs, AnyObjectId id) throws IOException { MultiPackIndex.PackOffset packOffset = getMidx().find(id); if (packOffset == null) { @@ -336,6 +338,7 @@ long getObjectSize(WindowCursor curs, long pos) throws IOException { } @Override + @Nullable LocalObjectRepresentation representation(WindowCursor curs, AnyObjectId objectId) throws IOException { MultiPackIndex.PackOffset po = getMidx().find(objectId); @@ -400,6 +403,7 @@ long encode(int packId, long offset) { return accSizes[packId] + offset; } + @Nullable MultiPackIndex.PackOffset decode(long totalOffset) { if (totalOffset < 0) { return null; From 990df013b5453c81b77e6caf035204840ee5468b Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 12 May 2026 22:43:16 +0000 Subject: [PATCH 118/200] Revert "DfsPackCompactor: Accept DfsPackDescription as input" This reverts commit 7ee50b61a2284f216fb51fcb961722a013563630. Reason for revert: This is not saving any memory. The references to the packs are alive until the actual writing. Change-Id: I7316d8a4487da3830df4154255f7cf7aecaa7df4 --- .../storage/dfs/DfsPackCompactor.java | 177 +++++++----------- 1 file changed, 65 insertions(+), 112 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java index 722c7ec1833..fbe641ec51d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java @@ -20,11 +20,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -64,11 +64,8 @@ */ public class DfsPackCompactor { private final DfsRepository repo; - - private final List inputDescsPacks; - - private final List inputDescsReftables; - + private final List srcPacks; + private final List srcReftables; private final List exclude; private final List prune; @@ -146,8 +143,8 @@ public DfsPackCompactor setPreCommitHook(PreCommitHook hook) { */ public DfsPackCompactor(DfsRepository repository) { repo = repository; - inputDescsPacks = new ArrayList<>(); - inputDescsReftables = new ArrayList<>(); + srcPacks = new ArrayList<>(); + srcReftables = new ArrayList<>(); exclude = new ArrayList<>(4); prune = new ArrayList<>(); } @@ -178,7 +175,8 @@ public DfsPackCompactor setReftableConfig(ReftableConfig cfg) { * @return {@code this} */ public DfsPackCompactor add(DfsPackFile pack) { - return addPack(pack.getPackDescription()); + srcPacks.add(pack); + return this; } /** @@ -189,54 +187,7 @@ public DfsPackCompactor add(DfsPackFile pack) { * @return {@code this} */ public DfsPackCompactor add(DfsReftable table) { - return addReftable(table.getPackDescription()); - } - - /** - * Add a pack to be compacted - *

- * This adds the objects in the pack to the compaction. If the description - * has reftables, they are ignored. Caller must explicitely call - * {@link #addReftable(DfsPackDescription)} with the same description to - * include them. - *

- * This method creates DfsPackFile instances when needed and can close them - * as soon as is done with them. This reduces the peak memory while - * processing many files. - * - * @param desc - * a pack description to combine. - * @return {@code this} - * @since 7.7 - */ - public DfsPackCompactor addPack(DfsPackDescription desc) { - if (!desc.hasFileExt(PACK)) { - throw new IllegalArgumentException( - "Adding for pack compaction a pack without data"); - } - inputDescsPacks.add(desc); - return this; - } - - /** - * Add a reftable to be compacted. - *

- * This adds the reftables in the pack to the compaction. If the description - * has pack data (objects), they are ignored. Caller must explicitely call - * {@link #addPack(DfsPackDescription)} with the same description to include - * them. - * - * @param desc - * a pack description to combine. - * @return {@code this} - * @since 7.7 - */ - public DfsPackCompactor addReftable(DfsPackDescription desc) { - if (!desc.hasFileExt(REFTABLE)) { - throw new IllegalArgumentException( - "Adding for reftable compaction a pack without reftables"); - } - inputDescsReftables.add(desc); + srcReftables.add(table); return this; } @@ -297,7 +248,7 @@ public void compact(ProgressMonitor pm) throws IOException { DfsObjDatabase objdb = repo.getObjectDatabase(); try (DfsReader ctx = objdb.newReader()) { - if (reftableConfig != null && !inputDescsReftables.isEmpty()) { + if (reftableConfig != null && !srcReftables.isEmpty()) { compactReftables(ctx); } compactPacks(ctx, pm); @@ -362,24 +313,18 @@ private long estimatePackSize() { // Include the final pack file header and trailer size here and ignore // the same from individual pack files. long size = 32; - for (DfsPackDescription desc : inputDescsPacks) { - if (desc.hasFileExt(PACK)) { - size += desc.getFileSize(PACK) - 32; - } + for (DfsPackFile pack : srcPacks) { + size += pack.getPackDescription().getFileSize(PACK) - 32; } return size; } private void compactReftables(DfsReader ctx) throws IOException { DfsObjDatabase objdb = repo.getObjectDatabase(); - Collections.sort(inputDescsReftables, - DfsPackDescription.reftableComparator()); - List tables = inputDescsReftables.stream() - .map(desc -> new DfsReftable(DfsBlockCache.getInstance(), desc)) - .collect(Collectors.toList()); + Collections.sort(srcReftables, objdb.reftableComparator()); initOutDesc(objdb); - try (DfsReftableStack stack = DfsReftableStack.open(ctx, tables); + try (DfsReftableStack stack = DfsReftableStack.open(ctx, srcReftables); DfsOutputStream out = objdb.writeFile(outDesc, REFTABLE)) { ReftableCompactor compact = new ReftableCompactor(out); compact.addAll(stack.readers()); @@ -403,11 +348,14 @@ private void initOutDesc(DfsObjDatabase objdb) throws IOException { * @return all of the source packs that fed into this compaction. */ public Collection getSourcePacks() { - HashSet all = new HashSet<>( - inputDescsPacks.size() + inputDescsReftables.size()); - all.addAll(inputDescsPacks); - all.addAll(inputDescsReftables); - return all; + Set src = new HashSet<>(); + for (DfsPackFile pack : srcPacks) { + src.add(pack.getPackDescription()); + } + for (DfsReftable table : srcReftables) { + src.add(table.getPackDescription()); + } + return src; } /** @@ -435,8 +383,15 @@ public List getNewPackStatistics() { } private Set toPrune() { - Set packs = new HashSet<>(inputDescsPacks); - Set reftables = new HashSet<>(inputDescsReftables); + Set packs = new HashSet<>(); + for (DfsPackFile pack : srcPacks) { + packs.add(pack.getPackDescription()); + } + + Set reftables = new HashSet<>(); + for (DfsReftable table : srcReftables) { + reftables.add(table.getPackDescription()); + } for (Iterator i = packs.iterator(); i.hasNext();) { DfsPackDescription d = i.next(); @@ -463,20 +418,49 @@ private Set toPrune() { private void addObjectsToPack(PackWriter pw, DfsReader ctx, ProgressMonitor pm) throws IOException, IncorrectObjectTypeException { + // Sort packs by description ordering, this places newer packs before + // older packs, allowing the PackWriter to be handed newer objects + // first and older objects last. + Collections.sort( + srcPacks, + Comparator.comparing( + DfsPackFile::getPackDescription, + DfsPackDescription.objectLookupComparator())); + rw = new RevWalk(ctx); added = rw.newFlag("ADDED"); //$NON-NLS-1$ isBase = rw.newFlag("IS_BASE"); //$NON-NLS-1$ List baseObjects = new BlockList<>(); pm.beginTask(JGitText.get().countingObjects, ProgressMonitor.UNKNOWN); + for (DfsPackFile src : srcPacks) { + List want = toInclude(src, ctx); + if (want.isEmpty()) + continue; - inputDescsPacks.sort(DfsPackDescription.objectLookupComparator()); - for (DfsPackDescription desc : inputDescsPacks) { - DfsPackFile src = repo.getObjectDatabase() - .createDfsPackFile(DfsBlockCache.getInstance(), desc); - addObjectFromPack(pw, ctx, pm, src, baseObjects); - } + PackReverseIndex rev = src.getReverseIdx(ctx); + DfsObjectRepresentation rep = new DfsObjectRepresentation(src); + for (ObjectIdWithOffset id : want) { + int type = src.getObjectType(ctx, id.offset); + RevObject obj = rw.lookupAny(id, type); + if (obj.has(added)) + continue; + pm.update(1); + pw.addObject(obj); + obj.add(added); + + src.fillRepresentation(rep, id.offset, ctx, rev); + if (rep.getFormat() != PACK_DELTA) + continue; + + RevObject base = rw.lookupAny(rep.getDeltaBase(), type); + if (!base.has(added) && !base.has(isBase)) { + baseObjects.add(base); + base.add(isBase); + } + } + } for (RevObject obj : baseObjects) { if (!obj.has(added)) { pm.update(1); @@ -487,37 +471,6 @@ private void addObjectsToPack(PackWriter pw, DfsReader ctx, pm.endTask(); } - private void addObjectFromPack(PackWriter pw, DfsReader ctx, - ProgressMonitor pm, DfsPackFile src, List baseObjects) - throws IOException { - List want = toInclude(src, ctx); - if (want.isEmpty()) - return; - - PackReverseIndex rev = src.getReverseIdx(ctx); - DfsObjectRepresentation rep = new DfsObjectRepresentation(src); - for (ObjectIdWithOffset id : want) { - int type = src.getObjectType(ctx, id.offset); - RevObject obj = rw.lookupAny(id, type); - if (obj.has(added)) - continue; - - pm.update(1); - pw.addObject(obj); - obj.add(added); - - src.fillRepresentation(rep, id.offset, ctx, rev); - if (rep.getFormat() != PACK_DELTA) - continue; - - RevObject base = rw.lookupAny(rep.getDeltaBase(), type); - if (!base.has(added) && !base.has(isBase)) { - baseObjects.add(base); - base.add(isBase); - } - } - } - private List toInclude(DfsPackFile src, DfsReader ctx) throws IOException { PackIndex srcIdx = src.getPackIndex(ctx); From 80f74cd7d69d5d42317891e00bbc2632c0b868ae Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 14 May 2026 22:19:34 +0200 Subject: [PATCH 119/200] Update gson to 2.14.0 Change-Id: Ib52c7859a920466ecfc461d773a2a3c3aa006c77 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 0d4662828e2..3fc3f7cc356 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -42,7 +42,7 @@ maven.install( name = "external_deps", artifacts = [ "args4j:args4j:2.37", - "com.google.code.gson:gson:2.13.2", + "com.google.code.gson:gson:2.14.0", "com.google.errorprone:error_prone_type_annotations:2.46.0", "com.googlecode.javaewah:JavaEWAH:1.2.3", "com.jcraft:jsch:0.1.55", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 9f231d139ae..fb85a5560e4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -191,7 +191,7 @@ com.google.code.gson gson - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 345a39ce495..0bee54575dd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -191,7 +191,7 @@ com.google.code.gson gson - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 9d1aa8a5107..d5331164758 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -191,7 +191,7 @@ com.google.code.gson gson - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index d89a1ba8afa..098506c8178 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -191,7 +191,7 @@ com.google.code.gson gson - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 4d7ff1787cf..f8c2efac066 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -191,7 +191,7 @@ com.google.code.gson gson - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 1155365c185..4158b43c729 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -191,7 +191,7 @@ com.google.code.gson gson - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index d494040c004..9781dbdb142 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -191,7 +191,7 @@ com.google.code.gson gson - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 3ada4c5b2e2..5d677d78f7d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -115,7 +115,7 @@ maven gson dependency { groupId = "com.google.code.gson" artifactId = "gson" - version = "2.13.2" + version = "2.14.0" } } diff --git a/pom.xml b/pom.xml index a9dd3de00ce..ae125794141 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ 4.4.16 2.0.17 3.12.0 - 2.13.2 + 2.14.0 1.84 4.9.8.2 3.9.0 From 9bee377026de44ca284e3d155cfc603d7b178096 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 14 May 2026 22:41:45 +0200 Subject: [PATCH 120/200] Update commons-codec to 1.22.0 Change-Id: I6778b338b05ec86e887623d7c6b0e749ab8d1bb5 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 3fc3f7cc356..2c22cd2e639 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -47,7 +47,7 @@ maven.install( "com.googlecode.javaewah:JavaEWAH:1.2.3", "com.jcraft:jsch:0.1.55", "com.jcraft:jzlib:1.1.3", - "commons-codec:commons-codec:1.21.0", + "commons-codec:commons-codec:1.22.0", "commons-io:commons-io:2.21.0", "commons-logging:commons-logging:1.3.6", "jakarta.servlet:jakarta.servlet-api:6.1.0", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index fb85a5560e4..487baed26c5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.21.0 + 1.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 0bee54575dd..ad01b533c5d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.21.0 + 1.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index d5331164758..703583ba008 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.21.0 + 1.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 098506c8178..91fef83b114 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.21.0 + 1.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index f8c2efac066..4484bddfbfe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.21.0 + 1.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 4158b43c729..559f4f3ffa1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.21.0 + 1.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 9781dbdb142..99b5b40d2a2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.21.0 + 1.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 5d677d78f7d..e892c19dc18 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -10,7 +10,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.21.0" + version = "1.22.0" } dependency { groupId = "org.apache.commons" diff --git a/pom.xml b/pom.xml index ae125794141..44a349b61c6 100644 --- a/pom.xml +++ b/pom.xml @@ -899,7 +899,7 @@ commons-codec commons-codec - 1.21.0 + 1.22.0 From 28141982aee4e887e05cd0fb504873d2678d3f75 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 14 May 2026 22:47:57 +0200 Subject: [PATCH 121/200] Update commons-io to 2.22.0 Change-Id: I70eb9632f23be001230d5e32c760dd3b97e35e34 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 2c22cd2e639..7dd0fa6d365 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -48,7 +48,7 @@ maven.install( "com.jcraft:jsch:0.1.55", "com.jcraft:jzlib:1.1.3", "commons-codec:commons-codec:1.22.0", - "commons-io:commons-io:2.21.0", + "commons-io:commons-io:2.22.0", "commons-logging:commons-logging:1.3.6", "jakarta.servlet:jakarta.servlet-api:6.1.0", "junit:junit:4.13.2", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 487baed26c5..c46ae8c4240 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -283,7 +283,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index ad01b533c5d..206f0d452fa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -283,7 +283,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 703583ba008..4d9163eb137 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -283,7 +283,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 91fef83b114..47bd1c42ab1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -283,7 +283,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 4484bddfbfe..6f7e4c162a3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -283,7 +283,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 559f4f3ffa1..8f21be4b203 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -283,7 +283,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 99b5b40d2a2..b6759d98fb6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -283,7 +283,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index e892c19dc18..149ad5e893e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -25,7 +25,7 @@ maven apache dependency { groupId = "commons-io" artifactId = "commons-io" - version = "2.21.0" + version = "2.22.0" } dependency { groupId = "commons-logging" diff --git a/pom.xml b/pom.xml index 44a349b61c6..345365ecd63 100644 --- a/pom.xml +++ b/pom.xml @@ -911,7 +911,7 @@ org.apache.commons commons-io - 2.21.0 + 2.22.0 From 170a26c66e7325977c12faf18d2f5d63507e4d13 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 14 May 2026 22:49:53 +0200 Subject: [PATCH 122/200] Update Jetty to 12.1.9 Change-Id: Ib344b3469fd591c35ee876a6ef4d8079ddd9b9c2 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.35.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.36.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.37.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.38.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.39.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.40.target | 18 +++++++++--------- .../maven/dependencies.tpd | 16 ++++++++-------- pom.xml | 2 +- 10 files changed, 73 insertions(+), 73 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 7dd0fa6d365..8be6459299a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,7 +27,7 @@ BOUNCYCASTLE_VERSION = "1.84" BYTE_BUDDY_VERSION = "1.18.8" -JETTY_VERSION = "12.1.8" +JETTY_VERSION = "12.1.9" JMH_VERSION = "1.37" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index c46ae8c4240..5602f60c8b9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-http - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-io - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-security - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-server - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-session - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util-ajax - 12.1.8 + 12.1.9 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 206f0d452fa..0ecef1b87c7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-http - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-io - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-security - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-server - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-session - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util-ajax - 12.1.8 + 12.1.9 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 4d9163eb137..2dd1116ced3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-http - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-io - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-security - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-server - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-session - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util-ajax - 12.1.8 + 12.1.9 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 47bd1c42ab1..e74ff6761c3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-http - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-io - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-security - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-server - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-session - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util-ajax - 12.1.8 + 12.1.9 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 6f7e4c162a3..12f94ce7ceb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-http - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-io - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-security - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-server - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-session - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util-ajax - 12.1.8 + 12.1.9 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 8f21be4b203..78ce6dfd975 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-http - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-io - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-security - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-server - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-session - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util-ajax - 12.1.8 + 12.1.9 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index b6759d98fb6..8bfe6badc32 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-http - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-io - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-security - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-server - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-session - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util - 12.1.8 + 12.1.9 jar org.eclipse.jetty jetty-util-ajax - 12.1.8 + 12.1.9 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 149ad5e893e..8c12807c8e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.8" + version = "12.1.9" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.8" + version = "12.1.9" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.8" + version = "12.1.9" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.8" + version = "12.1.9" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.8" + version = "12.1.9" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.8" + version = "12.1.9" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.8" + version = "12.1.9" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.8" + version = "12.1.9" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 345365ecd63..7eabd4f0195 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.28.0 6.0.0 6.1.0 - 12.1.8 + 12.1.9 0.25.0 4.5.14 4.4.16 From fc96d944082cbf5867d9e91180ea925e0bf429d5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 14 May 2026 22:51:33 +0200 Subject: [PATCH 123/200] Update slf4j to 2.0.18 Change-Id: I102edf9280a9e8930e980e2565fb5edeb3bb8068 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 8 ++++---- .../org.eclipse.jgit.target/jgit-4.35.target | 8 ++++---- .../org.eclipse.jgit.target/jgit-4.36.target | 8 ++++---- .../org.eclipse.jgit.target/jgit-4.37.target | 8 ++++---- .../org.eclipse.jgit.target/jgit-4.38.target | 8 ++++---- .../org.eclipse.jgit.target/jgit-4.39.target | 8 ++++---- .../org.eclipse.jgit.target/jgit-4.40.target | 8 ++++---- .../org.eclipse.jgit.target/maven/dependencies.tpd | 6 +++--- pom.xml | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 8be6459299a..99528a3c3c5 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -33,7 +33,7 @@ JMH_VERSION = "1.37" JNA_VERSION = "5.18.1" -SLF4J_VERSION = "2.0.17" +SLF4J_VERSION = "2.0.18" SSHD_VERSION = "2.17.1" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 5602f60c8b9..0ed6ad9fc02 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -49,19 +49,19 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.18 jar org.slf4j slf4j-simple - 2.0.17 + 2.0.18 jar org.slf4j jcl-over-slf4j - 2.0.17 + 2.0.18 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 0ecef1b87c7..a3469d1e3d4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -49,19 +49,19 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.18 jar org.slf4j slf4j-simple - 2.0.17 + 2.0.18 jar org.slf4j jcl-over-slf4j - 2.0.17 + 2.0.18 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 2dd1116ced3..ae957d4bf86 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -49,19 +49,19 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.18 jar org.slf4j slf4j-simple - 2.0.17 + 2.0.18 jar org.slf4j jcl-over-slf4j - 2.0.17 + 2.0.18 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index e74ff6761c3..bdf955c3e88 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -49,19 +49,19 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.18 jar org.slf4j slf4j-simple - 2.0.17 + 2.0.18 jar org.slf4j jcl-over-slf4j - 2.0.17 + 2.0.18 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 12f94ce7ceb..cbd8dcb82ab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -49,19 +49,19 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.18 jar org.slf4j slf4j-simple - 2.0.17 + 2.0.18 jar org.slf4j jcl-over-slf4j - 2.0.17 + 2.0.18 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 78ce6dfd975..dd38a8c2e91 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -49,19 +49,19 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.18 jar org.slf4j slf4j-simple - 2.0.17 + 2.0.18 jar org.slf4j jcl-over-slf4j - 2.0.17 + 2.0.18 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 8bfe6badc32..a00c7d0d9d9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -49,19 +49,19 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.18 jar org.slf4j slf4j-simple - 2.0.17 + 2.0.18 jar org.slf4j jcl-over-slf4j - 2.0.17 + 2.0.18 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 8c12807c8e5..367d4a34b94 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -256,17 +256,17 @@ maven slf4j dependency { groupId = "org.slf4j" artifactId = "slf4j-api" - version = "2.0.17" + version = "2.0.18" } dependency { groupId = "org.slf4j" artifactId = "slf4j-simple" - version = "2.0.17" + version = "2.0.18" } dependency { groupId = "org.slf4j" artifactId = "jcl-over-slf4j" - version = "2.0.17" + version = "2.0.18" } } diff --git a/pom.xml b/pom.xml index 7eabd4f0195..b1521e4d596 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ 0.25.0 4.5.14 4.4.16 - 2.0.17 + 2.0.18 3.12.0 2.14.0 1.84 From 6e6c7a95945cc5dfe4f6c4668d7e4332641f35da Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 22 Apr 2026 11:44:47 -0700 Subject: [PATCH 124/200] MidxPackList: Add a builder to edit the pack list In the compactor we have the existing list of packs, plus the new packs to add/remove. We need to combine all three to preview the new pack list and calculate what to put in the midx. Create a builder to add/remove packs. It takes care to take away from the list invalid midxs, to keep the updated list valid. Change-Id: Ied89ecceca4b2921d4bef39516af0e7d6a6a6964 --- .../storage/dfs/MidxPackListTest.java | 162 ++++++++++++++++++ .../internal/storage/dfs/MidxPackList.java | 146 ++++++++++++++++ 2 files changed, 308 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java index 217f5872b06..beaef580c23 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/MidxPackListTest.java @@ -311,6 +311,168 @@ public void getPlainPacksNotCoveredBy_midxChain() { assertEquals(List.of(), packList.getPlainPacksNotCoveredBy(midxTip)); } + @Test + public void builder_delete_onlyPlain() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + + MidxPackList packList = MidxPackList.create(a, b, c).edit().delete(b) + .build(); + assertEquals(List.of(a, c), packList.getAllPlainPacks()); + } + + @Test + public void builder_delete_oneMidxCovering() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + + MidxPackList packList = MidxPackList.create(midx).edit().delete(b) + .build(); + assertEquals(List.of(c, a), packList.getAllPlainPacks()); + assertEquals(0, packList.getAllMidxPacks().size()); + } + + @Test + public void builder_delete_singlePackMidx() { + DfsPackFile a = packPool.pack("a"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a"); + + MidxPackList packList = MidxPackList.create(midx).edit().delete(a) + .build(); + assertEquals(List.of(), packList.getAllPlainPacks()); + assertEquals(0, packList.getAllMidxPacks().size()); + } + + @Test + public void builder_delete_midxPlusOne_deleteUncovered() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + DfsPackFile d = packPool.pack("d"); + + MidxPackList deleteD = MidxPackList.create(d, midx).edit().delete(d) + .build(); + assertEquals(List.of(c, b, a), deleteD.getAllPlainPacks()); + assertEquals(midx, deleteD.getTopMidxPack()); + } + + @Test + public void builder_delete_midxPlusOne_deleteCovered() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFileMidx midx = packPool.midx("midx", null, "a", "b", "c"); + DfsPackFile d = packPool.pack("d"); + + MidxPackList deleteB = MidxPackList.create(d, midx).edit().delete(b) + .build(); + assertEquals(List.of(d, c, a), deleteB.getAllPlainPacks()); + assertEquals(0, deleteB.getAllMidxPacks().size()); + } + + @Test + public void builder_delete_nestedMidx() { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFileMidx midxBase = packPool.midx("midxBase", null, "a", "b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFile d = packPool.pack("d"); + DfsPackFileMidx midxMiddle = packPool.midx("midxMiddle", midxBase, "c", + "d"); + DfsPackFile e = packPool.pack("e"); + DfsPackFile f = packPool.pack("f"); + DfsPackFileMidx midxTip = packPool.midx("midxTip", midxMiddle, "e", + "f"); + + MidxPackList withoutF = MidxPackList.create(midxTip).edit().delete(f) + .build(); + assertEquals(List.of(e, d, c, b, a), withoutF.getAllPlainPacks()); + assertEquals(List.of(midxMiddle, midxBase), withoutF.getAllMidxPacks()); + assertEquals(midxMiddle, withoutF.getTopMidxPack()); + + MidxPackList withoutE = MidxPackList.create(midxTip).edit().delete(e) + .build(); + assertEquals(List.of(f, d, c, b, a), withoutE.getAllPlainPacks()); + assertEquals(List.of(midxMiddle, midxBase), withoutE.getAllMidxPacks()); + assertEquals(midxMiddle, withoutE.getTopMidxPack()); + assertEquals(Set.of(), withoutE.findAllCoveringMidxs(f)); + assertEquals(Set.of(midxMiddle, midxBase), + withoutE.findAllCoveringMidxs(a)); + + MidxPackList withoutD = MidxPackList.create(midxTip).edit().delete(d) + .build(); + assertEquals(List.of(f, e, c, b, a), withoutD.getAllPlainPacks()); + assertEquals(List.of(midxBase), withoutD.getAllMidxPacks()); + assertEquals(midxBase, withoutD.getTopMidxPack()); + + MidxPackList withoutC = MidxPackList.create(midxTip).edit().delete(c) + .build(); + assertEquals(List.of(f, e, d, b, a), withoutC.getAllPlainPacks()); + assertEquals(List.of(midxBase), withoutC.getAllMidxPacks()); + assertEquals(midxBase, withoutC.getTopMidxPack()); + assertEquals(Set.of(), withoutC.findAllCoveringMidxs(f, e, d, c)); + assertEquals(Set.of(midxBase), withoutC.findAllCoveringMidxs(a)); + + MidxPackList withoutB = MidxPackList.create(midxTip).edit().delete(b) + .build(); + assertEquals(List.of(f, e, d, c, a), withoutB.getAllPlainPacks()); + assertEquals(List.of(), withoutB.getAllMidxPacks()); + assertEquals(null, withoutB.getTopMidxPack()); + + MidxPackList withoutA = MidxPackList.create(midxTip).edit().delete(a) + .build(); + assertEquals(List.of(f, e, d, c, b), withoutA.getAllPlainPacks()); + assertEquals(List.of(), withoutA.getAllMidxPacks()); + assertEquals(null, withoutA.getTopMidxPack()); + assertEquals(Set.of(), withoutA.findAllCoveringMidxs(f, e, d, c, b)); + } + + @Test + public void builder_delete_nestedMidx_multipleDeletes() throws Exception { + DfsPackFile a = packPool.pack("a"); + DfsPackFile b = packPool.pack("b"); + DfsPackFileMidx midxBase = packPool.midx("midxBase", null, "a", "b"); + DfsPackFile c = packPool.pack("c"); + DfsPackFile d = packPool.pack("d"); + DfsPackFileMidx midxMiddle = packPool.midx("midxMiddle", midxBase, "c", + "d"); + DfsPackFile e = packPool.pack("e"); + DfsPackFile f = packPool.pack("f"); + DfsPackFileMidx midxTip = packPool.midx("midxTip", midxMiddle, "e", + "f"); + + { + MidxPackList deleteFromTopAndMiddle = MidxPackList.create(midxTip) + .edit().delete(e).delete(d).build(); + assertEquals(List.of(f, c, b, a), + deleteFromTopAndMiddle.getAllPlainPacks()); + assertEquals(List.of(midxBase), + deleteFromTopAndMiddle.getAllMidxPacks()); + assertEquals(midxBase, deleteFromTopAndMiddle.getTopMidxPack()); + } + { + MidxPackList deleteFromMiddleAndTop = MidxPackList.create(midxTip) + .edit().delete(d).delete(e).build(); + assertEquals(List.of(f, c, b, a), + deleteFromMiddleAndTop.getAllPlainPacks()); + assertEquals(List.of(midxBase), + deleteFromMiddleAndTop.getAllMidxPacks()); + assertEquals(midxBase, deleteFromMiddleAndTop.getTopMidxPack()); + } + { + MidxPackList deleteAllFromMidx = MidxPackList.create(midxTip).edit() + .delete(d).delete(c).build(); + assertEquals(List.of(f, e, b, a), + deleteAllFromMidx.getAllPlainPacks()); + assertEquals(List.of(midxBase), + deleteAllFromMidx.getAllMidxPacks()); + assertEquals(midxBase, deleteAllFromMidx.getTopMidxPack()); + } + } private static final class PackPool { private static final DfsRepositoryDescription repoDesc = new DfsRepositoryDescription( diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java index 70c9b858fca..d60ca1e45b9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/MidxPackList.java @@ -21,6 +21,7 @@ import java.util.Queue; import java.util.Set; import java.util.TreeSet; +import java.util.stream.Collectors; import org.eclipse.jgit.annotations.Nullable; @@ -209,6 +210,151 @@ public List getPlainPacksNotCoveredBy( .toList(); } + /** + * Get a builder to add/remove packs from the list + * + * @return the builder + */ + public Builder edit() { + return new Builder(packs); + } + + /** + * Builder to mutate the list of packs. + * + * It removes midxs from the list as packs are removed, to maintain a valid + * view of the packlist + */ + public final static class Builder { + + private final List packList; + + private Builder(List packs) { + this.packList = new ArrayList<>(packs); + } + + /** + * Add pack to the packlist + * + * @param toAdd + * pack to add + * @return this builder + */ + public Builder add(DfsPackFile toAdd) { + packList.add(toAdd); + return this; + } + + /** + * Delete the pack from the pack list + * + * Including any midx covering it directly or indirectly + * + * @param toDelete + * a pack to remove from the list + * @return this builder + */ + public Builder delete(DfsPackFile toDelete) { + // Check first top-level packs. In compact these are the most + // common packages being replaced. + DfsPackDescription toDeleteDesc = toDelete.getPackDescription(); + for (int i = 0; i < packList.size(); i++) { + if (packList.get(i).getPackDescription().equals(toDeleteDesc)) { + packList.remove(i); + return this; + } + } + + // If the pack is not "top-level", it may be covered by midx. + // We need to remove the pack, its covering midxs, but keep the + // other covered packs in their place. + // e.g. in the chain midx3(E, F) -> midx2 (C, D), -> midx(A, B), + // deleting C from midx3 produces: [F, E, D, midx(A, B)] + for (int i = packList.size() - 1; i >= 0; i--) { + if (!packList.get(i).getPackDescription() + .hasFileExt(MULTI_PACK_INDEX)) { + continue; + } + + DfsPackFileMidx midx = (DfsPackFileMidx) packList.get(i); + if (!containsAny(midx.getAllCoveredPacks(), + List.of(toDelete))) { + continue; + } + + List replacement = getPacksToReplaceMidx(midx, + toDelete); + if (replacement != null) { + packList.remove(i); + if (!replacement.isEmpty()) { + packList.addAll(i, replacement); + } + } + } + + return this; + } + + /** + * Return the list of packs that replace a midx if we remove a pack + * + * When the pack is removed, any midx covering it (and above in the + * chain) is invalid. Each invalid midx is replaced with its covered + * packs (excluding the deleted pack) + * + * @param midx + * the midx + * @param toDelete + * the pack to remove + * @return the resulting list of packs after removing the pack. It can + * be null (nothing to change), empty (replace with nothing, + * i.e. delete the midx) or a list of packs + */ + @Nullable + private List getPacksToReplaceMidx(DfsPackFileMidx midx, + DfsPackFile toDelete) { + List result = new ArrayList<>(); + DfsPackFileMidx current = midx; + while (current != null) { + if (containsAny(current.getCoveredPacks(), List.of(toDelete))) { + List otherCovered = current.getCoveredPacks() + .stream() + .filter(coveredPack -> !coveredPack + .getPackDescription() + .equals(toDelete.getPackDescription())) + .collect(Collectors.toCollection(ArrayList::new)); + Collections.reverse(otherCovered); + result.addAll(otherCovered); + if (current.getMultipackIndexBase() != null) { + result.add(current.getMultipackIndexBase()); + } + return result; + } + + // The deleted pack must be in the base of this midx, and it + // wil invalidate this one. Add all its covered packs to the + // result. + List tmp = new ArrayList<>( + current.getCoveredPacks()); + Collections.reverse(tmp); + result.addAll(tmp); + current = current.getMultipackIndexBase(); + } + + // We didn't find the pack to delete in this midx chain + return null; + } + + /** + * Create a new pack list with the modifications + * + * @return a new packlist with the changes applied + */ + public MidxPackList build() { + return new MidxPackList(packList); + } + } + private static boolean containsAny(List inMidx, List queryPacks) { Set inMidxSet = asSet(inMidx); From 2d5cf323888efcdc455998388e592be0a8efca3d Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 15 May 2026 11:02:36 -0700 Subject: [PATCH 125/200] DfsPackDescription: New method getTotalFileSize() In code setting up the compact, we need to iterate over the extensions and adding their sizes. DfsPackDescription itself is a better place for this functionality. Add a getTotalFileSize() method returning the accumulated size of all extensions in the pack. Change-Id: Ief378305122ef2e74367ff44d187ee256a6a6964 --- .../internal/storage/dfs/DfsPackDescription.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java index d4fe5669d88..7a3c1396b0f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackDescription.java @@ -366,6 +366,19 @@ public long getFileSize(PackExt ext) { return i < sizeMap.length ? sizeMap[i] : 0; } + /** + * Get total size of the pack, including indexes + * + * @return the size of the pack and all its extensions + */ + public long getTotalFileSize() { + long result = 0; + for (long sz : sizeMap) { + result += sz; + } + return result; + } + /** * Get blockSize of the file, in bytes. * From f5a9c691ae00b6c02cbf98803c08d4ada769da43 Mon Sep 17 00:00:00 2001 From: Daniele Sassoli Date: Thu, 14 May 2026 14:13:55 +0100 Subject: [PATCH 126/200] Update docs for logAllRefUpdates Currently it looks like logAllRefUpdates is a boolean value that can be either enabled or not, while in reality there is a third possible value of "always" that is required to log the vast majority of the ref updates. Document this third option and make it clearer what's actually being logged when setting it to true. Change-Id: I01a7700a05cbbd10cc9eeae9350f2671def4d813 --- Documentation/config-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index abf78646c78..1541b539930 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -41,7 +41,7 @@ For details on native git options see also the official [git config documentatio | `core.fileMode` | Auto detects if file modes are supported | ✅ | Tells Git if the executable bit of files in the working tree is to be honored. | | `core.hideDotFiles` | `dotGitOnly` | ✅ | Windows only. If `true`, mark newly-created directories and files whose name starts with a dot as hidden. If `dotGitOnly`, only the `.git/` directory is hidden, but no other files starting with a dot. | | `core.hooksPath` | `$GIT_DIR/hooks` | ✅ | Path to look for hooks. | -| `core.logAllRefUpdates` | `true` in a repository with working tree, `false` in bare repository | ✅ | Enable the reflog. | +| `core.logAllRefUpdates` | `true` in a repository with working tree, `false` in bare repository | ✅ | Enable the reflog. `true` to log updates only for `refs/heads/**`, `refs/remotes/**`, `refs/notes/**`, and `HEAD`, `always` to log for all refs, `false` to disable reflog updates | | `core.packedGitLimit` | `10 MiB` | ✅ | Maximum number of bytes to cache in memory from pack files. | | `core.packedGitMmap` | `false` | ✅ | Whether to use Java NIO virtual memory mapping for JGit buffer cache. When set to `true` enables use of Java NIO virtual memory mapping for cache windows, `false` reads entire window into a `byte[]` with standard read calls. `true` is experimental and may cause instabilities and crashes since Java doesn't support explicit unmapping of file regions mapped to virtual memory. | | `core.packedGitOpenFiles` | `128` | ⃞ | Maximum number of streams to open at a time. Open packs count against the process limits. | From d0ebb2a70e44ed7e19dd83834bc3b4143d044711 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 17 May 2026 20:59:00 +0200 Subject: [PATCH 127/200] TemporaryBuffer.LocalFile: use Files.newInputStream() On Unix, FileInputStream.skip() uses lseek under the hood and allows skipping beyond EOF, which makes WorkingTreeIterator.computeLength() go into an endless loop. Files.newInputStream() returns a sun.nio.ch.ChannelInputStream, which for files does not skip beyond EOF, avoiding this endless loop. At the point WorkingTreeIterator.computeLength() is called, the input stream is either a CR/LF-processing stream, which extend InputStream, which actually uses reads to implement skipping and thus doesn't skip beyond EOF, or a BlockInputStream, which also does not skip beyond the content length, or a stream obtained from TemporaryBuffer.LocalFile. Bug: jgit-261 Change-Id: I2e1bfe04c308220a1c2d819e6414a6ff7b2f9c34 --- .../eclipse/jgit/util/FilterCommandsTest.java | 70 +++++++++++++++++++ .../eclipse/jgit/util/TemporaryBuffer.java | 10 ++- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/FilterCommandsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/FilterCommandsTest.java index 0513da2d155..f7dab121e8b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/FilterCommandsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/FilterCommandsTest.java @@ -16,8 +16,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.file.Files; import java.util.HashSet; +import java.util.Random; import java.util.Set; +import java.util.concurrent.ThreadLocalRandom; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.MergeResult; @@ -70,6 +73,33 @@ public int run() throws IOException { } } + private static class NoOpCommandFactory implements FilterCommandFactory { + + @Override + public FilterCommand create(Repository db, InputStream in, + OutputStream out) throws IOException { + return new FilterCommand(in, out) { + + private byte[] buf = new byte[32 * 1024]; + + @Override + public int run() throws IOException { + int n = in.read(buf); + if (n < 0) { + in.close(); + out.close(); + return -1; + } + if (n > 0) { + out.write(buf, 0, n); + } + return n; + } + + }; + } + } + @Override @Before public void setUp() throws Exception { @@ -148,6 +178,46 @@ public void testBuiltinCleanFilter() throws Exception { indexState(CONTENT)); } + @Test + public void testCleanLargeFile() throws Exception { + String builtinCommandName = "jgit://builtin/test/clean"; + FilterCommandRegistry.register(builtinCommandName, + new NoOpCommandFactory()); + StoredConfig config = git.getRepository().getConfig(); + config.setString("filter", "test", "clean", builtinCommandName); + config.save(); + + writeTrashFile(".gitattributes", "*.bin filter=test"); + git.add().addFilepattern(".gitattributes").call(); + git.commit().setMessage("add filter").call(); + + File f = new File(git.getRepository().getWorkTree(), "a.bin"); + long length = 0; + try (OutputStream out = Files.newOutputStream(f.toPath())) { + byte[] buf = new byte[8 * 1024]; + Random r = ThreadLocalRandom.current(); + while (length < TemporaryBuffer.DEFAULT_IN_CORE_LIMIT) { + r.nextBytes(buf); + buf[0] = 0; + out.write(buf); + length += buf.length; + } + // Write a few bytes extra, just so that we don't have a + // multiple of 8k, and we're beyond the in-memory limit. + r.nextBytes(buf); + out.write(buf, 0, 19); + length += 19; + } + + fsTick(f); + git.add().addFilepattern("a.bin").call(); + assertEquals( + "[.gitattributes, mode:100644, length:17]" + + "[Test.txt, mode:100644, length:11]" + + "[a.bin, mode:100644, length:" + length + "]", + indexState(LENGTH)); + } + @Test public void testBuiltinSmudgeFilter() throws IOException, GitAPIException { String builtinCommandName = "jgit://builtin/test/smudge"; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java index 0f45162e717..fdb2679cd26 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java @@ -15,10 +15,12 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.UncheckedIOException; +import java.nio.file.Files; import java.util.ArrayList; import org.eclipse.jgit.internal.JGitText; @@ -556,9 +558,10 @@ public void writeTo(OutputStream os, ProgressMonitor pm) @Override public InputStream openInputStream() throws IOException { - if (onDiskFile == null) + if (onDiskFile == null) { return super.openInputStream(); - return new FileInputStream(onDiskFile); + } + return Files.newInputStream(onDiskFile.toPath()); } @Override @@ -566,7 +569,8 @@ public InputStream openInputStreamWithAutoDestroy() throws IOException { if (onDiskFile == null) { return super.openInputStreamWithAutoDestroy(); } - return new FileInputStream(onDiskFile) { + return new FilterInputStream( + Files.newInputStream(onDiskFile.toPath())) { @Override public void close() throws IOException { super.close(); From 7a4ddccdcc3e638cc07774fca1537c9ffb64f70b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 20 May 2026 19:43:35 +0200 Subject: [PATCH 128/200] JGit v7.7.0.202605201743-m3 Signed-off-by: Matthias Sohn Change-Id: I27fd4788cfd63943c1c2a6fd30d261359120dcd1 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 8b99ee9169b..3662bdd94f8 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1ed2fb90785..10341db84e8 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 e10e3854171..40d8948aafe 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 08d4b66eaf3..a181fa35251 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 8863da90e31..dcce0f3501c 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 9f4281261c3..1c6289b4baf 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 88f51d14431..db8aed7c262 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a04e9c6350f..504c6164225 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 53d1bfdd401..1a20124827e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index b02657ff86e..aad18f1d5fa 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.test - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 d9d1b0f1103..d0093a97af0 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 2ed7ba3958d..492be53b8ad 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 d6d826cd010..e9bf0c35d0c 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 556d2565756..20e3e6c39fd 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index e6b206344d6..f63d2dee926 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 06887836c6d..fa23f1b7f0f 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 03c16b891b7..f4643a3dd72 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51be72e9c23..5b30ee31363 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 02059c1b715..b957a1d4c07 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 520c2fb1153..6dddb8bc7eb 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2460ea91e7c..5bd84898724 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 d19255326f9..7619fbf66d5 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 310f87f4c05..bd8c9dc2dd8 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 fa7421aae95..52286086661 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: OSGI-INF/l10n/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 a913f9003de..21cb77ec2c4 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fc428ed766..b3e3b7f8304 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 04e96f9ec7d..ccdf1018a8a 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: OSGI-INF/l10n/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 479ec1333be..ca85cdd3af6 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 94397aba5f9..21845ebe6a4 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 78f05845141..d453a3378b0 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: OSGI-INF/l10n/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 c313e01220b..003c060a81a 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 907fc47920c..bf1df72073f 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 e85207181e7..3c4f1129d8f 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 4ad6d6524f1..57afb929a07 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 65079c689c5..328e0fb56df 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 9dc895322da..7f331a8edb7 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 73036eefecb..d87de0732df 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 b9df9f9e993..9db65c80daa 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 040b222cc63..69c525d3964 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 0fe46c793ee..1ad67f47bc9 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 5ecc42bb93c..eef72ca5402 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 19546b73995..e8d09dfdb8c 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 0caab549108..6abb4c6cf1b 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 a8ce2984b38..c01473554e7 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 e37d622a538..4da420937d3 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 d59c8de391c..aa85d12e15e 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 684d11994a1..87a05ba3eee 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 00a0601d333..01e91620663 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 8b28f14dfe1..e92daf6c4d1 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 6e07e85c123..437746dcd2f 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 bb6b80a4a62..a42e8bb6c48 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 0d91543b42d..eb342f92a48 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 d053e0ac2a8..a81c916d5f5 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 6a8c021997b..0ceb8b9fafb 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 9a1fd3ad202..30bf5ad74f3 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 73f1ecda7b6..fe470899a45 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 c5b75923b37..04b85b3736c 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 edb2020cf80..e1f75ed74b4 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 0b97560d28d..ad18bde22d2 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 706918f38ac..8354ce5d829 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 8db7e691045..683b89f7adf 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2a73924bae5..d3308849949 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 28b0ced222e..8edd35a7e10 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 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 f41d83d2cbd..e84733f772b 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 e31d3dc49ca..62d8414d2a7 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 65901e06a00..e34f41fea37 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 659718bd8a9..60fa33da45c 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 1dc3728c98f..aef824d45cb 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index a085c046432..b9a81a94483 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 4d7b7c233a8..2eacbb4adf2 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit.ssh.apache.agent 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 ae9e11e2182..830322123d3 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2ab6c3921f2..68b22cd400a 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 5cff8a866d3..7f37cb0d01e 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 fa44087d3cf..6a446ad5ce3 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 18cba188b71..57e8de58f65 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 73ef145eac6..6dae253bc44 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 176c91dc76b..d4317903083 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 9093f859b1b..315211c484c 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 4863daef6fc..fac4ca8f115 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index b8e2e4c212a..9b08837fa84 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 36a9e4f53f0..39f4a51eedd 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 92a7597b4cf..9c3dcb2b861 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 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 ef66f911cff..600013e52af 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 2430c2bb3d8..83f1745cc40 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a21d2f33ee2..1fe95dc6204 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 - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 2377e269927..2a1392a574e 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 46c35527314..1bfa5e53925 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605201743-m3 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202605201743-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e9b16e06934..d0574ed266c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index b1521e4d596..f4f04d62470 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0-SNAPSHOT + 7.7.0.202605201743-m3 JGit - Parent ${jgit-url} From 27a893ba60722b44d3f6161d65ab6041e1bb1ab9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 21 May 2026 09:23:28 +0200 Subject: [PATCH 129/200] Prepare 7.7.0-SNAPSHOT builds Change-Id: Ic7f91f412a51e547885dad2164f787544c059b6e --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 3662bdd94f8..8b99ee9169b 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 10341db84e8..1ed2fb90785 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 - 7.7.0.202605201743-m3 + 7.7.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 40d8948aafe..e10e3854171 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index a181fa35251..08d4b66eaf3 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index dcce0f3501c..8863da90e31 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 - 7.7.0.202605201743-m3 + 7.7.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 1c6289b4baf..9f4281261c3 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index db8aed7c262..88f51d14431 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 504c6164225..a04e9c6350f 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 - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 1a20124827e..53d1bfdd401 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index aad18f1d5fa..b02657ff86e 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 - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0.202605201743-m3 + 7.7.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 d0093a97af0..d9d1b0f1103 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 492be53b8ad..2ed7ba3958d 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 - 7.7.0.202605201743-m3 + 7.7.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 e9bf0c35d0c..d6d826cd010 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 20e3e6c39fd..556d2565756 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f63d2dee926..e6b206344d6 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 - 7.7.0.202605201743-m3 + 7.7.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 fa23f1b7f0f..06887836c6d 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 f4643a3dd72..03c16b891b7 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 5b30ee31363..51be72e9c23 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 - 7.7.0.202605201743-m3 + 7.7.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 b957a1d4c07..02059c1b715 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 6dddb8bc7eb..520c2fb1153 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 5bd84898724..2460ea91e7c 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 - 7.7.0.202605201743-m3 + 7.7.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 7619fbf66d5..d19255326f9 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index bd8c9dc2dd8..310f87f4c05 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 - 7.7.0.202605201743-m3 + 7.7.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 52286086661..fa7421aae95 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 21cb77ec2c4..a913f9003de 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index b3e3b7f8304..4fc428ed766 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 - 7.7.0.202605201743-m3 + 7.7.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 ccdf1018a8a..04e96f9ec7d 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 ca85cdd3af6..479ec1333be 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 21845ebe6a4..94397aba5f9 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 - 7.7.0.202605201743-m3 + 7.7.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 d453a3378b0..78f05845141 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 003c060a81a..c313e01220b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index bf1df72073f..907fc47920c 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 - 7.7.0.202605201743-m3 + 7.7.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 3c4f1129d8f..e85207181e7 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 57afb929a07..4ad6d6524f1 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 - 7.7.0.202605201743-m3 + 7.7.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 328e0fb56df..65079c689c5 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 7f331a8edb7..9dc895322da 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index d87de0732df..73036eefecb 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 - 7.7.0.202605201743-m3 + 7.7.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 9db65c80daa..b9df9f9e993 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 69c525d3964..040b222cc63 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 - 7.7.0.202605201743-m3 + 7.7.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 1ad67f47bc9..0fe46c793ee 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index eef72ca5402..5ecc42bb93c 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index e8d09dfdb8c..19546b73995 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 - 7.7.0.202605201743-m3 + 7.7.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 6abb4c6cf1b..0caab549108 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 c01473554e7..a8ce2984b38 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 - 7.7.0.202605201743-m3 + 7.7.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 4da420937d3..e37d622a538 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 aa85d12e15e..d59c8de391c 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 - 7.7.0.202605201743-m3 + 7.7.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 87a05ba3eee..684d11994a1 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 01e91620663..00a0601d333 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 - 7.7.0.202605201743-m3 + 7.7.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 e92daf6c4d1..8b28f14dfe1 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 437746dcd2f..6e07e85c123 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 - 7.7.0.202605201743-m3 + 7.7.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 a42e8bb6c48..bb6b80a4a62 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 eb342f92a48..0d91543b42d 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 - 7.7.0.202605201743-m3 + 7.7.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 a81c916d5f5..d053e0ac2a8 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 0ceb8b9fafb..6a8c021997b 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 - 7.7.0.202605201743-m3 + 7.7.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 30bf5ad74f3..9a1fd3ad202 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 - 7.7.0.202605201743-m3 + 7.7.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 fe470899a45..73f1ecda7b6 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 04b85b3736c..c5b75923b37 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 - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0.202605201743-m3 + 7.7.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 e1f75ed74b4..edb2020cf80 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 ad18bde22d2..0b97560d28d 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 - 7.7.0.202605201743-m3 + 7.7.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 8354ce5d829..706918f38ac 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 683b89f7adf..8db7e691045 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 - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index d3308849949..2a73924bae5 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 - 7.7.0.202605201743-m3 + 7.7.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 8edd35a7e10..28b0ced222e 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier 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 e84733f772b..f41d83d2cbd 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 - 7.7.0.202605201743-m3 + 7.7.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 62d8414d2a7..e31d3dc49ca 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index e34f41fea37..65901e06a00 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 60fa33da45c..659718bd8a9 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 - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index aef824d45cb..1dc3728c98f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index b9a81a94483..a085c046432 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 2eacbb4adf2..4d7b7c233a8 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 830322123d3..ae9e11e2182 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 68b22cd400a..2ab6c3921f2 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 - 7.7.0.202605201743-m3 + 7.7.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 7f37cb0d01e..5cff8a866d3 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 6a446ad5ce3..fa44087d3cf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 57e8de58f65..18cba188b71 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 - 7.7.0.202605201743-m3 + 7.7.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 6dae253bc44..73ef145eac6 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index d4317903083..176c91dc76b 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 - 7.7.0.202605201743-m3 + 7.7.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 315211c484c..9093f859b1b 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 fac4ca8f115..4863daef6fc 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 9b08837fa84..b8e2e4c212a 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 - 7.7.0.202605201743-m3 + 7.7.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 39f4a51eedd..36a9e4f53f0 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 9c3dcb2b861..92a7597b4cf 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 - 7.7.0.202605201743-m3 + 7.7.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 600013e52af..ef66f911cff 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 83f1745cc40..2430c2bb3d8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 1fe95dc6204..a21d2f33ee2 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 - 7.7.0.202605201743-m3 + 7.7.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 2a1392a574e..2377e269927 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: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 1bfa5e53925..46c35527314 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605201743-m3 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202605201743-m3";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index d0574ed266c..e9b16e06934 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index f4f04d62470..b1521e4d596 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0.202605201743-m3 + 7.7.0-SNAPSHOT JGit - Parent ${jgit-url} From 908a6a5848342883575fcdec5e917048de2a53e5 Mon Sep 17 00:00:00 2001 From: Victor Andreasson Date: Sat, 16 May 2026 00:22:17 +0200 Subject: [PATCH 130/200] Implement SystemReader.isAndroid() instead of catching a NoClassDefFoundError in GC.getPID(). This is done to get GC.getPID() to work on Android, where ProcessHandle.pid() is not supported. Change-Id: Ia70affff96a682eb275dde1e5d14dccabf8db593 --- .../jgit/internal/storage/file/GC.java | 3 +++ .../org/eclipse/jgit/util/SystemReader.java | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+) 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 6a7827160ca..7885794fcac 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 @@ -1995,6 +1995,9 @@ private String getProcDesc() { } private long getPID() { + if (SystemReader.getInstance().isAndroid()) { + return 0; + } return ProcessHandle.current().pid(); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 0b7c6204f2f..763bf26cd49 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -68,6 +68,8 @@ public abstract class SystemReader { private static volatile Boolean isLinux; + private static volatile Boolean isAndroid; + private static final String GIT_TRACE_PERFORMANCE = "GIT_TRACE_PERFORMANCE"; //$NON-NLS-1$ private static final boolean performanceTrace = initPerformanceTrace(); @@ -761,6 +763,25 @@ public boolean isLinux() { return isLinux.booleanValue(); } + /** + * Whether we are running on Android. + * + * @return true if we are running on Android. + * @since 7.7 + */ + public boolean isAndroid() { + if (isAndroid == null) { + String vendor = getProperty("java.vendor"); //$NON-NLS-1$ + if (vendor == null) { + isAndroid = Boolean.FALSE; + } else { + isAndroid = Boolean + .valueOf(vendor.toLowerCase().contains("android")); //$NON-NLS-1$ + } + } + return isAndroid.booleanValue(); + } + /** * Whether performance trace is enabled * From 41c2f03b2fc5c2d12a53f94893e6c7d336863cb1 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Sat, 23 May 2026 18:46:45 +0100 Subject: [PATCH 131/200] Introduce fetch.autogc to disable concurrent GC upon fetches The introduction of the auto-gc mechanism in I68a2a051 did introduce a conditional execution after receive-pack but unconditional after a fetch operation. There are concurrency issues when using the pull-replication plugin with Gerrit, based on the execution of fetch operations on a server, when the fetch operation executed as part of a replication task triggers uncontrolled repository garbage collection. The execution of the gc action can cause unexpected system overload and unwanted refs repacking. Change-Id: Ie6f17fc239131d669c0b898dbe5ed80a822c60d9 --- Documentation/config-options.md | 5 +++-- .../src/org/eclipse/jgit/transport/Transport.java | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index b30b95812d3..47ef8ab4fb7 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -61,9 +61,10 @@ For details on native git options see also the official [git config documentatio ## __fetch__ options -| option | default | git option | description | -|---------|---------|------------|-------------| +| option | default | git option | description | +|---------------------------|---------|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------| | `fetch.useNegotiationTip` | `false` | ✅ | When enabled it restricts the client negotiation on unrelated branches i.e. only send haves for the refs that the client is interested in fetching. | +| `fetch.autogc` | `true` | ⃞ | Perform an automatic garbage collection after the fetch operation has been completed. | ## __gc__ options diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java index b335675da5a..82a66dd8edc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java @@ -44,6 +44,7 @@ import org.eclipse.jgit.hooks.Hooks; import org.eclipse.jgit.hooks.PrePushHook; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectChecker; import org.eclipse.jgit.lib.ObjectId; @@ -1479,7 +1480,10 @@ public FetchResult fetch(final ProgressMonitor monitor, final FetchResult result = new FetchResult(); new FetchProcess(this, toFetch).execute(monitor, result, branch); - local.autoGC(monitor); + if (local.getConfig().getBoolean(ConfigConstants.CONFIG_FETCH_SECTION, + ConfigConstants.CONFIG_KEY_AUTOGC, true)) { + local.autoGC(monitor); + } return result; } From 9786d733db4ed7ff50197120b20d08300382a2e6 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Sun, 24 May 2026 10:23:04 +0100 Subject: [PATCH 132/200] Document receive.autogc configuration option The introduction for receive.autogc in I68a2a051b3 missed the documentation update. Change-Id: Ic47a31fd3f00ed60cbf77caccf4fcfcb75c6c5d7 --- Documentation/config-options.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index 47ef8ab4fb7..8a7012be107 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -131,6 +131,12 @@ Proxy configuration uses the standard Java mechanisms via class `java.net.ProxyS | `pack.window` | `10` | ✅ | Number of objects to try when looking for a delta base per thread searching for deltas. | | `pack.windowMemory` | `0` (unlimited) | ✅ | Maximum number of bytes to put into the delta search window. | +## __receive__ options + +| option | default | git option | description | +|------------------|---------|------------|--------------------------------------------------------------------------------------------| +| `receive.autogc` | `true` | ✅ | Perform an automatic garbage collection after a receive-pack operation has been completed. | + ## __repack__ options | option | default | git option | description | From f2c3bdde6437a3f4ce661f70a38cd4ea0c2f7def Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 24 May 2026 14:23:59 +0200 Subject: [PATCH 133/200] Document JGit receive command size options Document receive.maxCommandBytes and receive.maxCommandDiscardBytes, which limit the receive-pack command block and the amount of command data discarded after the limit is exceeded. These options are JGit-specific and do not correspond to native Git configuration options. Change-Id: I4e5c0586960b13acb814ff3e6a9e17153fd25ede --- Documentation/config-options.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index 8a7012be107..0b5a7f3b284 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -136,6 +136,9 @@ Proxy configuration uses the standard Java mechanisms via class `java.net.ProxyS | option | default | git option | description | |------------------|---------|------------|--------------------------------------------------------------------------------------------| | `receive.autogc` | `true` | ✅ | Perform an automatic garbage collection after a receive-pack operation has been completed. | +| `receive.maxCommandBytes` | `3 MiB` | ⃞ | Maximum number of bytes to read from the receive-pack command block before the pack data. If set to `0`, there is no limit. | +| `receive.maxCommandDiscardBytes` | `-1` | ⃞ | Maximum number of command-block bytes to discard after `receive.maxCommandBytes` is exceeded, so JGit can report a side-band error before disconnecting. If set to `0`, there is no limit. If set to `-1`, JGit uses the larger of `3 * receive.maxCommandBytes` and `3 MiB`. | + ## __repack__ options From eeb8685890cab16ca0e6fb58be5740ae058fe8cc Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Tue, 30 May 2023 18:27:15 +0200 Subject: [PATCH 134/200] ReceivePack: reject creation of one level refs such as refs/main Cgit describes valid reference names in the `git-check-ref-format(1)` manual page which lists the constraints. Excluding the `refs/` prefix, the name must contain at least one slash to enforce a category such as `heads/`, `tags/`. On Gerrit, jGit accepts a user pushing to `refs/main` but when replicating the reference using ssh and cgit, receive-pack on the remote rejects it with: Error: Failed replicate of refs/main to X, reason: funny refname It is a special case in cgit `builtin/receive-pack.c`: --------8<-----------8<-----------8<-----------8<-----------8<----------- static const char *update(struct command *cmd, struct shallow_info *si) { ... /* only refs/... are allowed */ if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) { rp_error("refusing to create funny ref '%s' remotely", name); return "funny refname"; } --------8<-----------8<-----------8<-----------8<-----------8<----------- So that if the part coming after `refs/` has a single component (`master`) it is rejected. Bug: 582000 Change-Id: Ica2bdc58e81459f08cfe42c2961a3c06622c30df --- .../jgit/lib/RepositoryResolveTest.java | 1 + .../jgit/transport/ReceivePackTest.java | 87 ++++++++++++++++++- .../src/org/eclipse/jgit/lib/Repository.java | 2 + .../eclipse/jgit/transport/ReceivePack.java | 26 +++++- 4 files changed, 112 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryResolveTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryResolveTest.java index 7f1dfc32ce7..27737154ab8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryResolveTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryResolveTest.java @@ -277,6 +277,7 @@ public void invalidNames() throws AmbiguousObjectException, IOException { assertTrue(Repository.isValidRefName("x/a]b")); // odd, yes.. assertTrue(Repository.isValidRefName("x/\u00a0")); // unicode is fine, // even hard space + assertFalse(Repository.isValidRefName("single-component")); assertFalse(Repository.isValidRefName("x/.a")); assertFalse(Repository.isValidRefName("x/a.")); assertFalse(Repository.isValidRefName("x/a..b")); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackTest.java index 595b970749e..bcc7082f780 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackTest.java @@ -42,22 +42,57 @@ package org.eclipse.jgit.transport; +import java.util.ArrayList; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; - -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; +import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.junit.TestRepository.BranchBuilder; +import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.transport.ReceiveCommand.Result; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.After; +import org.junit.Before; import org.junit.Test; /** Tests for receive-pack utilities. */ public class ReceivePackTest { + private URIish uri; + private TestProtocol testProtocol; + private InMemoryRepository client; + private InMemoryRepository server; + private TestRepository clientTestRepo; + private TestRepository serverTestRepo; + + @Before + public void setUp() throws Exception { + client = new InMemoryRepository(new DfsRepositoryDescription("client")); + server = new InMemoryRepository(new DfsRepositoryDescription("server")); + clientTestRepo = new TestRepository<>(client); + serverTestRepo = new TestRepository<>(server); + + testProtocol = new TestProtocol<>(null, (Object req, Repository db) -> { + ReceivePack rp = new ReceivePack(db); + return rp; + }); + uri = testProtocol.register(new Object(), server); + } + + @After + public void tearDown() { + Transport.unregister(testProtocol); + } + @Test public void parseCommand() throws Exception { String o = "0000000000000000000000000000000000000000"; @@ -81,6 +116,54 @@ public void parseCommand() throws Exception { assertParseCommandFails(o + " " + "X" + n.substring(1) + " " + r); } + /** + * Ensure receive-pack rejects a push to a one level ref (refs/master). + */ + @Test + public void rejectsCreationOfOneLevelRef() throws Exception { + // Create refs/master on the client so we can attempt to push it + RevCommit clientCommit; + BranchBuilder bb = clientTestRepo.branch("refs/master"); + clientCommit = bb.commit().noFiles().message("Testing").create(); + + ArrayList refUpdates = new ArrayList<>(); + refUpdates.add(new RemoteRefUpdate( + clientTestRepo.getRepository(), "refs/master", clientCommit, + "refs/master", false, /* force update */ + null, /* no local tracking ref */ + ObjectId.zeroId() // expected advertisement + )); + Transport tn = testProtocol.open(uri, client, "server"); + PushResult result = tn.push(NullProgressMonitor.INSTANCE, refUpdates); + RemoteRefUpdate update = result.getRemoteUpdate("refs/master"); + + assertEquals(RemoteRefUpdate.Status.REJECTED_OTHER_REASON, + update.getStatus()); + assertEquals(JGitText.get().funnyRefname, update.getMessage()); + } + + /** + * Allow deletion of one level refs (refs/master). + */ + @Test + public void acceptsDeletionOfOneLevelRef() throws Exception { + BranchBuilder bb = serverTestRepo.branch("refs/master"); + bb.update(bb.commit().noFiles().message("Testing").create()); + + ArrayList refUpdates = new ArrayList<>(); + refUpdates.add(new RemoteRefUpdate(null, null, ObjectId.zeroId(), + "refs/master", false, // force update + null, // no local tracking ref + null // expected advertisement + )); + Transport tn = testProtocol.open(uri, client, "server"); + PushResult result = tn.push(NullProgressMonitor.INSTANCE, refUpdates); + RemoteRefUpdate update = result.getRemoteUpdate("refs/master"); + + assertEquals(RemoteRefUpdate.Status.OK, update.getStatus()); + assertEquals(null, update.getMessage()); + } + private void assertParseCommandFails(String input) { try { ReceivePack.parseCommand(input); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index c9dc6da4ba5..01a43611cf9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -1375,6 +1375,8 @@ public RepositoryState getRepositoryState() { * * For portability reasons '\' is excluded * + * @see git-check-ref-format(1) manual page * @param refName a {@link java.lang.String} object. * @return true if refName is a valid ref name */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index 8b05d4155a9..ec7d4c16963 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -1658,6 +1658,18 @@ private void validateCommands() { continue; } + if (cmd.getRefName().startsWith(Constants.R_REFS) + && !Repository.isValidRefName( + cmd.getRefName().substring(Constants.R_REFS.length()) + ) + ) { + // Reject the creation of one level references such as + // refs/master to match cgit implementation. + cmd.setResult(Result.REJECTED_OTHER_REASON, + JGitText.get().funnyRefname); + continue; + } + if (ref != null) { // A well behaved client shouldn't have sent us a // create command for a ref we advertised to it. @@ -1753,8 +1765,18 @@ private void validateCommands() { } } - if (!cmd.getRefName().startsWith(Constants.R_REFS) - || !Repository.isValidRefName(cmd.getRefName())) { + if (!cmd.getRefName().startsWith(Constants.R_REFS)) { + cmd.setResult(Result.REJECTED_OTHER_REASON, + JGitText.get().funnyRefname); + } + + if (!Repository.isValidRefName(cmd.getRefName()) + // But accept deletion of one level refs (refs/main) + && !( + cmd.getType() == ReceiveCommand.Type.DELETE + && Repository.isValidRefName(cmd.getRefName().substring(Constants.R_REFS.length())) + ) + ) { cmd.setResult(Result.REJECTED_OTHER_REASON, JGitText.get().funnyRefname); } From 8feffbabdf801c1603da5354e7d6202940329933 Mon Sep 17 00:00:00 2001 From: Terry Parker Date: Wed, 20 May 2026 23:12:40 +0000 Subject: [PATCH 135/200] ReceivePack: Add option to retain PackParser's object IDs We need more control over inputs to the ConnectivityChecker, so add public getter/setter for retaining parsed object IDs. It would be cleaner if we could use ConnectivityCheckInfo to manage checker-related config, but currently that object is only created immediately before running the checker, which is after the PackParser has run. For now this change should let us redeploy TreeWalkConnectivityChecker and get some data. Change-Id: I9ae0e2b16f0caa8e67a1b57b58c3984e2fa8775f --- .../eclipse/jgit/transport/ReceivePack.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index ec7d4c16963..c0ff5bf33f6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -222,6 +222,8 @@ public class ReceivePack { private boolean checkReferencedAreReachable; + private boolean retainParsedObjectIDs; + /** Git object size limit */ private long maxObjectSizeLimit; @@ -500,6 +502,27 @@ public void setCheckReferencedObjectsAreReachable(boolean b) { this.checkReferencedAreReachable = b; } + /** + * Whether the {@code PackParser} should retain object IDs. + * + * @return {@code true} if the parsed object IDs should be retained. + * @since 7.7 + */ + public boolean isRetainParsedObjectIDs() { + return retainParsedObjectIDs; + } + + /** + * Set whether the {@code PackParser} should retain object IDs. + * + * @param retain + * {@code true} to retain the parsed object IDs. + * @since 7.7 + */ + public void setRetainParsedObjectIDs(boolean retain) { + this.retainParsedObjectIDs = retain; + } + /** * Whether this class expects a bi-directional pipe opened between the * client and itself. @@ -1547,7 +1570,7 @@ private void receivePack() throws IOException { parser = ins.newPackParser(packInputStream()); parser.setAllowThin(true); - parser.setNeedNewObjectIds(checkReferencedAreReachable); + parser.setNeedNewObjectIds(checkReferencedAreReachable || retainParsedObjectIDs); parser.setNeedBaseObjectIds(checkReferencedAreReachable); parser.setCheckEofAfterPackFooter(!biDirectionalPipe && !isExpectDataAfterPackFooter()); From babb1df890117323fe5d6858d9b4812c723d4a26 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 27 May 2026 00:31:54 +0200 Subject: [PATCH 136/200] JGit v7.7.0.202605262231-rc1 Signed-off-by: Matthias Sohn Change-Id: I39b992778c00bc13887b55ba543aa14b5ad0e1fd --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 8b99ee9169b..87edd4353d9 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1ed2fb90785..3ab31742717 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 e10e3854171..b6234acd39e 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 08d4b66eaf3..10e4c8ea5ec 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 8863da90e31..6f5d24b4857 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 9f4281261c3..c50103105af 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 88f51d14431..63abe6328af 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a04e9c6350f..3d5fe90024b 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 53d1bfdd401..7518ccf0894 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index b02657ff86e..cf64b7ac6e7 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.test - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 d9d1b0f1103..2c972bd9b83 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 2ed7ba3958d..f02c3ec12af 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 d6d826cd010..34a2575a4d5 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 556d2565756..070ca6714d7 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index e6b206344d6..d5ba56bdaf7 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 06887836c6d..9bdc68e0f1d 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 03c16b891b7..f248c32ec42 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51be72e9c23..4af8527f7d8 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 02059c1b715..7a48f1d6784 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 520c2fb1153..dff880d0dc0 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2460ea91e7c..3d6c6e83a78 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 d19255326f9..606b14c0a6f 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 310f87f4c05..812d45b6de9 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 fa7421aae95..7a205a7de4a 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: OSGI-INF/l10n/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 a913f9003de..743e2567b65 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fc428ed766..7c6eb66fd2c 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 04e96f9ec7d..22278712e1c 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: OSGI-INF/l10n/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 479ec1333be..e978ab7c753 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 94397aba5f9..d0001977ce3 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 78f05845141..65c32c6e2c8 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: OSGI-INF/l10n/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 c313e01220b..b1e1a8e9e65 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 907fc47920c..1a94ee47a47 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 e85207181e7..0dc78e30788 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 4ad6d6524f1..429d83718ce 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 65079c689c5..dfc807471f2 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 9dc895322da..bebf59f2126 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 73036eefecb..27e0e9b890c 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 b9df9f9e993..db3847ad172 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 040b222cc63..468e082003e 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 0fe46c793ee..42d937d3ccd 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 5ecc42bb93c..469ad9290d5 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 19546b73995..659e93b9b25 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 0caab549108..347811b5358 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 a8ce2984b38..86c30751b0e 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 e37d622a538..af02e2bc06a 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 d59c8de391c..c16a56b665a 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 684d11994a1..e135e14950b 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 00a0601d333..cf195a71924 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 8b28f14dfe1..7f2463af35c 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 6e07e85c123..5ac36ad5cda 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 bb6b80a4a62..3b9222c5e00 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 0d91543b42d..67072da5ec8 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 d053e0ac2a8..278101cf619 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 6a8c021997b..d3ff827781e 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 9a1fd3ad202..834131c9bff 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 73f1ecda7b6..fc29bac20ab 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 c5b75923b37..2cbb8273e70 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 edb2020cf80..9f23f5cb67b 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 0b97560d28d..7a3a29c6605 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 706918f38ac..1ae8520ebda 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 8db7e691045..0d4853b2ac6 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2a73924bae5..2ee85cd039e 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 28b0ced222e..a2c14ede4d4 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 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 f41d83d2cbd..b880707cf75 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 e31d3dc49ca..7d9614a1db8 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 65901e06a00..f8ab1f7ce0b 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 659718bd8a9..dc2ebbfb71a 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 1dc3728c98f..a46684fb33d 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index a085c046432..408f20f598e 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 4d7b7c233a8..5b8f2fbfd7a 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit.ssh.apache.agent 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 ae9e11e2182..f4ce9badc76 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2ab6c3921f2..d01af9870e8 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 5cff8a866d3..3df1974aa72 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 fa44087d3cf..ae28f4631f2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 18cba188b71..fe9acd5516c 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 73ef145eac6..79eae49b76c 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 176c91dc76b..afcfedfe479 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 9093f859b1b..7da34054eb5 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 4863daef6fc..66ddbaeba6e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index b8e2e4c212a..607e62bf62d 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 36a9e4f53f0..248646c4a32 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 92a7597b4cf..d9ed8cec8e5 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 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 ef66f911cff..43f3b673fa1 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 2430c2bb3d8..9b288421686 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a21d2f33ee2..5b12e5f49bd 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 - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 2377e269927..a9728eeec3b 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 46c35527314..e9178272ab8 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202605262231-rc1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202605262231-rc1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e9b16e06934..0f01b408377 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index b1521e4d596..6c73418f475 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0-SNAPSHOT + 7.7.0.202605262231-rc1 JGit - Parent ${jgit-url} From 47a982af0475c8f0c6104d49ea8f499bd136f392 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 28 May 2026 21:06:11 +0200 Subject: [PATCH 137/200] Prepare 7.7.0-SNAPSHOT builds Change-Id: I5468bf25c89ed0e7529f119375dbaeb4ab6945e8 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 87edd4353d9..8b99ee9169b 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 3ab31742717..1ed2fb90785 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 - 7.7.0.202605262231-rc1 + 7.7.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 b6234acd39e..e10e3854171 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 10e4c8ea5ec..08d4b66eaf3 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 6f5d24b4857..8863da90e31 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 - 7.7.0.202605262231-rc1 + 7.7.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 c50103105af..9f4281261c3 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 63abe6328af..88f51d14431 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 3d5fe90024b..a04e9c6350f 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 - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 7518ccf0894..53d1bfdd401 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index cf64b7ac6e7..b02657ff86e 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 - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0.202605262231-rc1 + 7.7.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 2c972bd9b83..d9d1b0f1103 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index f02c3ec12af..2ed7ba3958d 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 - 7.7.0.202605262231-rc1 + 7.7.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 34a2575a4d5..d6d826cd010 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 070ca6714d7..556d2565756 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index d5ba56bdaf7..e6b206344d6 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 - 7.7.0.202605262231-rc1 + 7.7.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 9bdc68e0f1d..06887836c6d 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 f248c32ec42..03c16b891b7 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 4af8527f7d8..51be72e9c23 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 - 7.7.0.202605262231-rc1 + 7.7.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 7a48f1d6784..02059c1b715 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 dff880d0dc0..520c2fb1153 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 3d6c6e83a78..2460ea91e7c 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 - 7.7.0.202605262231-rc1 + 7.7.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 606b14c0a6f..d19255326f9 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 812d45b6de9..310f87f4c05 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 - 7.7.0.202605262231-rc1 + 7.7.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 7a205a7de4a..fa7421aae95 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 743e2567b65..a913f9003de 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 7c6eb66fd2c..4fc428ed766 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 - 7.7.0.202605262231-rc1 + 7.7.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 22278712e1c..04e96f9ec7d 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 e978ab7c753..479ec1333be 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d0001977ce3..94397aba5f9 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 - 7.7.0.202605262231-rc1 + 7.7.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 65c32c6e2c8..78f05845141 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 b1e1a8e9e65..c313e01220b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 1a94ee47a47..907fc47920c 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 - 7.7.0.202605262231-rc1 + 7.7.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 0dc78e30788..e85207181e7 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 429d83718ce..4ad6d6524f1 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 - 7.7.0.202605262231-rc1 + 7.7.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 dfc807471f2..65079c689c5 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 bebf59f2126..9dc895322da 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 27e0e9b890c..73036eefecb 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 - 7.7.0.202605262231-rc1 + 7.7.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 db3847ad172..b9df9f9e993 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 468e082003e..040b222cc63 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 - 7.7.0.202605262231-rc1 + 7.7.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 42d937d3ccd..0fe46c793ee 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 469ad9290d5..5ecc42bb93c 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 659e93b9b25..19546b73995 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 - 7.7.0.202605262231-rc1 + 7.7.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 347811b5358..0caab549108 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 86c30751b0e..a8ce2984b38 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 - 7.7.0.202605262231-rc1 + 7.7.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 af02e2bc06a..e37d622a538 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 c16a56b665a..d59c8de391c 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 - 7.7.0.202605262231-rc1 + 7.7.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 e135e14950b..684d11994a1 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 cf195a71924..00a0601d333 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 - 7.7.0.202605262231-rc1 + 7.7.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 7f2463af35c..8b28f14dfe1 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 5ac36ad5cda..6e07e85c123 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 - 7.7.0.202605262231-rc1 + 7.7.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 3b9222c5e00..bb6b80a4a62 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 67072da5ec8..0d91543b42d 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 - 7.7.0.202605262231-rc1 + 7.7.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 278101cf619..d053e0ac2a8 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 d3ff827781e..6a8c021997b 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 - 7.7.0.202605262231-rc1 + 7.7.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 834131c9bff..9a1fd3ad202 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 - 7.7.0.202605262231-rc1 + 7.7.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 fc29bac20ab..73f1ecda7b6 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 2cbb8273e70..c5b75923b37 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 - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0.202605262231-rc1 + 7.7.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 9f23f5cb67b..edb2020cf80 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 7a3a29c6605..0b97560d28d 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 - 7.7.0.202605262231-rc1 + 7.7.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 1ae8520ebda..706918f38ac 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 0d4853b2ac6..8db7e691045 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 - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2ee85cd039e..2a73924bae5 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 - 7.7.0.202605262231-rc1 + 7.7.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 a2c14ede4d4..28b0ced222e 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier 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 b880707cf75..f41d83d2cbd 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 - 7.7.0.202605262231-rc1 + 7.7.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 7d9614a1db8..e31d3dc49ca 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index f8ab1f7ce0b..65901e06a00 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index dc2ebbfb71a..659718bd8a9 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 - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index a46684fb33d..1dc3728c98f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 408f20f598e..a085c046432 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 5b8f2fbfd7a..4d7b7c233a8 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 f4ce9badc76..ae9e11e2182 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index d01af9870e8..2ab6c3921f2 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 - 7.7.0.202605262231-rc1 + 7.7.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 3df1974aa72..5cff8a866d3 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 ae28f4631f2..fa44087d3cf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index fe9acd5516c..18cba188b71 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 - 7.7.0.202605262231-rc1 + 7.7.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 79eae49b76c..73ef145eac6 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index afcfedfe479..176c91dc76b 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 - 7.7.0.202605262231-rc1 + 7.7.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 7da34054eb5..9093f859b1b 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 66ddbaeba6e..4863daef6fc 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 607e62bf62d..b8e2e4c212a 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 - 7.7.0.202605262231-rc1 + 7.7.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 248646c4a32..36a9e4f53f0 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d9ed8cec8e5..92a7597b4cf 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 - 7.7.0.202605262231-rc1 + 7.7.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 43f3b673fa1..ef66f911cff 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 9b288421686..2430c2bb3d8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5b12e5f49bd..a21d2f33ee2 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 - 7.7.0.202605262231-rc1 + 7.7.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 a9728eeec3b..2377e269927 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: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index e9178272ab8..46c35527314 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202605262231-rc1 +Bundle-Version: 7.7.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202605262231-rc1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 0f01b408377..e9b16e06934 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 6c73418f475..b1521e4d596 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0.202605262231-rc1 + 7.7.0-SNAPSHOT JGit - Parent ${jgit-url} From a14a4be392f848f36fcd13c0654cd814cf72000a Mon Sep 17 00:00:00 2001 From: Fabio Ponciroli Date: Thu, 28 May 2026 13:14:36 +0200 Subject: [PATCH 138/200] Log loose ref deletion during ref cleanup Add log messages when loose refs are deleted while deleting refs or packing refs. These messages make it easier to investigate unexpected loose ref deletions by recording which loose ref file was removed and from which cleanup path the deletion originated. Change-Id: I8a114404200934189bc1098757b1ce854b4e59ee --- .../org/eclipse/jgit/internal/JGitText.properties | 1 + .../src/org/eclipse/jgit/internal/JGitText.java | 1 + .../eclipse/jgit/internal/storage/file/RefDirectory.java | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) 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 e24cba6ac4a..dffb8494675 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -259,6 +259,7 @@ deepenNotWithDeepen=Cannot combine deepen with deepen-not deepenSinceWithDeepen=Cannot combine deepen with deepen-since deleteBranchUnexpectedResult=Delete branch returned unexpected result {0} deleteFileFailed=Could not delete file {0} +deleteLooseRef=Deleted loose ref {}, object Id {} deletedOrphanInPackDir=Deleted orphaned file {} deleteRequiresZeroNewId=Delete requires new ID to be zero deleteTagUnexpectedResult=Delete tag returned unexpected result {0} 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 8928f472904..10c2b292bd0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -289,6 +289,7 @@ public static JGitText get() { /***/ public String deepenSinceWithDeepen; /***/ public String deleteBranchUnexpectedResult; /***/ public String deleteFileFailed; + /***/ public String deleteLooseRef; /***/ public String deletedOrphanInPackDir; /***/ public String deleteRequiresZeroNewId; /***/ public String deleteTagUnexpectedResult; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 85482710afd..91f7b245a2a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -740,7 +740,11 @@ void delete(RefDirectoryUpdate update) throws IOException { int levels = levelsIn(name) - 2; delete(logFor(name), levels); if (dst.getStorage().isLoose()) { - deleteAndUnlock(fileFor(name), levels, update); + File refFile = fileFor(name); + ObjectId refObjectId = dst.getObjectId(); + deleteAndUnlock(refFile, levels, update); + LOG.debug(JGitText.get().deleteLooseRef, + refFile, refObjectId); } } finally { lck.unlock(); @@ -866,6 +870,7 @@ private void pack(Collection refs, } while (!looseRefs.compareAndSet(curLoose, newLoose)); int levels = levelsIn(refName) - 2; deleteAndUnlock(refFile, levels, rLck); + LOG.debug(JGitText.get().deleteLooseRef, refFile, clr_oid); } } finally { if (shouldUnlock) { From e15d6597f612ca4f3ad3abc19f5b112664b5ffcc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 1 Jun 2026 23:56:16 +0200 Subject: [PATCH 139/200] JGit v7.7.0.202606012155-r Signed-off-by: Matthias Sohn Change-Id: I412a18a96f1217c5e1185bb0b6e2153a6424b990 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 8b99ee9169b..668a60701f4 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1ed2fb90785..cebc2dca9ce 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 e10e3854171..b5c6dabc92a 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 08d4b66eaf3..3199f205076 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 8863da90e31..ab67e2e3e5a 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 9f4281261c3..6d8ff4f6eaf 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 88f51d14431..2cb5d56875b 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a04e9c6350f..85b371700fa 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 53d1bfdd401..4b97aec758e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index b02657ff86e..9e698e19ecb 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.test - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 d9d1b0f1103..27d4b2ab0de 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 2ed7ba3958d..d3afad91709 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 d6d826cd010..dcdd1b3dde5 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 556d2565756..758d30e9244 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index e6b206344d6..5b7e2be5c40 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 06887836c6d..b94de9e424d 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 03c16b891b7..67f66ec169b 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51be72e9c23..0622fc00843 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 02059c1b715..a567f5c5c82 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 520c2fb1153..92f8529483d 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2460ea91e7c..e9f823d79e2 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 d19255326f9..c8728761f21 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 310f87f4c05..6655663e334 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 fa7421aae95..e8451eb32ea 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: OSGI-INF/l10n/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 a913f9003de..a168502303b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fc428ed766..b6dc2bdf862 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 04e96f9ec7d..7709315a26c 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: OSGI-INF/l10n/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 479ec1333be..ca53716c0c4 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 94397aba5f9..f8ff3661656 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 78f05845141..eb254ed7f8d 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: OSGI-INF/l10n/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 c313e01220b..04a26f1f6d8 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 907fc47920c..1b3055433b9 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 e85207181e7..851294f43a8 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 4ad6d6524f1..cd52190ae03 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 65079c689c5..0bc4b3e27c4 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 9dc895322da..feb7efe5060 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 73036eefecb..2c9b93ab5c1 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 b9df9f9e993..fd04a92b771 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 040b222cc63..9f3acfe12ad 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 0fe46c793ee..0ec4eab0800 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 5ecc42bb93c..14bd00667d4 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 19546b73995..003e4b1bc46 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 0caab549108..2a113879a80 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 a8ce2984b38..c0f3d35a948 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 e37d622a538..1dbed6f6aa2 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 d59c8de391c..235cf666c22 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 684d11994a1..bf08cfc9f77 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 00a0601d333..eda3c60668c 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 8b28f14dfe1..8853285e0ec 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 6e07e85c123..033035ff65d 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 bb6b80a4a62..9eabe5b3f58 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 0d91543b42d..e86125fe2d8 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 d053e0ac2a8..450ed98b855 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 6a8c021997b..c2b3f6c8c56 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 9a1fd3ad202..4ec078410ad 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 73f1ecda7b6..5de4f309114 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 c5b75923b37..8f4fd908c49 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 edb2020cf80..f1cd322d53d 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 0b97560d28d..fa0b576cec0 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 706918f38ac..3f41e9ee2a5 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 8db7e691045..e57c8c5b4aa 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2a73924bae5..cadbbf2e112 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 28b0ced222e..4fab5835c83 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-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 f41d83d2cbd..f844a7c10d6 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 e31d3dc49ca..a9d26b2d801 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 65901e06a00..28bcffa837e 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 659718bd8a9..14d2a9c2bc3 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 1dc3728c98f..50f6d38de85 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index a085c046432..e2a89a6787b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 4d7b7c233a8..5832563763c 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit.ssh.apache.agent 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 ae9e11e2182..7bb17f9ae54 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2ab6c3921f2..537e47cc3d5 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 5cff8a866d3..971e8b3601e 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 fa44087d3cf..57b705c49e7 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 18cba188b71..1fc773b6ea6 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 73ef145eac6..7029f1f3b2f 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 176c91dc76b..040fb2efa2e 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 9093f859b1b..5d51e07e252 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="[7.7.0,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.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 4863daef6fc..d37bbdba877 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index b8e2e4c212a..d4bb2b0860e 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 36a9e4f53f0..7520032cc4c 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 92a7597b4cf..8b6d60fea4a 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-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 ef66f911cff..d0ed6956ad7 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 2430c2bb3d8..da1dbb6faa2 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a21d2f33ee2..b9a321c530a 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 - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 2377e269927..28e0b6e95f2 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: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 46c35527314..12689fe617c 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.qualifier +Bundle-Version: 7.7.0.202606012155-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202606012155-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e9b16e06934..523fcef1017 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index b1521e4d596..a2ca73e0400 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0-SNAPSHOT + 7.7.0.202606012155-r JGit - Parent ${jgit-url} From 11b7c35000f9de00182d5d29ff0da6fe8f82f827 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 2 Jun 2026 09:21:06 +0200 Subject: [PATCH 140/200] Prepare 7.7.1-SNAPSHOT builds Change-Id: I5a73e8af52bc9fc609f659c1ac85a60dcc4131dd --- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++--- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 42 +++--- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 44 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++--- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 32 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 88 ++++++------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 ++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 122 +++++++++--------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 116 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 549 insertions(+), 549 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 668a60701f4..388021776f0 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.ant.tasks;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.hamcrest;version="[3.0.0,4.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 cebc2dca9ce..44ffa1515e7 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 - 7.7.0.202606012155-r + 7.7.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 b5c6dabc92a..8afb379bc93 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)" + org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.7.0", - org.eclipse.jgit.ant.tasks;version="7.7.0"; +Export-Package: org.eclipse.jgit.ant;version="7.7.1", + org.eclipse.jgit.ant.tasks;version="7.7.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 3199f205076..2a88ae0111f 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index ab67e2e3e5a..f863b44d682 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 - 7.7.0.202606012155-r + 7.7.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 6d8ff4f6eaf..e926ab523b9 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,18 +14,18 @@ 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="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.7.0"; +Export-Package: org.eclipse.jgit.archive;version="7.7.1"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.7.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.7.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 2cb5d56875b..417b563e33e 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 85b371700fa..16d3c6940e7 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 - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 4b97aec758e..eaa3787590a 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 9e698e19ecb..2abe2ae0776 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 - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.0.202606012155-r + 7.7.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 27d4b2ab0de..add1d61d869 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.sha1;version="[7.7.0,7.8.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.sha1;version="[7.7.1,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;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 d3afad91709..f551a552b59 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 - 7.7.0.202606012155-r + 7.7.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 dcdd1b3dde5..5646d759bd5 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="[7.7.0,7.8.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.7.1,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)", @@ -27,5 +27,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.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 758d30e9244..c3e578ee3bb 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 5b7e2be5c40..056159c4fdd 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 - 7.7.0.202606012155-r + 7.7.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 b94de9e424d..caa10d1e74a 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin @@ -27,11 +27,11 @@ Import-Package: javax.net.ssl, 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="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.7.0"; + org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.7.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 67f66ec169b..7bf7c7f4c40 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 0622fc00843..2834b869ab4 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 - 7.7.0.202606012155-r + 7.7.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 a567f5c5c82..1a82f050d35 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.http.server;version="7.7.0", - org.eclipse.jgit.http.server.glue;version="7.7.0"; +Export-Package: org.eclipse.jgit.http.server;version="7.7.1", + org.eclipse.jgit.http.server.glue;version="7.7.1"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.7.0"; + org.eclipse.jgit.http.server.resolver;version="7.7.1"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)" + org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.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 92f8529483d..6ee07958fb7 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index e9f823d79e2..e841c44a335 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 - 7.7.0.202606012155-r + 7.7.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 c8728761f21..d88dd16d822 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -28,26 +28,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.http.server;version="[7.7.0,7.8.0)", - org.eclipse.jgit.http.server.glue;version="[7.7.0,7.8.0)", - org.eclipse.jgit.http.server.resolver;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.http.server;version="[7.7.1,7.8.0)", + org.eclipse.jgit.http.server.glue;version="[7.7.1,7.8.0)", + org.eclipse.jgit.http.server.resolver;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.hamcrest;version="[3.0.0,4.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.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 6655663e334..ca012729342 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 - 7.7.0.202606012155-r + 7.7.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 e8451eb32ea..4cd26861225 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -23,17 +23,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.http.server;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.http.server;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.7.0"; +Export-Package: org.eclipse.jgit.junit.http;version="7.7.1"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.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 a168502303b..91621629bff 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index b6dc2bdf862..ace7792b6d5 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 - 7.7.0.202606012155-r + 7.7.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 7709315a26c..97073289d77 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -34,16 +34,16 @@ Import-Package: org.apache.sshd.common;version="[2.17.1,2.18.0)", org.apache.sshd.server.subsystem;version="[2.17.1,2.18.0)", org.apache.sshd.sftp;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.server;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.7.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.7.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 ca53716c0c4..8aaf647b470 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index f8ff3661656..788fb71ad20 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 - 7.7.0.202606012155-r + 7.7.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 eb254ed7f8d..d51e131bcfc 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,38 +3,38 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.util;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="7.7.0", - org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.time;version="[7.7.0,7.8.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="7.7.1", + org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.time;version="[7.7.1,7.8.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.7.0"; +Export-Package: org.eclipse.jgit.junit;version="7.7.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -47,4 +47,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.7.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.7.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.7.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 04a26f1f6d8..802e220d4a6 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 1b3055433b9..ed0ed462562 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 - 7.7.0.202606012155-r + 7.7.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 851294f43a8..22186e8d292 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -27,24 +27,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.server;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.test;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.server;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.test;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.hamcrest;version="[3.0.0,4.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 cd52190ae03..c1e3a5913ce 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 - 7.7.0.202606012155-r + 7.7.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 0bc4b3e27c4..8b3044bd9d8 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs.server;version="7.7.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.7.1"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.7.0"; + org.eclipse.jgit.lfs.server.fs;version="7.7.1"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.7.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.7.0"; + org.eclipse.jgit.lfs.server.internal;version="7.7.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.7.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Import-Package: com.google.gson;version="[2.8.0,3.0.0)", @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.slf4j;version="[1.7.0,3.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 feb7efe5060..1695ce7f064 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 2c9b93ab5c1..2d9078e9057 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 - 7.7.0.202606012155-r + 7.7.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 fd04a92b771..0cdb3e0a64d 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,29 +3,29 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", +Import-Package: org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.hamcrest;version="[3.0.0,4.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="7.7.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.7.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 9f3acfe12ad..a02b3300a93 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 - 7.7.0.202606012155-r + 7.7.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 0ec4eab0800..76dd31a0429 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs;version="7.7.0", - org.eclipse.jgit.lfs.errors;version="7.7.0", - org.eclipse.jgit.lfs.internal;version="7.7.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="7.7.0" +Export-Package: org.eclipse.jgit.lfs;version="7.7.1", + org.eclipse.jgit.lfs.errors;version="7.7.1", + org.eclipse.jgit.lfs.internal;version="7.7.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="7.7.1" Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.hooks;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)" + org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.hooks;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 14bd00667d4..2aaf4f88dde 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 003e4b1bc46..42997bfd213 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 - 7.7.0.202606012155-r + 7.7.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 2a113879a80..6842c6acf78 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 c0f3d35a948..84aa0fd2f83 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 - 7.7.0.202606012155-r + 7.7.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 1dbed6f6aa2..963d9f898c1 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 - 7.7.0.202606012155-r + 7.7.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 bf08cfc9f77..42082b2e7a5 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 - 7.7.0.202606012155-r + 7.7.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 8853285e0ec..031737390d9 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 - 7.7.0.202606012155-r + 7.7.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 9eabe5b3f58..a0134c218b2 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 - 7.7.0.202606012155-r + 7.7.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 450ed98b855..9d2e088c48b 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 - 7.7.0.202606012155-r + 7.7.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 4ec078410ad..2ebfa076c17 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 - 7.7.0.202606012155-r + 7.7.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 5de4f309114..ca741cd1496 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 - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.0.202606012155-r + 7.7.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 f1cd322d53d..161b24b06ee 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 - 7.7.0.202606012155-r + 7.7.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 3f41e9ee2a5..9cb3df65626 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 - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index cadbbf2e112..9e5c476e73d 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 - 7.7.0.202606012155-r + 7.7.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 4fab5835c83..8367261c572 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", - org.eclipse.jgit.pgm;version="[7.7.0,7.8.0)", - org.eclipse.jgit.pgm.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.pgm.opt;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", +Import-Package: org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", + org.eclipse.jgit.pgm;version="[7.7.1,7.8.0)", + org.eclipse.jgit.pgm.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.pgm.opt;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", org.hamcrest.core;bundle-version="[1.1.0,3.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 f844a7c10d6..bf845bfd5a3 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 - 7.7.0.202606012155-r + 7.7.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 a9d26b2d801..939f4c1c15f 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -15,50 +15,50 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.archive;version="[7.7.0,7.8.0)", - org.eclipse.jgit.awtui;version="[7.7.0,7.8.0)", - org.eclipse.jgit.blame;version="[7.7.0,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.gitrepo;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.io;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.server;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.notes;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk.filter;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.sshd;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", + org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.archive;version="[7.7.1,7.8.0)", + org.eclipse.jgit.awtui;version="[7.7.1,7.8.0)", + org.eclipse.jgit.blame;version="[7.7.1,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.gitrepo;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.io;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.server;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.notes;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.1,7.8.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="7.7.0"; +Export-Package: org.eclipse.jgit.console;version="7.7.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.7.0"; + org.eclipse.jgit.pgm;version="7.7.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -70,14 +70,14 @@ Export-Package: org.eclipse.jgit.console;version="7.7.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.7.0"; + org.eclipse.jgit.pgm.debug;version="7.7.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.7.0"; + org.eclipse.jgit.pgm.internal;version="7.7.1"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.7.0"; + org.eclipse.jgit.pgm.opt;version="7.7.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 28bcffa837e..c35643bdbf8 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 14d2a9c2bc3..07edcab602b 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 - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 50f6d38de85..18a92655a53 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.0,7.8.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.1,7.8.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.7.0";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.7.1";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index e2a89a6787b..3990cc56758 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 5832563763c..95d9ed91762 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 7bb17f9ae54..404ed80450c 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,22 +26,22 @@ Import-Package: org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.core;version="[2.17.1,2.18.0)", org.apache.sshd.server;version="[2.17.1,2.18.0)", org.apache.sshd.server.forward;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.sshd;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit.ssh;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.sshd;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.sshd;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit.ssh;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 537e47cc3d5..835eb2486e8 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 - 7.7.0.202606012155-r + 7.7.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 971e8b3601e..ec464311599 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test"; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -25,19 +25,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.0";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.7.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.7.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.7.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.7.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.7.0"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.7.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.7.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.7.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.7.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.7.1"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.7.0" + org.eclipse.jgit.transport.sshd.agent;version="7.7.1" Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.client;version="[2.17.1,2.18.0)", @@ -91,14 +91,14 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", org.apache.sshd.sftp;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.client;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.common;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.fnmatch;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.fnmatch;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.slf4j;version="[1.7.0,3.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 57b705c49e7..8810ecfc268 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 1fc773b6ea6..d1309d91d53 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 - 7.7.0.202606012155-r + 7.7.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 7029f1f3b2f..dd45a66d85f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit.ssh;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit.ssh;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 040fb2efa2e..69ccfdb3fd0 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 - 7.7.0.202606012155-r + 7.7.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 5d51e07e252..ad296f63d0e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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="[7.7.0,7.8.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.7.1,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.0" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.1" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", org.slf4j;version="[1.7.0,3.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 d37bbdba877..aa40ca65273 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index d4bb2b0860e..f295078ecdf 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 - 7.7.0.202606012155-r + 7.7.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 7520032cc4c..3a04b546527 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,66 +21,66 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.apache.commons.lang3;version="[3.17.0,4.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api;version="[7.7.0,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.archive;version="[7.7.0,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.0,7.8.0)", - org.eclipse.jgit.awtui;version="[7.7.0,7.8.0)", - org.eclipse.jgit.blame;version="[7.7.0,7.8.0)", - org.eclipse.jgit.blame.cache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.0,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.0,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.events;version="[7.7.0,7.8.0)", - org.eclipse.jgit.fnmatch;version="[7.7.0,7.8.0)", - org.eclipse.jgit.gitrepo;version="[7.7.0,7.8.0)", - org.eclipse.jgit.hooks;version="[7.7.0,7.8.0)", - org.eclipse.jgit.ignore;version="[7.7.0,7.8.0)", - org.eclipse.jgit.ignore.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.diff;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.fsck;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.7.0", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.io;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.7.0,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.0,7.8.0)", - org.eclipse.jgit.junit.time;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.logging;version="[7.7.0,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.notes;version="[7.7.0,7.8.0)", - org.eclipse.jgit.patch;version="[7.7.0,7.8.0)", - org.eclipse.jgit.pgm;version="[7.7.0,7.8.0)", - org.eclipse.jgit.pgm.internal;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk.filter;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.0,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.0,7.8.0)", - org.eclipse.jgit.submodule;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util.sha1;version="[7.7.0,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.archive;version="[7.7.1,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", + org.eclipse.jgit.awtui;version="[7.7.1,7.8.0)", + org.eclipse.jgit.blame;version="[7.7.1,7.8.0)", + org.eclipse.jgit.blame.cache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.events;version="[7.7.1,7.8.0)", + org.eclipse.jgit.fnmatch;version="[7.7.1,7.8.0)", + org.eclipse.jgit.gitrepo;version="[7.7.1,7.8.0)", + org.eclipse.jgit.hooks;version="[7.7.1,7.8.0)", + org.eclipse.jgit.ignore;version="[7.7.1,7.8.0)", + org.eclipse.jgit.ignore.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.diff;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.fsck;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.7.1", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.io;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.7.1,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", + org.eclipse.jgit.junit.time;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.logging;version="[7.7.1,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.notes;version="[7.7.1,7.8.0)", + org.eclipse.jgit.patch;version="[7.7.1,7.8.0)", + org.eclipse.jgit.pgm;version="[7.7.1,7.8.0)", + org.eclipse.jgit.pgm.internal;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", + org.eclipse.jgit.submodule;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util.sha1;version="[7.7.1,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.hamcrest.collection;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 8b6d60fea4a..a8451c6f074 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 - 7.7.0.202606012155-r + 7.7.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 d0ed6956ad7..adab468a0b9 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,15 +4,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.awtui;version="7.7.0" -Import-Package: org.eclipse.jgit.errors;version="[7.7.0,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.0,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.0,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.0,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.0,7.8.0)", - org.eclipse.jgit.util;version="[7.7.0,7.8.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.7.1" +Import-Package: org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", + org.eclipse.jgit.util;version="[7.7.1,7.8.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index da1dbb6faa2..88ad3da08b8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index b9a321c530a..0ea359bfd95 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 - 7.7.0.202606012155-r + 7.7.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 28e0b6e95f2..2b7411a414f 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: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -11,8 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.7.0", - org.eclipse.jgit.api;version="7.7.0"; +Export-Package: org.eclipse.jgit.annotations;version="7.7.1", + org.eclipse.jgit.api;version="7.7.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -27,21 +27,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.7.0"; + org.eclipse.jgit.api.errors;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.7.0"; + org.eclipse.jgit.attributes;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.7.0"; + org.eclipse.jgit.blame;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.blame.cache, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.blame.cache;version="7.7.0"; + org.eclipse.jgit.blame.cache;version="7.7.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.diff;version="7.7.0"; + org.eclipse.jgit.diff;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.patch, @@ -49,55 +49,55 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.7.0"; + org.eclipse.jgit.dircache;version="7.7.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="7.7.0"; + org.eclipse.jgit.errors;version="7.7.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib", - org.eclipse.jgit.events;version="7.7.0"; + org.eclipse.jgit.events;version="7.7.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.7.0", - org.eclipse.jgit.gitrepo;version="7.7.0"; + org.eclipse.jgit.fnmatch;version="7.7.1", + org.eclipse.jgit.gitrepo;version="7.7.1"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.api.errors, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.7.0";x-internal:=true, - org.eclipse.jgit.hooks;version="7.7.0"; + org.eclipse.jgit.gitrepo.internal;version="7.7.1";x-internal:=true, + org.eclipse.jgit.hooks;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.ignore;version="7.7.0", - org.eclipse.jgit.ignore.internal;version="7.7.0"; + org.eclipse.jgit.ignore;version="7.7.1", + org.eclipse.jgit.ignore.internal;version="7.7.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.7.0"; + org.eclipse.jgit.internal;version="7.7.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.7.0"; + org.eclipse.jgit.internal.diff;version="7.7.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.7.0"; + org.eclipse.jgit.internal.diffmergetool;version="7.7.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.7.0"; + org.eclipse.jgit.internal.fsck;version="7.7.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.7.0"; + org.eclipse.jgit.internal.revwalk;version="7.7.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.7.0"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.7.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.7.0"; + org.eclipse.jgit.internal.storage.dfs;version="7.7.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="7.7.0"; + org.eclipse.jgit.internal.storage.file;version="7.7.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -109,39 +109,39 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.0", org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.apache.test, org.eclipse.jgit.ssh.jsch.test", - org.eclipse.jgit.internal.storage.io;version="7.7.0"; + org.eclipse.jgit.internal.storage.io;version="7.7.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.7.0"; + org.eclipse.jgit.internal.storage.memory;version="7.7.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.7.0"; + org.eclipse.jgit.internal.storage.midx;version="7.7.1"; x-friends:="org.eclipse.jgit.pgm, org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.7.0"; + org.eclipse.jgit.internal.storage.pack;version="7.7.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.7.0"; + org.eclipse.jgit.internal.storage.reftable;version="7.7.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="7.7.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.7.0"; + org.eclipse.jgit.internal.submodule;version="7.7.1";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.7.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.7.0"; + org.eclipse.jgit.internal.transport.http;version="7.7.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.7.0"; + org.eclipse.jgit.internal.transport.parser;version="7.7.1"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.7.0"; + org.eclipse.jgit.internal.transport.ssh;version="7.7.1"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.7.0"; + org.eclipse.jgit.internal.util;version="7.7.1"; x-friends:="org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.7.0"; + org.eclipse.jgit.lib;version="7.7.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -156,12 +156,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.7.0"; + org.eclipse.jgit.lib.internal;version="7.7.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.7.0", - org.eclipse.jgit.merge;version="7.7.0"; + org.eclipse.jgit.logging;version="7.7.1", + org.eclipse.jgit.merge;version="7.7.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -170,42 +170,42 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.7.0", - org.eclipse.jgit.notes;version="7.7.0"; + org.eclipse.jgit.nls;version="7.7.1", + org.eclipse.jgit.notes;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.7.0"; + org.eclipse.jgit.patch;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.7.0"; + org.eclipse.jgit.revplot;version="7.7.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib", - org.eclipse.jgit.revwalk;version="7.7.0"; + org.eclipse.jgit.revwalk;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.internal.storage.commitgraph", - org.eclipse.jgit.revwalk.filter;version="7.7.0"; + org.eclipse.jgit.revwalk.filter;version="7.7.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.7.0"; + org.eclipse.jgit.storage.file;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.7.0"; + org.eclipse.jgit.storage.pack;version="7.7.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.7.0"; + org.eclipse.jgit.submodule;version="7.7.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.7.0"; + org.eclipse.jgit.transport;version="7.7.1"; uses:="javax.crypto, org.eclipse.jgit.hooks, org.eclipse.jgit.util.io, @@ -218,21 +218,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.7.0"; + org.eclipse.jgit.transport.http;version="7.7.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.7.0"; + org.eclipse.jgit.transport.resolver;version="7.7.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.7.0"; + org.eclipse.jgit.treewalk;version="7.7.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="7.7.0"; + org.eclipse.jgit.treewalk.filter;version="7.7.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.7.0"; + org.eclipse.jgit.util;version="7.7.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -245,12 +245,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.7.0"; + org.eclipse.jgit.util.io;version="7.7.1"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.7.0", - org.eclipse.jgit.util.time;version="7.7.0" + org.eclipse.jgit.util.sha1;version="7.7.1", + org.eclipse.jgit.util.time;version="7.7.1" Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, javax.management, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 12689fe617c..6c7e6a736d3 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.0.202606012155-r +Bundle-Version: 7.7.1.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.0.202606012155-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 523fcef1017..f4c8a4be044 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index a2ca73e0400..eae45351169 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.0.202606012155-r + 7.7.1-SNAPSHOT JGit - Parent ${jgit-url} From 2972195ae16b1ca6969073a0fb2098038b5fc4f7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 2 Jun 2026 09:22:33 +0200 Subject: [PATCH 141/200] Prepare 7.8.0-SNAPSHOT builds and bump jgit-last-release-version in pom.xml to 7.7.0.202606012155-r. Change-Id: I0dc49d46cc9659f0e356debacfa65ea1d475d7fd --- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++--- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 42 +++--- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 44 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++--- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 32 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 88 ++++++------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 ++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 122 +++++++++--------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 116 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 4 +- 89 files changed, 550 insertions(+), 550 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 388021776f0..29a2d3e84b5 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.ant.tasks;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.hamcrest;version="[3.0.0,4.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 44ffa1515e7..f9caf9430df 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 - 7.7.1-SNAPSHOT + 7.8.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 8afb379bc93..ce0918dd76c 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)" + org.eclipse.jgit.storage.file;version="[7.8.0,7.9.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.7.1", - org.eclipse.jgit.ant.tasks;version="7.7.1"; +Export-Package: org.eclipse.jgit.ant;version="7.8.0", + org.eclipse.jgit.ant.tasks;version="7.8.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 2a88ae0111f..b59816381bf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index f863b44d682..f08201344d8 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 - 7.7.1-SNAPSHOT + 7.8.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 e926ab523b9..6052ba70204 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,18 +14,18 @@ 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="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.7.1"; +Export-Package: org.eclipse.jgit.archive;version="7.8.0"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.7.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.8.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 417b563e33e..41795216d4a 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 16d3c6940e7..cd93dc089f4 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 - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index eaa3787590a..0313e52f0c5 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 2abe2ae0776..6a12964f4f5 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 - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.1-SNAPSHOT + 7.8.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 add1d61d869..8bed084244e 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.sha1;version="[7.7.1,7.8.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.sha1;version="[7.8.0,7.9.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;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 f551a552b59..b4e096442af 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 - 7.7.1-SNAPSHOT + 7.8.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 5646d759bd5..80ae7fcc64f 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="[7.7.1,7.8.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)", @@ -27,5 +27,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.8.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.8.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 c3e578ee3bb..7dd65e27821 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 056159c4fdd..74d9d1a9deb 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 - 7.7.1-SNAPSHOT + 7.8.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 caa10d1e74a..30d22e1dfae 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin @@ -27,11 +27,11 @@ Import-Package: javax.net.ssl, 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="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.7.1"; + org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.8.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 7bf7c7f4c40..9c108b338be 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 2834b869ab4..5ae175baf3f 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 - 7.7.1-SNAPSHOT + 7.8.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 1a82f050d35..245289b85d9 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.http.server;version="7.7.1", - org.eclipse.jgit.http.server.glue;version="7.7.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.8.0", + org.eclipse.jgit.http.server.glue;version="7.8.0"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.7.1"; + org.eclipse.jgit.http.server.resolver;version="7.8.0"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)" + org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.resolver;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.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 6ee07958fb7..6bb08e3336d 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index e841c44a335..f9e847baab7 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 - 7.7.1-SNAPSHOT + 7.8.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 d88dd16d822..c7874e3aeed 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -28,26 +28,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.http.server;version="[7.7.1,7.8.0)", - org.eclipse.jgit.http.server.glue;version="[7.7.1,7.8.0)", - org.eclipse.jgit.http.server.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.http.server;version="[7.8.0,7.9.0)", + org.eclipse.jgit.http.server.glue;version="[7.8.0,7.9.0)", + org.eclipse.jgit.http.server.resolver;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http.apache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.resolver;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.hamcrest;version="[3.0.0,4.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.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index ca012729342..66972ee96e1 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 - 7.7.1-SNAPSHOT + 7.8.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 4cd26861225..7c958ea636b 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -23,17 +23,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.http.server;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.http.server;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.resolver;version="[7.8.0,7.9.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.7.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.8.0"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.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 91621629bff..45634067f51 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ace7792b6d5..0993930d6e9 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 - 7.7.1-SNAPSHOT + 7.8.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 97073289d77..8fda1a7d554 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -34,16 +34,16 @@ Import-Package: org.apache.sshd.common;version="[2.17.1,2.18.0)", org.apache.sshd.server.subsystem;version="[2.17.1,2.18.0)", org.apache.sshd.sftp;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.server;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.7.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.8.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 8aaf647b470..d52282f694c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 788fb71ad20..5ac4ae7db0d 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 - 7.7.1-SNAPSHOT + 7.8.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 d51e131bcfc..6d7b85e20cd 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,38 +3,38 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="7.7.1", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.time;version="[7.7.1,7.8.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.dircache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.util;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.merge;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.pack;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="7.8.0", + org.eclipse.jgit.treewalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk.filter;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.io;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.time;version="[7.8.0,7.9.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.7.1"; +Export-Package: org.eclipse.jgit.junit;version="7.8.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -47,4 +47,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.7.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.7.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.8.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 802e220d4a6..4ccd459f50a 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index ed0ed462562..ac83f533922 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 - 7.7.1-SNAPSHOT + 7.8.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 22186e8d292..d7e377253af 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -27,24 +27,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.test;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.server;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.test;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk.filter;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.hamcrest;version="[3.0.0,4.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 c1e3a5913ce..af7b471c6ad 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 - 7.7.1-SNAPSHOT + 7.8.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 8b3044bd9d8..e643a522bfb 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs.server;version="7.7.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.8.0"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.7.1"; + org.eclipse.jgit.lfs.server.fs;version="7.8.0"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.7.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.7.1"; + org.eclipse.jgit.lfs.server.internal;version="7.8.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.8.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Import-Package: com.google.gson;version="[2.8.0,3.0.0)", @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http.apache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.slf4j;version="[1.7.0,3.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 1695ce7f064..5e4c9cf7bb6 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 2d9078e9057..67b1bf22e6a 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 - 7.7.1-SNAPSHOT + 7.8.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 0cdb3e0a64d..82b1403fc3c 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,29 +3,29 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", +Import-Package: org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.attributes;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk.filter;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.hamcrest;version="[3.0.0,4.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="7.7.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.8.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 a02b3300a93..2380339358c 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 - 7.7.1-SNAPSHOT + 7.8.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 76dd31a0429..4a1012758f5 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs;version="7.7.1", - org.eclipse.jgit.lfs.errors;version="7.7.1", - org.eclipse.jgit.lfs.internal;version="7.7.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="7.7.1" +Export-Package: org.eclipse.jgit.lfs;version="7.8.0", + org.eclipse.jgit.lfs.errors;version="7.8.0", + org.eclipse.jgit.lfs.internal;version="7.8.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="7.8.0" Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.hooks;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)" + org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.attributes;version="[7.8.0,7.9.0)", + org.eclipse.jgit.diff;version="[7.8.0,7.9.0)", + org.eclipse.jgit.dircache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.hooks;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.pack;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk.filter;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.io;version="[7.8.0,7.9.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 2aaf4f88dde..b468bc3b2b2 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 42997bfd213..78d3b3990e0 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 - 7.7.1-SNAPSHOT + 7.8.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 6842c6acf78..1c04cc8f141 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 84aa0fd2f83..62ebf8218d2 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 - 7.7.1-SNAPSHOT + 7.8.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 963d9f898c1..17a3e8f06a9 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 - 7.7.1-SNAPSHOT + 7.8.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 42082b2e7a5..81e9291d983 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 - 7.7.1-SNAPSHOT + 7.8.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 031737390d9..4bdf2678fb3 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 - 7.7.1-SNAPSHOT + 7.8.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 a0134c218b2..811948aa1fd 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 - 7.7.1-SNAPSHOT + 7.8.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 9d2e088c48b..feb04004e08 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 - 7.7.1-SNAPSHOT + 7.8.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 2ebfa076c17..4b597ea6f45 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 - 7.7.1-SNAPSHOT + 7.8.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 ca741cd1496..59085683575 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 - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.1-SNAPSHOT + 7.8.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 161b24b06ee..2cd6ac85f6e 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 - 7.7.1-SNAPSHOT + 7.8.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 9cb3df65626..c14e4a31fd4 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 - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 9e5c476e73d..a31b9288d90 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 - 7.7.1-SNAPSHOT + 7.8.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 8367261c572..a28a4efb467 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm.opt;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", +Import-Package: org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.diff;version="[7.8.0,7.9.0)", + org.eclipse.jgit.dircache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.merge;version="[7.8.0,7.9.0)", + org.eclipse.jgit.pgm;version="[7.8.0,7.9.0)", + org.eclipse.jgit.pgm.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.pgm.opt;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.io;version="[7.8.0,7.9.0)", org.hamcrest.core;bundle-version="[1.1.0,3.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 bf845bfd5a3..5319d3e79b5 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 - 7.7.1-SNAPSHOT + 7.8.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 939f4c1c15f..a0bace41ebc 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -15,50 +15,50 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.archive;version="[7.7.1,7.8.0)", - org.eclipse.jgit.awtui;version="[7.7.1,7.8.0)", - org.eclipse.jgit.blame;version="[7.7.1,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.gitrepo;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.io;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.notes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.archive;version="[7.8.0,7.9.0)", + org.eclipse.jgit.awtui;version="[7.8.0,7.9.0)", + org.eclipse.jgit.blame;version="[7.8.0,7.9.0)", + org.eclipse.jgit.diff;version="[7.8.0,7.9.0)", + org.eclipse.jgit.dircache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.gitrepo;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.io;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.server;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.merge;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.notes;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revplot;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk.filter;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.pack;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http.apache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.resolver;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.sshd;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk.filter;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.io;version="[7.8.0,7.9.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="7.7.1"; +Export-Package: org.eclipse.jgit.console;version="7.8.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.7.1"; + org.eclipse.jgit.pgm;version="7.8.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -70,14 +70,14 @@ Export-Package: org.eclipse.jgit.console;version="7.7.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.7.1"; + org.eclipse.jgit.pgm.debug;version="7.8.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.7.1"; + org.eclipse.jgit.pgm.internal;version="7.8.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.7.1"; + org.eclipse.jgit.pgm.opt;version="7.8.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 c35643bdbf8..e9a6b049971 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 07edcab602b..bb437240a31 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 - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 18a92655a53..7df322ed6c4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.1,7.8.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.8.0,7.9.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.7.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.8.0";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 3990cc56758..9a8ae16ca80 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 95d9ed91762..8769f646466 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 404ed80450c..cb43ec81e6f 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,22 +26,22 @@ Import-Package: org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.core;version="[2.17.1,2.18.0)", org.apache.sshd.server;version="[2.17.1,2.18.0)", org.apache.sshd.server.forward;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.sshd;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.sshd;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit.ssh;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.sshd;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 835eb2486e8..c42eb2bea1d 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 - 7.7.1-SNAPSHOT + 7.8.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 ec464311599..84a9beb10eb 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test"; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -25,19 +25,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.1";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.7.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.7.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.7.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.7.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.7.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.8.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.8.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.8.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.8.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.8.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.7.1" + org.eclipse.jgit.transport.sshd.agent;version="7.8.0" Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", org.apache.sshd.agent;version="[2.17.1,2.18.0)", org.apache.sshd.client;version="[2.17.1,2.18.0)", @@ -91,14 +91,14 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", org.apache.sshd.sftp;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.client;version="[2.17.1,2.18.0)", org.apache.sshd.sftp.common;version="[2.17.1,2.18.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.fnmatch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.fnmatch;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.slf4j;version="[1.7.0,3.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 8810ecfc268..3b936a8cf8f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index d1309d91d53..d5cff8da7fa 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 - 7.7.1-SNAPSHOT + 7.8.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 dd45a66d85f..85d12abdf26 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit.ssh;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 69ccfdb3fd0..a5e57f69f60 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 - 7.7.1-SNAPSHOT + 7.8.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 ad296f63d0e..8eaf94dbf78 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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="[7.7.1,7.8.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.8.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.io;version="[7.8.0,7.9.0)", org.slf4j;version="[1.7.0,3.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 aa40ca65273..9d08701fc5e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index f295078ecdf..865298d9ecc 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 - 7.7.1-SNAPSHOT + 7.8.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 3a04b546527..5cab045aa0e 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,66 +21,66 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.apache.commons.lang3;version="[3.17.0,4.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.archive;version="[7.7.1,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.awtui;version="[7.7.1,7.8.0)", - org.eclipse.jgit.blame;version="[7.7.1,7.8.0)", - org.eclipse.jgit.blame.cache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.events;version="[7.7.1,7.8.0)", - org.eclipse.jgit.fnmatch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.gitrepo;version="[7.7.1,7.8.0)", - org.eclipse.jgit.hooks;version="[7.7.1,7.8.0)", - org.eclipse.jgit.ignore;version="[7.7.1,7.8.0)", - org.eclipse.jgit.ignore.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.fsck;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.7.1", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.io;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.time;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.logging;version="[7.7.1,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.notes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.patch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.submodule;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.sha1;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api;version="[7.8.0,7.9.0)", + org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.archive;version="[7.8.0,7.9.0)", + org.eclipse.jgit.attributes;version="[7.8.0,7.9.0)", + org.eclipse.jgit.awtui;version="[7.8.0,7.9.0)", + org.eclipse.jgit.blame;version="[7.8.0,7.9.0)", + org.eclipse.jgit.blame.cache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.diff;version="[7.8.0,7.9.0)", + org.eclipse.jgit.dircache;version="[7.8.0,7.9.0)", + org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.events;version="[7.8.0,7.9.0)", + org.eclipse.jgit.fnmatch;version="[7.8.0,7.9.0)", + org.eclipse.jgit.gitrepo;version="[7.8.0,7.9.0)", + org.eclipse.jgit.hooks;version="[7.8.0,7.9.0)", + org.eclipse.jgit.ignore;version="[7.8.0,7.9.0)", + org.eclipse.jgit.ignore.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.diff;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.fsck;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.8.0", + org.eclipse.jgit.internal.storage.dfs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.io;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.8.0,7.9.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit;version="[7.8.0,7.9.0)", + org.eclipse.jgit.junit.time;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lfs;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.logging;version="[7.8.0,7.9.0)", + org.eclipse.jgit.merge;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.notes;version="[7.8.0,7.9.0)", + org.eclipse.jgit.patch;version="[7.8.0,7.9.0)", + org.eclipse.jgit.pgm;version="[7.8.0,7.9.0)", + org.eclipse.jgit.pgm.internal;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revplot;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk.filter;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.file;version="[7.8.0,7.9.0)", + org.eclipse.jgit.storage.pack;version="[7.8.0,7.9.0)", + org.eclipse.jgit.submodule;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.http;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport.resolver;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.treewalk.filter;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.io;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util.sha1;version="[7.8.0,7.9.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.hamcrest.collection;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index a8451c6f074..531bdcbf065 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 - 7.7.1-SNAPSHOT + 7.8.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 adab468a0b9..e376952db1c 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,15 +4,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.awtui;version="7.7.1" -Import-Package: org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.8.0" +Import-Package: org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", + org.eclipse.jgit.lib;version="[7.8.0,7.9.0)", + org.eclipse.jgit.nls;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revplot;version="[7.8.0,7.9.0)", + org.eclipse.jgit.revwalk;version="[7.8.0,7.9.0)", + org.eclipse.jgit.transport;version="[7.8.0,7.9.0)", + org.eclipse.jgit.util;version="[7.8.0,7.9.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 88ad3da08b8..54a8d561d1e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 0ea359bfd95..40056db33ca 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 - 7.7.1-SNAPSHOT + 7.8.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 2b7411a414f..8e92528f808 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: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -11,8 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.7.1", - org.eclipse.jgit.api;version="7.7.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.8.0", + org.eclipse.jgit.api;version="7.8.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -27,21 +27,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.7.1"; + org.eclipse.jgit.api.errors;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.7.1"; + org.eclipse.jgit.attributes;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.7.1"; + org.eclipse.jgit.blame;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.blame.cache, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.blame.cache;version="7.7.1"; + org.eclipse.jgit.blame.cache;version="7.8.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.diff;version="7.7.1"; + org.eclipse.jgit.diff;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.patch, @@ -49,55 +49,55 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.7.1"; + org.eclipse.jgit.dircache;version="7.8.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="7.7.1"; + org.eclipse.jgit.errors;version="7.8.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib", - org.eclipse.jgit.events;version="7.7.1"; + org.eclipse.jgit.events;version="7.8.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.7.1", - org.eclipse.jgit.gitrepo;version="7.7.1"; + org.eclipse.jgit.fnmatch;version="7.8.0", + org.eclipse.jgit.gitrepo;version="7.8.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.api.errors, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.7.1";x-internal:=true, - org.eclipse.jgit.hooks;version="7.7.1"; + org.eclipse.jgit.gitrepo.internal;version="7.8.0";x-internal:=true, + org.eclipse.jgit.hooks;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.ignore;version="7.7.1", - org.eclipse.jgit.ignore.internal;version="7.7.1"; + org.eclipse.jgit.ignore;version="7.8.0", + org.eclipse.jgit.ignore.internal;version="7.8.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.7.1"; + org.eclipse.jgit.internal;version="7.8.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.7.1"; + org.eclipse.jgit.internal.diff;version="7.8.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.7.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.8.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.7.1"; + org.eclipse.jgit.internal.fsck;version="7.8.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.7.1"; + org.eclipse.jgit.internal.revwalk;version="7.8.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.7.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.8.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.7.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.8.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="7.7.1"; + org.eclipse.jgit.internal.storage.file;version="7.8.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -109,39 +109,39 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.apache.test, org.eclipse.jgit.ssh.jsch.test", - org.eclipse.jgit.internal.storage.io;version="7.7.1"; + org.eclipse.jgit.internal.storage.io;version="7.8.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.7.1"; + org.eclipse.jgit.internal.storage.memory;version="7.8.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.7.1"; + org.eclipse.jgit.internal.storage.midx;version="7.8.0"; x-friends:="org.eclipse.jgit.pgm, org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.7.1"; + org.eclipse.jgit.internal.storage.pack;version="7.8.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.7.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.8.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="7.7.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.7.1"; + org.eclipse.jgit.internal.submodule;version="7.8.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.8.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.7.1"; + org.eclipse.jgit.internal.transport.http;version="7.8.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.7.1"; + org.eclipse.jgit.internal.transport.parser;version="7.8.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.7.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.8.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.7.1"; + org.eclipse.jgit.internal.util;version="7.8.0"; x-friends:="org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.7.1"; + org.eclipse.jgit.lib;version="7.8.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -156,12 +156,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.7.1"; + org.eclipse.jgit.lib.internal;version="7.8.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.7.1", - org.eclipse.jgit.merge;version="7.7.1"; + org.eclipse.jgit.logging;version="7.8.0", + org.eclipse.jgit.merge;version="7.8.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -170,42 +170,42 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.7.1", - org.eclipse.jgit.notes;version="7.7.1"; + org.eclipse.jgit.nls;version="7.8.0", + org.eclipse.jgit.notes;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.7.1"; + org.eclipse.jgit.patch;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.7.1"; + org.eclipse.jgit.revplot;version="7.8.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib", - org.eclipse.jgit.revwalk;version="7.7.1"; + org.eclipse.jgit.revwalk;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.internal.storage.commitgraph", - org.eclipse.jgit.revwalk.filter;version="7.7.1"; + org.eclipse.jgit.revwalk.filter;version="7.8.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.7.1"; + org.eclipse.jgit.storage.file;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.7.1"; + org.eclipse.jgit.storage.pack;version="7.8.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.7.1"; + org.eclipse.jgit.submodule;version="7.8.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.7.1"; + org.eclipse.jgit.transport;version="7.8.0"; uses:="javax.crypto, org.eclipse.jgit.hooks, org.eclipse.jgit.util.io, @@ -218,21 +218,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.7.1"; + org.eclipse.jgit.transport.http;version="7.8.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.7.1"; + org.eclipse.jgit.transport.resolver;version="7.8.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.7.1"; + org.eclipse.jgit.treewalk;version="7.8.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="7.7.1"; + org.eclipse.jgit.treewalk.filter;version="7.8.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.7.1"; + org.eclipse.jgit.util;version="7.8.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -245,12 +245,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.7.1"; + org.eclipse.jgit.util.io;version="7.8.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.7.1", - org.eclipse.jgit.util.time;version="7.7.1" + org.eclipse.jgit.util.sha1;version="7.8.0", + org.eclipse.jgit.util.time;version="7.8.0" Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, javax.management, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 6c7e6a736d3..09b1ed35b42 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index f4c8a4be044..d893037f5dc 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index eae45351169..60da201ae03 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.1-SNAPSHOT + 7.8.0-SNAPSHOT JGit - Parent ${jgit-url} @@ -118,7 +118,7 @@ ${commit.time.iso} - 7.6.0.202603022253-r + 7.7.0.202606012155-r 1.10.15 2.17.1 0.1.55 From 4d9cc4caa7078e878c140b178142292cddae326f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 7 Jun 2026 10:53:16 +0200 Subject: [PATCH 142/200] Update bytebuddy to 1.18.10 Change-Id: Iedb7d15c74b8bc6953c011d7e604a50dd18c4be9 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 5f592ad76b2..a0550c203ec 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,7 +27,7 @@ git_repository( BOUNCYCASTLE_VERSION = "1.84" -BYTE_BUDDY_VERSION = "1.18.8" +BYTE_BUDDY_VERSION = "1.18.10" JETTY_VERSION = "12.1.9" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 0ed6ad9fc02..c2668536089 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.8 + 1.18.10 jar net.bytebuddy byte-buddy-agent - 1.18.8 + 1.18.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index a3469d1e3d4..694c19ae418 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.8 + 1.18.10 jar net.bytebuddy byte-buddy-agent - 1.18.8 + 1.18.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index ae957d4bf86..35391fa8ce7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.8 + 1.18.10 jar net.bytebuddy byte-buddy-agent - 1.18.8 + 1.18.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index bdf955c3e88..f4c84822a0d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.8 + 1.18.10 jar net.bytebuddy byte-buddy-agent - 1.18.8 + 1.18.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index cbd8dcb82ab..4b9cb074c56 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.8 + 1.18.10 jar net.bytebuddy byte-buddy-agent - 1.18.8 + 1.18.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index dd38a8c2e91..1c805591bc6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.8 + 1.18.10 jar net.bytebuddy byte-buddy-agent - 1.18.8 + 1.18.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index a00c7d0d9d9..bb0a495da70 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.8 + 1.18.10 jar net.bytebuddy byte-buddy-agent - 1.18.8 + 1.18.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 367d4a34b94..042efb77267 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.8" + version = "1.18.10" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.8" + version = "1.18.10" } } diff --git a/pom.xml b/pom.xml index 60da201ae03..ed184eee8e6 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 3.0 3.27.7 5.18.1 - 1.18.8 + 1.18.10 jacoco From 5a995932e85c84a982dc61bcd58adff0b68de1d1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 7 Jun 2026 10:54:44 +0200 Subject: [PATCH 143/200] Update jna to 5.19.0 Change-Id: I14216d3a777da721cc8c7abe29cc2cf0148c1a4d --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a0550c203ec..5073e4bf54e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -33,7 +33,7 @@ JETTY_VERSION = "12.1.9" JMH_VERSION = "1.37" -JNA_VERSION = "5.18.1" +JNA_VERSION = "5.19.0" SLF4J_VERSION = "2.0.18" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index c2668536089..cdd55944484 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.18.1 + 5.19.0 jar net.java.dev.jna jna-platform - 5.18.1 + 5.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 694c19ae418..3bfbd909500 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.18.1 + 5.19.0 jar net.java.dev.jna jna-platform - 5.18.1 + 5.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 35391fa8ce7..f5cd9590b1a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.18.1 + 5.19.0 jar net.java.dev.jna jna-platform - 5.18.1 + 5.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index f4c84822a0d..222777d8465 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.18.1 + 5.19.0 jar net.java.dev.jna jna-platform - 5.18.1 + 5.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 4b9cb074c56..8f509b29db5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.18.1 + 5.19.0 jar net.java.dev.jna jna-platform - 5.18.1 + 5.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 1c805591bc6..44e073fb52a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.18.1 + 5.19.0 jar net.java.dev.jna jna-platform - 5.18.1 + 5.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index bb0a495da70..88254294a9e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.18.1 + 5.19.0 jar net.java.dev.jna jna-platform - 5.18.1 + 5.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 042efb77267..dbe12857d01 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -207,12 +207,12 @@ maven jna dependency { groupId = "net.java.dev.jna" artifactId = "jna" - version = "5.18.1" + version = "5.19.0" } dependency { groupId = "net.java.dev.jna" artifactId = "jna-platform" - version = "5.18.1" + version = "5.19.0" } } diff --git a/pom.xml b/pom.xml index ed184eee8e6..8fa548b1798 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.16.1 3.0 3.27.7 - 5.18.1 + 5.19.0 1.18.10 From 60880a27d7a8725159e4e842266ab74643914e47 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 7 Jun 2026 13:17:41 +0200 Subject: [PATCH 144/200] Update apache mina-sshd to 2.18.0 Change-Id: Ib5b63e44c66bba41191a898fbf7ded04bdca5cd4 --- MODULE.bazel | 2 +- .../META-INF/MANIFEST.MF | 50 ++++----- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +- .../maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 36 +++--- .../META-INF/MANIFEST.MF | 104 +++++++++--------- pom.xml | 2 +- 13 files changed, 120 insertions(+), 120 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 5073e4bf54e..78e2adcf949 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -37,7 +37,7 @@ JNA_VERSION = "5.19.0" SLF4J_VERSION = "2.0.18" -SSHD_VERSION = "2.17.1" +SSHD_VERSION = "2.18.0" maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 8fda1a7d554..f50f3d2b60c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -9,31 +9,31 @@ Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.apache.sshd.common;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.common.file.virtualfs;version="[2.17.1,2.18.0)", - org.apache.sshd.common.helpers;version="[2.17.1,2.18.0)", - org.apache.sshd.common.io;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex;version="[2.17.1,2.18.0)", - org.apache.sshd.common.keyprovider;version="[2.17.1,2.18.0)", - org.apache.sshd.common.session;version="[2.17.1,2.18.0)", - org.apache.sshd.common.signature;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.buffer;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.logging;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.security;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.threads;version="[2.17.1,2.18.0)", - org.apache.sshd.core;version="[2.17.1,2.18.0)", - org.apache.sshd.server;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth.gss;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth.keyboard;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth.password;version="[2.17.1,2.18.0)", - org.apache.sshd.server.command;version="[2.17.1,2.18.0)", - org.apache.sshd.server.session;version="[2.17.1,2.18.0)", - org.apache.sshd.server.shell;version="[2.17.1,2.18.0)", - org.apache.sshd.server.subsystem;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp.server;version="[2.17.1,2.18.0)", +Import-Package: org.apache.sshd.common;version="[2.18.0,2.19.0)", + org.apache.sshd.common.config.keys;version="[2.18.0,2.19.0)", + org.apache.sshd.common.file.virtualfs;version="[2.18.0,2.19.0)", + org.apache.sshd.common.helpers;version="[2.18.0,2.19.0)", + org.apache.sshd.common.io;version="[2.18.0,2.19.0)", + org.apache.sshd.common.kex;version="[2.18.0,2.19.0)", + org.apache.sshd.common.keyprovider;version="[2.18.0,2.19.0)", + org.apache.sshd.common.session;version="[2.18.0,2.19.0)", + org.apache.sshd.common.signature;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.buffer;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.logging;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.security;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.threads;version="[2.18.0,2.19.0)", + org.apache.sshd.core;version="[2.18.0,2.19.0)", + org.apache.sshd.server;version="[2.18.0,2.19.0)", + org.apache.sshd.server.auth;version="[2.18.0,2.19.0)", + org.apache.sshd.server.auth.gss;version="[2.18.0,2.19.0)", + org.apache.sshd.server.auth.keyboard;version="[2.18.0,2.19.0)", + org.apache.sshd.server.auth.password;version="[2.18.0,2.19.0)", + org.apache.sshd.server.command;version="[2.18.0,2.19.0)", + org.apache.sshd.server.session;version="[2.18.0,2.19.0)", + org.apache.sshd.server.shell;version="[2.18.0,2.19.0)", + org.apache.sshd.server.subsystem;version="[2.18.0,2.19.0)", + org.apache.sshd.sftp;version="[2.18.0,2.19.0)", + org.apache.sshd.sftp.server;version="[2.18.0,2.19.0)", org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", org.eclipse.jgit.api;version="[7.8.0,7.9.0)", org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index cdd55944484..c1d41f253b2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.18.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 3bfbd909500..e1c9545832f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.18.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index f5cd9590b1a..7019fe8fc5d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.18.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 222777d8465..b80fa3d71f4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.18.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 8f509b29db5..c5fadecd053 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.18.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 44e073fb52a..8298f1629fa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.18.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 88254294a9e..24e835ad27f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.18.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index dbe12857d01..2192b80d7c7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -238,12 +238,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.17.1" + version = "2.18.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.17.1" + version = "2.18.0" } } 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 cb43ec81e6f..d48c4a2a596 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,24 +8,24 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.apache.sshd.agent;version="[2.17.1,2.18.0)", - org.apache.sshd.certificate;version="[2.17.1,2.18.0)", - org.apache.sshd.client.config.hosts;version="[2.17.1,2.18.0)", - org.apache.sshd.common;version="[2.17.1,2.18.0)", - org.apache.sshd.common.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.common.cipher;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.common.helpers;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex;version="[2.17.1,2.18.0)", - org.apache.sshd.common.keyprovider;version="[2.17.1,2.18.0)", - org.apache.sshd.common.session;version="[2.17.1,2.18.0)", - org.apache.sshd.common.signature;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.buffer;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.net;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.security;version="[2.17.1,2.18.0)", - org.apache.sshd.core;version="[2.17.1,2.18.0)", - org.apache.sshd.server;version="[2.17.1,2.18.0)", - org.apache.sshd.server.forward;version="[2.17.1,2.18.0)", +Import-Package: org.apache.sshd.agent;version="[2.18.0,2.19.0)", + org.apache.sshd.certificate;version="[2.18.0,2.19.0)", + org.apache.sshd.client.config.hosts;version="[2.18.0,2.19.0)", + org.apache.sshd.common;version="[2.18.0,2.19.0)", + org.apache.sshd.common.auth;version="[2.18.0,2.19.0)", + org.apache.sshd.common.cipher;version="[2.18.0,2.19.0)", + org.apache.sshd.common.config.keys;version="[2.18.0,2.19.0)", + org.apache.sshd.common.helpers;version="[2.18.0,2.19.0)", + org.apache.sshd.common.kex;version="[2.18.0,2.19.0)", + org.apache.sshd.common.keyprovider;version="[2.18.0,2.19.0)", + org.apache.sshd.common.session;version="[2.18.0,2.19.0)", + org.apache.sshd.common.signature;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.buffer;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.net;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.security;version="[2.18.0,2.19.0)", + org.apache.sshd.core;version="[2.18.0,2.19.0)", + org.apache.sshd.server;version="[2.18.0,2.19.0)", + org.apache.sshd.server.forward;version="[2.18.0,2.19.0)", org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", org.eclipse.jgit.api;version="[7.8.0,7.9.0)", org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 84a9beb10eb..c090c4d5ad4 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -39,58 +39,58 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends: org.apache.sshd.client.keyverifier", org.eclipse.jgit.transport.sshd.agent;version="7.8.0" Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", - org.apache.sshd.agent;version="[2.17.1,2.18.0)", - org.apache.sshd.client;version="[2.17.1,2.18.0)", - org.apache.sshd.client.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.client.auth.keyboard;version="[2.17.1,2.18.0)", - org.apache.sshd.client.auth.password;version="[2.17.1,2.18.0)", - org.apache.sshd.client.auth.pubkey;version="[2.17.1,2.18.0)", - org.apache.sshd.client.channel;version="[2.17.1,2.18.0)", - org.apache.sshd.client.config.hosts;version="[2.17.1,2.18.0)", - org.apache.sshd.client.config.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.client.future;version="[2.17.1,2.18.0)", - org.apache.sshd.client.keyverifier;version="[2.17.1,2.18.0)", - org.apache.sshd.client.session;version="[2.17.1,2.18.0)", - org.apache.sshd.client.session.forward;version="[2.17.1,2.18.0)", - org.apache.sshd.common;version="[2.17.1,2.18.0)", - org.apache.sshd.common.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.common.channel;version="[2.17.1,2.18.0)", - org.apache.sshd.common.cipher;version="[2.17.1,2.18.0)", - org.apache.sshd.common.compression;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys.loader;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.17.1,2.18.0)", - org.apache.sshd.common.digest;version="[2.17.1,2.18.0)", - org.apache.sshd.common.forward;version="[2.17.1,2.18.0)", - org.apache.sshd.common.future;version="[2.17.1,2.18.0)", - org.apache.sshd.common.helpers;version="[2.17.1,2.18.0)", - org.apache.sshd.common.io;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex.extension;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.17.1,2.18.0)", - org.apache.sshd.common.keyprovider;version="[2.17.1,2.18.0)", - org.apache.sshd.common.mac;version="[2.17.1,2.18.0)", - org.apache.sshd.common.random;version="[2.17.1,2.18.0)", - org.apache.sshd.common.session;version="[2.17.1,2.18.0)", - org.apache.sshd.common.session.helpers;version="[2.17.1,2.18.0)", - org.apache.sshd.common.signature;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.buffer;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.closeable;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.io;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.io.der;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.io.functors;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.io.resource;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.logging;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.net;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.security;version="[2.17.1,2.18.0)", - org.apache.sshd.core;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp.client;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp.common;version="[2.17.1,2.18.0)", + org.apache.sshd.agent;version="[2.18.0,2.19.0)", + org.apache.sshd.client;version="[2.18.0,2.19.0)", + org.apache.sshd.client.auth;version="[2.18.0,2.19.0)", + org.apache.sshd.client.auth.keyboard;version="[2.18.0,2.19.0)", + org.apache.sshd.client.auth.password;version="[2.18.0,2.19.0)", + org.apache.sshd.client.auth.pubkey;version="[2.18.0,2.19.0)", + org.apache.sshd.client.channel;version="[2.18.0,2.19.0)", + org.apache.sshd.client.config.hosts;version="[2.18.0,2.19.0)", + org.apache.sshd.client.config.keys;version="[2.18.0,2.19.0)", + org.apache.sshd.client.future;version="[2.18.0,2.19.0)", + org.apache.sshd.client.keyverifier;version="[2.18.0,2.19.0)", + org.apache.sshd.client.session;version="[2.18.0,2.19.0)", + org.apache.sshd.client.session.forward;version="[2.18.0,2.19.0)", + org.apache.sshd.common;version="[2.18.0,2.19.0)", + org.apache.sshd.common.auth;version="[2.18.0,2.19.0)", + org.apache.sshd.common.channel;version="[2.18.0,2.19.0)", + org.apache.sshd.common.cipher;version="[2.18.0,2.19.0)", + org.apache.sshd.common.compression;version="[2.18.0,2.19.0)", + org.apache.sshd.common.config.keys;version="[2.18.0,2.19.0)", + org.apache.sshd.common.config.keys.loader;version="[2.18.0,2.19.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.18.0,2.19.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.18.0,2.19.0)", + org.apache.sshd.common.digest;version="[2.18.0,2.19.0)", + org.apache.sshd.common.forward;version="[2.18.0,2.19.0)", + org.apache.sshd.common.future;version="[2.18.0,2.19.0)", + org.apache.sshd.common.helpers;version="[2.18.0,2.19.0)", + org.apache.sshd.common.io;version="[2.18.0,2.19.0)", + org.apache.sshd.common.kex;version="[2.18.0,2.19.0)", + org.apache.sshd.common.kex.extension;version="[2.18.0,2.19.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.18.0,2.19.0)", + org.apache.sshd.common.keyprovider;version="[2.18.0,2.19.0)", + org.apache.sshd.common.mac;version="[2.18.0,2.19.0)", + org.apache.sshd.common.random;version="[2.18.0,2.19.0)", + org.apache.sshd.common.session;version="[2.18.0,2.19.0)", + org.apache.sshd.common.session.helpers;version="[2.18.0,2.19.0)", + org.apache.sshd.common.signature;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.buffer;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.closeable;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.io;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.io.der;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.io.functors;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.io.resource;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.logging;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.net;version="[2.18.0,2.19.0)", + org.apache.sshd.common.util.security;version="[2.18.0,2.19.0)", + org.apache.sshd.core;version="[2.18.0,2.19.0)", + org.apache.sshd.server.auth;version="[2.18.0,2.19.0)", + org.apache.sshd.sftp;version="[2.18.0,2.19.0)", + org.apache.sshd.sftp.client;version="[2.18.0,2.19.0)", + org.apache.sshd.sftp.common;version="[2.18.0,2.19.0)", org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", diff --git a/pom.xml b/pom.xml index 8fa548b1798..5a48402c9dc 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 7.7.0.202606012155-r 1.10.15 - 2.17.1 + 2.18.0 0.1.55 1.1.3 1.2.3 From 1c6d8987ce0cbed0d82b16ea564ef41e524e8bca Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 7 Jun 2026 23:34:41 +0200 Subject: [PATCH 145/200] Update jetty to 12.1.10 Change-Id: I3bc0c64c02082638ed8467cc83f4ada7e6216493 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.35.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.36.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.37.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.38.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.39.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.40.target | 18 +++++++++--------- .../maven/dependencies.tpd | 16 ++++++++-------- pom.xml | 2 +- 10 files changed, 73 insertions(+), 73 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 78e2adcf949..a4a610ca59e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -29,7 +29,7 @@ BOUNCYCASTLE_VERSION = "1.84" BYTE_BUDDY_VERSION = "1.18.10" -JETTY_VERSION = "12.1.9" +JETTY_VERSION = "12.1.10" JMH_VERSION = "1.37" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index c1d41f253b2..6665be632e3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-http - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-io - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-security - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-server - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-session - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util-ajax - 12.1.9 + 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index e1c9545832f..a2188de683d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-http - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-io - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-security - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-server - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-session - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util-ajax - 12.1.9 + 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 7019fe8fc5d..9485a6b8726 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-http - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-io - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-security - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-server - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-session - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util-ajax - 12.1.9 + 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index b80fa3d71f4..12e7b9961a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-http - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-io - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-security - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-server - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-session - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util-ajax - 12.1.9 + 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index c5fadecd053..600437dc8dc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-http - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-io - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-security - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-server - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-session - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util-ajax - 12.1.9 + 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 8298f1629fa..5e13ebaaac8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-http - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-io - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-security - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-server - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-session - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util-ajax - 12.1.9 + 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 24e835ad27f..5a0242f9c6a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-http - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-io - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-security - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-server - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-session - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util - 12.1.9 + 12.1.10 jar org.eclipse.jetty jetty-util-ajax - 12.1.9 + 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 2192b80d7c7..f39aae7efd4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.1.9" + version = "12.1.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.9" + version = "12.1.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.9" + version = "12.1.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.9" + version = "12.1.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.9" + version = "12.1.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.9" + version = "12.1.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.9" + version = "12.1.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.9" + version = "12.1.10" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 5a48402c9dc..cf23398f872 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.28.0 6.0.0 6.1.0 - 12.1.9 + 12.1.10 0.25.0 4.5.14 4.4.16 From 476c6a5c7926e061099c8eca31142da222ef80bd Mon Sep 17 00:00:00 2001 From: Vlad Arakelov Date: Fri, 29 May 2026 20:39:58 +0300 Subject: [PATCH 146/200] Checkout: Reduce temp filename truncation from 200 to 50 chars Checkout writes new file content to a temporary file which is then renamed atomically to the name of the file to be checked out to ensure atomic updates. The name of the temporary file contains the truncated name of the file to be checked out to help investigating issues if e.g. such a temp file is left in the filesystem if the process crashed. Non-ascii filename of 200 chars could exceed the filesystem limit for file name length, measured in bytes. Hence reduce truncation from 200 to 50 chars. If the last char is a high surrogate truncate to 49 chars to avoid creating an invalid file name. Change-Id: I90f29590d1875c9152272e6925e69a02d86427d5 --- .../jgit/lib/DirCacheCheckoutTest.java | 12 +++--- .../org/eclipse/jgit/dircache/Checkout.java | 38 ++++++++++++++++--- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java index d64cfc53a64..b1fd58e8191 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java @@ -1996,16 +1996,18 @@ public void testLongFilename() throws Exception { break; } } - char[] bytes = new char[maximumFileNameLength]; - Arrays.fill(bytes, 'f'); - String longFileName = new String(bytes); + String longFileName = "f".repeat(maximumFileNameLength); + String longFileName2 = "ф".repeat(maximumFileNameLength / 2); // 1 - doit(mkmap(longFileName, "a"), mkmap(longFileName, "b"), - mkmap(longFileName, "a")); + doit(mkmap(longFileName, "a", longFileName2, "a"), + mkmap(longFileName, "b", longFileName2, "b"), + mkmap(longFileName, "a", longFileName2, "a")); writeTrashFile(longFileName, "a"); + writeTrashFile(longFileName2, "a"); checkout(); assertNoConflicts(); assertUpdated(longFileName); + assertUpdated(longFileName2); } @Test diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java index de02aecdb96..84301c84234 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java @@ -186,12 +186,7 @@ public void checkout(DirCacheEntry entry, CheckoutMetadata metadata, return; } - String name = f.getName(); - if (name.length() > 200) { - name = name.substring(0, 200); - } - File tmpFile = File.createTempFile("._" + name, null, parentDir); //$NON-NLS-1$ - + File tmpFile = createTempFile(f, parentDir); DirCacheCheckout.getContent(cache.getRepository(), path, metadata, ol, options, new FileOutputStream(tmpFile)); @@ -243,4 +238,35 @@ public void checkout(DirCacheEntry entry, CheckoutMetadata metadata, } entry.setLastModified(fs.lastModifiedInstant(f)); } + + /** + * Creates a temp file starting with the prefix "._" followed by the name of + * the given file, truncated to a maximum of 50 characters if necessary. The + * temp file is created in the given parent directory. If the last character + * of the truncated name is a high surrogate, it is removed to avoid + * creating an invalid file name. Some filesystems have a limit of 255 bytes + * for file names, hence the truncation to 50 characters to allow for the + * "._" prefix and potential multi-byte characters. + * + * @param f + * file to create a temp file for + * @param parentDir + * parent directory in which to create the temp file + * @return the temp file created + * @throws IOException + * if an I/O error occurs while creating the temp file + */ + private File createTempFile(File f, File parentDir) throws IOException { + final int MAXLENGTH = 50; + + String name = f.getName(); + if (name.length() > MAXLENGTH) { + if (Character.isHighSurrogate(name.charAt(MAXLENGTH - 1))) { + name = name.substring(0, MAXLENGTH - 1); + } else { + name = name.substring(0, MAXLENGTH); + } + } + return File.createTempFile("._" + name, null, parentDir); //$NON-NLS-1$ + } } \ No newline at end of file From b05364919ca50644bd39a398c8928b9e5a8ec20c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 10 Jun 2026 12:36:56 +0300 Subject: [PATCH 147/200] DfsObjDatabase: expose method to translate descriptions to PackList In compact, we want to recalculate a list of packs and translate them into DfsPackFile instances. Extract the code that translates descriptions into packs to a method and make it public. We expose the version without previous packList because it is the only one used in compact and then we do not need to make NO_PACKS public. Change-Id: Ide71becf6910b6a9920c2c84aca1e1a96a6a6964 --- .../internal/storage/dfs/DfsObjDatabase.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java index 3f457f27c1c..8c96e85a16f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java @@ -612,19 +612,36 @@ PackList scanPacks(PackList original) throws IOException { } private PackList scanPacksImpl(PackList old) throws IOException { - DfsBlockCache cache = DfsBlockCache.getInstance(); - Map packs = packMap(old); - Map reftables = reftableMap(old); - List scanned = useMultipackIndex() ? MidxPackFilter.useMidx(listPacks()) : MidxPackFilter.skipMidxs(listPacks()); scanned.sort(packComparator); + return descTreeToPackList(scanned, old); + } + + /** + * Translate the valid list of descriptions (with midx as trees of packs) + * into DfsPackFile and DfsReftable instances + * + * @param descTree + * a valid list of descriptions, may contain midx. Covered packs + * and nested midxs are NOT in the top level list. + * @return a packlist with the new/reused DfsPackFile instances + */ + public PackList descTreeToPackList(List descTree) { + return descTreeToPackList(descTree, NO_PACKS); + } - List newPacks = new ArrayList<>(scanned.size()); + private PackList descTreeToPackList(List descTree, + PackList old) { + Map packs = packMap(old); + Map reftables = reftableMap(old); + + DfsBlockCache cache = DfsBlockCache.getInstance(); + List newPacks = new ArrayList<>(descTree.size()); List packsWithReftables = new ArrayList<>(); boolean foundNew = false; - for (DfsPackDescription dsc : scanned) { + for (DfsPackDescription dsc : descTree) { DfsPackFile oldPack = packs.remove(dsc); if (oldPack != null) { newPacks.add(oldPack); From 0c4bb4039f11ab8de6d489e411c58d73af783b71 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 15 Jun 2026 23:31:06 +0200 Subject: [PATCH 148/200] Update jna to 5.19.1 Change-Id: Ia27620bf4894b3112c62b8aa3bdec80aec1baea8 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a4a610ca59e..00261082930 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -33,7 +33,7 @@ JETTY_VERSION = "12.1.10" JMH_VERSION = "1.37" -JNA_VERSION = "5.19.0" +JNA_VERSION = "5.19.1" SLF4J_VERSION = "2.0.18" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 6665be632e3..09915547b17 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.19.0 + 5.19.1 jar net.java.dev.jna jna-platform - 5.19.0 + 5.19.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index a2188de683d..cc7867bdd0b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.19.0 + 5.19.1 jar net.java.dev.jna jna-platform - 5.19.0 + 5.19.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 9485a6b8726..9b2c6722b00 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.19.0 + 5.19.1 jar net.java.dev.jna jna-platform - 5.19.0 + 5.19.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 12e7b9961a7..d1051a6d499 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.19.0 + 5.19.1 jar net.java.dev.jna jna-platform - 5.19.0 + 5.19.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 600437dc8dc..7a970eb821b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.19.0 + 5.19.1 jar net.java.dev.jna jna-platform - 5.19.0 + 5.19.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 5e13ebaaac8..c05a5604242 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.19.0 + 5.19.1 jar net.java.dev.jna jna-platform - 5.19.0 + 5.19.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 5a0242f9c6a..c8beef8aa34 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -97,13 +97,13 @@ net.java.dev.jna jna - 5.19.0 + 5.19.1 jar net.java.dev.jna jna-platform - 5.19.0 + 5.19.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index f39aae7efd4..9bb43f9e5d4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -207,12 +207,12 @@ maven jna dependency { groupId = "net.java.dev.jna" artifactId = "jna" - version = "5.19.0" + version = "5.19.1" } dependency { groupId = "net.java.dev.jna" artifactId = "jna-platform" - version = "5.19.0" + version = "5.19.1" } } diff --git a/pom.xml b/pom.xml index cf23398f872..cc84eba7f96 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.16.1 3.0 3.27.7 - 5.19.0 + 5.19.1 1.18.10 From 31459eb5b5cf41984b8c024b03b2814d3b25d3fa Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 23 Jun 2026 10:40:08 +0200 Subject: [PATCH 149/200] Update commons-logging to 1.4.0 Release notes: https://github.com/apache/commons-logging/blob/a685f33a4164813d908f43eac34c14f6b0dc4994/RELEASE-NOTES.txt Change-Id: I31635a8197226534c65396fa99b7e5a00daa8fdf --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 00261082930..ceca81faff9 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -51,7 +51,7 @@ maven.install( "com.jcraft:jzlib:1.1.3", "commons-codec:commons-codec:1.22.0", "commons-io:commons-io:2.22.0", - "commons-logging:commons-logging:1.3.6", + "commons-logging:commons-logging:1.4.0", "jakarta.servlet:jakarta.servlet-api:6.1.0", "junit:junit:4.13.2", "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 09915547b17..8c41fe27bc6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.6 + 1.4.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index cc7867bdd0b..a2026552c73 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.6 + 1.4.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 9b2c6722b00..5587f6339a0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.6 + 1.4.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index d1051a6d499..34a2eae0360 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.6 + 1.4.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 7a970eb821b..e453d08bead 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.6 + 1.4.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index c05a5604242..e246863bb20 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.6 + 1.4.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index c8beef8aa34..ca068bf2bbd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -289,7 +289,7 @@ commons-logging commons-logging - 1.3.6 + 1.4.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 9bb43f9e5d4..76f199bb0a1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -30,7 +30,7 @@ maven apache dependency { groupId = "commons-logging" artifactId = "commons-logging" - version = "1.3.6" + version = "1.4.0" } } diff --git a/pom.xml b/pom.xml index cc84eba7f96..bcd85085996 100644 --- a/pom.xml +++ b/pom.xml @@ -917,7 +917,7 @@ commons-logging commons-logging - 1.3.6 + 1.4.0 From 2f8bc42fadd4c836f1f280888e0b33cdbd13f417 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Mon, 22 Jun 2026 18:05:48 -0700 Subject: [PATCH 150/200] Ensure the SnapshottingRefDirectory shares the packedRefsRefresher When the packedRefsRefresher was added to RefDirectory, it was erroneously initialized on the object instead of in the constructors. This meant that it was not shared with any SnapshottingRefDirectories created from the RefDirectory which prevents its optimization from coming into play in such situations. Fix this by initializing the packedRefsRefresher in the primary constructor, and copying it in the one meant for inherited classes. Change-Id: Iaa424f9f86160662730aa1b4ffc3b99f41b469c0 Signed-off-by: Martin Fick --- .../org/eclipse/jgit/internal/storage/file/RefDirectory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index c93d176e35c..29630b74ad0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -147,8 +147,7 @@ public class RefDirectory extends RefDatabase { /** Immutable sorted list of packed references. */ final AtomicReference packedRefs = new AtomicReference<>(); - private final AtomicReference packedRefsRefresher = - new AtomicReference<>(); + private final AtomicReference packedRefsRefresher; /** * Lock for coordinating operations within a single process that may contend @@ -202,6 +201,7 @@ public class RefDirectory extends RefDatabase { trustFolderStat = refDb.trustFolderStat; trustPackedRefsStat = refDb.trustPackedRefsStat; trustLooseRefStat = refDb.trustLooseRefStat; + packedRefsRefresher = refDb.packedRefsRefresher; inProcessPackedRefsLock = refDb.inProcessPackedRefsLock; } @@ -227,6 +227,7 @@ public class RefDirectory extends RefDatabase { .getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_TRUST_LOOSE_REF_STAT, TrustLooseRefStat.ALWAYS); + packedRefsRefresher = new AtomicReference<>(); inProcessPackedRefsLock = new ReentrantLock(true); } From 71b8cede5b41c74e727515d72880c0277126f9a2 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 24 Jun 2026 17:05:08 +0200 Subject: [PATCH 151/200] Bazel: format build files with buildifier Change-Id: I7a654fe8f138c4e59687d65a3ada4bfee4e51173 --- lib/BUILD | 6 +- lib/jmh/BUILD | 4 +- org.eclipse.jgit.benchmarks/BUILD | 2 +- org.eclipse.jgit.junit.http/BUILD | 5 +- org.eclipse.jgit.junit/BUILD | 5 +- org.eclipse.jgit.pgm.test/BUILD | 2 +- org.eclipse.jgit.test/BUILD | 7 +- org.eclipse.jgit/BUILD | 12 +- tools/BUILD | 783 +++++++++++++++--------------- 9 files changed, 417 insertions(+), 409 deletions(-) diff --git a/lib/BUILD b/lib/BUILD index 20b85dafa17..c1a36721cff 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -264,10 +264,10 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@external_deps//:net_bytebuddy_byte_buddy_agent", + "@external_deps//:junit_junit", "@external_deps//:net_bytebuddy_byte_buddy", + "@external_deps//:net_bytebuddy_byte_buddy_agent", "@external_deps//:org_hamcrest_hamcrest", - "@external_deps//:junit_junit", "@external_deps//:org_mockito_mockito_core", "@external_deps//:org_objenesis_objenesis", ], @@ -278,8 +278,8 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@external_deps//:net_bytebuddy_byte_buddy_agent", "@external_deps//:net_bytebuddy_byte_buddy", + "@external_deps//:net_bytebuddy_byte_buddy_agent", "@external_deps//:org_mockito_mockito_core", "@external_deps//:org_objenesis_objenesis", ], diff --git a/lib/jmh/BUILD b/lib/jmh/BUILD index 2b15300bfbc..e6d39770159 100644 --- a/lib/jmh/BUILD +++ b/lib/jmh/BUILD @@ -4,9 +4,9 @@ java_library( name = "jmh", visibility = ["//visibility:public"], exports = [ - "@external_deps//:org_openjdk_jmh_jmh_generator_annprocess", - "@external_deps//:org_openjdk_jmh_jmh_core", "@external_deps//:net_sf_jopt_simple_jopt_simple", "@external_deps//:org_apache_commons_commons_math3", + "@external_deps//:org_openjdk_jmh_jmh_core", + "@external_deps//:org_openjdk_jmh_jmh_generator_annprocess", ], ) diff --git a/org.eclipse.jgit.benchmarks/BUILD b/org.eclipse.jgit.benchmarks/BUILD index 7c311e79946..91ceb7fe5f7 100644 --- a/org.eclipse.jgit.benchmarks/BUILD +++ b/org.eclipse.jgit.benchmarks/BUILD @@ -6,8 +6,8 @@ SRCS = glob( jmh_java_benchmarks( name = "benchmarks", - srcs = SRCS, testonly = 1, + srcs = SRCS, deps = [ "//lib:javaewah", "//lib:junit", diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 66620cea510..87dcf3ecfce 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -6,7 +6,10 @@ java_library( name = "junit-http", testonly = 1, srcs = glob(["src/**/*.java"]), - resources = glob(["resources/**"], allow_empty=True), + resources = glob( + ["resources/**"], + allow_empty = True, + ), # TODO(davido): we want here provided deps deps = [ "//lib:jetty-http", diff --git a/org.eclipse.jgit.junit/BUILD b/org.eclipse.jgit.junit/BUILD index f4a7165dbbb..8879cd98b69 100644 --- a/org.eclipse.jgit.junit/BUILD +++ b/org.eclipse.jgit.junit/BUILD @@ -7,7 +7,10 @@ java_library( testonly = 1, srcs = glob(["src/**/*.java"]), resource_strip_prefix = "org.eclipse.jgit.junit/resources", - resources = glob(["resources/**"], allow_empty=True), + resources = glob( + ["resources/**"], + allow_empty = True, + ), deps = [ "//lib:junit", # We want these deps to be provided_deps diff --git a/org.eclipse.jgit.pgm.test/BUILD b/org.eclipse.jgit.pgm.test/BUILD index b8ffa695940..fdd87d3e95e 100644 --- a/org.eclipse.jgit.pgm.test/BUILD +++ b/org.eclipse.jgit.pgm.test/BUILD @@ -15,8 +15,8 @@ junit_tests( deps = [ ":helpers", "//lib:args4j", - "//lib:commons-io", "//lib:commons-compress", + "//lib:commons-io", "//lib:javaewah", "//lib:junit", "//lib:slf4j-api", diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index 7755df04996..7dab36d0676 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -53,10 +53,11 @@ tests(tests = glob( exclude = HELPERS + DATA + EXCLUDED, )) - -tests(tests = glob(["exttst/**/*.java"]), +tests( + extra_tags = ["ext"], srcprefix = "exttst/", - extra_tags = ["ext"]) + tests = glob(["exttst/**/*.java"]), +) # Non abstract base classes used for tests by other test classes BASE = [ diff --git a/org.eclipse.jgit/BUILD b/org.eclipse.jgit/BUILD index 1e9b7708a0f..5d4bce4207a 100644 --- a/org.eclipse.jgit/BUILD +++ b/org.eclipse.jgit/BUILD @@ -16,6 +16,12 @@ RESOURCES = glob(["resources/**"]) java_library( name = "jgit_non_stamped", srcs = SRCS, + javacopts = [ + "-Xep:ReferenceEquality:OFF", + "-Xep:StringEquality:OFF", + "-Xep:TypeParameterUnusedInFormals:OFF", + "-Xep:DefaultCharset:OFF", + ], resource_strip_prefix = "org.eclipse.jgit/resources", resources = RESOURCES, deps = [ @@ -24,12 +30,6 @@ java_library( "//lib:javaewah", "//lib:slf4j-api", ], - javacopts = [ - "-Xep:ReferenceEquality:OFF", - "-Xep:StringEquality:OFF", - "-Xep:TypeParameterUnusedInFormals:OFF", - "-Xep:DefaultCharset:OFF", - ] ) genrule( diff --git a/tools/BUILD b/tools/BUILD index 379a9bd34cb..4238054dadf 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -35,398 +35,399 @@ default_java_toolchain( # https://github.com/bazelbuild/BUILD_file_generator/blob/master/tools/bazel_defs/java.bzl # However, feel free to add any additional errors. Thus far they have all been pretty useful. errorprone_checks = [ - "-XepDisableWarningsInGeneratedCode", - # The XepDisableWarningsInGeneratedCode disables only warnings, but - # not errors. We should manually exclude all files generated by - # AutoValue; such files always start $AutoValue_..... - # XepExcludedPaths is a regexp. If you need more paths - use | as - # separator. - "-XepExcludedPaths:.*/\\\\$$AutoValue_.*\\.java", - "-Xep:AlmostJavadoc:ERROR", - "-Xep:AlwaysThrows:ERROR", - "-Xep:AmbiguousMethodReference:ERROR", - # don't want to add dependency to errorprone - "-Xep:AnnotateFormatMethod:OFF", - "-Xep:ArgumentSelectionDefectChecker:ERROR", - "-Xep:ArrayAsKeyOfSetOrMap:ERROR", - "-Xep:ArrayEquals:ERROR", - "-Xep:ArrayFillIncompatibleType:ERROR", - "-Xep:ArrayHashCode:ERROR", - "-Xep:ArraysAsListPrimitiveArray:ERROR", - "-Xep:ArrayToString:ERROR", - "-Xep:AssertEqualsArgumentOrderChecker:WARN", - "-Xep:AssertionFailureIgnored:WARN", - "-Xep:AsyncCallableReturnsNull:ERROR", - "-Xep:AsyncFunctionReturnsNull:ERROR", - "-Xep:AutoValueConstructorOrderChecker:ERROR", - "-Xep:AutoValueFinalMethods:ERROR", - "-Xep:AutoValueImmutableFields:ERROR", - "-Xep:AutoValueSubclassLeaked:WARN", - "-Xep:BadAnnotationImplementation:ERROR", - "-Xep:BadComparable:ERROR", - "-Xep:BadImport:ERROR", - "-Xep:BadInstanceof:ERROR", - "-Xep:BadShiftAmount:ERROR", - "-Xep:BanSerializableRead:ERROR", - "-Xep:BigDecimalEquals:ERROR", - "-Xep:BigDecimalLiteralDouble:ERROR", - "-Xep:BoxedPrimitiveConstructor:ERROR", - "-Xep:BoxedPrimitiveEquality:ERROR", - "-Xep:BundleDeserializationCast:ERROR", - "-Xep:ByteBufferBackingArray:WARN", - "-Xep:CacheLoaderNull:ERROR", - "-Xep:CannotMockFinalClass:ERROR", - "-Xep:CanonicalDuration:ERROR", - "-Xep:CatchAndPrintStackTrace:ERROR", - "-Xep:CatchFail:ERROR", - "-Xep:ChainedAssertionLosesContext:ERROR", - "-Xep:ChainingConstructorIgnoresParameter:ERROR", - "-Xep:CharacterGetNumericValue:ERROR", - "-Xep:CheckNotNullMultipleTimes:ERROR", - "-Xep:CheckReturnValue:ERROR", - "-Xep:ClassCanBeStatic:ERROR", - "-Xep:ClassName:ERROR", - "-Xep:ClassNewInstance:ERROR", - "-Xep:CollectionIncompatibleType:ERROR", - "-Xep:CollectionToArraySafeParameter:ERROR", - "-Xep:CollectionUndefinedEquality:ERROR", - "-Xep:CollectorShouldNotUseState:ERROR", - "-Xep:ComparableAndComparator:ERROR", - "-Xep:ComparableType:ERROR", - "-Xep:CompareToZero:ERROR", - "-Xep:ComparingThisWithNull:ERROR", - "-Xep:ComparisonOutOfRange:ERROR", - "-Xep:CompatibleWithAnnotationMisuse:ERROR", - "-Xep:CompileTimeConstant:ERROR", - "-Xep:ComplexBooleanConstant:ERROR", - "-Xep:ComputeIfAbsentAmbiguousReference:ERROR", - "-Xep:ConditionalExpressionNumericPromotion:ERROR", - "-Xep:ConstantOverflow:ERROR", - "-Xep:DaggerProvidesNull:ERROR", - "-Xep:DangerousLiteralNull:ERROR", - "-Xep:DateChecker:ERROR", - "-Xep:DateFormatConstant:ERROR", - "-Xep:DeadException:ERROR", - "-Xep:DeadThread:ERROR", - "-Xep:DefaultCharset:ERROR", - "-Xep:DefaultPackage:ERROR", - "-Xep:DepAnn:ERROR", - "-Xep:DeprecatedVariable:ERROR", - "-Xep:DiscardedPostfixExpression:ERROR", - "-Xep:DoNotCall:ERROR", - "-Xep:DoNotCallSuggester:ERROR", - "-Xep:DoNotClaimAnnotations:ERROR", - "-Xep:DoNotMock:ERROR", - "-Xep:DoNotMockAutoValue:WARN", - "-Xep:DoubleBraceInitialization:ERROR", - "-Xep:DoubleCheckedLocking:ERROR", - "-Xep:DuplicateMapKeys:ERROR", - "-Xep:DurationFrom:ERROR", - "-Xep:DurationGetTemporalUnit:ERROR", - "-Xep:DurationTemporalUnit:ERROR", - "-Xep:DurationToLongTimeUnit:ERROR", - "-Xep:EmptyBlockTag:WARN", - "-Xep:EmptyCatch:ERROR", - "-Xep:EmptySetMultibindingContributions:ERROR", - "-Xep:EqualsGetClass:ERROR", - "-Xep:EqualsHashCode:ERROR", - "-Xep:EqualsIncompatibleType:ERROR", - "-Xep:EqualsNaN:ERROR", - "-Xep:EqualsNull:ERROR", - "-Xep:EqualsReference:ERROR", - "-Xep:EqualsUnsafeCast:ERROR", - "-Xep:EqualsUsingHashCode:ERROR", - "-Xep:EqualsWrongThing:ERROR", - "-Xep:ErroneousThreadPoolConstructorChecker:ERROR", - "-Xep:EscapedEntity:WARN", - "-Xep:ExpectedExceptionChecker:ERROR", - "-Xep:ExtendingJUnitAssert:ERROR", - "-Xep:ExtendsAutoValue:ERROR", - "-Xep:FallThrough:ERROR", - "-Xep:Finally:ERROR", - "-Xep:FloatCast:ERROR", - "-Xep:FloatingPointAssertionWithinEpsilon:ERROR", - "-Xep:FloatingPointLiteralPrecision:ERROR", - "-Xep:FloggerArgumentToString:ERROR", - "-Xep:FloggerFormatString:ERROR", - "-Xep:FloggerLogVarargs:ERROR", - "-Xep:FloggerSplitLogStatement:ERROR", - "-Xep:FloggerStringConcatenation:ERROR", - "-Xep:FormatString:ERROR", - "-Xep:FormatStringAnnotation:ERROR", - "-Xep:ForOverride:ERROR", - "-Xep:FragmentInjection:ERROR", - "-Xep:FragmentNotInstantiable:ERROR", - "-Xep:FromTemporalAccessor:ERROR", - "-Xep:FunctionalInterfaceClash:ERROR", - "-Xep:FunctionalInterfaceMethodChanged:ERROR", - "-Xep:FutureReturnValueIgnored:ERROR", - "-Xep:FuturesGetCheckedIllegalExceptionType:ERROR", - "-Xep:GetClassOnAnnotation:ERROR", - "-Xep:GetClassOnClass:ERROR", - "-Xep:GetClassOnEnum:ERROR", - "-Xep:GuardedBy:ERROR", - "-Xep:GuiceAssistedInjectScoping:ERROR", - "-Xep:GuiceAssistedParameters:ERROR", - "-Xep:HashtableContains:ERROR", - "-Xep:HidingField:WARN", - "-Xep:IdentityBinaryExpression:ERROR", - "-Xep:IdentityHashMapBoxing:ERROR", - "-Xep:IdentityHashMapUsage:ERROR", - "-Xep:IgnoredPureGetter:ERROR", - "-Xep:Immutable:ERROR", - "-Xep:ImmutableAnnotationChecker:ERROR", - "-Xep:ImmutableEnumChecker:ERROR", - "-Xep:ImmutableModification:ERROR", - "-Xep:Incomparable:ERROR", - "-Xep:IncompatibleArgumentType:ERROR", - "-Xep:IncompatibleModifiers:ERROR", - "-Xep:InconsistentCapitalization:WARN", - "-Xep:InconsistentHashCode:ERROR", - "-Xep:IncrementInForLoopAndHeader:ERROR", - "-Xep:IndexOfChar:ERROR", - "-Xep:InexactVarargsConditional:ERROR", - "-Xep:InfiniteRecursion:ERROR", - "-Xep:InheritDoc:ERROR", - "-Xep:InjectOnConstructorOfAbstractClass:ERROR", - "-Xep:InlineFormatString:ERROR", - "-Xep:InlineMeInliner:ERROR", - # don't want to add dependency to errorprone - "-Xep:InlineMeSuggester:OFF", - "-Xep:InlineMeValidator:ERROR", - "-Xep:InputStreamSlowMultibyteRead:ERROR", - "-Xep:InsecureCryptoUsage:ERROR", - "-Xep:InstanceOfAndCastMatchWrongType:ERROR", - "-Xep:InstantTemporalUnit:ERROR", - "-Xep:IntLongMath:ERROR", - "-Xep:InvalidBlockTag:ERROR", - "-Xep:InvalidInlineTag:ERROR", - "-Xep:InvalidJavaTimeConstant:ERROR", - "-Xep:InvalidLink:ERROR", - "-Xep:InvalidParam:ERROR", - "-Xep:InvalidPatternSyntax:ERROR", - "-Xep:InvalidThrows:ERROR", - "-Xep:InvalidThrowsLink:ERROR", - "-Xep:InvalidTimeZoneID:ERROR", - "-Xep:InvalidZoneId:ERROR", - "-Xep:IsInstanceIncompatibleType:ERROR", - "-Xep:IsInstanceOfClass:ERROR", - "-Xep:IsLoggableTagLength:ERROR", - "-Xep:IterableAndIterator:ERROR", - "-Xep:IterablePathParameter:ERROR", - "-Xep:JavaDurationGetSecondsGetNano:ERROR", - "-Xep:JavaDurationWithNanos:ERROR", - "-Xep:JavaDurationWithSeconds:ERROR", - "-Xep:JavaInstantGetSecondsGetNano:ERROR", - "-Xep:JavaLangClash:ERROR", - "-Xep:JavaLocalDateTimeGetNano:ERROR", - "-Xep:JavaLocalTimeGetNano:ERROR", - "-Xep:JavaPeriodGetDays:ERROR", - "-Xep:JavaTimeDefaultTimeZone:ERROR", - "-Xep:JavaUtilDate:WARN", - "-Xep:JdkObsolete:ERROR", - "-Xep:JodaConstructors:ERROR", - "-Xep:JodaDateTimeConstants:ERROR", - "-Xep:JodaDurationWithMillis:ERROR", - "-Xep:JodaInstantWithMillis:ERROR", - "-Xep:JodaNewPeriod:ERROR", - "-Xep:JodaPlusMinusLong:ERROR", - "-Xep:JodaTimeConverterManager:ERROR", - "-Xep:JodaToSelf:ERROR", - "-Xep:JodaWithDurationAddedLong:ERROR", - "-Xep:JUnit3FloatingPointComparisonWithoutDelta:ERROR", - "-Xep:JUnit3TestNotRun:ERROR", - "-Xep:JUnit4ClassAnnotationNonStatic:ERROR", - "-Xep:JUnit4ClassUsedInJUnit3:ERROR", - "-Xep:JUnit4SetUpNotRun:ERROR", - "-Xep:JUnit4TearDownNotRun:ERROR", - "-Xep:JUnit4TestNotRun:ERROR", - "-Xep:JUnit4TestsNotRunWithinEnclosed:ERROR", - "-Xep:JUnitAmbiguousTestClass:ERROR", - "-Xep:JUnitAssertSameCheck:ERROR", - "-Xep:JUnitParameterMethodNotFound:ERROR", - "-Xep:LiteByteStringUtf8:ERROR", - "-Xep:LiteEnumValueOf:ERROR", - "-Xep:LiteProtoToString:ERROR", - "-Xep:LocalDateTemporalAmount:ERROR", - "-Xep:LockNotBeforeTry:ERROR", - "-Xep:LockOnBoxedPrimitive:ERROR", - "-Xep:LogicalAssignment:ERROR", - "-Xep:LongFloatConversion:ERROR", - "-Xep:LongLiteralLowerCaseSuffix:ERROR", - "-Xep:LoopConditionChecker:ERROR", - "-Xep:LoopOverCharArray:ERROR", - "-Xep:LossyPrimitiveCompare:ERROR", - "-Xep:MathAbsoluteRandom:ERROR", - "-Xep:MathRoundIntLong:ERROR", - "-Xep:MemoizeConstantVisitorStateLookups:ERROR", - "-Xep:MislabeledAndroidString:ERROR", - "-Xep:MissingCasesInEnumSwitch:ERROR", - "-Xep:MissingFail:ERROR", - "-Xep:MissingOverride:ERROR", - "-Xep:MissingSummary:WARN", - "-Xep:MissingSuperCall:ERROR", - "-Xep:MissingTestCall:ERROR", - "-Xep:MisusedDayOfYear:ERROR", - "-Xep:MisusedWeekYear:ERROR", - "-Xep:MixedDescriptors:ERROR", - "-Xep:MixedMutabilityReturnType:WARN", - "-Xep:MockitoUsage:ERROR", - "-Xep:ModifiedButNotUsed:ERROR", - "-Xep:ModifyCollectionInEnhancedForLoop:ERROR", - "-Xep:ModifyingCollectionWithItself:ERROR", - "-Xep:ModifySourceCollectionInStream:ERROR", - "-Xep:MultipleParallelOrSequentialCalls:ERROR", - "-Xep:MultipleUnaryOperatorsInMethodCall:ERROR", - "-Xep:MustBeClosedChecker:ERROR", - "-Xep:MutableConstantField:ERROR", - # Java provides no good alternative - "-Xep:MutablePublicArray:OFF", - "-Xep:NarrowingCompoundAssignment:ERROR", - "-Xep:NCopiesOfChar:ERROR", - "-Xep:NestedInstanceOfConditions:ERROR", - "-Xep:NonAtomicVolatileUpdate:ERROR", - "-Xep:NonCanonicalStaticImport:ERROR", - "-Xep:NonCanonicalType:ERROR", - "-Xep:NonFinalCompileTimeConstant:ERROR", - "-Xep:NonOverridingEquals:ERROR", - "-Xep:NonRuntimeAnnotation:ERROR", - "-Xep:NullableConstructor:ERROR", - "-Xep:NullablePrimitive:ERROR", - "-Xep:NullablePrimitiveArray:ERROR", - "-Xep:NullableVoid:ERROR", - "-Xep:NullOptional:ERROR", - "-Xep:NullTernary:ERROR", - "-Xep:ObjectEqualsForPrimitives:ERROR", - "-Xep:ObjectsHashCodePrimitive:ERROR", - "-Xep:ObjectToString:ERROR", - "-Xep:OperatorPrecedence:ERROR", - "-Xep:OptionalEquality:ERROR", - "-Xep:OptionalMapToOptional:ERROR", - "-Xep:OptionalMapUnusedValue:ERROR", - "-Xep:OptionalNotPresent:ERROR", - "-Xep:OptionalOfRedundantMethod:ERROR", - "-Xep:OrphanedFormatString:ERROR", - "-Xep:OutlineNone:ERROR", - "-Xep:OverlappingQualifierAndScopeAnnotation:ERROR", - "-Xep:Overrides:ERROR", - "-Xep:OverridesGuiceInjectableMethod:ERROR", - "-Xep:OverridesJavaxInjectableMethod:ERROR", - "-Xep:OverrideThrowableToString:ERROR", - "-Xep:PackageInfo:ERROR", - "-Xep:ParameterName:ERROR", - "-Xep:ParametersButNotParameterized:ERROR", - "-Xep:ParcelableCreator:ERROR", - "-Xep:PeriodFrom:ERROR", - "-Xep:PeriodGetTemporalUnit:ERROR", - "-Xep:PeriodTimeMath:ERROR", - "-Xep:PreconditionsCheckNotNullRepeated:ERROR", - "-Xep:PreconditionsInvalidPlaceholder:ERROR", - "-Xep:PreferredInterfaceType:OFF", - "-Xep:PrimitiveAtomicReference:ERROR", - "-Xep:PrivateSecurityContractProtoAccess:ERROR", - "-Xep:ProtectedMembersInFinalClass:ERROR", - "-Xep:ProtoBuilderReturnValueIgnored:ERROR", - "-Xep:ProtocolBufferOrdinal:ERROR", - "-Xep:ProtoDurationGetSecondsGetNano:ERROR", - "-Xep:ProtoFieldNullComparison:ERROR", - "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR", - "-Xep:ProtoRedundantSet:ERROR", - "-Xep:ProtoStringFieldReferenceEquality:ERROR", - "-Xep:ProtoTimestampGetSecondsGetNano:ERROR", - "-Xep:ProtoTruthMixedDescriptors:ERROR", - "-Xep:ProvidesMethodOutsideOfModule:ERROR", - "-Xep:RandomCast:ERROR", - "-Xep:RandomModInteger:ERROR", - "-Xep:ReachabilityFenceUsage:ERROR", - "-Xep:RectIntersectReturnValueIgnored:ERROR", - "-Xep:ReferenceEquality:ERROR", - "-Xep:RefersToDaggerCodegen:ERROR", - "-Xep:RemovedInJDK11:ERROR", - "-Xep:RequiredModifiers:ERROR", - "-Xep:RestrictedApiChecker:ERROR", - "-Xep:RethrowReflectiveOperationExceptionAsLinkageError:ERROR", - "-Xep:ReturnFromVoid:ERROR", - "-Xep:ReturnValueIgnored:ERROR", - "-Xep:RxReturnValueIgnored:ERROR", - "-Xep:SameNameButDifferent:ERROR", - "-Xep:SelfAssignment:ERROR", - "-Xep:SelfComparison:ERROR", - "-Xep:SelfEquals:ERROR", - "-Xep:ShortCircuitBoolean:ERROR", - "-Xep:ShouldHaveEvenArgs:ERROR", - "-Xep:SizeGreaterThanOrEqualsZero:ERROR", - "-Xep:StaticAssignmentInConstructor:ERROR", - "-Xep:StaticGuardedByInstance:ERROR", - "-Xep:StaticMockMember:ERROR", - "-Xep:StaticQualifiedUsingExpression:ERROR", - "-Xep:StreamToString:ERROR", - "-Xep:StringBuilderInitWithChar:ERROR", - "-Xep:StringEquality:ERROR", - "-Xep:StringSplitter:WARN", - "-Xep:SubstringOfZero:ERROR", - "-Xep:SuppressWarningsDeprecated:ERROR", - "-Xep:SwigMemoryLeak:ERROR", - "-Xep:SynchronizeOnNonFinalField:ERROR", - "-Xep:TemporalAccessorGetChronoField:ERROR", - "-Xep:TestParametersNotInitialized:ERROR", - "-Xep:TheoryButNoTheories:ERROR", - "-Xep:ThreadJoinLoop:ERROR", - "-Xep:ThreadLocalUsage:ERROR", - "-Xep:ThreadPriorityCheck:ERROR", - "-Xep:ThreeLetterTimeZoneID:WARN", - "-Xep:ThrowIfUncheckedKnownChecked:ERROR", - "-Xep:ThrowNull:ERROR", - "-Xep:TimeUnitConversionChecker:ERROR", - "-Xep:ToStringReturnsNull:ERROR", - "-Xep:TreeToString:ERROR", - "-Xep:TruthAssertExpected:ERROR", - "-Xep:TruthConstantAsserts:ERROR", - "-Xep:TruthGetOrDefault:ERROR", - "-Xep:TruthIncompatibleType:ERROR", - "-Xep:TruthSelfEquals:ERROR", - "-Xep:TryFailThrowable:ERROR", - "-Xep:TypeEquals:ERROR", - "-Xep:TypeNameShadowing:ERROR", - "-Xep:TypeParameterQualifier:ERROR", - "-Xep:TypeParameterShadowing:ERROR", - "-Xep:TypeParameterUnusedInFormals:ERROR", - "-Xep:UndefinedEquals:WARN", - "-Xep:UnescapedEntity:WARN", - "-Xep:UnnecessaryAssignment:ERROR", - "-Xep:UnnecessaryCheckNotNull:ERROR", - "-Xep:UnnecessaryLambda:ERROR", - "-Xep:UnnecessaryMethodInvocationMatcher:ERROR", - "-Xep:UnnecessaryMethodReference:ERROR", - "-Xep:UnnecessaryParentheses:ERROR", - "-Xep:UnnecessaryTypeArgument:ERROR", - "-Xep:UnrecognisedJavadocTag:ERROR", - "-Xep:UnsafeFinalization:ERROR", - "-Xep:UnsafeReflectiveConstructionCast:ERROR", - "-Xep:UnsynchronizedOverridesSynchronized:ERROR", - "-Xep:UnusedAnonymousClass:ERROR", - "-Xep:UnusedCollectionModifiedInPlace:ERROR", - "-Xep:UnusedException:ERROR", - "-Xep:UnusedMethod:WARN", - "-Xep:UnusedNestedClass:ERROR", - "-Xep:UnusedVariable:ERROR", - "-Xep:URLEqualsHashCode:ERROR", - "-Xep:UseBinds:ERROR", - "-Xep:UseCorrectAssertInTests:ERROR", - "-Xep:VariableNameSameAsType:ERROR", - "-Xep:VarTypeName:ERROR", - "-Xep:WaitNotInLoop:ERROR", - "-Xep:WakelockReleasedDangerously:ERROR", - "-Xep:WildcardImport:ERROR", - "-Xep:WithSignatureDiscouraged:ERROR", - "-Xep:WrongOneof:ERROR", - "-Xep:XorPower:ERROR", - "-Xep:ZoneIdOfZ:ERROR", + "-XepDisableWarningsInGeneratedCode", + # The XepDisableWarningsInGeneratedCode disables only warnings, but + # not errors. We should manually exclude all files generated by + # AutoValue; such files always start $AutoValue_..... + # XepExcludedPaths is a regexp. If you need more paths - use | as + # separator. + "-XepExcludedPaths:.*/\\\\$$AutoValue_.*\\.java", + "-Xep:AlmostJavadoc:ERROR", + "-Xep:AlwaysThrows:ERROR", + "-Xep:AmbiguousMethodReference:ERROR", + # don't want to add dependency to errorprone + "-Xep:AnnotateFormatMethod:OFF", + "-Xep:ArgumentSelectionDefectChecker:ERROR", + "-Xep:ArrayAsKeyOfSetOrMap:ERROR", + "-Xep:ArrayEquals:ERROR", + "-Xep:ArrayFillIncompatibleType:ERROR", + "-Xep:ArrayHashCode:ERROR", + "-Xep:ArraysAsListPrimitiveArray:ERROR", + "-Xep:ArrayToString:ERROR", + "-Xep:AssertEqualsArgumentOrderChecker:WARN", + "-Xep:AssertionFailureIgnored:WARN", + "-Xep:AsyncCallableReturnsNull:ERROR", + "-Xep:AsyncFunctionReturnsNull:ERROR", + "-Xep:AutoValueConstructorOrderChecker:ERROR", + "-Xep:AutoValueFinalMethods:ERROR", + "-Xep:AutoValueImmutableFields:ERROR", + "-Xep:AutoValueSubclassLeaked:WARN", + "-Xep:BadAnnotationImplementation:ERROR", + "-Xep:BadComparable:ERROR", + "-Xep:BadImport:ERROR", + "-Xep:BadInstanceof:ERROR", + "-Xep:BadShiftAmount:ERROR", + "-Xep:BanSerializableRead:ERROR", + "-Xep:BigDecimalEquals:ERROR", + "-Xep:BigDecimalLiteralDouble:ERROR", + "-Xep:BoxedPrimitiveConstructor:ERROR", + "-Xep:BoxedPrimitiveEquality:ERROR", + "-Xep:BundleDeserializationCast:ERROR", + "-Xep:ByteBufferBackingArray:WARN", + "-Xep:CacheLoaderNull:ERROR", + "-Xep:CannotMockFinalClass:ERROR", + "-Xep:CanonicalDuration:ERROR", + "-Xep:CatchAndPrintStackTrace:ERROR", + "-Xep:CatchFail:ERROR", + "-Xep:ChainedAssertionLosesContext:ERROR", + "-Xep:ChainingConstructorIgnoresParameter:ERROR", + "-Xep:CharacterGetNumericValue:ERROR", + "-Xep:CheckNotNullMultipleTimes:ERROR", + "-Xep:CheckReturnValue:ERROR", + "-Xep:ClassCanBeStatic:ERROR", + "-Xep:ClassName:ERROR", + "-Xep:ClassNewInstance:ERROR", + "-Xep:CollectionIncompatibleType:ERROR", + "-Xep:CollectionToArraySafeParameter:ERROR", + "-Xep:CollectionUndefinedEquality:ERROR", + "-Xep:CollectorShouldNotUseState:ERROR", + "-Xep:ComparableAndComparator:ERROR", + "-Xep:ComparableType:ERROR", + "-Xep:CompareToZero:ERROR", + "-Xep:ComparingThisWithNull:ERROR", + "-Xep:ComparisonOutOfRange:ERROR", + "-Xep:CompatibleWithAnnotationMisuse:ERROR", + "-Xep:CompileTimeConstant:ERROR", + "-Xep:ComplexBooleanConstant:ERROR", + "-Xep:ComputeIfAbsentAmbiguousReference:ERROR", + "-Xep:ConditionalExpressionNumericPromotion:ERROR", + "-Xep:ConstantOverflow:ERROR", + "-Xep:DaggerProvidesNull:ERROR", + "-Xep:DangerousLiteralNull:ERROR", + "-Xep:DateChecker:ERROR", + "-Xep:DateFormatConstant:ERROR", + "-Xep:DeadException:ERROR", + "-Xep:DeadThread:ERROR", + "-Xep:DefaultCharset:ERROR", + "-Xep:DefaultPackage:ERROR", + "-Xep:DepAnn:ERROR", + "-Xep:DeprecatedVariable:ERROR", + "-Xep:DiscardedPostfixExpression:ERROR", + "-Xep:DoNotCall:ERROR", + "-Xep:DoNotCallSuggester:ERROR", + "-Xep:DoNotClaimAnnotations:ERROR", + "-Xep:DoNotMock:ERROR", + "-Xep:DoNotMockAutoValue:WARN", + "-Xep:DoubleBraceInitialization:ERROR", + "-Xep:DoubleCheckedLocking:ERROR", + "-Xep:DuplicateMapKeys:ERROR", + "-Xep:DurationFrom:ERROR", + "-Xep:DurationGetTemporalUnit:ERROR", + "-Xep:DurationTemporalUnit:ERROR", + "-Xep:DurationToLongTimeUnit:ERROR", + "-Xep:EmptyBlockTag:WARN", + "-Xep:EmptyCatch:ERROR", + "-Xep:EmptySetMultibindingContributions:ERROR", + "-Xep:EqualsGetClass:ERROR", + "-Xep:EqualsHashCode:ERROR", + "-Xep:EqualsIncompatibleType:ERROR", + "-Xep:EqualsNaN:ERROR", + "-Xep:EqualsNull:ERROR", + "-Xep:EqualsReference:ERROR", + "-Xep:EqualsUnsafeCast:ERROR", + "-Xep:EqualsUsingHashCode:ERROR", + "-Xep:EqualsWrongThing:ERROR", + "-Xep:ErroneousThreadPoolConstructorChecker:ERROR", + "-Xep:EscapedEntity:WARN", + "-Xep:ExpectedExceptionChecker:ERROR", + "-Xep:ExtendingJUnitAssert:ERROR", + "-Xep:ExtendsAutoValue:ERROR", + "-Xep:FallThrough:ERROR", + "-Xep:Finally:ERROR", + "-Xep:FloatCast:ERROR", + "-Xep:FloatingPointAssertionWithinEpsilon:ERROR", + "-Xep:FloatingPointLiteralPrecision:ERROR", + "-Xep:FloggerArgumentToString:ERROR", + "-Xep:FloggerFormatString:ERROR", + "-Xep:FloggerLogVarargs:ERROR", + "-Xep:FloggerSplitLogStatement:ERROR", + "-Xep:FloggerStringConcatenation:ERROR", + "-Xep:FormatString:ERROR", + "-Xep:FormatStringAnnotation:ERROR", + "-Xep:ForOverride:ERROR", + "-Xep:FragmentInjection:ERROR", + "-Xep:FragmentNotInstantiable:ERROR", + "-Xep:FromTemporalAccessor:ERROR", + "-Xep:FunctionalInterfaceClash:ERROR", + "-Xep:FunctionalInterfaceMethodChanged:ERROR", + "-Xep:FutureReturnValueIgnored:ERROR", + "-Xep:FuturesGetCheckedIllegalExceptionType:ERROR", + "-Xep:GetClassOnAnnotation:ERROR", + "-Xep:GetClassOnClass:ERROR", + "-Xep:GetClassOnEnum:ERROR", + "-Xep:GuardedBy:ERROR", + "-Xep:GuiceAssistedInjectScoping:ERROR", + "-Xep:GuiceAssistedParameters:ERROR", + "-Xep:HashtableContains:ERROR", + "-Xep:HidingField:WARN", + "-Xep:IdentityBinaryExpression:ERROR", + "-Xep:IdentityHashMapBoxing:ERROR", + "-Xep:IdentityHashMapUsage:ERROR", + "-Xep:IgnoredPureGetter:ERROR", + "-Xep:Immutable:ERROR", + "-Xep:ImmutableAnnotationChecker:ERROR", + "-Xep:ImmutableEnumChecker:ERROR", + "-Xep:ImmutableModification:ERROR", + "-Xep:Incomparable:ERROR", + "-Xep:IncompatibleArgumentType:ERROR", + "-Xep:IncompatibleModifiers:ERROR", + "-Xep:InconsistentCapitalization:WARN", + "-Xep:InconsistentHashCode:ERROR", + "-Xep:IncrementInForLoopAndHeader:ERROR", + "-Xep:IndexOfChar:ERROR", + "-Xep:InexactVarargsConditional:ERROR", + "-Xep:InfiniteRecursion:ERROR", + "-Xep:InheritDoc:ERROR", + "-Xep:InjectOnConstructorOfAbstractClass:ERROR", + "-Xep:InlineFormatString:ERROR", + "-Xep:InlineMeInliner:ERROR", + # don't want to add dependency to errorprone + "-Xep:InlineMeSuggester:OFF", + "-Xep:InlineMeValidator:ERROR", + "-Xep:InputStreamSlowMultibyteRead:ERROR", + "-Xep:InsecureCryptoUsage:ERROR", + "-Xep:InstanceOfAndCastMatchWrongType:ERROR", + "-Xep:InstantTemporalUnit:ERROR", + "-Xep:IntLongMath:ERROR", + "-Xep:InvalidBlockTag:ERROR", + "-Xep:InvalidInlineTag:ERROR", + "-Xep:InvalidJavaTimeConstant:ERROR", + "-Xep:InvalidLink:ERROR", + "-Xep:InvalidParam:ERROR", + "-Xep:InvalidPatternSyntax:ERROR", + "-Xep:InvalidThrows:ERROR", + "-Xep:InvalidThrowsLink:ERROR", + "-Xep:InvalidTimeZoneID:ERROR", + "-Xep:InvalidZoneId:ERROR", + "-Xep:IsInstanceIncompatibleType:ERROR", + "-Xep:IsInstanceOfClass:ERROR", + "-Xep:IsLoggableTagLength:ERROR", + "-Xep:IterableAndIterator:ERROR", + "-Xep:IterablePathParameter:ERROR", + "-Xep:JavaDurationGetSecondsGetNano:ERROR", + "-Xep:JavaDurationWithNanos:ERROR", + "-Xep:JavaDurationWithSeconds:ERROR", + "-Xep:JavaInstantGetSecondsGetNano:ERROR", + "-Xep:JavaLangClash:ERROR", + "-Xep:JavaLocalDateTimeGetNano:ERROR", + "-Xep:JavaLocalTimeGetNano:ERROR", + "-Xep:JavaPeriodGetDays:ERROR", + "-Xep:JavaTimeDefaultTimeZone:ERROR", + "-Xep:JavaUtilDate:WARN", + "-Xep:JdkObsolete:ERROR", + "-Xep:JodaConstructors:ERROR", + "-Xep:JodaDateTimeConstants:ERROR", + "-Xep:JodaDurationWithMillis:ERROR", + "-Xep:JodaInstantWithMillis:ERROR", + "-Xep:JodaNewPeriod:ERROR", + "-Xep:JodaPlusMinusLong:ERROR", + "-Xep:JodaTimeConverterManager:ERROR", + "-Xep:JodaToSelf:ERROR", + "-Xep:JodaWithDurationAddedLong:ERROR", + "-Xep:JUnit3FloatingPointComparisonWithoutDelta:ERROR", + "-Xep:JUnit3TestNotRun:ERROR", + "-Xep:JUnit4ClassAnnotationNonStatic:ERROR", + "-Xep:JUnit4ClassUsedInJUnit3:ERROR", + "-Xep:JUnit4SetUpNotRun:ERROR", + "-Xep:JUnit4TearDownNotRun:ERROR", + "-Xep:JUnit4TestNotRun:ERROR", + "-Xep:JUnit4TestsNotRunWithinEnclosed:ERROR", + "-Xep:JUnitAmbiguousTestClass:ERROR", + "-Xep:JUnitAssertSameCheck:ERROR", + "-Xep:JUnitParameterMethodNotFound:ERROR", + "-Xep:LiteByteStringUtf8:ERROR", + "-Xep:LiteEnumValueOf:ERROR", + "-Xep:LiteProtoToString:ERROR", + "-Xep:LocalDateTemporalAmount:ERROR", + "-Xep:LockNotBeforeTry:ERROR", + "-Xep:LockOnBoxedPrimitive:ERROR", + "-Xep:LogicalAssignment:ERROR", + "-Xep:LongFloatConversion:ERROR", + "-Xep:LongLiteralLowerCaseSuffix:ERROR", + "-Xep:LoopConditionChecker:ERROR", + "-Xep:LoopOverCharArray:ERROR", + "-Xep:LossyPrimitiveCompare:ERROR", + "-Xep:MathAbsoluteRandom:ERROR", + "-Xep:MathRoundIntLong:ERROR", + "-Xep:MemoizeConstantVisitorStateLookups:ERROR", + "-Xep:MislabeledAndroidString:ERROR", + "-Xep:MissingCasesInEnumSwitch:ERROR", + "-Xep:MissingFail:ERROR", + "-Xep:MissingOverride:ERROR", + "-Xep:MissingSummary:WARN", + "-Xep:MissingSuperCall:ERROR", + "-Xep:MissingTestCall:ERROR", + "-Xep:MisusedDayOfYear:ERROR", + "-Xep:MisusedWeekYear:ERROR", + "-Xep:MixedDescriptors:ERROR", + "-Xep:MixedMutabilityReturnType:WARN", + "-Xep:MockitoUsage:ERROR", + "-Xep:ModifiedButNotUsed:ERROR", + "-Xep:ModifyCollectionInEnhancedForLoop:ERROR", + "-Xep:ModifyingCollectionWithItself:ERROR", + "-Xep:ModifySourceCollectionInStream:ERROR", + "-Xep:MultipleParallelOrSequentialCalls:ERROR", + "-Xep:MultipleUnaryOperatorsInMethodCall:ERROR", + "-Xep:MustBeClosedChecker:ERROR", + "-Xep:MutableConstantField:ERROR", + # Java provides no good alternative + "-Xep:MutablePublicArray:OFF", + "-Xep:NarrowingCompoundAssignment:ERROR", + "-Xep:NCopiesOfChar:ERROR", + "-Xep:NestedInstanceOfConditions:ERROR", + "-Xep:NonAtomicVolatileUpdate:ERROR", + "-Xep:NonCanonicalStaticImport:ERROR", + "-Xep:NonCanonicalType:ERROR", + "-Xep:NonFinalCompileTimeConstant:ERROR", + "-Xep:NonOverridingEquals:ERROR", + "-Xep:NonRuntimeAnnotation:ERROR", + "-Xep:NullableConstructor:ERROR", + "-Xep:NullablePrimitive:ERROR", + "-Xep:NullablePrimitiveArray:ERROR", + "-Xep:NullableVoid:ERROR", + "-Xep:NullOptional:ERROR", + "-Xep:NullTernary:ERROR", + "-Xep:ObjectEqualsForPrimitives:ERROR", + "-Xep:ObjectsHashCodePrimitive:ERROR", + "-Xep:ObjectToString:ERROR", + "-Xep:OperatorPrecedence:ERROR", + "-Xep:OptionalEquality:ERROR", + "-Xep:OptionalMapToOptional:ERROR", + "-Xep:OptionalMapUnusedValue:ERROR", + "-Xep:OptionalNotPresent:ERROR", + "-Xep:OptionalOfRedundantMethod:ERROR", + "-Xep:OrphanedFormatString:ERROR", + "-Xep:OutlineNone:ERROR", + "-Xep:OverlappingQualifierAndScopeAnnotation:ERROR", + "-Xep:Overrides:ERROR", + "-Xep:OverridesGuiceInjectableMethod:ERROR", + "-Xep:OverridesJavaxInjectableMethod:ERROR", + "-Xep:OverrideThrowableToString:ERROR", + "-Xep:PackageInfo:ERROR", + "-Xep:ParameterName:ERROR", + "-Xep:ParametersButNotParameterized:ERROR", + "-Xep:ParcelableCreator:ERROR", + "-Xep:PeriodFrom:ERROR", + "-Xep:PeriodGetTemporalUnit:ERROR", + "-Xep:PeriodTimeMath:ERROR", + "-Xep:PreconditionsCheckNotNullRepeated:ERROR", + "-Xep:PreconditionsInvalidPlaceholder:ERROR", + "-Xep:PreferredInterfaceType:OFF", + "-Xep:PrimitiveAtomicReference:ERROR", + "-Xep:PrivateSecurityContractProtoAccess:ERROR", + "-Xep:ProtectedMembersInFinalClass:ERROR", + "-Xep:ProtoBuilderReturnValueIgnored:ERROR", + "-Xep:ProtocolBufferOrdinal:ERROR", + "-Xep:ProtoDurationGetSecondsGetNano:ERROR", + "-Xep:ProtoFieldNullComparison:ERROR", + "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR", + "-Xep:ProtoRedundantSet:ERROR", + "-Xep:ProtoStringFieldReferenceEquality:ERROR", + "-Xep:ProtoTimestampGetSecondsGetNano:ERROR", + "-Xep:ProtoTruthMixedDescriptors:ERROR", + "-Xep:ProvidesMethodOutsideOfModule:ERROR", + "-Xep:RandomCast:ERROR", + "-Xep:RandomModInteger:ERROR", + "-Xep:ReachabilityFenceUsage:ERROR", + "-Xep:RectIntersectReturnValueIgnored:ERROR", + "-Xep:ReferenceEquality:ERROR", + "-Xep:RefersToDaggerCodegen:ERROR", + "-Xep:RemovedInJDK11:ERROR", + "-Xep:RequiredModifiers:ERROR", + "-Xep:RestrictedApiChecker:ERROR", + "-Xep:RethrowReflectiveOperationExceptionAsLinkageError:ERROR", + "-Xep:ReturnFromVoid:ERROR", + "-Xep:ReturnValueIgnored:ERROR", + "-Xep:RxReturnValueIgnored:ERROR", + "-Xep:SameNameButDifferent:ERROR", + "-Xep:SelfAssignment:ERROR", + "-Xep:SelfComparison:ERROR", + "-Xep:SelfEquals:ERROR", + "-Xep:ShortCircuitBoolean:ERROR", + "-Xep:ShouldHaveEvenArgs:ERROR", + "-Xep:SizeGreaterThanOrEqualsZero:ERROR", + "-Xep:StaticAssignmentInConstructor:ERROR", + "-Xep:StaticGuardedByInstance:ERROR", + "-Xep:StaticMockMember:ERROR", + "-Xep:StaticQualifiedUsingExpression:ERROR", + "-Xep:StreamToString:ERROR", + "-Xep:StringBuilderInitWithChar:ERROR", + "-Xep:StringEquality:ERROR", + "-Xep:StringSplitter:WARN", + "-Xep:SubstringOfZero:ERROR", + "-Xep:SuppressWarningsDeprecated:ERROR", + "-Xep:SwigMemoryLeak:ERROR", + "-Xep:SynchronizeOnNonFinalField:ERROR", + "-Xep:TemporalAccessorGetChronoField:ERROR", + "-Xep:TestParametersNotInitialized:ERROR", + "-Xep:TheoryButNoTheories:ERROR", + "-Xep:ThreadJoinLoop:ERROR", + "-Xep:ThreadLocalUsage:ERROR", + "-Xep:ThreadPriorityCheck:ERROR", + "-Xep:ThreeLetterTimeZoneID:WARN", + "-Xep:ThrowIfUncheckedKnownChecked:ERROR", + "-Xep:ThrowNull:ERROR", + "-Xep:TimeUnitConversionChecker:ERROR", + "-Xep:ToStringReturnsNull:ERROR", + "-Xep:TreeToString:ERROR", + "-Xep:TruthAssertExpected:ERROR", + "-Xep:TruthConstantAsserts:ERROR", + "-Xep:TruthGetOrDefault:ERROR", + "-Xep:TruthIncompatibleType:ERROR", + "-Xep:TruthSelfEquals:ERROR", + "-Xep:TryFailThrowable:ERROR", + "-Xep:TypeEquals:ERROR", + "-Xep:TypeNameShadowing:ERROR", + "-Xep:TypeParameterQualifier:ERROR", + "-Xep:TypeParameterShadowing:ERROR", + "-Xep:TypeParameterUnusedInFormals:ERROR", + "-Xep:UndefinedEquals:WARN", + "-Xep:UnescapedEntity:WARN", + "-Xep:UnnecessaryAssignment:ERROR", + "-Xep:UnnecessaryCheckNotNull:ERROR", + "-Xep:UnnecessaryLambda:ERROR", + "-Xep:UnnecessaryMethodInvocationMatcher:ERROR", + "-Xep:UnnecessaryMethodReference:ERROR", + "-Xep:UnnecessaryParentheses:ERROR", + "-Xep:UnnecessaryTypeArgument:ERROR", + "-Xep:UnrecognisedJavadocTag:ERROR", + "-Xep:UnsafeFinalization:ERROR", + "-Xep:UnsafeReflectiveConstructionCast:ERROR", + "-Xep:UnsynchronizedOverridesSynchronized:ERROR", + "-Xep:UnusedAnonymousClass:ERROR", + "-Xep:UnusedCollectionModifiedInPlace:ERROR", + "-Xep:UnusedException:ERROR", + "-Xep:UnusedMethod:WARN", + "-Xep:UnusedNestedClass:ERROR", + "-Xep:UnusedVariable:ERROR", + "-Xep:URLEqualsHashCode:ERROR", + "-Xep:UseBinds:ERROR", + "-Xep:UseCorrectAssertInTests:ERROR", + "-Xep:VariableNameSameAsType:ERROR", + "-Xep:VarTypeName:ERROR", + "-Xep:WaitNotInLoop:ERROR", + "-Xep:WakelockReleasedDangerously:ERROR", + "-Xep:WildcardImport:ERROR", + "-Xep:WithSignatureDiscouraged:ERROR", + "-Xep:WrongOneof:ERROR", + "-Xep:XorPower:ERROR", + "-Xep:ZoneIdOfZ:ERROR", ] - -exclude_in_tests = ["-Xep:EmptyBlockTag:WARN", - "-Xep:MissingSummary:WARN"] +exclude_in_tests = [ + "-Xep:EmptyBlockTag:WARN", + "-Xep:MissingSummary:WARN", +] java_package_configuration( name = "error_prone", @@ -436,7 +437,7 @@ java_package_configuration( java_package_configuration( name = "error_prone_tests", - javacopts = [ check for check in errorprone_checks if check not in exclude_in_tests], + javacopts = [check for check in errorprone_checks if check not in exclude_in_tests], packages = ["error_prone_packages_test"], ) From 1641a3f42d342c459fe5dc914f4eb0eeb543a214 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 18 Jun 2026 09:21:29 +0200 Subject: [PATCH 152/200] Bazel: Rename //lib:servlet-api to //lib:jakarta-servlet-api //lib:servlet-api exported the canonical Jakarta servlet API (jakarta.servlet:jakarta.servlet-api:6.1.0). The name did not distinguish it from //lib:javax-servlet-api, which the EE8 bridge in //org.eclipse.jgit.http.server.ee8 and //org.eclipse.jgit.lfs.server.ee8 uses to depend on javax.servlet:javax.servlet-api:4.0.1. Rename the canonical target to //lib:jakarta-servlet-api so the API flavour is self-evident at consumer sites. Migrate the six in-tree consumers (http.server, http.test, junit.http, lfs.server, lfs.server.test, pgm) in the same change. No compatibility alias is kept: JGit is consumed from source by Gerrit through a git submodule, which has its own //lib:* wrappers, and the EE8 bridge commit added //lib:javax-servlet-api without an alias for the same reason. Change-Id: I764b01d171d2c2dc55fecef89bf4b36ce1cb9c59 --- lib/BUILD | 2 +- org.eclipse.jgit.http.server/BUILD | 2 +- org.eclipse.jgit.http.test/BUILD | 4 ++-- org.eclipse.jgit.junit.http/BUILD | 2 +- org.eclipse.jgit.lfs.server.test/BUILD | 2 +- org.eclipse.jgit.lfs.server/BUILD | 2 +- org.eclipse.jgit.pgm/BUILD | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/BUILD b/lib/BUILD index c1a36721cff..a84d93b9fd3 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -295,7 +295,7 @@ java_library( ) java_library( - name = "servlet-api", + name = "jakarta-servlet-api", visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.server:__pkg__", diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index a0dae488b83..cae8d8847b7 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -13,7 +13,7 @@ java_library( resource_strip_prefix = "org.eclipse.jgit.http.server/resources", resources = [":jgit-servlet-resources"], deps = [ - "//lib:servlet-api", + "//lib:jakarta-servlet-api", # We want these deps to be provided_deps "//org.eclipse.jgit:jgit", ], diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index 732b4fae2c1..bc04d229dd6 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -12,6 +12,7 @@ junit_tests( ":helpers", "//lib:commons-logging", "//lib:httpcore", + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", @@ -19,7 +20,6 @@ junit_tests( "//lib:jetty-servlet", "//lib:jetty-util", "//lib:junit", - "//lib:servlet-api", "//lib:slf4j-api", "//lib:slf4j-simple", "//org.eclipse.jgit.http.apache:http-apache", @@ -35,8 +35,8 @@ java_library( testonly = 1, srcs = glob(["src/**/*.java"]), deps = [ + "//lib:jakarta-servlet-api", "//lib:junit", - "//lib:servlet-api", "//org.eclipse.jgit:jgit", "//org.eclipse.jgit.junit:junit", ], diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 87dcf3ecfce..17a75701540 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -12,6 +12,7 @@ java_library( ), # TODO(davido): we want here provided deps deps = [ + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", @@ -20,7 +21,6 @@ java_library( "//lib:jetty-session", "//lib:jetty-util", "//lib:junit", - "//lib:servlet-api", "//lib:slf4j-api", "//org.eclipse.jgit.http.server:jgit-servlet", "//org.eclipse.jgit:jgit", diff --git a/org.eclipse.jgit.lfs.server.test/BUILD b/org.eclipse.jgit.lfs.server.test/BUILD index 76a0870a881..adc2df63c02 100644 --- a/org.eclipse.jgit.lfs.server.test/BUILD +++ b/org.eclipse.jgit.lfs.server.test/BUILD @@ -23,7 +23,7 @@ DEPS = [ "//lib:jetty-servlet", "//lib:jetty-security", "//lib:jetty-util", - "//lib:servlet-api", + "//lib:jakarta-servlet-api", ] junit_tests( diff --git a/org.eclipse.jgit.lfs.server/BUILD b/org.eclipse.jgit.lfs.server/BUILD index cd1831b8320..c363d52ad15 100644 --- a/org.eclipse.jgit.lfs.server/BUILD +++ b/org.eclipse.jgit.lfs.server/BUILD @@ -10,7 +10,7 @@ java_library( deps = [ "//lib:gson", "//lib:httpcore", - "//lib:servlet-api", + "//lib:jakarta-servlet-api", "//lib:slf4j-api", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit:jgit", diff --git a/org.eclipse.jgit.pgm/BUILD b/org.eclipse.jgit.pgm/BUILD index a267b155ac9..596aed2e24b 100644 --- a/org.eclipse.jgit.pgm/BUILD +++ b/org.eclipse.jgit.pgm/BUILD @@ -16,13 +16,13 @@ java_library( "//lib:commons-logging", "//lib:httpclient", "//lib:httpcore", + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", "//lib:jetty-server", "//lib:jetty-servlet", "//lib:jetty-util", - "//lib:servlet-api", "//org.eclipse.jgit.archive:jgit-archive", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit:jgit", From 7bc7aaaa2b4c0b77df45df63f3eb7ad2a2b8c3f6 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 18 Jun 2026 05:08:19 +0200 Subject: [PATCH 153/200] Bazel: Add EE8 servlet bridge targets Add Bazel-only generated EE8 targets for the HTTP servlet and LFS server modules. The generated jars keep the original JGit Java packages and rewrite only servlet API references from jakarta.servlet to javax.servlet. The rewrite uses the shared servlet-flavour transform toolchain from bazlets (transform_srcjar + generated_srcs_test.sh under //tools). It is a plain sed package-prefix substitution; the universal servlet and Jetty package mapping lives in bazlets and this consumer selects only the direction (to_javax), so it carries no renames data and adds no Maven dependency (no Eclipse Transformer CLI). This supports source consumers that still run on EE8 while JGit master uses Jakarta servlet APIs. Gerrit is the known downstream consumer in that state today and consumes JGit from source through a git submodule. With these targets, Gerrit can track JGit master without a dedicated servlet-4 maintenance branch. The goal is to let the servlet-4 branch be retired for Gerrit's maintenance purposes. That branch was not offered as a stable JGit release line. Keeping Gerrit on it makes JGit updates hard for Gerrit, including updates for important fixes and improvements, and forces repeated merge work from master onto a parallel branch. Keep the maintenance surface small. The EE8 targets consume canonical srcs filegroups backed by glob(["src/**/*.java"]), so new Java sources flow into the generated jars without per-file BUILD updates. Resources are also shared through canonical filegroups. This Bazel change intentionally does not add Maven, Tycho/p2, or Maven Central publication machinery. Maven support is added by the follow-up Maven commit; Tycho/p2 remains out of scope because the EE8 jars export the same packages as their canonical Jakarta counterparts and are not co-installable with them. Also avoid relocating Java packages to org.eclipse.jgit.*.ee8. Keeping the same package names avoids source-consumer import churn, but means the canonical Jakarta jars and generated EE8 jars must not share a classpath. Possible follow-ups are duplicate-classpath enforcement for source consumers and additional generated EE8 modules only when a consumer needs them. Verify generated source layout, line counts, javax servlet rewriting, and the absence of package-renamed .ee8 sources. Change-Id: I897e4facbbae79349e8d1853ea4dab8d7087ba5b --- BUILD | 2 ++ MODULE.bazel | 5 +-- lib/BUILD | 11 ++++++ org.eclipse.jgit.http.server.ee8/BUILD | 27 ++++++++++++++ org.eclipse.jgit.http.server/BUILD | 11 +++++- org.eclipse.jgit.lfs.server.ee8/BUILD | 32 +++++++++++++++++ org.eclipse.jgit.lfs.server/BUILD | 18 ++++++++-- tools/jgit-ee8/BUILD | 28 +++++++++++++++ tools/jgit-ee8/README.md | 50 ++++++++++++++++++++++++++ 9 files changed, 179 insertions(+), 5 deletions(-) create mode 100644 org.eclipse.jgit.http.server.ee8/BUILD create mode 100644 org.eclipse.jgit.lfs.server.ee8/BUILD create mode 100644 tools/jgit-ee8/BUILD create mode 100644 tools/jgit-ee8/README.md diff --git a/BUILD b/BUILD index b8d8b9f0b79..b9be9cb2820 100644 --- a/BUILD +++ b/BUILD @@ -10,8 +10,10 @@ genrule( "//org.eclipse.jgit.archive:jgit-archive", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit.http.server:jgit-servlet", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", "//org.eclipse.jgit.lfs:jgit-lfs", "//org.eclipse.jgit.lfs.server:jgit-lfs-server", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8", "//org.eclipse.jgit.junit:junit", "//org.eclipse.jgit.ssh.apache:ssh-apache", "//org.eclipse.jgit.ssh.apache.agent:ssh-apache-agent", diff --git a/MODULE.bazel b/MODULE.bazel index ceca81faff9..287bbe72a34 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -5,7 +5,7 @@ bazel_dep(name = "rules_android", version = "0.7.1") bazel_dep(name = "rules_go", version = "0.60.0") bazel_dep(name = "rules_java", version = "9.3.0") bazel_dep(name = "rules_jvm_external", version = "6.10") - +bazel_dep(name = "rules_shell", version = "0.6.1") bazel_dep(name = "rbe_autoconfig") git_override( module_name = "rbe_autoconfig", @@ -21,7 +21,7 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g git_repository( name = "com_googlesource_gerrit_bazlets", - commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f", + commit = "156bae8bb0d329d8886f681c723979cbdb39d37c", remote = "https://gerrit.googlesource.com/bazlets", ) @@ -53,6 +53,7 @@ maven.install( "commons-io:commons-io:2.22.0", "commons-logging:commons-logging:1.4.0", "jakarta.servlet:jakarta.servlet-api:6.1.0", + "javax.servlet:javax.servlet-api:4.0.1", "junit:junit:4.13.2", "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, diff --git a/lib/BUILD b/lib/BUILD index a84d93b9fd3..2bd92093ca8 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -59,6 +59,7 @@ java_library( visibility = [ "//org.eclipse.jgit.lfs:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", ], exports = ["@external_deps//:com_google_code_gson_gson"], ) @@ -79,6 +80,7 @@ java_library( "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], @@ -308,6 +310,15 @@ java_library( exports = ["@external_deps//:jakarta_servlet_jakarta_servlet_api_6_1_0"], ) +java_library( + name = "javax-servlet-api", + visibility = [ + "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + ], + exports = ["@external_deps//:javax_servlet_javax_servlet_api"], +) + java_library( name = "slf4j-api", visibility = ["//visibility:public"], diff --git a/org.eclipse.jgit.http.server.ee8/BUILD b/org.eclipse.jgit.http.server.ee8/BUILD new file mode 100644 index 00000000000..df39628ccad --- /dev/null +++ b/org.eclipse.jgit.http.server.ee8/BUILD @@ -0,0 +1,27 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +package(default_visibility = ["//visibility:public"]) + +transform_srcjar( + name = "jgit-http-server-ee8-srcs", + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.server:srcs"], + src_prefix = "org.eclipse.jgit.http.server/src/", +) + +filegroup( + name = "jgit-servlet-ee8-srcjar", + srcs = [":jgit-http-server-ee8-srcs"], +) + +java_library( + name = "jgit-servlet-ee8", + srcs = [":jgit-http-server-ee8-srcs"], + resource_strip_prefix = "org.eclipse.jgit.http.server/resources", + resources = ["//org.eclipse.jgit.http.server:jgit-servlet-resources"], + deps = [ + "//lib:javax-servlet-api", + "//org.eclipse.jgit:jgit", + ], +) diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index cae8d8847b7..f6b4a1084fb 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -2,6 +2,15 @@ load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "srcs", + srcs = glob(["src/**/*.java"]), + visibility = [ + "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + filegroup( name = "jgit-servlet-resources", srcs = glob(["resources/**"]), @@ -9,7 +18,7 @@ filegroup( java_library( name = "jgit-servlet", - srcs = glob(["src/**/*.java"]), + srcs = [":srcs"], resource_strip_prefix = "org.eclipse.jgit.http.server/resources", resources = [":jgit-servlet-resources"], deps = [ diff --git a/org.eclipse.jgit.lfs.server.ee8/BUILD b/org.eclipse.jgit.lfs.server.ee8/BUILD new file mode 100644 index 00000000000..b07dae2cde3 --- /dev/null +++ b/org.eclipse.jgit.lfs.server.ee8/BUILD @@ -0,0 +1,32 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +package(default_visibility = ["//visibility:public"]) + +transform_srcjar( + name = "jgit-lfs-server-ee8-srcs", + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server:srcs"], + src_prefix = "org.eclipse.jgit.lfs.server/src/", +) + +filegroup( + name = "jgit-lfs-server-ee8-srcjar", + srcs = [":jgit-lfs-server-ee8-srcs"], +) + +java_library( + name = "jgit-lfs-server-ee8", + srcs = [":jgit-lfs-server-ee8-srcs"], + resource_strip_prefix = "org.eclipse.jgit.lfs.server/resources", + resources = ["//org.eclipse.jgit.lfs.server:jgit-lfs-server-resources"], + deps = [ + "//lib:gson", + "//lib:httpcore", + "//lib:javax-servlet-api", + "//lib:slf4j-api", + "//org.eclipse.jgit.http.apache:http-apache", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.lfs:jgit-lfs", + ], +) diff --git a/org.eclipse.jgit.lfs.server/BUILD b/org.eclipse.jgit.lfs.server/BUILD index c363d52ad15..d6b08a6ee94 100644 --- a/org.eclipse.jgit.lfs.server/BUILD +++ b/org.eclipse.jgit.lfs.server/BUILD @@ -2,11 +2,25 @@ load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "srcs", + srcs = glob(["src/**/*.java"]), + visibility = [ + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "jgit-lfs-server-resources", + srcs = glob(["resources/**"]), +) + java_library( name = "jgit-lfs-server", - srcs = glob(["src/**/*.java"]), + srcs = [":srcs"], resource_strip_prefix = "org.eclipse.jgit.lfs.server/resources", - resources = glob(["resources/**"]), + resources = [":jgit-lfs-server-resources"], deps = [ "//lib:gson", "//lib:httpcore", diff --git a/tools/jgit-ee8/BUILD b/tools/jgit-ee8/BUILD new file mode 100644 index 00000000000..df5c27cd73d --- /dev/null +++ b/tools/jgit-ee8/BUILD @@ -0,0 +1,28 @@ +load("@rules_shell//shell:sh_test.bzl", "sh_test") + +sh_test( + name = "generated_srcs_test", + srcs = ["@com_googlesource_gerrit_bazlets//tools:generated_srcs_test.sh"], + args = [ + "--forbid", + "jakarta\\.servlet", + "--forbid", + "org\\.eclipse\\.jgit\\..*\\.ee8", + "--require", + "javax\\.servlet", + "--module", + "org.eclipse.jgit.http.server/src/", + "$(location //org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs)", + "$(locations //org.eclipse.jgit.http.server:srcs)", + "--module", + "org.eclipse.jgit.lfs.server/src/", + "$(location //org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs)", + "$(locations //org.eclipse.jgit.lfs.server:srcs)", + ], + data = [ + "//org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs", + "//org.eclipse.jgit.http.server:srcs", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs", + "//org.eclipse.jgit.lfs.server:srcs", + ], +) diff --git a/tools/jgit-ee8/README.md b/tools/jgit-ee8/README.md new file mode 100644 index 00000000000..5578d6553b5 --- /dev/null +++ b/tools/jgit-ee8/README.md @@ -0,0 +1,50 @@ +# JGit EE8 Bazel bridge + +This package contains the Bazel-only bridge for source consumers that still run +on EE8 and `javax.servlet` while JGit master uses `jakarta.servlet`. + +JGit hosts this bridge because Gerrit is a known downstream that consumes JGit +from source through a git submodule and still runs Jetty 12 EE8. Keeping the +bridge in JGit lets Gerrit track JGit master and avoids maintaining a long-lived +servlet-4 branch just for Gerrit. That branch was never a stable JGit release +line, so it is not a sustainable way for Gerrit to receive JGit maintenance +updates. + +The bridge intentionally keeps the original JGit package names. It rewrites only +servlet API references from `jakarta.servlet` to `javax.servlet`, then compiles +generated jars from the rewritten source jars. + +Generated targets: + +* `//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8` +* `//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8` + +Do not put one of these generated jars and its canonical Jakarta counterpart on +the same classpath. They contain the same JGit classes. + +This is intentionally limited to Bazel source consumers. It does not add Maven, +Tycho, p2, or Maven Central publication machinery. Those should be added only if +a non-Bazel consumer needs published EE8 artifacts. + +Run: + +```sh +bazelisk test //tools/jgit-ee8:generated_srcs_test +``` + +The test checks: + +* generated sources are derived from the canonical source filegroups +* generated srcjar entries use Java package paths +* generated sources preserve line counts for debugger breakpoints +* generated sources contain `javax.servlet`, not `jakarta.servlet` +* generated sources do not move JGit classes to an `.ee8` package + +Next steps: + +* Keep this source-consumer bridge while Gerrit runs on Jetty 12 EE8. +* Reuse these targets for other Bazel source consumers that need EE8 output. +* Add Maven/Tycho/p2 generation only when a non-Bazel consumer needs published + EE8 artifacts. +* Keep the canonical `srcs` filegroups aligned with each servlet-facing + `java_library` so new Java sources are transformed automatically. From 9b065e236f7f5ec9719cca48c0d963f37a47d2c6 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 19 Jun 2026 14:26:26 +0200 Subject: [PATCH 154/200] Bazel: Add EE8 servlet test targets Add EE8 variants of the HTTP and LFS servlet test suites and run them against the generated EE8 servlet bridge artifacts. Generate EE8 test sources from the canonical Jakarta-based tests by rewriting servlet API references and Jetty EE10 test helper imports to their EE8 equivalents. Export canonical test source filegroups so the generated tests remain synchronized with the primary test suites. Introduce EE8 Jetty test dependencies, generated junit-http helpers, and JUnit suite generation for the transformed sources. Restore AppServer from the servlet-4 branch because its API usage cannot be converted mechanically. Extend generated-source verification to cover test sources and ensure that no Jakarta or Jetty EE10 servlet references remain in generated EE8 outputs. Test Plan: bazelisk test \ //tools/jgit-ee8:generated_srcs_test \ //org.eclipse.jgit.http.test.ee8/... \ //org.eclipse.jgit.lfs.server.test.ee8/... Change-Id: Id3d9312f0a93d443d83054a81b9d868611e18b27 --- MODULE.bazel | 3 + lib/BUILD | 36 ++ org.eclipse.jgit.http.test.ee8/BUILD | 84 ++++ org.eclipse.jgit.http.test/BUILD | 41 +- org.eclipse.jgit.junit.http.ee8/BUILD | 43 ++ .../eclipse/jgit/junit/http/AppServer.java | 461 ++++++++++++++++++ org.eclipse.jgit.junit.http/BUILD | 38 +- org.eclipse.jgit.lfs.server.test.ee8/BUILD | 65 +++ org.eclipse.jgit.lfs.server.test/BUILD | 29 ++ tools/jgit-ee8/BUILD | 29 +- tools/jgit-ee8/README.md | 29 +- 11 files changed, 849 insertions(+), 9 deletions(-) create mode 100644 org.eclipse.jgit.http.test.ee8/BUILD create mode 100644 org.eclipse.jgit.junit.http.ee8/BUILD create mode 100644 org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java create mode 100644 org.eclipse.jgit.lfs.server.test.ee8/BUILD diff --git a/MODULE.bazel b/MODULE.bazel index 287bbe72a34..c4edb7dbc34 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -79,6 +79,9 @@ maven.install( "org.eclipse.jetty:jetty-session:" + JETTY_VERSION, "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VERSION, "org.eclipse.jetty:jetty-util:" + JETTY_VERSION, + "org.eclipse.jetty.ee8:jetty-ee8-nested:" + JETTY_VERSION, + "org.eclipse.jetty.ee8:jetty-ee8-security:" + JETTY_VERSION, + "org.eclipse.jetty.ee8:jetty-ee8-servlet:" + JETTY_VERSION, "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VERSION, "org.hamcrest:hamcrest:3.0", "org.mockito:mockito-core:5.23.0", diff --git a/lib/BUILD b/lib/BUILD index 2bd92093ca8..4ce0c1adc24 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -69,6 +69,7 @@ java_library( visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], exports = ["@external_deps//:org_apache_httpcomponents_httpclient"], @@ -79,9 +80,11 @@ java_library( visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", + "//org.eclipse.jgit.http.test.ee8:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", "//org.eclipse.jgit.lfs.server.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], exports = ["@external_deps//:org_apache_httpcomponents_httpcore"], @@ -178,6 +181,35 @@ java_library( ], ) +java_library( + name = "jetty-ee8-nested", + testonly = 1, + visibility = ["//org.eclipse.jgit.junit.http.ee8:__pkg__"], + exports = ["@external_deps//:org_eclipse_jetty_ee8_jetty_ee8_nested"], +) + +java_library( + name = "jetty-security-ee8", + testonly = 1, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + ], + exports = ["@external_deps//:org_eclipse_jetty_ee8_jetty_ee8_security"], +) + +java_library( + name = "jetty-servlet-ee8", + testonly = 1, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + ], + exports = ["@external_deps//:org_eclipse_jetty_ee8_jetty_ee8_servlet"], +) + java_library( name = "jetty-util", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. @@ -303,6 +335,7 @@ java_library( "//org.eclipse.jgit.http.server:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", "//org.eclipse.jgit.junit.http:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", @@ -314,7 +347,10 @@ java_library( name = "javax-servlet-api", visibility = [ "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", ], exports = ["@external_deps//:javax_servlet_javax_servlet_api"], ) diff --git a/org.eclipse.jgit.http.test.ee8/BUILD b/org.eclipse.jgit.http.test.ee8/BUILD new file mode 100644 index 00000000000..a6a5506e988 --- /dev/null +++ b/org.eclipse.jgit.http.test.ee8/BUILD @@ -0,0 +1,84 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +transform_srcjar( + name = "helpers-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:helper-srcs"], + src_prefix = "org.eclipse.jgit.http.test/src/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:test-srcs"], + src_prefix = "org.eclipse.jgit.http.test/tst/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "server-unit-test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:http-server-unit-test-srcs"], + src_prefix = "org.eclipse.jgit.http.test/tst/", +) + +# Fast slice for the server utility tests; the default EE8 suite runs the full +# HTTP test target, which already includes these classes. +junit_tests( + name = "server_unit", + suite_srcs = ["//org.eclipse.jgit.http.test:http-server-unit-test-srcs"], + tags = ["http"], + srcs = [":server-unit-test-srcs"], + deps = [ + "//lib:junit", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) + +junit_tests( + name = "http", + suite_srcs = ["//org.eclipse.jgit.http.test:test-srcs"], + tags = ["http"], + srcs = [":test-srcs"], + deps = [ + ":helpers", + "//lib:commons-logging", + "//lib:httpcore", + "//lib:javax-servlet-api", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-util", + "//lib:junit", + "//lib:slf4j-api", + "//lib:slf4j-simple", + "//org.eclipse.jgit.http.apache:http-apache", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit.http.ee8:junit-http-ee8", + "//org.eclipse.jgit.junit:junit", + ], +) + +java_library( + name = "helpers", + testonly = 1, + srcs = [":helpers-srcs"], + deps = [ + "//lib:javax-servlet-api", + "//lib:junit", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index bc04d229dd6..cb6a738178a 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -4,9 +4,46 @@ load( ) load("@rules_java//java:defs.bzl", "java_library") +HTTP_HELPER_SRCS = glob(["src/**/*.java"]) + +HTTP_TEST_SRCS = glob(["tst/**/*.java"]) + +HTTP_SERVER_UNIT_TEST_SRCS = [ + "tst/org/eclipse/jgit/http/server/ClientVersionUtilTest.java", + "tst/org/eclipse/jgit/http/server/RootLocaleTest.java", + "tst/org/eclipse/jgit/http/server/ServletUtilsTest.java", +] + +filegroup( + name = "helper-srcs", + testonly = 1, + srcs = HTTP_HELPER_SRCS, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "test-srcs", + testonly = 1, + srcs = HTTP_TEST_SRCS, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "http-server-unit-test-srcs", + testonly = 1, + srcs = HTTP_SERVER_UNIT_TEST_SRCS, + visibility = ["//org.eclipse.jgit.http.test.ee8:__pkg__"], +) + junit_tests( name = "http", - srcs = glob(["tst/**/*.java"]), + srcs = HTTP_TEST_SRCS, tags = ["http"], deps = [ ":helpers", @@ -33,7 +70,7 @@ junit_tests( java_library( name = "helpers", testonly = 1, - srcs = glob(["src/**/*.java"]), + srcs = HTTP_HELPER_SRCS, deps = [ "//lib:jakarta-servlet-api", "//lib:junit", diff --git a/org.eclipse.jgit.junit.http.ee8/BUILD b/org.eclipse.jgit.junit.http.ee8/BUILD new file mode 100644 index 00000000000..c7f6fb5a537 --- /dev/null +++ b/org.eclipse.jgit.junit.http.ee8/BUILD @@ -0,0 +1,43 @@ +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) + +java_library( + name = "junit-http-ee8", + testonly = 1, + srcs = [ + "//org.eclipse.jgit.junit.http:junit-http-ee8-srcs", + # AppServer diverges from the canonical Jakarta version and is copied + # from the servlet-4 branch as a hand-maintained EE8 overlay. + "src/org/eclipse/jgit/junit/http/AppServer.java", + ], + resources = glob( + ["resources/**"], + allow_empty = True, + ), + deps = [ + "//lib:javax-servlet-api", + "//lib:jetty-ee8-nested", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-session", + "//lib:jetty-util", + "//lib:junit", + "//lib:slf4j-api", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) + +test_suite( + name = "tests", + tests = [ + "//org.eclipse.jgit.http.test.ee8:http", + "//org.eclipse.jgit.lfs.server.test.ee8:lfs_server", + ], +) diff --git a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java new file mode 100644 index 00000000000..1e4c7966b60 --- /dev/null +++ b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java @@ -0,0 +1,461 @@ +/* + * Copyright (C) 2010, 2017 Google Inc. and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.junit.http; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.jetty.ee8.nested.ServletConstraint; +import org.eclipse.jetty.ee8.security.Authenticator; +import org.eclipse.jetty.ee8.security.ConstraintMapping; +import org.eclipse.jetty.ee8.security.ConstraintSecurityHandler; +import org.eclipse.jetty.ee8.security.authentication.BasicAuthenticator; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.security.AbstractLoginService; +import org.eclipse.jetty.security.RolePrincipal; +import org.eclipse.jetty.security.UserPrincipal; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.util.security.Password; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.eclipse.jgit.transport.URIish; + +/** + * Tiny web application server for unit testing. + *

+ * Tests should start the server in their {@code setUp()} method and stop the + * server in their {@code tearDown()} method. Only while started the server's + * URL and/or port number can be obtained. + */ +public class AppServer { + /** Realm name for the secure access areas. */ + public static final String realm = "Secure Area"; + + /** Username for secured access areas. */ + public static final String username = "agitter"; + + /** Password for {@link #username} in secured access areas. */ + public static final String password = "letmein"; + + /** SSL keystore password; must have at least 6 characters. */ + private static final String keyPassword = "mykeys"; + + /** Role for authentication. */ + private static final String authRole = "can-access"; + + static { + // Install a logger that throws warning messages. + // + final String prop = "org.eclipse.jetty.util.log.class"; + System.setProperty(prop, RecordingLogger.class.getName()); + } + + private final Server server; + + private final HttpConfiguration config; + + private final ServerConnector connector; + + private final HttpConfiguration secureConfig; + + private final ServerConnector secureConnector; + + private final ContextHandlerCollection contexts; + + private final TestRequestLog log; + + private List filesToDelete = new ArrayList<>(); + + /** + * Constructor for AppServer. + */ + public AppServer() { + this(0, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * the http port number; may be zero to allocate a port + * dynamically + * @since 4.2 + */ + public AppServer(int port) { + this(port, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * for http, may be zero to allocate a port dynamically + * @param sslPort + * for https,may be zero to allocate a port dynamically. If + * negative, the server will be set up without https support. + * @since 4.9 + */ + public AppServer(int port, int sslPort) { + server = new Server(); + + config = new HttpConfiguration(); + config.setSecureScheme("https"); + config.setSecurePort(0); + config.setOutputBufferSize(32768); + + connector = new ServerConnector(server, + new HttpConnectionFactory(config)); + connector.setPort(port); + String ip; + String hostName; + try { + final InetAddress me = InetAddress.getByName("localhost"); + ip = me.getHostAddress(); + connector.setHost(ip); + hostName = InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + throw new RuntimeException("Cannot find localhost", e); + } + + if (sslPort >= 0) { + SslContextFactory.Server sslContextFactory = createTestSslContextFactory( + hostName, ip); + secureConfig = new HttpConfiguration(config); + secureConfig.addCustomizer(new SecureRequestCustomizer()); + HttpConnectionFactory http11 = new HttpConnectionFactory( + secureConfig); + SslConnectionFactory tls = new SslConnectionFactory( + sslContextFactory, http11.getProtocol()); + secureConnector = new ServerConnector(server, tls, http11); + secureConnector.setPort(sslPort); + secureConnector.setHost(ip); + } else { + secureConfig = null; + secureConnector = null; + } + + contexts = new ContextHandlerCollection(); + + log = new TestRequestLog(); + log.setHandler(contexts); + + if (secureConnector == null) { + server.setConnectors(new Connector[] { connector }); + } else { + server.setConnectors( + new Connector[] { connector, secureConnector }); + } + server.setHandler(log); + } + + private SslContextFactory.Server createTestSslContextFactory( + String hostName, String ip) { + SslContextFactory.Server factory = new SslContextFactory.Server(); + + String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; + + try { + File tmpDir = Files.createTempDirectory("jks").toFile(); + tmpDir.deleteOnExit(); + makePrivate(tmpDir); + File keyStore = new File(tmpDir, "keystore.jks"); + File keytool = new File( + new File(new File(System.getProperty("java.home")), "bin"), + "keytool"); + Runtime.getRuntime().exec( + new String[] { + keytool.getAbsolutePath(), // + "-keystore", keyStore.getAbsolutePath(), // + "-storepass", keyPassword, + "-alias", hostName, // + "-ext", "bc=ca:true", // + "-ext", + String.format( + "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", + ip, hostName), // + "-genkeypair", // + "-keyalg", "RSA", // + "-keypass", keyPassword, // + "-dname", dName, // + "-validity", "2" // + }).waitFor(); + keyStore.deleteOnExit(); + makePrivate(keyStore); + filesToDelete.add(keyStore); + filesToDelete.add(tmpDir); + factory.setKeyStorePath(keyStore.getAbsolutePath()); + factory.setKeyStorePassword(keyPassword); + factory.setKeyManagerPassword(keyPassword); + factory.setTrustStorePath(keyStore.getAbsolutePath()); + factory.setTrustStorePassword(keyPassword); + } catch (InterruptedException | IOException e) { + throw new RuntimeException("Cannot create ssl key/certificate", e); + } + return factory; + } + + private void makePrivate(File file) { + file.setReadable(false); + file.setWritable(false); + file.setExecutable(false); + file.setReadable(true, true); + file.setWritable(true, true); + if (file.isDirectory()) { + file.setExecutable(true, true); + } + } + + /** + * Create a new servlet context within the server. + *

+ * This method should be invoked before the server is started, once for each + * context the caller wants to register. + * + * @param path + * path of the context; use "/" for the root context if binding + * to the root is desired. + * @return the context to add servlets into. + * @since 7.0 + */ + public ServletContextHandler addContext(String path) { + assertNotYetSetUp(); + if ("".equals(path)) + path = "/"; + + ServletContextHandler ctx = new ServletContextHandler(); + ctx.setContextPath(path); + contexts.addHandler(ctx); + + return ctx; + } + + /** + * Configure basic authentication. + * + * @param ctx + * servlet context handler + * @param methods + * the methods + * @return servlet context handler + * @since 7.0 + */ + public ServletContextHandler authBasic(ServletContextHandler ctx, + String... methods) { + assertNotYetSetUp(); + auth(ctx, new BasicAuthenticator(), methods); + return ctx; + } + + static class TestMappedLoginService extends AbstractLoginService { + private RolePrincipal role; + + protected final Map users = new ConcurrentHashMap<>(); + + TestMappedLoginService(String role) { + this.role = new RolePrincipal(role); + } + + @Override + protected void doStart() throws Exception { + UserPrincipal p = new UserPrincipal(username, + new Password(password)); + users.put(username, p); + super.doStart(); + } + + @Override + protected UserPrincipal loadUserInfo(String user) { + return users.get(user); + } + + @Override + protected List loadRoleInfo(UserPrincipal user) { + if (users.get(user.getName()) == null) { + return null; + } + return Collections.singletonList(role); + } + } + + private ConstraintMapping createConstraintMapping() { + ConstraintMapping cm = new ConstraintMapping(); + cm.setConstraint(new ServletConstraint()); + cm.getConstraint().setAuthenticate(true); + cm.getConstraint().setDataConstraint(ServletConstraint.DC_NONE); + cm.getConstraint().setRoles(new String[] { authRole }); + return cm; + } + + private void auth(ServletContextHandler ctx, Authenticator authType, + String... methods) { + AbstractLoginService users = new TestMappedLoginService(authRole); + List mappings = new ArrayList<>(); + if (methods == null || methods.length == 0) { + ConstraintMapping cm = createConstraintMapping(); + cm.setPathSpec("/*"); + mappings.add(cm); + } else { + for (String method : methods) { + ConstraintMapping cm = createConstraintMapping(); + cm.setMethod(method.toUpperCase(Locale.ROOT)); + cm.setPathSpec("/*"); + mappings.add(cm); + } + } + + ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); + sec.setRealmName(realm); + sec.setAuthenticator(authType); + sec.setLoginService(users); + sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); + ctx.setSecurityHandler(sec); + } + + /** + * Start the server on a random local port. + * + * @throws Exception + * the server cannot be started, testing is not possible. + */ + public void setUp() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.start(); + config.setSecurePort(getSecurePort()); + if (secureConfig != null) { + secureConfig.setSecurePort(getSecurePort()); + } + } + + /** + * Shutdown the server. + * + * @throws Exception + * the server refuses to halt, or wasn't running. + */ + public void tearDown() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.stop(); + for (File f : filesToDelete) { + f.delete(); + } + filesToDelete.clear(); + } + + /** + * Get the URI to reference this server. + *

+ * The returned URI includes the proper host name and port number, but does + * not contain a path. + * + * @return URI to reference this server's root context. + */ + public URI getURI() { + assertAlreadySetUp(); + String host = connector.getHost(); + if (host.contains(":") && !host.startsWith("[")) + host = "[" + host + "]"; + final String uri = "http://" + host + ":" + getPort(); + try { + return new URI(uri); + } catch (URISyntaxException e) { + throw new RuntimeException("Unexpected URI error on " + uri, e); + } + } + + /** + * Get port. + * + * @return the local port number the server is listening on. + */ + public int getPort() { + assertAlreadySetUp(); + return connector.getLocalPort(); + } + + /** + * Get secure port. + * + * @return the HTTPS port or -1 if not configured. + */ + public int getSecurePort() { + assertAlreadySetUp(); + return secureConnector != null ? secureConnector.getLocalPort() : -1; + } + + /** + * Get requests. + * + * @return all requests since the server was started. + */ + public List getRequests() { + return new ArrayList<>(log.getEvents()); + } + + /** + * Get requests. + * + * @param base + * base URI used to access the server. + * @param path + * the path to locate requests for, relative to {@code base}. + * @return all requests which match the given path. + */ + public List getRequests(URIish base, String path) { + return getRequests(HttpTestCase.join(base, path)); + } + + /** + * Get requests. + * + * @param path + * the path to locate requests for. + * @return all requests which match the given path. + */ + public List getRequests(String path) { + ArrayList r = new ArrayList<>(); + for (AccessEvent event : log.getEvents()) { + if (event.getPath().equals(path)) { + r.add(event); + } + } + return r; + } + + private void assertNotYetSetUp() { + assertFalse("server is not running", server.isRunning()); + } + + private void assertAlreadySetUp() { + assertTrue("server is running", server.isRunning()); + } +} diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 17a75701540..8ab98ac5d95 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -1,11 +1,36 @@ load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") package(default_visibility = ["//visibility:public"]) +JUNIT_HTTP_SRCS = glob(["src/**/*.java"]) + +JUNIT_HTTP_EE8_TRANSFORM_SRCS = glob( + ["src/**/*.java"], + exclude = ["src/org/eclipse/jgit/junit/http/AppServer.java"], +) + +filegroup( + name = "srcs", + testonly = 1, + srcs = JUNIT_HTTP_SRCS, + visibility = [ + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "ee8-transform-srcs", + testonly = 1, + srcs = JUNIT_HTTP_EE8_TRANSFORM_SRCS, + visibility = ["//tools/jgit-ee8:__pkg__"], +) + java_library( name = "junit-http", testonly = 1, - srcs = glob(["src/**/*.java"]), + srcs = JUNIT_HTTP_SRCS, resources = glob( ["resources/**"], allow_empty = True, @@ -27,3 +52,14 @@ java_library( "//org.eclipse.jgit.junit:junit", ], ) + +transform_srcjar( + name = "junit-http-ee8-srcs", + direction = "to_javax", + sources = JUNIT_HTTP_EE8_TRANSFORM_SRCS, + src_prefix = "org.eclipse.jgit.junit.http/src/", + visibility = [ + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) diff --git a/org.eclipse.jgit.lfs.server.test.ee8/BUILD b/org.eclipse.jgit.lfs.server.test.ee8/BUILD new file mode 100644 index 00000000000..bb93b79374b --- /dev/null +++ b/org.eclipse.jgit.lfs.server.test.ee8/BUILD @@ -0,0 +1,65 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +transform_srcjar( + name = "test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server.test:test-srcs"], + src_prefix = "org.eclipse.jgit.lfs.server.test/tst/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "base-test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server.test:base-test-srcs"], + src_prefix = "org.eclipse.jgit.lfs.server.test/tst/", +) + +# Keep the helper/base class separate: the canonical LfsServerTest is compiled +# into the helper jar, while the remaining tests are executed from the EE8 +# suite target. +DEPS = [ + "//org.eclipse.jgit.lfs.test:helpers", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + "//org.eclipse.jgit.junit.http.ee8:junit-http-ee8", + "//org.eclipse.jgit.lfs:jgit-lfs", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8", + "//lib:commons-logging", + "//lib:httpcore", + "//lib:httpclient", + "//lib:junit", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-util", + "//lib:javax-servlet-api", +] + +junit_tests( + name = "lfs_server", + jvm_flags = [ + "-Xmx512m", + "-Dfile.encoding=UTF-8", + ], + suite_srcs = ["//org.eclipse.jgit.lfs.server.test:nonbase-test-srcs"], + tags = ["lfs-server"], + srcs = [":test-srcs"], + deps = DEPS + [ + ":helpers", + ], +) + +java_library( + name = "helpers", + testonly = 1, + srcs = [":base-test-srcs"], + deps = DEPS, +) diff --git a/org.eclipse.jgit.lfs.server.test/BUILD b/org.eclipse.jgit.lfs.server.test/BUILD index adc2df63c02..4b698048694 100644 --- a/org.eclipse.jgit.lfs.server.test/BUILD +++ b/org.eclipse.jgit.lfs.server.test/BUILD @@ -6,6 +6,35 @@ load("@rules_java//java:defs.bzl", "java_library") TEST_BASE = ["tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java"] +TEST_SRCS = glob(["tst/**/*.java"]) + +filegroup( + name = "test-srcs", + testonly = 1, + srcs = TEST_SRCS, + visibility = [ + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "base-test-srcs", + testonly = 1, + srcs = TEST_BASE, + visibility = ["//org.eclipse.jgit.lfs.server.test.ee8:__pkg__"], +) + +filegroup( + name = "nonbase-test-srcs", + testonly = 1, + srcs = glob( + ["tst/**/*.java"], + exclude = TEST_BASE, + ), + visibility = ["//org.eclipse.jgit.lfs.server.test.ee8:__pkg__"], +) + DEPS = [ "//org.eclipse.jgit.lfs.test:helpers", "//org.eclipse.jgit:jgit", diff --git a/tools/jgit-ee8/BUILD b/tools/jgit-ee8/BUILD index df5c27cd73d..f6681ccf163 100644 --- a/tools/jgit-ee8/BUILD +++ b/tools/jgit-ee8/BUILD @@ -7,8 +7,11 @@ sh_test( "--forbid", "jakarta\\.servlet", "--forbid", + "org\\.eclipse\\.jetty\\.ee10\\.servlet", + "--forbid", "org\\.eclipse\\.jgit\\..*\\.ee8", - "--require", + "--require-if-source", + "jakarta\\.servlet", "javax\\.servlet", "--module", "org.eclipse.jgit.http.server/src/", @@ -18,11 +21,35 @@ sh_test( "org.eclipse.jgit.lfs.server/src/", "$(location //org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs)", "$(locations //org.eclipse.jgit.lfs.server:srcs)", + "--module", + "org.eclipse.jgit.junit.http/src/", + "$(location //org.eclipse.jgit.junit.http:junit-http-ee8-srcs)", + "$(locations //org.eclipse.jgit.junit.http:ee8-transform-srcs)", + "--module", + "org.eclipse.jgit.http.test/src/", + "$(location //org.eclipse.jgit.http.test.ee8:helpers-srcs)", + "$(locations //org.eclipse.jgit.http.test:helper-srcs)", + "--module", + "org.eclipse.jgit.http.test/tst/", + "$(location //org.eclipse.jgit.http.test.ee8:test-srcs)", + "$(locations //org.eclipse.jgit.http.test:test-srcs)", + "--module", + "org.eclipse.jgit.lfs.server.test/tst/", + "$(location //org.eclipse.jgit.lfs.server.test.ee8:test-srcs)", + "$(locations //org.eclipse.jgit.lfs.server.test:test-srcs)", ], data = [ "//org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs", "//org.eclipse.jgit.http.server:srcs", + "//org.eclipse.jgit.http.test.ee8:helpers-srcs", + "//org.eclipse.jgit.http.test.ee8:test-srcs", + "//org.eclipse.jgit.http.test:helper-srcs", + "//org.eclipse.jgit.http.test:test-srcs", + "//org.eclipse.jgit.junit.http:ee8-transform-srcs", + "//org.eclipse.jgit.junit.http:junit-http-ee8-srcs", "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs", "//org.eclipse.jgit.lfs.server:srcs", + "//org.eclipse.jgit.lfs.server.test.ee8:test-srcs", + "//org.eclipse.jgit.lfs.server.test:test-srcs", ], ) diff --git a/tools/jgit-ee8/README.md b/tools/jgit-ee8/README.md index 5578d6553b5..7bb2f477aa7 100644 --- a/tools/jgit-ee8/README.md +++ b/tools/jgit-ee8/README.md @@ -22,17 +22,18 @@ Generated targets: Do not put one of these generated jars and its canonical Jakarta counterpart on the same classpath. They contain the same JGit classes. -This is intentionally limited to Bazel source consumers. It does not add Maven, -Tycho, p2, or Maven Central publication machinery. Those should be added only if -a non-Bazel consumer needs published EE8 artifacts. +This is intentionally limited to source generation, build, and test. It does +not add Tycho, p2, or Maven Central publication machinery yet. Run: ```sh -bazelisk test //tools/jgit-ee8:generated_srcs_test +bazelisk test \ + //tools/jgit-ee8:generated_srcs_test \ + //org.eclipse.jgit.junit.http.ee8:tests ``` -The test checks: +`//tools/jgit-ee8:generated_srcs_test` checks: * generated sources are derived from the canonical source filegroups * generated srcjar entries use Java package paths @@ -40,10 +41,28 @@ The test checks: * generated sources contain `javax.servlet`, not `jakarta.servlet` * generated sources do not move JGit classes to an `.ee8` package +The dedicated `org.eclipse.jgit.*.ee8` targets follow the Jetty 12 EE8 testing +model in a smaller form. Jetty generates EE8 main and test sources from the +canonical newer-EE modules and then runs the EE8 tests in the EE8 module graph. +JGit does the same for the servlet-facing tests: the HTTP/LFS test sources and +shared `junit-http` helpers are transformed to `javax.servlet`, wired to Jetty +EE8 test dependencies, and run against the generated EE8 JGit jars. + +`//org.eclipse.jgit.http.test.ee8:server_unit` is a fast, focused target for the +three HTTP server utility tests. It is not part of the default EE8 suite because +those classes already run under `//org.eclipse.jgit.http.test.ee8:http`. + +The test rewrite rules also map Jetty test helper imports from +`org.eclipse.jetty.ee10.servlet` to the Jetty EE8 packages needed by the tests. +They are intentionally test-only and separate from the production +`jakarta.servlet` to `javax.servlet` rules. + Next steps: * Keep this source-consumer bridge while Gerrit runs on Jetty 12 EE8. * Reuse these targets for other Bazel source consumers that need EE8 output. +* Move the generated-test JUnit helper to bazlets only if more generated-test + users need the same split between suite source labels and compiled sources. * Add Maven/Tycho/p2 generation only when a non-Bazel consumer needs published EE8 artifacts. * Keep the canonical `srcs` filegroups aligned with each servlet-facing From 0f55a0f28e5e0c0507b75834f72f7c3b2340f1f3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 29 Jun 2026 11:50:59 +0200 Subject: [PATCH 155/200] Add NOTICE.md generated by the Legal Documentation generator Committers can access the legal documentation generator here https://www.eclipse.org/projects/tools/documentation.php This was requested in the June 2026 progress review of the JGit project linked below. Bug: https://gitlab.eclipse.org/eclipsefdn/emo-team/emo/-/work_items/1218 Change-Id: I5ae96448580c99c481b7ef9a8c188c2201ad40b9 --- NOTICE.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 NOTICE.md diff --git a/NOTICE.md b/NOTICE.md new file mode 100644 index 00000000000..31e8ed9a8c6 --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,41 @@ +# Notices for Eclipse JGit + +This content is produced and maintained by the Eclipse JGit project. + +* Project home: https://projects.eclipse.org/projects/technology.jgit + +## Trademarks + +JGit™ is a trademark of the Eclipse Foundation. + +## Copyright + +All content is the property of the respective authors or their employers. For +more information regarding authorship of content, please consult the listed +source code repository logs. + +## Declared Project Licenses + +This program and the accompanying materials are made available under the terms +of the Eclipse Distribution License v1.0 which is available at +https://www.eclipse.org/org/documents/edl-v10.php. + +SPDX-License-Identifier: BSD-3-Clause + +## Source Code + +The project maintains the following source code repositories: + +* https://github.com/eclipse-jgit/.github +* https://github.com/eclipse-jgit/jgit +* https://github.com/eclipse-jgit/jgit-pipelines +* https://github.com/eclipse-jgit/jgit-website + +## Cryptography + +Content may contain encryption software. The country in which you are currently +may have restrictions on the import, possession, and use, and/or re-export to +another country, of encryption software. BEFORE using any encryption software, +please check the country's laws, regulations and policies concerning the import, +possession, or use, and re-export of encryption software, to see if this is +permitted. From 038353ea91fc4643c8e94215bdafccb8e34ea755 Mon Sep 17 00:00:00 2001 From: "Mennig, Robin" Date: Fri, 22 May 2026 15:01:46 +0200 Subject: [PATCH 156/200] DirCacheEntry: Fix mightBeRacilyClean() time difference calculation Fixes error which caused 'racily clean' DirCacheEntry's to not be smudged if the entry's cached modification time is ((999,999,999 - the entry's cached nanoseconds-from-second value) + 1) or more nanoseconds later than the index's modification time. Bug: jgit-267 Change-Id: I09234558aa9158d91884d146e86f0518597629d0 --- .../jgit/dircache/DirCacheEntryTest.java | 26 +++++++++++++++++++ .../eclipse/jgit/dircache/DirCacheEntry.java | 11 +++++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheEntryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheEntryTest.java index 01d1e0282db..158d9deb696 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheEntryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/DirCacheEntryTest.java @@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.security.MessageDigest; +import java.time.Duration; import java.time.Instant; import java.util.concurrent.TimeUnit; @@ -339,4 +340,29 @@ private static void copyMetaDataHelper(boolean keepStage) { assertTrue(e.isUpdateNeeded()); assertEquals("some/path", e.getPathString()); } + + @Test + public void testMightBeRacilyCleanNanoOverflow() { + DirCacheEntry entry = new DirCacheEntry("some/path"); + final Instant instant = Instant.ofEpochSecond(1, 999_999_999); + entry.setLastModified(instant.plus(Duration.ofNanos(1))); + assertTrue(entry.mightBeRacilyClean(instant)); + } + + @Test + public void testMightBeRacilyCleanOneSecondAfter() { + DirCacheEntry entry = new DirCacheEntry("some/path"); + final Instant instant = Instant.ofEpochSecond(1, 0); + entry.setLastModified(instant.plus(Duration.ofSeconds(1))); + assertTrue(entry.mightBeRacilyClean(instant)); + } + + @Test + public void testNotRacilyCleanWhenSmudgeIsAfter() { + DirCacheEntry entry = new DirCacheEntry("some/path"); + final Instant entryTime = Instant.ofEpochSecond(1, 0); + entry.setLastModified(entryTime); + final Instant smudge = entryTime.plus(Duration.ofNanos(1)); + assertFalse(entry.mightBeRacilyClean(smudge)); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java index 5a229386945..aebea7a583d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java @@ -411,9 +411,14 @@ public final boolean mightBeRacilyClean(Instant smudge) { // it is clean or not based on the modification time alone. // final int base = infoOffset + P_MTIME; - final int mtime = NB.decodeInt32(info, base); - if ((int) smudge.getEpochSecond() == mtime) { - return smudge.getNano() <= NB.decodeInt32(info, base + 4); + final int entryMtimeSec = NB.decodeInt32(info, base); + final int smudgeSec = (int) smudge.getEpochSecond(); + if (smudgeSec != 0) { + if (smudgeSec < entryMtimeSec) { + return true; + } else if (smudgeSec == entryMtimeSec) { + return smudge.getNano() <= NB.decodeInt32(info, base + 4); + } } return false; } From 1e0c1cebcc8028a1693d613427201f1a7f6a1da5 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 25 Jun 2026 11:32:28 +0200 Subject: [PATCH 157/200] junit.http: Extract AppServerBase to dedupe the EE8 AppServer overlay The EE8 servlet bridge ships a hand-maintained org.eclipse.jgit.junit.http.ee8 AppServer because the canonical AppServer cannot be rewritten into its EE8 form automatically: the Jetty security API (Constraint.Builder + ContextHandler juggling) differs structurally from the Jetty EE8 one (ServletConstraint + setSecurityHandler), which a jakarta->javax string rewrite cannot bridge. The overlay was a 461-line copy; only ~40 lines diverge. Split the common code into an abstract AppServerBase and reduce both AppServers to the generation-specific part: AppServerBase common server/context/login wiring plus the protected abstract configureAuthentication() method; transform-safe (only the ServletContextHandler import renames ee10 -> ee8). AppServer (canonical) EE10: Constraint.Builder + setHandler. AppServer (ee8 overlay) EE8: ServletConstraint + setSecurityHandler. 461 -> 103 lines. Both toolchains pick AppServerBase up for free: the Bazel transform and the Maven antrun copy both exclude only the file name AppServer.java, so AppServerBase.java flows through the jakarta->javax / ee10->ee8 rewrite while the hand-written EE8 AppServer.java stays the overlay. No BUILD or pom changes. The class stays named AppServer in both worlds (separate classpaths), so every "new AppServer(...)" site is untouched. Moving the shared username/password constants into AppServerBase turns the AppServer.username uses in the HTTP tests into an indirect static access, which JGit's ecj settings escalate to a compile error (caught by Maven, not by the Bazel javac build). Reference the declaring class (AppServerBase.username) instead of re-declaring the constants on both AppServers, which would reintroduce the duplication this change removes. Alternative considered: renaming the EE8 overlay to EE8AppServer. Rejected because a distinct name forces rewriting every "new AppServer(...)" site in the transformed EE8 tests and couples the transform to class names instead of imports. Copyright is carried over unchanged from the split file. Change-Id: I1d68bcc7d1d23668696ee91d8910f4940064bb37 --- .../jgit/http/test/HttpClientTests.java | 6 +- .../http/test/SmartClientSmartServerTest.java | 27 +- .../eclipse/jgit/junit/http/AppServer.java | 390 +--------------- .../eclipse/jgit/junit/http/AppServer.java | 389 +-------------- .../jgit/junit/http/AppServerBase.java | 441 ++++++++++++++++++ 5 files changed, 487 insertions(+), 766 deletions(-) create mode 100644 org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java index 3937627f53c..2737a492fc2 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java @@ -41,7 +41,7 @@ import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.http.AccessEvent; -import org.eclipse.jgit.junit.http.AppServer; +import org.eclipse.jgit.junit.http.AppServerBase; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; @@ -266,12 +266,12 @@ public void testListRemote_Dumb_Auth() throws Exception { Repository dst = createBareRepository(); try (Transport t = Transport.open(dst, dumbAuthBasicURI)) { t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, AppServer.password)); + AppServerBase.username, AppServerBase.password)); t.openFetch().close(); } try (Transport t = Transport.open(dst, dumbAuthBasicURI)) { t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, "")); + AppServerBase.username, "")); try { t.openFetch(); fail("connection opened even info/refs needs auth basic and we provide wrong password"); diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index b0d17adb3a0..46a48f7e704 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -68,6 +68,7 @@ import org.eclipse.jgit.junit.TestRng; import org.eclipse.jgit.junit.http.AccessEvent; import org.eclipse.jgit.junit.http.AppServer; +import org.eclipse.jgit.junit.http.AppServerBase; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; @@ -111,7 +112,7 @@ public class SmartClientSmartServerTest extends AllProtocolsHttpTestCase { private Repository remoteRepository; private CredentialsProvider testCredentials = new UsernamePasswordCredentialsProvider( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); private URIish remoteURI; @@ -998,7 +999,7 @@ public void testInitialClone_WithPreAuthentication() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1018,7 +1019,7 @@ public void testInitialClone_WithPreAuthenticationCleared() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); ((TransportHttp) t).setPreemptiveBasicAuthentication(null, null); t.setCredentialsProvider(testCredentials); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); @@ -1043,7 +1044,7 @@ public void testInitialClone_PreAuthenticationTooLate() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1053,7 +1054,7 @@ public void testInitialClone_PreAuthenticationTooLate() throws Exception { assertFetchRequests(requests, 0); assertThrows(IllegalStateException.class, () -> ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password)); + AppServerBase.username, AppServerBase.password)); assertThrows(IllegalStateException.class, () -> ((TransportHttp) t) .setPreemptiveBasicAuthentication(null, null)); } @@ -1066,7 +1067,7 @@ public void testInitialClone_WithWrongPreAuthenticationAndCredentialProvider() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password + 'x'); + AppServerBase.username, AppServerBase.password + 'x'); t.setCredentialsProvider(testCredentials); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); @@ -1090,7 +1091,7 @@ public void testInitialClone_WithWrongPreAuthentication() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password + 'x'); + AppServerBase.username, AppServerBase.password + 'x'); TransportException e = assertThrows(TransportException.class, () -> t.fetch(NullProgressMonitor.INSTANCE, mirror(master))); @@ -1108,8 +1109,8 @@ public void testInitialClone_WithWrongPreAuthentication() throws Exception { @Test public void testInitialClone_WithUserInfo() throws Exception { - URIish withUserInfo = authURI.setUser(AppServer.username) - .setPass(AppServer.password); + URIish withUserInfo = authURI.setUser(AppServerBase.username) + .setPass(AppServerBase.password); try (Repository dst = createBareRepository(); Transport t = Transport.open(dst, withUserInfo)) { assertFalse(dst.getObjectDatabase().has(A_txt)); @@ -1127,13 +1128,13 @@ public void testInitialClone_WithUserInfo() throws Exception { @Test public void testInitialClone_PreAuthOverridesUserInfo() throws Exception { - URIish withUserInfo = authURI.setUser(AppServer.username) - .setPass(AppServer.password + 'x'); + URIish withUserInfo = authURI.setUser(AppServerBase.username) + .setPass(AppServerBase.password + 'x'); try (Repository dst = createBareRepository(); Transport t = Transport.open(dst, withUserInfo)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1174,7 +1175,7 @@ public void testInitialClone_WithAuthenticationWrongCredentials() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, "wrongpassword")); + AppServerBase.username, "wrongpassword")); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); fail("Should not have succeeded -- wrong password"); } catch (TransportException e) { diff --git a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java index 1e4c7966b60..3627d920a89 100644 --- a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java @@ -10,95 +10,34 @@ package org.eclipse.jgit.junit.http; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.nio.file.Files; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jetty.ee8.nested.ServletConstraint; -import org.eclipse.jetty.ee8.security.Authenticator; import org.eclipse.jetty.ee8.security.ConstraintMapping; import org.eclipse.jetty.ee8.security.ConstraintSecurityHandler; import org.eclipse.jetty.ee8.security.authentication.BasicAuthenticator; import org.eclipse.jetty.ee8.servlet.ServletContextHandler; import org.eclipse.jetty.security.AbstractLoginService; -import org.eclipse.jetty.security.RolePrincipal; -import org.eclipse.jetty.security.UserPrincipal; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.util.security.Password; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jgit.transport.URIish; /** - * Tiny web application server for unit testing. + * Tiny web application server for unit testing, wired for the EE8 + * (javax.servlet / Jetty EE8) generation. *

- * Tests should start the server in their {@code setUp()} method and stop the - * server in their {@code tearDown()} method. Only while started the server's - * URL and/or port number can be obtained. + * Only the Jetty security wiring is generation specific; everything else is + * inherited from the generated {@link AppServerBase}. This is the hand + * maintained EE8 overlay that the canonical {@code AppServer} cannot be + * rewritten into automatically, because the Jetty EE8 security API + * ({@code ServletConstraint} + {@code setSecurityHandler}) differs structurally + * from the EE10 one. */ -public class AppServer { - /** Realm name for the secure access areas. */ - public static final String realm = "Secure Area"; - - /** Username for secured access areas. */ - public static final String username = "agitter"; - - /** Password for {@link #username} in secured access areas. */ - public static final String password = "letmein"; - - /** SSL keystore password; must have at least 6 characters. */ - private static final String keyPassword = "mykeys"; - - /** Role for authentication. */ - private static final String authRole = "can-access"; - - static { - // Install a logger that throws warning messages. - // - final String prop = "org.eclipse.jetty.util.log.class"; - System.setProperty(prop, RecordingLogger.class.getName()); - } - - private final Server server; - - private final HttpConfiguration config; - - private final ServerConnector connector; - - private final HttpConfiguration secureConfig; - - private final ServerConnector secureConnector; - - private final ContextHandlerCollection contexts; - - private final TestRequestLog log; - - private List filesToDelete = new ArrayList<>(); - +public class AppServer extends AppServerBase { /** * Constructor for AppServer. */ public AppServer() { - this(0, -1); + super(); } /** @@ -110,7 +49,7 @@ public AppServer() { * @since 4.2 */ public AppServer(int port) { - this(port, -1); + super(port); } /** @@ -124,185 +63,7 @@ public AppServer(int port) { * @since 4.9 */ public AppServer(int port, int sslPort) { - server = new Server(); - - config = new HttpConfiguration(); - config.setSecureScheme("https"); - config.setSecurePort(0); - config.setOutputBufferSize(32768); - - connector = new ServerConnector(server, - new HttpConnectionFactory(config)); - connector.setPort(port); - String ip; - String hostName; - try { - final InetAddress me = InetAddress.getByName("localhost"); - ip = me.getHostAddress(); - connector.setHost(ip); - hostName = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - throw new RuntimeException("Cannot find localhost", e); - } - - if (sslPort >= 0) { - SslContextFactory.Server sslContextFactory = createTestSslContextFactory( - hostName, ip); - secureConfig = new HttpConfiguration(config); - secureConfig.addCustomizer(new SecureRequestCustomizer()); - HttpConnectionFactory http11 = new HttpConnectionFactory( - secureConfig); - SslConnectionFactory tls = new SslConnectionFactory( - sslContextFactory, http11.getProtocol()); - secureConnector = new ServerConnector(server, tls, http11); - secureConnector.setPort(sslPort); - secureConnector.setHost(ip); - } else { - secureConfig = null; - secureConnector = null; - } - - contexts = new ContextHandlerCollection(); - - log = new TestRequestLog(); - log.setHandler(contexts); - - if (secureConnector == null) { - server.setConnectors(new Connector[] { connector }); - } else { - server.setConnectors( - new Connector[] { connector, secureConnector }); - } - server.setHandler(log); - } - - private SslContextFactory.Server createTestSslContextFactory( - String hostName, String ip) { - SslContextFactory.Server factory = new SslContextFactory.Server(); - - String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; - - try { - File tmpDir = Files.createTempDirectory("jks").toFile(); - tmpDir.deleteOnExit(); - makePrivate(tmpDir); - File keyStore = new File(tmpDir, "keystore.jks"); - File keytool = new File( - new File(new File(System.getProperty("java.home")), "bin"), - "keytool"); - Runtime.getRuntime().exec( - new String[] { - keytool.getAbsolutePath(), // - "-keystore", keyStore.getAbsolutePath(), // - "-storepass", keyPassword, - "-alias", hostName, // - "-ext", "bc=ca:true", // - "-ext", - String.format( - "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", - ip, hostName), // - "-genkeypair", // - "-keyalg", "RSA", // - "-keypass", keyPassword, // - "-dname", dName, // - "-validity", "2" // - }).waitFor(); - keyStore.deleteOnExit(); - makePrivate(keyStore); - filesToDelete.add(keyStore); - filesToDelete.add(tmpDir); - factory.setKeyStorePath(keyStore.getAbsolutePath()); - factory.setKeyStorePassword(keyPassword); - factory.setKeyManagerPassword(keyPassword); - factory.setTrustStorePath(keyStore.getAbsolutePath()); - factory.setTrustStorePassword(keyPassword); - } catch (InterruptedException | IOException e) { - throw new RuntimeException("Cannot create ssl key/certificate", e); - } - return factory; - } - - private void makePrivate(File file) { - file.setReadable(false); - file.setWritable(false); - file.setExecutable(false); - file.setReadable(true, true); - file.setWritable(true, true); - if (file.isDirectory()) { - file.setExecutable(true, true); - } - } - - /** - * Create a new servlet context within the server. - *

- * This method should be invoked before the server is started, once for each - * context the caller wants to register. - * - * @param path - * path of the context; use "/" for the root context if binding - * to the root is desired. - * @return the context to add servlets into. - * @since 7.0 - */ - public ServletContextHandler addContext(String path) { - assertNotYetSetUp(); - if ("".equals(path)) - path = "/"; - - ServletContextHandler ctx = new ServletContextHandler(); - ctx.setContextPath(path); - contexts.addHandler(ctx); - - return ctx; - } - - /** - * Configure basic authentication. - * - * @param ctx - * servlet context handler - * @param methods - * the methods - * @return servlet context handler - * @since 7.0 - */ - public ServletContextHandler authBasic(ServletContextHandler ctx, - String... methods) { - assertNotYetSetUp(); - auth(ctx, new BasicAuthenticator(), methods); - return ctx; - } - - static class TestMappedLoginService extends AbstractLoginService { - private RolePrincipal role; - - protected final Map users = new ConcurrentHashMap<>(); - - TestMappedLoginService(String role) { - this.role = new RolePrincipal(role); - } - - @Override - protected void doStart() throws Exception { - UserPrincipal p = new UserPrincipal(username, - new Password(password)); - users.put(username, p); - super.doStart(); - } - - @Override - protected UserPrincipal loadUserInfo(String user) { - return users.get(user); - } - - @Override - protected List loadRoleInfo(UserPrincipal user) { - if (users.get(user.getName()) == null) { - return null; - } - return Collections.singletonList(role); - } + super(port, sslPort); } private ConstraintMapping createConstraintMapping() { @@ -314,8 +75,9 @@ private ConstraintMapping createConstraintMapping() { return cm; } - private void auth(ServletContextHandler ctx, Authenticator authType, - String... methods) { + @Override + protected void configureAuthentication(ServletContextHandler ctx, + String[] methods) { AbstractLoginService users = new TestMappedLoginService(authRole); List mappings = new ArrayList<>(); if (methods == null || methods.length == 0) { @@ -333,129 +95,9 @@ private void auth(ServletContextHandler ctx, Authenticator authType, ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); sec.setRealmName(realm); - sec.setAuthenticator(authType); + sec.setAuthenticator(new BasicAuthenticator()); sec.setLoginService(users); sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); ctx.setSecurityHandler(sec); } - - /** - * Start the server on a random local port. - * - * @throws Exception - * the server cannot be started, testing is not possible. - */ - public void setUp() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.start(); - config.setSecurePort(getSecurePort()); - if (secureConfig != null) { - secureConfig.setSecurePort(getSecurePort()); - } - } - - /** - * Shutdown the server. - * - * @throws Exception - * the server refuses to halt, or wasn't running. - */ - public void tearDown() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.stop(); - for (File f : filesToDelete) { - f.delete(); - } - filesToDelete.clear(); - } - - /** - * Get the URI to reference this server. - *

- * The returned URI includes the proper host name and port number, but does - * not contain a path. - * - * @return URI to reference this server's root context. - */ - public URI getURI() { - assertAlreadySetUp(); - String host = connector.getHost(); - if (host.contains(":") && !host.startsWith("[")) - host = "[" + host + "]"; - final String uri = "http://" + host + ":" + getPort(); - try { - return new URI(uri); - } catch (URISyntaxException e) { - throw new RuntimeException("Unexpected URI error on " + uri, e); - } - } - - /** - * Get port. - * - * @return the local port number the server is listening on. - */ - public int getPort() { - assertAlreadySetUp(); - return connector.getLocalPort(); - } - - /** - * Get secure port. - * - * @return the HTTPS port or -1 if not configured. - */ - public int getSecurePort() { - assertAlreadySetUp(); - return secureConnector != null ? secureConnector.getLocalPort() : -1; - } - - /** - * Get requests. - * - * @return all requests since the server was started. - */ - public List getRequests() { - return new ArrayList<>(log.getEvents()); - } - - /** - * Get requests. - * - * @param base - * base URI used to access the server. - * @param path - * the path to locate requests for, relative to {@code base}. - * @return all requests which match the given path. - */ - public List getRequests(URIish base, String path) { - return getRequests(HttpTestCase.join(base, path)); - } - - /** - * Get requests. - * - * @param path - * the path to locate requests for. - * @return all requests which match the given path. - */ - public List getRequests(String path) { - ArrayList r = new ArrayList<>(); - for (AccessEvent event : log.getEvents()) { - if (event.getPath().equals(path)) { - r.add(event); - } - } - return r; - } - - private void assertNotYetSetUp() { - assertFalse("server is not running", server.isRunning()); - } - - private void assertAlreadySetUp() { - assertTrue("server is running", server.isRunning()); - } } diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 76e437bc3d6..3a4bce7419e 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -10,95 +10,30 @@ package org.eclipse.jgit.junit.http; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.nio.file.Files; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jetty.ee10.servlet.ServletContextHandler; import org.eclipse.jetty.ee10.servlet.security.ConstraintMapping; import org.eclipse.jetty.ee10.servlet.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.AbstractLoginService; -import org.eclipse.jetty.security.Authenticator; import org.eclipse.jetty.security.Constraint; -import org.eclipse.jetty.security.RolePrincipal; -import org.eclipse.jetty.security.UserPrincipal; import org.eclipse.jetty.security.authentication.BasicAuthenticator; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.util.security.Password; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jgit.transport.URIish; /** - * Tiny web application server for unit testing. + * Tiny web application server for unit testing, wired for the Jakarta servlet + * (Jetty EE10) generation. *

- * Tests should start the server in their {@code setUp()} method and stop the - * server in their {@code tearDown()} method. Only while started the server's - * URL and/or port number can be obtained. + * Only the Jetty security wiring is generation specific; everything else lives + * in {@link AppServerBase}. */ -public class AppServer { - /** Realm name for the secure access areas. */ - public static final String realm = "Secure Area"; - - /** Username for secured access areas. */ - public static final String username = "agitter"; - - /** Password for {@link #username} in secured access areas. */ - public static final String password = "letmein"; - - /** SSL keystore password; must have at least 6 characters. */ - private static final String keyPassword = "mykeys"; - - /** Role for authentication. */ - private static final String authRole = "can-access"; - - static { - // Install a logger that throws warning messages. - // - final String prop = "org.eclipse.jetty.util.log.class"; - System.setProperty(prop, RecordingLogger.class.getName()); - } - - private final Server server; - - private final HttpConfiguration config; - - private final ServerConnector connector; - - private final HttpConfiguration secureConfig; - - private final ServerConnector secureConnector; - - private final ContextHandlerCollection contexts; - - private final TestRequestLog log; - - private List filesToDelete = new ArrayList<>(); - +public class AppServer extends AppServerBase { /** * Constructor for AppServer. */ public AppServer() { - this(0, -1); + super(); } /** @@ -110,7 +45,7 @@ public AppServer() { * @since 4.2 */ public AppServer(int port) { - this(port, -1); + super(port); } /** @@ -124,185 +59,7 @@ public AppServer(int port) { * @since 4.9 */ public AppServer(int port, int sslPort) { - server = new Server(); - - config = new HttpConfiguration(); - config.setSecureScheme("https"); - config.setSecurePort(0); - config.setOutputBufferSize(32768); - - connector = new ServerConnector(server, - new HttpConnectionFactory(config)); - connector.setPort(port); - String ip; - String hostName; - try { - final InetAddress me = InetAddress.getByName("localhost"); - ip = me.getHostAddress(); - connector.setHost(ip); - hostName = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - throw new RuntimeException("Cannot find localhost", e); - } - - if (sslPort >= 0) { - SslContextFactory.Server sslContextFactory = createTestSslContextFactory( - hostName, ip); - secureConfig = new HttpConfiguration(config); - secureConfig.addCustomizer(new SecureRequestCustomizer()); - HttpConnectionFactory http11 = new HttpConnectionFactory( - secureConfig); - SslConnectionFactory tls = new SslConnectionFactory( - sslContextFactory, http11.getProtocol()); - secureConnector = new ServerConnector(server, tls, http11); - secureConnector.setPort(sslPort); - secureConnector.setHost(ip); - } else { - secureConfig = null; - secureConnector = null; - } - - contexts = new ContextHandlerCollection(); - - log = new TestRequestLog(); - log.setHandler(contexts); - - if (secureConnector == null) { - server.setConnectors(new Connector[] { connector }); - } else { - server.setConnectors( - new Connector[] { connector, secureConnector }); - } - server.setHandler(log); - } - - private SslContextFactory.Server createTestSslContextFactory( - String hostName, String ip) { - SslContextFactory.Server factory = new SslContextFactory.Server(); - - String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; - - try { - File tmpDir = Files.createTempDirectory("jks").toFile(); - tmpDir.deleteOnExit(); - makePrivate(tmpDir); - File keyStore = new File(tmpDir, "keystore.jks"); - File keytool = new File( - new File(new File(System.getProperty("java.home")), "bin"), - "keytool"); - Runtime.getRuntime().exec( - new String[] { - keytool.getAbsolutePath(), // - "-keystore", keyStore.getAbsolutePath(), // - "-storepass", keyPassword, - "-alias", hostName, // - "-ext", "bc=ca:true", // - "-ext", - String.format( - "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", - ip, hostName), // - "-genkeypair", // - "-keyalg", "RSA", // - "-keypass", keyPassword, // - "-dname", dName, // - "-validity", "2" // - }).waitFor(); - keyStore.deleteOnExit(); - makePrivate(keyStore); - filesToDelete.add(keyStore); - filesToDelete.add(tmpDir); - factory.setKeyStorePath(keyStore.getAbsolutePath()); - factory.setKeyStorePassword(keyPassword); - factory.setKeyManagerPassword(keyPassword); - factory.setTrustStorePath(keyStore.getAbsolutePath()); - factory.setTrustStorePassword(keyPassword); - } catch (InterruptedException | IOException e) { - throw new RuntimeException("Cannot create ssl key/certificate", e); - } - return factory; - } - - private void makePrivate(File file) { - file.setReadable(false); - file.setWritable(false); - file.setExecutable(false); - file.setReadable(true, true); - file.setWritable(true, true); - if (file.isDirectory()) { - file.setExecutable(true, true); - } - } - - /** - * Create a new servlet context within the server. - *

- * This method should be invoked before the server is started, once for each - * context the caller wants to register. - * - * @param path - * path of the context; use "/" for the root context if binding - * to the root is desired. - * @return the context to add servlets into. - * @since 7.0 - */ - public ServletContextHandler addContext(String path) { - assertNotYetSetUp(); - if ("".equals(path)) - path = "/"; - - ServletContextHandler ctx = new ServletContextHandler(); - ctx.setContextPath(path); - contexts.addHandler(ctx); - - return ctx; - } - - /** - * Configure basic authentication. - * - * @param ctx - * servlet context handler - * @param methods - * the methods - * @return servlet context handler - * @since 7.0 - */ - public ServletContextHandler authBasic(ServletContextHandler ctx, - String... methods) { - assertNotYetSetUp(); - auth(ctx, new BasicAuthenticator(), methods); - return ctx; - } - - static class TestMappedLoginService extends AbstractLoginService { - private RolePrincipal role; - - protected final Map users = new ConcurrentHashMap<>(); - - TestMappedLoginService(String role) { - this.role = new RolePrincipal(role); - } - - @Override - protected void doStart() throws Exception { - UserPrincipal p = new UserPrincipal(username, - new Password(password)); - users.put(username, p); - super.doStart(); - } - - @Override - protected UserPrincipal loadUserInfo(String user) { - return users.get(user); - } - - @Override - protected List loadRoleInfo(UserPrincipal user) { - if (users.get(user.getName()) == null) { - return null; - } - return Collections.singletonList(role); - } + super(port, sslPort); } private ConstraintMapping createConstraintMapping() { @@ -315,8 +72,9 @@ private ConstraintMapping createConstraintMapping() { return cm; } - private void auth(ServletContextHandler ctx, Authenticator authType, - String... methods) { + @Override + protected void configureAuthentication(ServletContextHandler ctx, + String[] methods) { AbstractLoginService users = new TestMappedLoginService(authRole); List mappings = new ArrayList<>(); if (methods == null || methods.length == 0) { @@ -331,133 +89,12 @@ private void auth(ServletContextHandler ctx, Authenticator authType, ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); sec.setRealmName(realm); - sec.setAuthenticator(authType); + sec.setAuthenticator(new BasicAuthenticator()); sec.setLoginService(users); - sec.setConstraintMappings( - mappings.toArray(new ConstraintMapping[0])); + sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); sec.setHandler(ctx); contexts.removeHandler(ctx); contexts.addHandler(sec); } - - /** - * Start the server on a random local port. - * - * @throws Exception - * the server cannot be started, testing is not possible. - */ - public void setUp() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.start(); - config.setSecurePort(getSecurePort()); - if (secureConfig != null) { - secureConfig.setSecurePort(getSecurePort()); - } - } - - /** - * Shutdown the server. - * - * @throws Exception - * the server refuses to halt, or wasn't running. - */ - public void tearDown() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.stop(); - for (File f : filesToDelete) { - f.delete(); - } - filesToDelete.clear(); - } - - /** - * Get the URI to reference this server. - *

- * The returned URI includes the proper host name and port number, but does - * not contain a path. - * - * @return URI to reference this server's root context. - */ - public URI getURI() { - assertAlreadySetUp(); - String host = connector.getHost(); - if (host.contains(":") && !host.startsWith("[")) - host = "[" + host + "]"; - final String uri = "http://" + host + ":" + getPort(); - try { - return new URI(uri); - } catch (URISyntaxException e) { - throw new RuntimeException("Unexpected URI error on " + uri, e); - } - } - - /** - * Get port. - * - * @return the local port number the server is listening on. - */ - public int getPort() { - assertAlreadySetUp(); - return connector.getLocalPort(); - } - - /** - * Get secure port. - * - * @return the HTTPS port or -1 if not configured. - */ - public int getSecurePort() { - assertAlreadySetUp(); - return secureConnector != null ? secureConnector.getLocalPort() : -1; - } - - /** - * Get requests. - * - * @return all requests since the server was started. - */ - public List getRequests() { - return new ArrayList<>(log.getEvents()); - } - - /** - * Get requests. - * - * @param base - * base URI used to access the server. - * @param path - * the path to locate requests for, relative to {@code base}. - * @return all requests which match the given path. - */ - public List getRequests(URIish base, String path) { - return getRequests(HttpTestCase.join(base, path)); - } - - /** - * Get requests. - * - * @param path - * the path to locate requests for. - * @return all requests which match the given path. - */ - public List getRequests(String path) { - ArrayList r = new ArrayList<>(); - for (AccessEvent event : log.getEvents()) { - if (event.getPath().equals(path)) { - r.add(event); - } - } - return r; - } - - private void assertNotYetSetUp() { - assertFalse("server is not running", server.isRunning()); - } - - private void assertAlreadySetUp() { - assertTrue("server is running", server.isRunning()); - } } diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java new file mode 100644 index 00000000000..bc2baadd837 --- /dev/null +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java @@ -0,0 +1,441 @@ +/* + * Copyright (C) 2010, 2017 Google Inc. and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.junit.http; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.security.AbstractLoginService; +import org.eclipse.jetty.security.RolePrincipal; +import org.eclipse.jetty.security.UserPrincipal; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.util.security.Password; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.eclipse.jgit.transport.URIish; + +/** + * Tiny web application server for unit testing. + *

+ * Tests should start the server in their {@code setUp()} method and stop the + * server in their {@code tearDown()} method. Only while started the server's + * URL and/or port number can be obtained. + *

+ * The Jetty security API for declaring authentication constraints differs + * between EE generations. That part is therefore isolated in the abstract + * {@link #configureAuthentication(ServletContextHandler, String[])} seam, which + * the concrete {@code AppServer} provides for its servlet generation. + */ +public abstract class AppServerBase { + /** Realm name for the secure access areas. */ + public static final String realm = "Secure Area"; + + /** Username for secured access areas. */ + public static final String username = "agitter"; + + /** Password for {@link #username} in secured access areas. */ + public static final String password = "letmein"; + + /** SSL keystore password; must have at least 6 characters. */ + private static final String keyPassword = "mykeys"; + + /** Role for authentication. */ + protected static final String authRole = "can-access"; + + static { + // Install a logger that throws warning messages. + // + final String prop = "org.eclipse.jetty.util.log.class"; + System.setProperty(prop, RecordingLogger.class.getName()); + } + + private final Server server; + + private final HttpConfiguration config; + + private final ServerConnector connector; + + private final HttpConfiguration secureConfig; + + private final ServerConnector secureConnector; + + /** Collection the servlet contexts are registered in. */ + protected final ContextHandlerCollection contexts; + + private final TestRequestLog log; + + private List filesToDelete = new ArrayList<>(); + + /** + * Constructor for AppServer. + */ + protected AppServerBase() { + this(0, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * the http port number; may be zero to allocate a port + * dynamically + */ + protected AppServerBase(int port) { + this(port, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * for http, may be zero to allocate a port dynamically + * @param sslPort + * for https,may be zero to allocate a port dynamically. If + * negative, the server will be set up without https support. + */ + protected AppServerBase(int port, int sslPort) { + server = new Server(); + + config = new HttpConfiguration(); + config.setSecureScheme("https"); + config.setSecurePort(0); + config.setOutputBufferSize(32768); + + connector = new ServerConnector(server, + new HttpConnectionFactory(config)); + connector.setPort(port); + String ip; + String hostName; + try { + final InetAddress me = InetAddress.getByName("localhost"); + ip = me.getHostAddress(); + connector.setHost(ip); + hostName = InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + throw new RuntimeException("Cannot find localhost", e); + } + + if (sslPort >= 0) { + SslContextFactory.Server sslContextFactory = createTestSslContextFactory( + hostName, ip); + secureConfig = new HttpConfiguration(config); + secureConfig.addCustomizer(new SecureRequestCustomizer()); + HttpConnectionFactory http11 = new HttpConnectionFactory( + secureConfig); + SslConnectionFactory tls = new SslConnectionFactory( + sslContextFactory, http11.getProtocol()); + secureConnector = new ServerConnector(server, tls, http11); + secureConnector.setPort(sslPort); + secureConnector.setHost(ip); + } else { + secureConfig = null; + secureConnector = null; + } + + contexts = new ContextHandlerCollection(); + + log = new TestRequestLog(); + log.setHandler(contexts); + + if (secureConnector == null) { + server.setConnectors(new Connector[] { connector }); + } else { + server.setConnectors( + new Connector[] { connector, secureConnector }); + } + server.setHandler(log); + } + + private SslContextFactory.Server createTestSslContextFactory( + String hostName, String ip) { + SslContextFactory.Server factory = new SslContextFactory.Server(); + + String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; + + try { + File tmpDir = Files.createTempDirectory("jks").toFile(); + tmpDir.deleteOnExit(); + makePrivate(tmpDir); + File keyStore = new File(tmpDir, "keystore.jks"); + File keytool = new File( + new File(new File(System.getProperty("java.home")), "bin"), + "keytool"); + Runtime.getRuntime().exec( + new String[] { + keytool.getAbsolutePath(), // + "-keystore", keyStore.getAbsolutePath(), // + "-storepass", keyPassword, + "-alias", hostName, // + "-ext", "bc=ca:true", // + "-ext", + String.format( + "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", + ip, hostName), // + "-genkeypair", // + "-keyalg", "RSA", // + "-keypass", keyPassword, // + "-dname", dName, // + "-validity", "2" // + }).waitFor(); + keyStore.deleteOnExit(); + makePrivate(keyStore); + filesToDelete.add(keyStore); + filesToDelete.add(tmpDir); + factory.setKeyStorePath(keyStore.getAbsolutePath()); + factory.setKeyStorePassword(keyPassword); + factory.setKeyManagerPassword(keyPassword); + factory.setTrustStorePath(keyStore.getAbsolutePath()); + factory.setTrustStorePassword(keyPassword); + } catch (InterruptedException | IOException e) { + throw new RuntimeException("Cannot create ssl key/certificate", e); + } + return factory; + } + + private void makePrivate(File file) { + file.setReadable(false); + file.setWritable(false); + file.setExecutable(false); + file.setReadable(true, true); + file.setWritable(true, true); + if (file.isDirectory()) { + file.setExecutable(true, true); + } + } + + /** + * Create a new servlet context within the server. + *

+ * This method should be invoked before the server is started, once for each + * context the caller wants to register. + * + * @param path + * path of the context; use "/" for the root context if binding + * to the root is desired. + * @return the context to add servlets into. + * @since 7.0 + */ + public ServletContextHandler addContext(String path) { + assertNotYetSetUp(); + if ("".equals(path)) + path = "/"; + + ServletContextHandler ctx = new ServletContextHandler(); + ctx.setContextPath(path); + contexts.addHandler(ctx); + + return ctx; + } + + /** + * Configure basic authentication. + * + * @param ctx + * servlet context handler + * @param methods + * the methods + * @return servlet context handler + * @since 7.0 + */ + public ServletContextHandler authBasic(ServletContextHandler ctx, + String... methods) { + assertNotYetSetUp(); + configureAuthentication(ctx, methods); + return ctx; + } + + /** + * Install basic-authentication constraints on the given context. + *

+ * The Jetty security API used to build the constraints and attach the + * security handler differs between servlet generations, so each concrete + * {@code AppServer} implements this seam for its Jetty flavor. + * + * @param ctx + * servlet context handler to secure + * @param methods + * HTTP methods to constrain; empty constrains all methods + */ + protected abstract void configureAuthentication(ServletContextHandler ctx, + String[] methods); + + /** Login service mapping the single test user and role. */ + protected static class TestMappedLoginService extends AbstractLoginService { + private RolePrincipal role; + + protected final Map users = new ConcurrentHashMap<>(); + + TestMappedLoginService(String role) { + this.role = new RolePrincipal(role); + } + + @Override + protected void doStart() throws Exception { + UserPrincipal p = new UserPrincipal(username, + new Password(password)); + users.put(username, p); + super.doStart(); + } + + @Override + protected UserPrincipal loadUserInfo(String user) { + return users.get(user); + } + + @Override + protected List loadRoleInfo(UserPrincipal user) { + if (users.get(user.getName()) == null) { + return null; + } + return Collections.singletonList(role); + } + } + + /** + * Start the server on a random local port. + * + * @throws Exception + * the server cannot be started, testing is not possible. + */ + public void setUp() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.start(); + config.setSecurePort(getSecurePort()); + if (secureConfig != null) { + secureConfig.setSecurePort(getSecurePort()); + } + } + + /** + * Shutdown the server. + * + * @throws Exception + * the server refuses to halt, or wasn't running. + */ + public void tearDown() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.stop(); + for (File f : filesToDelete) { + f.delete(); + } + filesToDelete.clear(); + } + + /** + * Get the URI to reference this server. + *

+ * The returned URI includes the proper host name and port number, but does + * not contain a path. + * + * @return URI to reference this server's root context. + */ + public URI getURI() { + assertAlreadySetUp(); + String host = connector.getHost(); + if (host.contains(":") && !host.startsWith("[")) + host = "[" + host + "]"; + final String uri = "http://" + host + ":" + getPort(); + try { + return new URI(uri); + } catch (URISyntaxException e) { + throw new RuntimeException("Unexpected URI error on " + uri, e); + } + } + + /** + * Get port. + * + * @return the local port number the server is listening on. + */ + public int getPort() { + assertAlreadySetUp(); + return connector.getLocalPort(); + } + + /** + * Get secure port. + * + * @return the HTTPS port or -1 if not configured. + */ + public int getSecurePort() { + assertAlreadySetUp(); + return secureConnector != null ? secureConnector.getLocalPort() : -1; + } + + /** + * Get requests. + * + * @return all requests since the server was started. + */ + public List getRequests() { + return new ArrayList<>(log.getEvents()); + } + + /** + * Get requests. + * + * @param base + * base URI used to access the server. + * @param path + * the path to locate requests for, relative to {@code base}. + * @return all requests which match the given path. + */ + public List getRequests(URIish base, String path) { + return getRequests(HttpTestCase.join(base, path)); + } + + /** + * Get requests. + * + * @param path + * the path to locate requests for. + * @return all requests which match the given path. + */ + public List getRequests(String path) { + ArrayList r = new ArrayList<>(); + for (AccessEvent event : log.getEvents()) { + if (event.getPath().equals(path)) { + r.add(event); + } + } + return r; + } + + private void assertNotYetSetUp() { + assertFalse("server is not running", server.isRunning()); + } + + private void assertAlreadySetUp() { + assertTrue("server is running", server.isRunning()); + } +} From f07b8fbe89a5c822e71896b0cd57deb227e333fe Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 24 Jun 2026 17:05:08 +0200 Subject: [PATCH 158/200] Bazel: format build files with buildifier Change-Id: I7a654fe8f138c4e59687d65a3ada4bfee4e51173 --- org.eclipse.jgit.benchmarks/BUILD | 2 +- org.eclipse.jgit.junit.http/BUILD | 5 +- org.eclipse.jgit.junit/BUILD | 5 +- org.eclipse.jgit.pgm.test/BUILD | 2 +- org.eclipse.jgit.test/BUILD | 7 +- org.eclipse.jgit/BUILD | 12 +- tools/BUILD | 783 +++++++++++++++--------------- 7 files changed, 412 insertions(+), 404 deletions(-) diff --git a/org.eclipse.jgit.benchmarks/BUILD b/org.eclipse.jgit.benchmarks/BUILD index 7c311e79946..91ceb7fe5f7 100644 --- a/org.eclipse.jgit.benchmarks/BUILD +++ b/org.eclipse.jgit.benchmarks/BUILD @@ -6,8 +6,8 @@ SRCS = glob( jmh_java_benchmarks( name = "benchmarks", - srcs = SRCS, testonly = 1, + srcs = SRCS, deps = [ "//lib:javaewah", "//lib:junit", diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 66620cea510..87dcf3ecfce 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -6,7 +6,10 @@ java_library( name = "junit-http", testonly = 1, srcs = glob(["src/**/*.java"]), - resources = glob(["resources/**"], allow_empty=True), + resources = glob( + ["resources/**"], + allow_empty = True, + ), # TODO(davido): we want here provided deps deps = [ "//lib:jetty-http", diff --git a/org.eclipse.jgit.junit/BUILD b/org.eclipse.jgit.junit/BUILD index f4a7165dbbb..8879cd98b69 100644 --- a/org.eclipse.jgit.junit/BUILD +++ b/org.eclipse.jgit.junit/BUILD @@ -7,7 +7,10 @@ java_library( testonly = 1, srcs = glob(["src/**/*.java"]), resource_strip_prefix = "org.eclipse.jgit.junit/resources", - resources = glob(["resources/**"], allow_empty=True), + resources = glob( + ["resources/**"], + allow_empty = True, + ), deps = [ "//lib:junit", # We want these deps to be provided_deps diff --git a/org.eclipse.jgit.pgm.test/BUILD b/org.eclipse.jgit.pgm.test/BUILD index b8ffa695940..fdd87d3e95e 100644 --- a/org.eclipse.jgit.pgm.test/BUILD +++ b/org.eclipse.jgit.pgm.test/BUILD @@ -15,8 +15,8 @@ junit_tests( deps = [ ":helpers", "//lib:args4j", - "//lib:commons-io", "//lib:commons-compress", + "//lib:commons-io", "//lib:javaewah", "//lib:junit", "//lib:slf4j-api", diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index 7755df04996..7dab36d0676 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -53,10 +53,11 @@ tests(tests = glob( exclude = HELPERS + DATA + EXCLUDED, )) - -tests(tests = glob(["exttst/**/*.java"]), +tests( + extra_tags = ["ext"], srcprefix = "exttst/", - extra_tags = ["ext"]) + tests = glob(["exttst/**/*.java"]), +) # Non abstract base classes used for tests by other test classes BASE = [ diff --git a/org.eclipse.jgit/BUILD b/org.eclipse.jgit/BUILD index 1e9b7708a0f..5d4bce4207a 100644 --- a/org.eclipse.jgit/BUILD +++ b/org.eclipse.jgit/BUILD @@ -16,6 +16,12 @@ RESOURCES = glob(["resources/**"]) java_library( name = "jgit_non_stamped", srcs = SRCS, + javacopts = [ + "-Xep:ReferenceEquality:OFF", + "-Xep:StringEquality:OFF", + "-Xep:TypeParameterUnusedInFormals:OFF", + "-Xep:DefaultCharset:OFF", + ], resource_strip_prefix = "org.eclipse.jgit/resources", resources = RESOURCES, deps = [ @@ -24,12 +30,6 @@ java_library( "//lib:javaewah", "//lib:slf4j-api", ], - javacopts = [ - "-Xep:ReferenceEquality:OFF", - "-Xep:StringEquality:OFF", - "-Xep:TypeParameterUnusedInFormals:OFF", - "-Xep:DefaultCharset:OFF", - ] ) genrule( diff --git a/tools/BUILD b/tools/BUILD index 379a9bd34cb..4238054dadf 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -35,398 +35,399 @@ default_java_toolchain( # https://github.com/bazelbuild/BUILD_file_generator/blob/master/tools/bazel_defs/java.bzl # However, feel free to add any additional errors. Thus far they have all been pretty useful. errorprone_checks = [ - "-XepDisableWarningsInGeneratedCode", - # The XepDisableWarningsInGeneratedCode disables only warnings, but - # not errors. We should manually exclude all files generated by - # AutoValue; such files always start $AutoValue_..... - # XepExcludedPaths is a regexp. If you need more paths - use | as - # separator. - "-XepExcludedPaths:.*/\\\\$$AutoValue_.*\\.java", - "-Xep:AlmostJavadoc:ERROR", - "-Xep:AlwaysThrows:ERROR", - "-Xep:AmbiguousMethodReference:ERROR", - # don't want to add dependency to errorprone - "-Xep:AnnotateFormatMethod:OFF", - "-Xep:ArgumentSelectionDefectChecker:ERROR", - "-Xep:ArrayAsKeyOfSetOrMap:ERROR", - "-Xep:ArrayEquals:ERROR", - "-Xep:ArrayFillIncompatibleType:ERROR", - "-Xep:ArrayHashCode:ERROR", - "-Xep:ArraysAsListPrimitiveArray:ERROR", - "-Xep:ArrayToString:ERROR", - "-Xep:AssertEqualsArgumentOrderChecker:WARN", - "-Xep:AssertionFailureIgnored:WARN", - "-Xep:AsyncCallableReturnsNull:ERROR", - "-Xep:AsyncFunctionReturnsNull:ERROR", - "-Xep:AutoValueConstructorOrderChecker:ERROR", - "-Xep:AutoValueFinalMethods:ERROR", - "-Xep:AutoValueImmutableFields:ERROR", - "-Xep:AutoValueSubclassLeaked:WARN", - "-Xep:BadAnnotationImplementation:ERROR", - "-Xep:BadComparable:ERROR", - "-Xep:BadImport:ERROR", - "-Xep:BadInstanceof:ERROR", - "-Xep:BadShiftAmount:ERROR", - "-Xep:BanSerializableRead:ERROR", - "-Xep:BigDecimalEquals:ERROR", - "-Xep:BigDecimalLiteralDouble:ERROR", - "-Xep:BoxedPrimitiveConstructor:ERROR", - "-Xep:BoxedPrimitiveEquality:ERROR", - "-Xep:BundleDeserializationCast:ERROR", - "-Xep:ByteBufferBackingArray:WARN", - "-Xep:CacheLoaderNull:ERROR", - "-Xep:CannotMockFinalClass:ERROR", - "-Xep:CanonicalDuration:ERROR", - "-Xep:CatchAndPrintStackTrace:ERROR", - "-Xep:CatchFail:ERROR", - "-Xep:ChainedAssertionLosesContext:ERROR", - "-Xep:ChainingConstructorIgnoresParameter:ERROR", - "-Xep:CharacterGetNumericValue:ERROR", - "-Xep:CheckNotNullMultipleTimes:ERROR", - "-Xep:CheckReturnValue:ERROR", - "-Xep:ClassCanBeStatic:ERROR", - "-Xep:ClassName:ERROR", - "-Xep:ClassNewInstance:ERROR", - "-Xep:CollectionIncompatibleType:ERROR", - "-Xep:CollectionToArraySafeParameter:ERROR", - "-Xep:CollectionUndefinedEquality:ERROR", - "-Xep:CollectorShouldNotUseState:ERROR", - "-Xep:ComparableAndComparator:ERROR", - "-Xep:ComparableType:ERROR", - "-Xep:CompareToZero:ERROR", - "-Xep:ComparingThisWithNull:ERROR", - "-Xep:ComparisonOutOfRange:ERROR", - "-Xep:CompatibleWithAnnotationMisuse:ERROR", - "-Xep:CompileTimeConstant:ERROR", - "-Xep:ComplexBooleanConstant:ERROR", - "-Xep:ComputeIfAbsentAmbiguousReference:ERROR", - "-Xep:ConditionalExpressionNumericPromotion:ERROR", - "-Xep:ConstantOverflow:ERROR", - "-Xep:DaggerProvidesNull:ERROR", - "-Xep:DangerousLiteralNull:ERROR", - "-Xep:DateChecker:ERROR", - "-Xep:DateFormatConstant:ERROR", - "-Xep:DeadException:ERROR", - "-Xep:DeadThread:ERROR", - "-Xep:DefaultCharset:ERROR", - "-Xep:DefaultPackage:ERROR", - "-Xep:DepAnn:ERROR", - "-Xep:DeprecatedVariable:ERROR", - "-Xep:DiscardedPostfixExpression:ERROR", - "-Xep:DoNotCall:ERROR", - "-Xep:DoNotCallSuggester:ERROR", - "-Xep:DoNotClaimAnnotations:ERROR", - "-Xep:DoNotMock:ERROR", - "-Xep:DoNotMockAutoValue:WARN", - "-Xep:DoubleBraceInitialization:ERROR", - "-Xep:DoubleCheckedLocking:ERROR", - "-Xep:DuplicateMapKeys:ERROR", - "-Xep:DurationFrom:ERROR", - "-Xep:DurationGetTemporalUnit:ERROR", - "-Xep:DurationTemporalUnit:ERROR", - "-Xep:DurationToLongTimeUnit:ERROR", - "-Xep:EmptyBlockTag:WARN", - "-Xep:EmptyCatch:ERROR", - "-Xep:EmptySetMultibindingContributions:ERROR", - "-Xep:EqualsGetClass:ERROR", - "-Xep:EqualsHashCode:ERROR", - "-Xep:EqualsIncompatibleType:ERROR", - "-Xep:EqualsNaN:ERROR", - "-Xep:EqualsNull:ERROR", - "-Xep:EqualsReference:ERROR", - "-Xep:EqualsUnsafeCast:ERROR", - "-Xep:EqualsUsingHashCode:ERROR", - "-Xep:EqualsWrongThing:ERROR", - "-Xep:ErroneousThreadPoolConstructorChecker:ERROR", - "-Xep:EscapedEntity:WARN", - "-Xep:ExpectedExceptionChecker:ERROR", - "-Xep:ExtendingJUnitAssert:ERROR", - "-Xep:ExtendsAutoValue:ERROR", - "-Xep:FallThrough:ERROR", - "-Xep:Finally:ERROR", - "-Xep:FloatCast:ERROR", - "-Xep:FloatingPointAssertionWithinEpsilon:ERROR", - "-Xep:FloatingPointLiteralPrecision:ERROR", - "-Xep:FloggerArgumentToString:ERROR", - "-Xep:FloggerFormatString:ERROR", - "-Xep:FloggerLogVarargs:ERROR", - "-Xep:FloggerSplitLogStatement:ERROR", - "-Xep:FloggerStringConcatenation:ERROR", - "-Xep:FormatString:ERROR", - "-Xep:FormatStringAnnotation:ERROR", - "-Xep:ForOverride:ERROR", - "-Xep:FragmentInjection:ERROR", - "-Xep:FragmentNotInstantiable:ERROR", - "-Xep:FromTemporalAccessor:ERROR", - "-Xep:FunctionalInterfaceClash:ERROR", - "-Xep:FunctionalInterfaceMethodChanged:ERROR", - "-Xep:FutureReturnValueIgnored:ERROR", - "-Xep:FuturesGetCheckedIllegalExceptionType:ERROR", - "-Xep:GetClassOnAnnotation:ERROR", - "-Xep:GetClassOnClass:ERROR", - "-Xep:GetClassOnEnum:ERROR", - "-Xep:GuardedBy:ERROR", - "-Xep:GuiceAssistedInjectScoping:ERROR", - "-Xep:GuiceAssistedParameters:ERROR", - "-Xep:HashtableContains:ERROR", - "-Xep:HidingField:WARN", - "-Xep:IdentityBinaryExpression:ERROR", - "-Xep:IdentityHashMapBoxing:ERROR", - "-Xep:IdentityHashMapUsage:ERROR", - "-Xep:IgnoredPureGetter:ERROR", - "-Xep:Immutable:ERROR", - "-Xep:ImmutableAnnotationChecker:ERROR", - "-Xep:ImmutableEnumChecker:ERROR", - "-Xep:ImmutableModification:ERROR", - "-Xep:Incomparable:ERROR", - "-Xep:IncompatibleArgumentType:ERROR", - "-Xep:IncompatibleModifiers:ERROR", - "-Xep:InconsistentCapitalization:WARN", - "-Xep:InconsistentHashCode:ERROR", - "-Xep:IncrementInForLoopAndHeader:ERROR", - "-Xep:IndexOfChar:ERROR", - "-Xep:InexactVarargsConditional:ERROR", - "-Xep:InfiniteRecursion:ERROR", - "-Xep:InheritDoc:ERROR", - "-Xep:InjectOnConstructorOfAbstractClass:ERROR", - "-Xep:InlineFormatString:ERROR", - "-Xep:InlineMeInliner:ERROR", - # don't want to add dependency to errorprone - "-Xep:InlineMeSuggester:OFF", - "-Xep:InlineMeValidator:ERROR", - "-Xep:InputStreamSlowMultibyteRead:ERROR", - "-Xep:InsecureCryptoUsage:ERROR", - "-Xep:InstanceOfAndCastMatchWrongType:ERROR", - "-Xep:InstantTemporalUnit:ERROR", - "-Xep:IntLongMath:ERROR", - "-Xep:InvalidBlockTag:ERROR", - "-Xep:InvalidInlineTag:ERROR", - "-Xep:InvalidJavaTimeConstant:ERROR", - "-Xep:InvalidLink:ERROR", - "-Xep:InvalidParam:ERROR", - "-Xep:InvalidPatternSyntax:ERROR", - "-Xep:InvalidThrows:ERROR", - "-Xep:InvalidThrowsLink:ERROR", - "-Xep:InvalidTimeZoneID:ERROR", - "-Xep:InvalidZoneId:ERROR", - "-Xep:IsInstanceIncompatibleType:ERROR", - "-Xep:IsInstanceOfClass:ERROR", - "-Xep:IsLoggableTagLength:ERROR", - "-Xep:IterableAndIterator:ERROR", - "-Xep:IterablePathParameter:ERROR", - "-Xep:JavaDurationGetSecondsGetNano:ERROR", - "-Xep:JavaDurationWithNanos:ERROR", - "-Xep:JavaDurationWithSeconds:ERROR", - "-Xep:JavaInstantGetSecondsGetNano:ERROR", - "-Xep:JavaLangClash:ERROR", - "-Xep:JavaLocalDateTimeGetNano:ERROR", - "-Xep:JavaLocalTimeGetNano:ERROR", - "-Xep:JavaPeriodGetDays:ERROR", - "-Xep:JavaTimeDefaultTimeZone:ERROR", - "-Xep:JavaUtilDate:WARN", - "-Xep:JdkObsolete:ERROR", - "-Xep:JodaConstructors:ERROR", - "-Xep:JodaDateTimeConstants:ERROR", - "-Xep:JodaDurationWithMillis:ERROR", - "-Xep:JodaInstantWithMillis:ERROR", - "-Xep:JodaNewPeriod:ERROR", - "-Xep:JodaPlusMinusLong:ERROR", - "-Xep:JodaTimeConverterManager:ERROR", - "-Xep:JodaToSelf:ERROR", - "-Xep:JodaWithDurationAddedLong:ERROR", - "-Xep:JUnit3FloatingPointComparisonWithoutDelta:ERROR", - "-Xep:JUnit3TestNotRun:ERROR", - "-Xep:JUnit4ClassAnnotationNonStatic:ERROR", - "-Xep:JUnit4ClassUsedInJUnit3:ERROR", - "-Xep:JUnit4SetUpNotRun:ERROR", - "-Xep:JUnit4TearDownNotRun:ERROR", - "-Xep:JUnit4TestNotRun:ERROR", - "-Xep:JUnit4TestsNotRunWithinEnclosed:ERROR", - "-Xep:JUnitAmbiguousTestClass:ERROR", - "-Xep:JUnitAssertSameCheck:ERROR", - "-Xep:JUnitParameterMethodNotFound:ERROR", - "-Xep:LiteByteStringUtf8:ERROR", - "-Xep:LiteEnumValueOf:ERROR", - "-Xep:LiteProtoToString:ERROR", - "-Xep:LocalDateTemporalAmount:ERROR", - "-Xep:LockNotBeforeTry:ERROR", - "-Xep:LockOnBoxedPrimitive:ERROR", - "-Xep:LogicalAssignment:ERROR", - "-Xep:LongFloatConversion:ERROR", - "-Xep:LongLiteralLowerCaseSuffix:ERROR", - "-Xep:LoopConditionChecker:ERROR", - "-Xep:LoopOverCharArray:ERROR", - "-Xep:LossyPrimitiveCompare:ERROR", - "-Xep:MathAbsoluteRandom:ERROR", - "-Xep:MathRoundIntLong:ERROR", - "-Xep:MemoizeConstantVisitorStateLookups:ERROR", - "-Xep:MislabeledAndroidString:ERROR", - "-Xep:MissingCasesInEnumSwitch:ERROR", - "-Xep:MissingFail:ERROR", - "-Xep:MissingOverride:ERROR", - "-Xep:MissingSummary:WARN", - "-Xep:MissingSuperCall:ERROR", - "-Xep:MissingTestCall:ERROR", - "-Xep:MisusedDayOfYear:ERROR", - "-Xep:MisusedWeekYear:ERROR", - "-Xep:MixedDescriptors:ERROR", - "-Xep:MixedMutabilityReturnType:WARN", - "-Xep:MockitoUsage:ERROR", - "-Xep:ModifiedButNotUsed:ERROR", - "-Xep:ModifyCollectionInEnhancedForLoop:ERROR", - "-Xep:ModifyingCollectionWithItself:ERROR", - "-Xep:ModifySourceCollectionInStream:ERROR", - "-Xep:MultipleParallelOrSequentialCalls:ERROR", - "-Xep:MultipleUnaryOperatorsInMethodCall:ERROR", - "-Xep:MustBeClosedChecker:ERROR", - "-Xep:MutableConstantField:ERROR", - # Java provides no good alternative - "-Xep:MutablePublicArray:OFF", - "-Xep:NarrowingCompoundAssignment:ERROR", - "-Xep:NCopiesOfChar:ERROR", - "-Xep:NestedInstanceOfConditions:ERROR", - "-Xep:NonAtomicVolatileUpdate:ERROR", - "-Xep:NonCanonicalStaticImport:ERROR", - "-Xep:NonCanonicalType:ERROR", - "-Xep:NonFinalCompileTimeConstant:ERROR", - "-Xep:NonOverridingEquals:ERROR", - "-Xep:NonRuntimeAnnotation:ERROR", - "-Xep:NullableConstructor:ERROR", - "-Xep:NullablePrimitive:ERROR", - "-Xep:NullablePrimitiveArray:ERROR", - "-Xep:NullableVoid:ERROR", - "-Xep:NullOptional:ERROR", - "-Xep:NullTernary:ERROR", - "-Xep:ObjectEqualsForPrimitives:ERROR", - "-Xep:ObjectsHashCodePrimitive:ERROR", - "-Xep:ObjectToString:ERROR", - "-Xep:OperatorPrecedence:ERROR", - "-Xep:OptionalEquality:ERROR", - "-Xep:OptionalMapToOptional:ERROR", - "-Xep:OptionalMapUnusedValue:ERROR", - "-Xep:OptionalNotPresent:ERROR", - "-Xep:OptionalOfRedundantMethod:ERROR", - "-Xep:OrphanedFormatString:ERROR", - "-Xep:OutlineNone:ERROR", - "-Xep:OverlappingQualifierAndScopeAnnotation:ERROR", - "-Xep:Overrides:ERROR", - "-Xep:OverridesGuiceInjectableMethod:ERROR", - "-Xep:OverridesJavaxInjectableMethod:ERROR", - "-Xep:OverrideThrowableToString:ERROR", - "-Xep:PackageInfo:ERROR", - "-Xep:ParameterName:ERROR", - "-Xep:ParametersButNotParameterized:ERROR", - "-Xep:ParcelableCreator:ERROR", - "-Xep:PeriodFrom:ERROR", - "-Xep:PeriodGetTemporalUnit:ERROR", - "-Xep:PeriodTimeMath:ERROR", - "-Xep:PreconditionsCheckNotNullRepeated:ERROR", - "-Xep:PreconditionsInvalidPlaceholder:ERROR", - "-Xep:PreferredInterfaceType:OFF", - "-Xep:PrimitiveAtomicReference:ERROR", - "-Xep:PrivateSecurityContractProtoAccess:ERROR", - "-Xep:ProtectedMembersInFinalClass:ERROR", - "-Xep:ProtoBuilderReturnValueIgnored:ERROR", - "-Xep:ProtocolBufferOrdinal:ERROR", - "-Xep:ProtoDurationGetSecondsGetNano:ERROR", - "-Xep:ProtoFieldNullComparison:ERROR", - "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR", - "-Xep:ProtoRedundantSet:ERROR", - "-Xep:ProtoStringFieldReferenceEquality:ERROR", - "-Xep:ProtoTimestampGetSecondsGetNano:ERROR", - "-Xep:ProtoTruthMixedDescriptors:ERROR", - "-Xep:ProvidesMethodOutsideOfModule:ERROR", - "-Xep:RandomCast:ERROR", - "-Xep:RandomModInteger:ERROR", - "-Xep:ReachabilityFenceUsage:ERROR", - "-Xep:RectIntersectReturnValueIgnored:ERROR", - "-Xep:ReferenceEquality:ERROR", - "-Xep:RefersToDaggerCodegen:ERROR", - "-Xep:RemovedInJDK11:ERROR", - "-Xep:RequiredModifiers:ERROR", - "-Xep:RestrictedApiChecker:ERROR", - "-Xep:RethrowReflectiveOperationExceptionAsLinkageError:ERROR", - "-Xep:ReturnFromVoid:ERROR", - "-Xep:ReturnValueIgnored:ERROR", - "-Xep:RxReturnValueIgnored:ERROR", - "-Xep:SameNameButDifferent:ERROR", - "-Xep:SelfAssignment:ERROR", - "-Xep:SelfComparison:ERROR", - "-Xep:SelfEquals:ERROR", - "-Xep:ShortCircuitBoolean:ERROR", - "-Xep:ShouldHaveEvenArgs:ERROR", - "-Xep:SizeGreaterThanOrEqualsZero:ERROR", - "-Xep:StaticAssignmentInConstructor:ERROR", - "-Xep:StaticGuardedByInstance:ERROR", - "-Xep:StaticMockMember:ERROR", - "-Xep:StaticQualifiedUsingExpression:ERROR", - "-Xep:StreamToString:ERROR", - "-Xep:StringBuilderInitWithChar:ERROR", - "-Xep:StringEquality:ERROR", - "-Xep:StringSplitter:WARN", - "-Xep:SubstringOfZero:ERROR", - "-Xep:SuppressWarningsDeprecated:ERROR", - "-Xep:SwigMemoryLeak:ERROR", - "-Xep:SynchronizeOnNonFinalField:ERROR", - "-Xep:TemporalAccessorGetChronoField:ERROR", - "-Xep:TestParametersNotInitialized:ERROR", - "-Xep:TheoryButNoTheories:ERROR", - "-Xep:ThreadJoinLoop:ERROR", - "-Xep:ThreadLocalUsage:ERROR", - "-Xep:ThreadPriorityCheck:ERROR", - "-Xep:ThreeLetterTimeZoneID:WARN", - "-Xep:ThrowIfUncheckedKnownChecked:ERROR", - "-Xep:ThrowNull:ERROR", - "-Xep:TimeUnitConversionChecker:ERROR", - "-Xep:ToStringReturnsNull:ERROR", - "-Xep:TreeToString:ERROR", - "-Xep:TruthAssertExpected:ERROR", - "-Xep:TruthConstantAsserts:ERROR", - "-Xep:TruthGetOrDefault:ERROR", - "-Xep:TruthIncompatibleType:ERROR", - "-Xep:TruthSelfEquals:ERROR", - "-Xep:TryFailThrowable:ERROR", - "-Xep:TypeEquals:ERROR", - "-Xep:TypeNameShadowing:ERROR", - "-Xep:TypeParameterQualifier:ERROR", - "-Xep:TypeParameterShadowing:ERROR", - "-Xep:TypeParameterUnusedInFormals:ERROR", - "-Xep:UndefinedEquals:WARN", - "-Xep:UnescapedEntity:WARN", - "-Xep:UnnecessaryAssignment:ERROR", - "-Xep:UnnecessaryCheckNotNull:ERROR", - "-Xep:UnnecessaryLambda:ERROR", - "-Xep:UnnecessaryMethodInvocationMatcher:ERROR", - "-Xep:UnnecessaryMethodReference:ERROR", - "-Xep:UnnecessaryParentheses:ERROR", - "-Xep:UnnecessaryTypeArgument:ERROR", - "-Xep:UnrecognisedJavadocTag:ERROR", - "-Xep:UnsafeFinalization:ERROR", - "-Xep:UnsafeReflectiveConstructionCast:ERROR", - "-Xep:UnsynchronizedOverridesSynchronized:ERROR", - "-Xep:UnusedAnonymousClass:ERROR", - "-Xep:UnusedCollectionModifiedInPlace:ERROR", - "-Xep:UnusedException:ERROR", - "-Xep:UnusedMethod:WARN", - "-Xep:UnusedNestedClass:ERROR", - "-Xep:UnusedVariable:ERROR", - "-Xep:URLEqualsHashCode:ERROR", - "-Xep:UseBinds:ERROR", - "-Xep:UseCorrectAssertInTests:ERROR", - "-Xep:VariableNameSameAsType:ERROR", - "-Xep:VarTypeName:ERROR", - "-Xep:WaitNotInLoop:ERROR", - "-Xep:WakelockReleasedDangerously:ERROR", - "-Xep:WildcardImport:ERROR", - "-Xep:WithSignatureDiscouraged:ERROR", - "-Xep:WrongOneof:ERROR", - "-Xep:XorPower:ERROR", - "-Xep:ZoneIdOfZ:ERROR", + "-XepDisableWarningsInGeneratedCode", + # The XepDisableWarningsInGeneratedCode disables only warnings, but + # not errors. We should manually exclude all files generated by + # AutoValue; such files always start $AutoValue_..... + # XepExcludedPaths is a regexp. If you need more paths - use | as + # separator. + "-XepExcludedPaths:.*/\\\\$$AutoValue_.*\\.java", + "-Xep:AlmostJavadoc:ERROR", + "-Xep:AlwaysThrows:ERROR", + "-Xep:AmbiguousMethodReference:ERROR", + # don't want to add dependency to errorprone + "-Xep:AnnotateFormatMethod:OFF", + "-Xep:ArgumentSelectionDefectChecker:ERROR", + "-Xep:ArrayAsKeyOfSetOrMap:ERROR", + "-Xep:ArrayEquals:ERROR", + "-Xep:ArrayFillIncompatibleType:ERROR", + "-Xep:ArrayHashCode:ERROR", + "-Xep:ArraysAsListPrimitiveArray:ERROR", + "-Xep:ArrayToString:ERROR", + "-Xep:AssertEqualsArgumentOrderChecker:WARN", + "-Xep:AssertionFailureIgnored:WARN", + "-Xep:AsyncCallableReturnsNull:ERROR", + "-Xep:AsyncFunctionReturnsNull:ERROR", + "-Xep:AutoValueConstructorOrderChecker:ERROR", + "-Xep:AutoValueFinalMethods:ERROR", + "-Xep:AutoValueImmutableFields:ERROR", + "-Xep:AutoValueSubclassLeaked:WARN", + "-Xep:BadAnnotationImplementation:ERROR", + "-Xep:BadComparable:ERROR", + "-Xep:BadImport:ERROR", + "-Xep:BadInstanceof:ERROR", + "-Xep:BadShiftAmount:ERROR", + "-Xep:BanSerializableRead:ERROR", + "-Xep:BigDecimalEquals:ERROR", + "-Xep:BigDecimalLiteralDouble:ERROR", + "-Xep:BoxedPrimitiveConstructor:ERROR", + "-Xep:BoxedPrimitiveEquality:ERROR", + "-Xep:BundleDeserializationCast:ERROR", + "-Xep:ByteBufferBackingArray:WARN", + "-Xep:CacheLoaderNull:ERROR", + "-Xep:CannotMockFinalClass:ERROR", + "-Xep:CanonicalDuration:ERROR", + "-Xep:CatchAndPrintStackTrace:ERROR", + "-Xep:CatchFail:ERROR", + "-Xep:ChainedAssertionLosesContext:ERROR", + "-Xep:ChainingConstructorIgnoresParameter:ERROR", + "-Xep:CharacterGetNumericValue:ERROR", + "-Xep:CheckNotNullMultipleTimes:ERROR", + "-Xep:CheckReturnValue:ERROR", + "-Xep:ClassCanBeStatic:ERROR", + "-Xep:ClassName:ERROR", + "-Xep:ClassNewInstance:ERROR", + "-Xep:CollectionIncompatibleType:ERROR", + "-Xep:CollectionToArraySafeParameter:ERROR", + "-Xep:CollectionUndefinedEquality:ERROR", + "-Xep:CollectorShouldNotUseState:ERROR", + "-Xep:ComparableAndComparator:ERROR", + "-Xep:ComparableType:ERROR", + "-Xep:CompareToZero:ERROR", + "-Xep:ComparingThisWithNull:ERROR", + "-Xep:ComparisonOutOfRange:ERROR", + "-Xep:CompatibleWithAnnotationMisuse:ERROR", + "-Xep:CompileTimeConstant:ERROR", + "-Xep:ComplexBooleanConstant:ERROR", + "-Xep:ComputeIfAbsentAmbiguousReference:ERROR", + "-Xep:ConditionalExpressionNumericPromotion:ERROR", + "-Xep:ConstantOverflow:ERROR", + "-Xep:DaggerProvidesNull:ERROR", + "-Xep:DangerousLiteralNull:ERROR", + "-Xep:DateChecker:ERROR", + "-Xep:DateFormatConstant:ERROR", + "-Xep:DeadException:ERROR", + "-Xep:DeadThread:ERROR", + "-Xep:DefaultCharset:ERROR", + "-Xep:DefaultPackage:ERROR", + "-Xep:DepAnn:ERROR", + "-Xep:DeprecatedVariable:ERROR", + "-Xep:DiscardedPostfixExpression:ERROR", + "-Xep:DoNotCall:ERROR", + "-Xep:DoNotCallSuggester:ERROR", + "-Xep:DoNotClaimAnnotations:ERROR", + "-Xep:DoNotMock:ERROR", + "-Xep:DoNotMockAutoValue:WARN", + "-Xep:DoubleBraceInitialization:ERROR", + "-Xep:DoubleCheckedLocking:ERROR", + "-Xep:DuplicateMapKeys:ERROR", + "-Xep:DurationFrom:ERROR", + "-Xep:DurationGetTemporalUnit:ERROR", + "-Xep:DurationTemporalUnit:ERROR", + "-Xep:DurationToLongTimeUnit:ERROR", + "-Xep:EmptyBlockTag:WARN", + "-Xep:EmptyCatch:ERROR", + "-Xep:EmptySetMultibindingContributions:ERROR", + "-Xep:EqualsGetClass:ERROR", + "-Xep:EqualsHashCode:ERROR", + "-Xep:EqualsIncompatibleType:ERROR", + "-Xep:EqualsNaN:ERROR", + "-Xep:EqualsNull:ERROR", + "-Xep:EqualsReference:ERROR", + "-Xep:EqualsUnsafeCast:ERROR", + "-Xep:EqualsUsingHashCode:ERROR", + "-Xep:EqualsWrongThing:ERROR", + "-Xep:ErroneousThreadPoolConstructorChecker:ERROR", + "-Xep:EscapedEntity:WARN", + "-Xep:ExpectedExceptionChecker:ERROR", + "-Xep:ExtendingJUnitAssert:ERROR", + "-Xep:ExtendsAutoValue:ERROR", + "-Xep:FallThrough:ERROR", + "-Xep:Finally:ERROR", + "-Xep:FloatCast:ERROR", + "-Xep:FloatingPointAssertionWithinEpsilon:ERROR", + "-Xep:FloatingPointLiteralPrecision:ERROR", + "-Xep:FloggerArgumentToString:ERROR", + "-Xep:FloggerFormatString:ERROR", + "-Xep:FloggerLogVarargs:ERROR", + "-Xep:FloggerSplitLogStatement:ERROR", + "-Xep:FloggerStringConcatenation:ERROR", + "-Xep:FormatString:ERROR", + "-Xep:FormatStringAnnotation:ERROR", + "-Xep:ForOverride:ERROR", + "-Xep:FragmentInjection:ERROR", + "-Xep:FragmentNotInstantiable:ERROR", + "-Xep:FromTemporalAccessor:ERROR", + "-Xep:FunctionalInterfaceClash:ERROR", + "-Xep:FunctionalInterfaceMethodChanged:ERROR", + "-Xep:FutureReturnValueIgnored:ERROR", + "-Xep:FuturesGetCheckedIllegalExceptionType:ERROR", + "-Xep:GetClassOnAnnotation:ERROR", + "-Xep:GetClassOnClass:ERROR", + "-Xep:GetClassOnEnum:ERROR", + "-Xep:GuardedBy:ERROR", + "-Xep:GuiceAssistedInjectScoping:ERROR", + "-Xep:GuiceAssistedParameters:ERROR", + "-Xep:HashtableContains:ERROR", + "-Xep:HidingField:WARN", + "-Xep:IdentityBinaryExpression:ERROR", + "-Xep:IdentityHashMapBoxing:ERROR", + "-Xep:IdentityHashMapUsage:ERROR", + "-Xep:IgnoredPureGetter:ERROR", + "-Xep:Immutable:ERROR", + "-Xep:ImmutableAnnotationChecker:ERROR", + "-Xep:ImmutableEnumChecker:ERROR", + "-Xep:ImmutableModification:ERROR", + "-Xep:Incomparable:ERROR", + "-Xep:IncompatibleArgumentType:ERROR", + "-Xep:IncompatibleModifiers:ERROR", + "-Xep:InconsistentCapitalization:WARN", + "-Xep:InconsistentHashCode:ERROR", + "-Xep:IncrementInForLoopAndHeader:ERROR", + "-Xep:IndexOfChar:ERROR", + "-Xep:InexactVarargsConditional:ERROR", + "-Xep:InfiniteRecursion:ERROR", + "-Xep:InheritDoc:ERROR", + "-Xep:InjectOnConstructorOfAbstractClass:ERROR", + "-Xep:InlineFormatString:ERROR", + "-Xep:InlineMeInliner:ERROR", + # don't want to add dependency to errorprone + "-Xep:InlineMeSuggester:OFF", + "-Xep:InlineMeValidator:ERROR", + "-Xep:InputStreamSlowMultibyteRead:ERROR", + "-Xep:InsecureCryptoUsage:ERROR", + "-Xep:InstanceOfAndCastMatchWrongType:ERROR", + "-Xep:InstantTemporalUnit:ERROR", + "-Xep:IntLongMath:ERROR", + "-Xep:InvalidBlockTag:ERROR", + "-Xep:InvalidInlineTag:ERROR", + "-Xep:InvalidJavaTimeConstant:ERROR", + "-Xep:InvalidLink:ERROR", + "-Xep:InvalidParam:ERROR", + "-Xep:InvalidPatternSyntax:ERROR", + "-Xep:InvalidThrows:ERROR", + "-Xep:InvalidThrowsLink:ERROR", + "-Xep:InvalidTimeZoneID:ERROR", + "-Xep:InvalidZoneId:ERROR", + "-Xep:IsInstanceIncompatibleType:ERROR", + "-Xep:IsInstanceOfClass:ERROR", + "-Xep:IsLoggableTagLength:ERROR", + "-Xep:IterableAndIterator:ERROR", + "-Xep:IterablePathParameter:ERROR", + "-Xep:JavaDurationGetSecondsGetNano:ERROR", + "-Xep:JavaDurationWithNanos:ERROR", + "-Xep:JavaDurationWithSeconds:ERROR", + "-Xep:JavaInstantGetSecondsGetNano:ERROR", + "-Xep:JavaLangClash:ERROR", + "-Xep:JavaLocalDateTimeGetNano:ERROR", + "-Xep:JavaLocalTimeGetNano:ERROR", + "-Xep:JavaPeriodGetDays:ERROR", + "-Xep:JavaTimeDefaultTimeZone:ERROR", + "-Xep:JavaUtilDate:WARN", + "-Xep:JdkObsolete:ERROR", + "-Xep:JodaConstructors:ERROR", + "-Xep:JodaDateTimeConstants:ERROR", + "-Xep:JodaDurationWithMillis:ERROR", + "-Xep:JodaInstantWithMillis:ERROR", + "-Xep:JodaNewPeriod:ERROR", + "-Xep:JodaPlusMinusLong:ERROR", + "-Xep:JodaTimeConverterManager:ERROR", + "-Xep:JodaToSelf:ERROR", + "-Xep:JodaWithDurationAddedLong:ERROR", + "-Xep:JUnit3FloatingPointComparisonWithoutDelta:ERROR", + "-Xep:JUnit3TestNotRun:ERROR", + "-Xep:JUnit4ClassAnnotationNonStatic:ERROR", + "-Xep:JUnit4ClassUsedInJUnit3:ERROR", + "-Xep:JUnit4SetUpNotRun:ERROR", + "-Xep:JUnit4TearDownNotRun:ERROR", + "-Xep:JUnit4TestNotRun:ERROR", + "-Xep:JUnit4TestsNotRunWithinEnclosed:ERROR", + "-Xep:JUnitAmbiguousTestClass:ERROR", + "-Xep:JUnitAssertSameCheck:ERROR", + "-Xep:JUnitParameterMethodNotFound:ERROR", + "-Xep:LiteByteStringUtf8:ERROR", + "-Xep:LiteEnumValueOf:ERROR", + "-Xep:LiteProtoToString:ERROR", + "-Xep:LocalDateTemporalAmount:ERROR", + "-Xep:LockNotBeforeTry:ERROR", + "-Xep:LockOnBoxedPrimitive:ERROR", + "-Xep:LogicalAssignment:ERROR", + "-Xep:LongFloatConversion:ERROR", + "-Xep:LongLiteralLowerCaseSuffix:ERROR", + "-Xep:LoopConditionChecker:ERROR", + "-Xep:LoopOverCharArray:ERROR", + "-Xep:LossyPrimitiveCompare:ERROR", + "-Xep:MathAbsoluteRandom:ERROR", + "-Xep:MathRoundIntLong:ERROR", + "-Xep:MemoizeConstantVisitorStateLookups:ERROR", + "-Xep:MislabeledAndroidString:ERROR", + "-Xep:MissingCasesInEnumSwitch:ERROR", + "-Xep:MissingFail:ERROR", + "-Xep:MissingOverride:ERROR", + "-Xep:MissingSummary:WARN", + "-Xep:MissingSuperCall:ERROR", + "-Xep:MissingTestCall:ERROR", + "-Xep:MisusedDayOfYear:ERROR", + "-Xep:MisusedWeekYear:ERROR", + "-Xep:MixedDescriptors:ERROR", + "-Xep:MixedMutabilityReturnType:WARN", + "-Xep:MockitoUsage:ERROR", + "-Xep:ModifiedButNotUsed:ERROR", + "-Xep:ModifyCollectionInEnhancedForLoop:ERROR", + "-Xep:ModifyingCollectionWithItself:ERROR", + "-Xep:ModifySourceCollectionInStream:ERROR", + "-Xep:MultipleParallelOrSequentialCalls:ERROR", + "-Xep:MultipleUnaryOperatorsInMethodCall:ERROR", + "-Xep:MustBeClosedChecker:ERROR", + "-Xep:MutableConstantField:ERROR", + # Java provides no good alternative + "-Xep:MutablePublicArray:OFF", + "-Xep:NarrowingCompoundAssignment:ERROR", + "-Xep:NCopiesOfChar:ERROR", + "-Xep:NestedInstanceOfConditions:ERROR", + "-Xep:NonAtomicVolatileUpdate:ERROR", + "-Xep:NonCanonicalStaticImport:ERROR", + "-Xep:NonCanonicalType:ERROR", + "-Xep:NonFinalCompileTimeConstant:ERROR", + "-Xep:NonOverridingEquals:ERROR", + "-Xep:NonRuntimeAnnotation:ERROR", + "-Xep:NullableConstructor:ERROR", + "-Xep:NullablePrimitive:ERROR", + "-Xep:NullablePrimitiveArray:ERROR", + "-Xep:NullableVoid:ERROR", + "-Xep:NullOptional:ERROR", + "-Xep:NullTernary:ERROR", + "-Xep:ObjectEqualsForPrimitives:ERROR", + "-Xep:ObjectsHashCodePrimitive:ERROR", + "-Xep:ObjectToString:ERROR", + "-Xep:OperatorPrecedence:ERROR", + "-Xep:OptionalEquality:ERROR", + "-Xep:OptionalMapToOptional:ERROR", + "-Xep:OptionalMapUnusedValue:ERROR", + "-Xep:OptionalNotPresent:ERROR", + "-Xep:OptionalOfRedundantMethod:ERROR", + "-Xep:OrphanedFormatString:ERROR", + "-Xep:OutlineNone:ERROR", + "-Xep:OverlappingQualifierAndScopeAnnotation:ERROR", + "-Xep:Overrides:ERROR", + "-Xep:OverridesGuiceInjectableMethod:ERROR", + "-Xep:OverridesJavaxInjectableMethod:ERROR", + "-Xep:OverrideThrowableToString:ERROR", + "-Xep:PackageInfo:ERROR", + "-Xep:ParameterName:ERROR", + "-Xep:ParametersButNotParameterized:ERROR", + "-Xep:ParcelableCreator:ERROR", + "-Xep:PeriodFrom:ERROR", + "-Xep:PeriodGetTemporalUnit:ERROR", + "-Xep:PeriodTimeMath:ERROR", + "-Xep:PreconditionsCheckNotNullRepeated:ERROR", + "-Xep:PreconditionsInvalidPlaceholder:ERROR", + "-Xep:PreferredInterfaceType:OFF", + "-Xep:PrimitiveAtomicReference:ERROR", + "-Xep:PrivateSecurityContractProtoAccess:ERROR", + "-Xep:ProtectedMembersInFinalClass:ERROR", + "-Xep:ProtoBuilderReturnValueIgnored:ERROR", + "-Xep:ProtocolBufferOrdinal:ERROR", + "-Xep:ProtoDurationGetSecondsGetNano:ERROR", + "-Xep:ProtoFieldNullComparison:ERROR", + "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR", + "-Xep:ProtoRedundantSet:ERROR", + "-Xep:ProtoStringFieldReferenceEquality:ERROR", + "-Xep:ProtoTimestampGetSecondsGetNano:ERROR", + "-Xep:ProtoTruthMixedDescriptors:ERROR", + "-Xep:ProvidesMethodOutsideOfModule:ERROR", + "-Xep:RandomCast:ERROR", + "-Xep:RandomModInteger:ERROR", + "-Xep:ReachabilityFenceUsage:ERROR", + "-Xep:RectIntersectReturnValueIgnored:ERROR", + "-Xep:ReferenceEquality:ERROR", + "-Xep:RefersToDaggerCodegen:ERROR", + "-Xep:RemovedInJDK11:ERROR", + "-Xep:RequiredModifiers:ERROR", + "-Xep:RestrictedApiChecker:ERROR", + "-Xep:RethrowReflectiveOperationExceptionAsLinkageError:ERROR", + "-Xep:ReturnFromVoid:ERROR", + "-Xep:ReturnValueIgnored:ERROR", + "-Xep:RxReturnValueIgnored:ERROR", + "-Xep:SameNameButDifferent:ERROR", + "-Xep:SelfAssignment:ERROR", + "-Xep:SelfComparison:ERROR", + "-Xep:SelfEquals:ERROR", + "-Xep:ShortCircuitBoolean:ERROR", + "-Xep:ShouldHaveEvenArgs:ERROR", + "-Xep:SizeGreaterThanOrEqualsZero:ERROR", + "-Xep:StaticAssignmentInConstructor:ERROR", + "-Xep:StaticGuardedByInstance:ERROR", + "-Xep:StaticMockMember:ERROR", + "-Xep:StaticQualifiedUsingExpression:ERROR", + "-Xep:StreamToString:ERROR", + "-Xep:StringBuilderInitWithChar:ERROR", + "-Xep:StringEquality:ERROR", + "-Xep:StringSplitter:WARN", + "-Xep:SubstringOfZero:ERROR", + "-Xep:SuppressWarningsDeprecated:ERROR", + "-Xep:SwigMemoryLeak:ERROR", + "-Xep:SynchronizeOnNonFinalField:ERROR", + "-Xep:TemporalAccessorGetChronoField:ERROR", + "-Xep:TestParametersNotInitialized:ERROR", + "-Xep:TheoryButNoTheories:ERROR", + "-Xep:ThreadJoinLoop:ERROR", + "-Xep:ThreadLocalUsage:ERROR", + "-Xep:ThreadPriorityCheck:ERROR", + "-Xep:ThreeLetterTimeZoneID:WARN", + "-Xep:ThrowIfUncheckedKnownChecked:ERROR", + "-Xep:ThrowNull:ERROR", + "-Xep:TimeUnitConversionChecker:ERROR", + "-Xep:ToStringReturnsNull:ERROR", + "-Xep:TreeToString:ERROR", + "-Xep:TruthAssertExpected:ERROR", + "-Xep:TruthConstantAsserts:ERROR", + "-Xep:TruthGetOrDefault:ERROR", + "-Xep:TruthIncompatibleType:ERROR", + "-Xep:TruthSelfEquals:ERROR", + "-Xep:TryFailThrowable:ERROR", + "-Xep:TypeEquals:ERROR", + "-Xep:TypeNameShadowing:ERROR", + "-Xep:TypeParameterQualifier:ERROR", + "-Xep:TypeParameterShadowing:ERROR", + "-Xep:TypeParameterUnusedInFormals:ERROR", + "-Xep:UndefinedEquals:WARN", + "-Xep:UnescapedEntity:WARN", + "-Xep:UnnecessaryAssignment:ERROR", + "-Xep:UnnecessaryCheckNotNull:ERROR", + "-Xep:UnnecessaryLambda:ERROR", + "-Xep:UnnecessaryMethodInvocationMatcher:ERROR", + "-Xep:UnnecessaryMethodReference:ERROR", + "-Xep:UnnecessaryParentheses:ERROR", + "-Xep:UnnecessaryTypeArgument:ERROR", + "-Xep:UnrecognisedJavadocTag:ERROR", + "-Xep:UnsafeFinalization:ERROR", + "-Xep:UnsafeReflectiveConstructionCast:ERROR", + "-Xep:UnsynchronizedOverridesSynchronized:ERROR", + "-Xep:UnusedAnonymousClass:ERROR", + "-Xep:UnusedCollectionModifiedInPlace:ERROR", + "-Xep:UnusedException:ERROR", + "-Xep:UnusedMethod:WARN", + "-Xep:UnusedNestedClass:ERROR", + "-Xep:UnusedVariable:ERROR", + "-Xep:URLEqualsHashCode:ERROR", + "-Xep:UseBinds:ERROR", + "-Xep:UseCorrectAssertInTests:ERROR", + "-Xep:VariableNameSameAsType:ERROR", + "-Xep:VarTypeName:ERROR", + "-Xep:WaitNotInLoop:ERROR", + "-Xep:WakelockReleasedDangerously:ERROR", + "-Xep:WildcardImport:ERROR", + "-Xep:WithSignatureDiscouraged:ERROR", + "-Xep:WrongOneof:ERROR", + "-Xep:XorPower:ERROR", + "-Xep:ZoneIdOfZ:ERROR", ] - -exclude_in_tests = ["-Xep:EmptyBlockTag:WARN", - "-Xep:MissingSummary:WARN"] +exclude_in_tests = [ + "-Xep:EmptyBlockTag:WARN", + "-Xep:MissingSummary:WARN", +] java_package_configuration( name = "error_prone", @@ -436,7 +437,7 @@ java_package_configuration( java_package_configuration( name = "error_prone_tests", - javacopts = [ check for check in errorprone_checks if check not in exclude_in_tests], + javacopts = [check for check in errorprone_checks if check not in exclude_in_tests], packages = ["error_prone_packages_test"], ) From d14bd3b78f2a7982ff0b1de7ece6d2e4f679a23f Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 18 Jun 2026 09:21:29 +0200 Subject: [PATCH 159/200] Bazel: Rename //lib:servlet-api to //lib:jakarta-servlet-api //lib:servlet-api exported the canonical Jakarta servlet API (jakarta.servlet:jakarta.servlet-api:6.1.0). The name did not distinguish it from //lib:javax-servlet-api, which the EE8 bridge in //org.eclipse.jgit.http.server.ee8 and //org.eclipse.jgit.lfs.server.ee8 uses to depend on javax.servlet:javax.servlet-api:4.0.1. Rename the canonical target to //lib:jakarta-servlet-api so the API flavour is self-evident at consumer sites. Migrate the six in-tree consumers (http.server, http.test, junit.http, lfs.server, lfs.server.test, pgm) in the same change. No compatibility alias is kept: JGit is consumed from source by Gerrit through a git submodule, which has its own //lib:* wrappers, and the EE8 bridge commit added //lib:javax-servlet-api without an alias for the same reason. Change-Id: I764b01d171d2c2dc55fecef89bf4b36ce1cb9c59 --- lib/BUILD | 2 +- org.eclipse.jgit.http.server/BUILD | 2 +- org.eclipse.jgit.http.test/BUILD | 4 ++-- org.eclipse.jgit.junit.http/BUILD | 2 +- org.eclipse.jgit.lfs.server.test/BUILD | 2 +- org.eclipse.jgit.lfs.server/BUILD | 2 +- org.eclipse.jgit.pgm/BUILD | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/BUILD b/lib/BUILD index 551383b79d5..c065158413a 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -309,7 +309,7 @@ java_library( ) java_library( - name = "servlet-api", + name = "jakarta-servlet-api", visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.server:__pkg__", diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index a0dae488b83..cae8d8847b7 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -13,7 +13,7 @@ java_library( resource_strip_prefix = "org.eclipse.jgit.http.server/resources", resources = [":jgit-servlet-resources"], deps = [ - "//lib:servlet-api", + "//lib:jakarta-servlet-api", # We want these deps to be provided_deps "//org.eclipse.jgit:jgit", ], diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index 732b4fae2c1..bc04d229dd6 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -12,6 +12,7 @@ junit_tests( ":helpers", "//lib:commons-logging", "//lib:httpcore", + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", @@ -19,7 +20,6 @@ junit_tests( "//lib:jetty-servlet", "//lib:jetty-util", "//lib:junit", - "//lib:servlet-api", "//lib:slf4j-api", "//lib:slf4j-simple", "//org.eclipse.jgit.http.apache:http-apache", @@ -35,8 +35,8 @@ java_library( testonly = 1, srcs = glob(["src/**/*.java"]), deps = [ + "//lib:jakarta-servlet-api", "//lib:junit", - "//lib:servlet-api", "//org.eclipse.jgit:jgit", "//org.eclipse.jgit.junit:junit", ], diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 87dcf3ecfce..17a75701540 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -12,6 +12,7 @@ java_library( ), # TODO(davido): we want here provided deps deps = [ + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", @@ -20,7 +21,6 @@ java_library( "//lib:jetty-session", "//lib:jetty-util", "//lib:junit", - "//lib:servlet-api", "//lib:slf4j-api", "//org.eclipse.jgit.http.server:jgit-servlet", "//org.eclipse.jgit:jgit", diff --git a/org.eclipse.jgit.lfs.server.test/BUILD b/org.eclipse.jgit.lfs.server.test/BUILD index 76a0870a881..adc2df63c02 100644 --- a/org.eclipse.jgit.lfs.server.test/BUILD +++ b/org.eclipse.jgit.lfs.server.test/BUILD @@ -23,7 +23,7 @@ DEPS = [ "//lib:jetty-servlet", "//lib:jetty-security", "//lib:jetty-util", - "//lib:servlet-api", + "//lib:jakarta-servlet-api", ] junit_tests( diff --git a/org.eclipse.jgit.lfs.server/BUILD b/org.eclipse.jgit.lfs.server/BUILD index cd1831b8320..c363d52ad15 100644 --- a/org.eclipse.jgit.lfs.server/BUILD +++ b/org.eclipse.jgit.lfs.server/BUILD @@ -10,7 +10,7 @@ java_library( deps = [ "//lib:gson", "//lib:httpcore", - "//lib:servlet-api", + "//lib:jakarta-servlet-api", "//lib:slf4j-api", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit:jgit", diff --git a/org.eclipse.jgit.pgm/BUILD b/org.eclipse.jgit.pgm/BUILD index a267b155ac9..596aed2e24b 100644 --- a/org.eclipse.jgit.pgm/BUILD +++ b/org.eclipse.jgit.pgm/BUILD @@ -16,13 +16,13 @@ java_library( "//lib:commons-logging", "//lib:httpclient", "//lib:httpcore", + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", "//lib:jetty-server", "//lib:jetty-servlet", "//lib:jetty-util", - "//lib:servlet-api", "//org.eclipse.jgit.archive:jgit-archive", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit:jgit", From 6416c9f54558fcf7eac295f8a971bf404907dde1 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 18 Jun 2026 05:08:19 +0200 Subject: [PATCH 160/200] Bazel: Add EE8 servlet bridge targets Add Bazel-only generated EE8 targets for the HTTP servlet and LFS server modules. The generated jars keep the original JGit Java packages and rewrite only servlet API references from jakarta.servlet to javax.servlet. The rewrite uses the shared servlet-flavour transform toolchain from bazlets (transform_srcjar + generated_srcs_test.sh under //tools). It is a plain sed package-prefix substitution; the universal servlet and Jetty package mapping lives in bazlets and this consumer selects only the direction (to_javax), so it carries no renames data and adds no Maven dependency (no Eclipse Transformer CLI). This supports source consumers that still run on EE8 while JGit master uses Jakarta servlet APIs. Gerrit is the known downstream consumer in that state today and consumes JGit from source through a git submodule. With these targets, Gerrit can track JGit master without a dedicated servlet-4 maintenance branch. The goal is to let the servlet-4 branch be retired for Gerrit's maintenance purposes. That branch was not offered as a stable JGit release line. Keeping Gerrit on it makes JGit updates hard for Gerrit, including updates for important fixes and improvements, and forces repeated merge work from master onto a parallel branch. Keep the maintenance surface small. The EE8 targets consume canonical srcs filegroups backed by glob(["src/**/*.java"]), so new Java sources flow into the generated jars without per-file BUILD updates. Resources are also shared through canonical filegroups. This Bazel change intentionally does not add Maven, Tycho/p2, or Maven Central publication machinery. Maven support is added by the follow-up Maven commit; Tycho/p2 remains out of scope because the EE8 jars export the same packages as their canonical Jakarta counterparts and are not co-installable with them. Also avoid relocating Java packages to org.eclipse.jgit.*.ee8. Keeping the same package names avoids source-consumer import churn, but means the canonical Jakarta jars and generated EE8 jars must not share a classpath. Possible follow-ups are duplicate-classpath enforcement for source consumers and additional generated EE8 modules only when a consumer needs them. Verify generated source layout, line counts, javax servlet rewriting, and the absence of package-renamed .ee8 sources. Stable-7.4 backport note: keep the cherry-picked BUILD/test targets aligned with master, but wire their dependencies through WORKSPACE. Add rules_shell, update bazlets, and expose javax-servlet-api through the maven_jar repository used on this branch. Change-Id: I897e4facbbae79349e8d1853ea4dab8d7087ba5b --- BUILD | 2 ++ WORKSPACE | 24 ++++++++++++- lib/BUILD | 11 ++++++ org.eclipse.jgit.http.server.ee8/BUILD | 27 ++++++++++++++ org.eclipse.jgit.http.server/BUILD | 11 +++++- org.eclipse.jgit.lfs.server.ee8/BUILD | 32 +++++++++++++++++ org.eclipse.jgit.lfs.server/BUILD | 18 ++++++++-- tools/jgit-ee8/BUILD | 28 +++++++++++++++ tools/jgit-ee8/README.md | 50 ++++++++++++++++++++++++++ 9 files changed, 199 insertions(+), 4 deletions(-) create mode 100644 org.eclipse.jgit.http.server.ee8/BUILD create mode 100644 org.eclipse.jgit.lfs.server.ee8/BUILD create mode 100644 tools/jgit-ee8/BUILD create mode 100644 tools/jgit-ee8/README.md diff --git a/BUILD b/BUILD index b8d8b9f0b79..b9be9cb2820 100644 --- a/BUILD +++ b/BUILD @@ -10,8 +10,10 @@ genrule( "//org.eclipse.jgit.archive:jgit-archive", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit.http.server:jgit-servlet", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", "//org.eclipse.jgit.lfs:jgit-lfs", "//org.eclipse.jgit.lfs.server:jgit-lfs-server", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8", "//org.eclipse.jgit.junit:junit", "//org.eclipse.jgit.ssh.apache:ssh-apache", "//org.eclipse.jgit.ssh.apache.agent:ssh-apache-agent", diff --git a/WORKSPACE b/WORKSPACE index 17a61796c64..022218cbc5a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "jgit") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("//tools:bazlets.bzl", "load_bazlets") -load_bazlets(commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f") +load_bazlets(commit = "156bae8bb0d329d8886f681c723979cbdb39d37c") load( "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", @@ -22,6 +22,20 @@ load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_jav rules_java_dependencies() +http_archive( + name = "rules_shell", + sha256 = "e6b87c89bd0b27039e3af2c5da01147452f240f75d505f5b6880874f31036307", + strip_prefix = "rules_shell-0.6.1", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_shell/releases/download/v0.6.1/rules_shell-v0.6.1.tar.gz", + "https://github.com/bazelbuild/rules_shell/releases/download/v0.6.1/rules_shell-v0.6.1.tar.gz", + ], +) + +load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains") + +rules_shell_dependencies() + http_archive( name = "ubuntu2204_jdk17", sha256 = "8ea82b81c9707e535ff93ef5349d11e55b2a23c62bcc3b0faaec052144aed87d", @@ -42,6 +56,8 @@ register_toolchains("//tools:error_prone_warnings_toolchain_java21_definition") # must be called after the `register_toolchain()` invocation. rules_java_toolchains() +rules_shell_toolchains() + JMH_VERS = "1.37" maven_jar( @@ -160,6 +176,12 @@ maven_jar( sha1 = "1169a246913fe3823782af7943e7a103634867c5", ) +maven_jar( + name = "javax-servlet-api", + artifact = "javax.servlet:javax.servlet-api:4.0.1", + sha1 = "a27082684a2ff0bf397666c3943496c44541d1ca", +) + maven_jar( name = "commons-compress", artifact = "org.apache.commons:commons-compress:1.28.0", diff --git a/lib/BUILD b/lib/BUILD index c065158413a..85f66053e57 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -59,6 +59,7 @@ java_library( visibility = [ "//org.eclipse.jgit.lfs:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", ], exports = ["@gson//jar"], ) @@ -79,6 +80,7 @@ java_library( "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], @@ -322,6 +324,15 @@ java_library( exports = ["@servlet-api//jar"], ) +java_library( + name = "javax-servlet-api", + visibility = [ + "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + ], + exports = ["@javax-servlet-api//jar"], +) + java_library( name = "slf4j-api", visibility = ["//visibility:public"], diff --git a/org.eclipse.jgit.http.server.ee8/BUILD b/org.eclipse.jgit.http.server.ee8/BUILD new file mode 100644 index 00000000000..df39628ccad --- /dev/null +++ b/org.eclipse.jgit.http.server.ee8/BUILD @@ -0,0 +1,27 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +package(default_visibility = ["//visibility:public"]) + +transform_srcjar( + name = "jgit-http-server-ee8-srcs", + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.server:srcs"], + src_prefix = "org.eclipse.jgit.http.server/src/", +) + +filegroup( + name = "jgit-servlet-ee8-srcjar", + srcs = [":jgit-http-server-ee8-srcs"], +) + +java_library( + name = "jgit-servlet-ee8", + srcs = [":jgit-http-server-ee8-srcs"], + resource_strip_prefix = "org.eclipse.jgit.http.server/resources", + resources = ["//org.eclipse.jgit.http.server:jgit-servlet-resources"], + deps = [ + "//lib:javax-servlet-api", + "//org.eclipse.jgit:jgit", + ], +) diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index cae8d8847b7..f6b4a1084fb 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -2,6 +2,15 @@ load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "srcs", + srcs = glob(["src/**/*.java"]), + visibility = [ + "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + filegroup( name = "jgit-servlet-resources", srcs = glob(["resources/**"]), @@ -9,7 +18,7 @@ filegroup( java_library( name = "jgit-servlet", - srcs = glob(["src/**/*.java"]), + srcs = [":srcs"], resource_strip_prefix = "org.eclipse.jgit.http.server/resources", resources = [":jgit-servlet-resources"], deps = [ diff --git a/org.eclipse.jgit.lfs.server.ee8/BUILD b/org.eclipse.jgit.lfs.server.ee8/BUILD new file mode 100644 index 00000000000..b07dae2cde3 --- /dev/null +++ b/org.eclipse.jgit.lfs.server.ee8/BUILD @@ -0,0 +1,32 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +package(default_visibility = ["//visibility:public"]) + +transform_srcjar( + name = "jgit-lfs-server-ee8-srcs", + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server:srcs"], + src_prefix = "org.eclipse.jgit.lfs.server/src/", +) + +filegroup( + name = "jgit-lfs-server-ee8-srcjar", + srcs = [":jgit-lfs-server-ee8-srcs"], +) + +java_library( + name = "jgit-lfs-server-ee8", + srcs = [":jgit-lfs-server-ee8-srcs"], + resource_strip_prefix = "org.eclipse.jgit.lfs.server/resources", + resources = ["//org.eclipse.jgit.lfs.server:jgit-lfs-server-resources"], + deps = [ + "//lib:gson", + "//lib:httpcore", + "//lib:javax-servlet-api", + "//lib:slf4j-api", + "//org.eclipse.jgit.http.apache:http-apache", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.lfs:jgit-lfs", + ], +) diff --git a/org.eclipse.jgit.lfs.server/BUILD b/org.eclipse.jgit.lfs.server/BUILD index c363d52ad15..d6b08a6ee94 100644 --- a/org.eclipse.jgit.lfs.server/BUILD +++ b/org.eclipse.jgit.lfs.server/BUILD @@ -2,11 +2,25 @@ load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "srcs", + srcs = glob(["src/**/*.java"]), + visibility = [ + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "jgit-lfs-server-resources", + srcs = glob(["resources/**"]), +) + java_library( name = "jgit-lfs-server", - srcs = glob(["src/**/*.java"]), + srcs = [":srcs"], resource_strip_prefix = "org.eclipse.jgit.lfs.server/resources", - resources = glob(["resources/**"]), + resources = [":jgit-lfs-server-resources"], deps = [ "//lib:gson", "//lib:httpcore", diff --git a/tools/jgit-ee8/BUILD b/tools/jgit-ee8/BUILD new file mode 100644 index 00000000000..df5c27cd73d --- /dev/null +++ b/tools/jgit-ee8/BUILD @@ -0,0 +1,28 @@ +load("@rules_shell//shell:sh_test.bzl", "sh_test") + +sh_test( + name = "generated_srcs_test", + srcs = ["@com_googlesource_gerrit_bazlets//tools:generated_srcs_test.sh"], + args = [ + "--forbid", + "jakarta\\.servlet", + "--forbid", + "org\\.eclipse\\.jgit\\..*\\.ee8", + "--require", + "javax\\.servlet", + "--module", + "org.eclipse.jgit.http.server/src/", + "$(location //org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs)", + "$(locations //org.eclipse.jgit.http.server:srcs)", + "--module", + "org.eclipse.jgit.lfs.server/src/", + "$(location //org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs)", + "$(locations //org.eclipse.jgit.lfs.server:srcs)", + ], + data = [ + "//org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs", + "//org.eclipse.jgit.http.server:srcs", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs", + "//org.eclipse.jgit.lfs.server:srcs", + ], +) diff --git a/tools/jgit-ee8/README.md b/tools/jgit-ee8/README.md new file mode 100644 index 00000000000..5578d6553b5 --- /dev/null +++ b/tools/jgit-ee8/README.md @@ -0,0 +1,50 @@ +# JGit EE8 Bazel bridge + +This package contains the Bazel-only bridge for source consumers that still run +on EE8 and `javax.servlet` while JGit master uses `jakarta.servlet`. + +JGit hosts this bridge because Gerrit is a known downstream that consumes JGit +from source through a git submodule and still runs Jetty 12 EE8. Keeping the +bridge in JGit lets Gerrit track JGit master and avoids maintaining a long-lived +servlet-4 branch just for Gerrit. That branch was never a stable JGit release +line, so it is not a sustainable way for Gerrit to receive JGit maintenance +updates. + +The bridge intentionally keeps the original JGit package names. It rewrites only +servlet API references from `jakarta.servlet` to `javax.servlet`, then compiles +generated jars from the rewritten source jars. + +Generated targets: + +* `//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8` +* `//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8` + +Do not put one of these generated jars and its canonical Jakarta counterpart on +the same classpath. They contain the same JGit classes. + +This is intentionally limited to Bazel source consumers. It does not add Maven, +Tycho, p2, or Maven Central publication machinery. Those should be added only if +a non-Bazel consumer needs published EE8 artifacts. + +Run: + +```sh +bazelisk test //tools/jgit-ee8:generated_srcs_test +``` + +The test checks: + +* generated sources are derived from the canonical source filegroups +* generated srcjar entries use Java package paths +* generated sources preserve line counts for debugger breakpoints +* generated sources contain `javax.servlet`, not `jakarta.servlet` +* generated sources do not move JGit classes to an `.ee8` package + +Next steps: + +* Keep this source-consumer bridge while Gerrit runs on Jetty 12 EE8. +* Reuse these targets for other Bazel source consumers that need EE8 output. +* Add Maven/Tycho/p2 generation only when a non-Bazel consumer needs published + EE8 artifacts. +* Keep the canonical `srcs` filegroups aligned with each servlet-facing + `java_library` so new Java sources are transformed automatically. From fbf29d88ccc90cf98d89b9f74bf4533fe618eda6 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 19 Jun 2026 14:26:26 +0200 Subject: [PATCH 161/200] Bazel: Add EE8 servlet test targets Add EE8 variants of the HTTP and LFS servlet test suites and run them against the generated EE8 servlet bridge artifacts. Generate EE8 test sources from the canonical Jakarta-based tests by rewriting servlet API references and Jetty EE10 test helper imports to their EE8 equivalents. Export canonical test source filegroups so the generated tests remain synchronized with the primary test suites. Introduce EE8 Jetty test dependencies, generated junit-http helpers, and JUnit suite generation for the transformed sources. Restore AppServer from the servlet-4 branch because its API usage cannot be converted mechanically. Extend generated-source verification to cover test sources and ensure that no Jakarta or Jetty EE10 servlet references remain in generated EE8 outputs. Test Plan: bazelisk test \ //tools/jgit-ee8:generated_srcs_test \ //org.eclipse.jgit.http.test.ee8/... \ //org.eclipse.jgit.lfs.server.test.ee8/... Change-Id: Id3d9312f0a93d443d83054a81b9d868611e18b27 --- WORKSPACE | 18 + lib/BUILD | 36 ++ org.eclipse.jgit.http.test.ee8/BUILD | 84 ++++ org.eclipse.jgit.http.test/BUILD | 41 +- org.eclipse.jgit.junit.http.ee8/BUILD | 43 ++ .../eclipse/jgit/junit/http/AppServer.java | 461 ++++++++++++++++++ org.eclipse.jgit.junit.http/BUILD | 38 +- org.eclipse.jgit.lfs.server.test.ee8/BUILD | 65 +++ org.eclipse.jgit.lfs.server.test/BUILD | 29 ++ tools/jgit-ee8/BUILD | 29 +- tools/jgit-ee8/README.md | 29 +- 11 files changed, 864 insertions(+), 9 deletions(-) create mode 100644 org.eclipse.jgit.http.test.ee8/BUILD create mode 100644 org.eclipse.jgit.junit.http.ee8/BUILD create mode 100644 org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java create mode 100644 org.eclipse.jgit.lfs.server.test.ee8/BUILD diff --git a/WORKSPACE b/WORKSPACE index 022218cbc5a..7f5fec86587 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -270,6 +270,24 @@ maven_jar( sha1 = "56c5180952f23a6af4d8f7e34e84a838c7d284cb", ) +maven_jar( + name = "jetty-ee8-nested", + artifact = "org.eclipse.jetty.ee8:jetty-ee8-nested:" + JETTY_VER, + sha1 = "8118cdcdf9cdf163584d47e136e1cee17b547985", +) + +maven_jar( + name = "jetty-security-ee8", + artifact = "org.eclipse.jetty.ee8:jetty-ee8-security:" + JETTY_VER, + sha1 = "d25c84218ef00b7e54f537acdee3fda8f20be975", +) + +maven_jar( + name = "jetty-servlet-ee8", + artifact = "org.eclipse.jetty.ee8:jetty-ee8-servlet:" + JETTY_VER, + sha1 = "881b69b15540215aace32ab7c985abb6e4fe0c25", +) + maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, diff --git a/lib/BUILD b/lib/BUILD index 85f66053e57..7acc0292451 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -69,6 +69,7 @@ java_library( visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], exports = ["@httpclient//jar"], @@ -79,9 +80,11 @@ java_library( visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", + "//org.eclipse.jgit.http.test.ee8:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", "//org.eclipse.jgit.lfs.server.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], exports = ["@httpcore//jar"], @@ -178,6 +181,35 @@ java_library( ], ) +java_library( + name = "jetty-ee8-nested", + testonly = 1, + visibility = ["//org.eclipse.jgit.junit.http.ee8:__pkg__"], + exports = ["@jetty-ee8-nested//jar"], +) + +java_library( + name = "jetty-security-ee8", + testonly = 1, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + ], + exports = ["@jetty-security-ee8//jar"], +) + +java_library( + name = "jetty-servlet-ee8", + testonly = 1, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + ], + exports = ["@jetty-servlet-ee8//jar"], +) + java_library( name = "jetty-util", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. @@ -317,6 +349,7 @@ java_library( "//org.eclipse.jgit.http.server:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", "//org.eclipse.jgit.junit.http:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", @@ -328,7 +361,10 @@ java_library( name = "javax-servlet-api", visibility = [ "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", ], exports = ["@javax-servlet-api//jar"], ) diff --git a/org.eclipse.jgit.http.test.ee8/BUILD b/org.eclipse.jgit.http.test.ee8/BUILD new file mode 100644 index 00000000000..a6a5506e988 --- /dev/null +++ b/org.eclipse.jgit.http.test.ee8/BUILD @@ -0,0 +1,84 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +transform_srcjar( + name = "helpers-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:helper-srcs"], + src_prefix = "org.eclipse.jgit.http.test/src/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:test-srcs"], + src_prefix = "org.eclipse.jgit.http.test/tst/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "server-unit-test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:http-server-unit-test-srcs"], + src_prefix = "org.eclipse.jgit.http.test/tst/", +) + +# Fast slice for the server utility tests; the default EE8 suite runs the full +# HTTP test target, which already includes these classes. +junit_tests( + name = "server_unit", + suite_srcs = ["//org.eclipse.jgit.http.test:http-server-unit-test-srcs"], + tags = ["http"], + srcs = [":server-unit-test-srcs"], + deps = [ + "//lib:junit", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) + +junit_tests( + name = "http", + suite_srcs = ["//org.eclipse.jgit.http.test:test-srcs"], + tags = ["http"], + srcs = [":test-srcs"], + deps = [ + ":helpers", + "//lib:commons-logging", + "//lib:httpcore", + "//lib:javax-servlet-api", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-util", + "//lib:junit", + "//lib:slf4j-api", + "//lib:slf4j-simple", + "//org.eclipse.jgit.http.apache:http-apache", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit.http.ee8:junit-http-ee8", + "//org.eclipse.jgit.junit:junit", + ], +) + +java_library( + name = "helpers", + testonly = 1, + srcs = [":helpers-srcs"], + deps = [ + "//lib:javax-servlet-api", + "//lib:junit", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index bc04d229dd6..cb6a738178a 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -4,9 +4,46 @@ load( ) load("@rules_java//java:defs.bzl", "java_library") +HTTP_HELPER_SRCS = glob(["src/**/*.java"]) + +HTTP_TEST_SRCS = glob(["tst/**/*.java"]) + +HTTP_SERVER_UNIT_TEST_SRCS = [ + "tst/org/eclipse/jgit/http/server/ClientVersionUtilTest.java", + "tst/org/eclipse/jgit/http/server/RootLocaleTest.java", + "tst/org/eclipse/jgit/http/server/ServletUtilsTest.java", +] + +filegroup( + name = "helper-srcs", + testonly = 1, + srcs = HTTP_HELPER_SRCS, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "test-srcs", + testonly = 1, + srcs = HTTP_TEST_SRCS, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "http-server-unit-test-srcs", + testonly = 1, + srcs = HTTP_SERVER_UNIT_TEST_SRCS, + visibility = ["//org.eclipse.jgit.http.test.ee8:__pkg__"], +) + junit_tests( name = "http", - srcs = glob(["tst/**/*.java"]), + srcs = HTTP_TEST_SRCS, tags = ["http"], deps = [ ":helpers", @@ -33,7 +70,7 @@ junit_tests( java_library( name = "helpers", testonly = 1, - srcs = glob(["src/**/*.java"]), + srcs = HTTP_HELPER_SRCS, deps = [ "//lib:jakarta-servlet-api", "//lib:junit", diff --git a/org.eclipse.jgit.junit.http.ee8/BUILD b/org.eclipse.jgit.junit.http.ee8/BUILD new file mode 100644 index 00000000000..c7f6fb5a537 --- /dev/null +++ b/org.eclipse.jgit.junit.http.ee8/BUILD @@ -0,0 +1,43 @@ +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) + +java_library( + name = "junit-http-ee8", + testonly = 1, + srcs = [ + "//org.eclipse.jgit.junit.http:junit-http-ee8-srcs", + # AppServer diverges from the canonical Jakarta version and is copied + # from the servlet-4 branch as a hand-maintained EE8 overlay. + "src/org/eclipse/jgit/junit/http/AppServer.java", + ], + resources = glob( + ["resources/**"], + allow_empty = True, + ), + deps = [ + "//lib:javax-servlet-api", + "//lib:jetty-ee8-nested", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-session", + "//lib:jetty-util", + "//lib:junit", + "//lib:slf4j-api", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) + +test_suite( + name = "tests", + tests = [ + "//org.eclipse.jgit.http.test.ee8:http", + "//org.eclipse.jgit.lfs.server.test.ee8:lfs_server", + ], +) diff --git a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java new file mode 100644 index 00000000000..1e4c7966b60 --- /dev/null +++ b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java @@ -0,0 +1,461 @@ +/* + * Copyright (C) 2010, 2017 Google Inc. and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.junit.http; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.jetty.ee8.nested.ServletConstraint; +import org.eclipse.jetty.ee8.security.Authenticator; +import org.eclipse.jetty.ee8.security.ConstraintMapping; +import org.eclipse.jetty.ee8.security.ConstraintSecurityHandler; +import org.eclipse.jetty.ee8.security.authentication.BasicAuthenticator; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.security.AbstractLoginService; +import org.eclipse.jetty.security.RolePrincipal; +import org.eclipse.jetty.security.UserPrincipal; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.util.security.Password; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.eclipse.jgit.transport.URIish; + +/** + * Tiny web application server for unit testing. + *

+ * Tests should start the server in their {@code setUp()} method and stop the + * server in their {@code tearDown()} method. Only while started the server's + * URL and/or port number can be obtained. + */ +public class AppServer { + /** Realm name for the secure access areas. */ + public static final String realm = "Secure Area"; + + /** Username for secured access areas. */ + public static final String username = "agitter"; + + /** Password for {@link #username} in secured access areas. */ + public static final String password = "letmein"; + + /** SSL keystore password; must have at least 6 characters. */ + private static final String keyPassword = "mykeys"; + + /** Role for authentication. */ + private static final String authRole = "can-access"; + + static { + // Install a logger that throws warning messages. + // + final String prop = "org.eclipse.jetty.util.log.class"; + System.setProperty(prop, RecordingLogger.class.getName()); + } + + private final Server server; + + private final HttpConfiguration config; + + private final ServerConnector connector; + + private final HttpConfiguration secureConfig; + + private final ServerConnector secureConnector; + + private final ContextHandlerCollection contexts; + + private final TestRequestLog log; + + private List filesToDelete = new ArrayList<>(); + + /** + * Constructor for AppServer. + */ + public AppServer() { + this(0, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * the http port number; may be zero to allocate a port + * dynamically + * @since 4.2 + */ + public AppServer(int port) { + this(port, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * for http, may be zero to allocate a port dynamically + * @param sslPort + * for https,may be zero to allocate a port dynamically. If + * negative, the server will be set up without https support. + * @since 4.9 + */ + public AppServer(int port, int sslPort) { + server = new Server(); + + config = new HttpConfiguration(); + config.setSecureScheme("https"); + config.setSecurePort(0); + config.setOutputBufferSize(32768); + + connector = new ServerConnector(server, + new HttpConnectionFactory(config)); + connector.setPort(port); + String ip; + String hostName; + try { + final InetAddress me = InetAddress.getByName("localhost"); + ip = me.getHostAddress(); + connector.setHost(ip); + hostName = InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + throw new RuntimeException("Cannot find localhost", e); + } + + if (sslPort >= 0) { + SslContextFactory.Server sslContextFactory = createTestSslContextFactory( + hostName, ip); + secureConfig = new HttpConfiguration(config); + secureConfig.addCustomizer(new SecureRequestCustomizer()); + HttpConnectionFactory http11 = new HttpConnectionFactory( + secureConfig); + SslConnectionFactory tls = new SslConnectionFactory( + sslContextFactory, http11.getProtocol()); + secureConnector = new ServerConnector(server, tls, http11); + secureConnector.setPort(sslPort); + secureConnector.setHost(ip); + } else { + secureConfig = null; + secureConnector = null; + } + + contexts = new ContextHandlerCollection(); + + log = new TestRequestLog(); + log.setHandler(contexts); + + if (secureConnector == null) { + server.setConnectors(new Connector[] { connector }); + } else { + server.setConnectors( + new Connector[] { connector, secureConnector }); + } + server.setHandler(log); + } + + private SslContextFactory.Server createTestSslContextFactory( + String hostName, String ip) { + SslContextFactory.Server factory = new SslContextFactory.Server(); + + String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; + + try { + File tmpDir = Files.createTempDirectory("jks").toFile(); + tmpDir.deleteOnExit(); + makePrivate(tmpDir); + File keyStore = new File(tmpDir, "keystore.jks"); + File keytool = new File( + new File(new File(System.getProperty("java.home")), "bin"), + "keytool"); + Runtime.getRuntime().exec( + new String[] { + keytool.getAbsolutePath(), // + "-keystore", keyStore.getAbsolutePath(), // + "-storepass", keyPassword, + "-alias", hostName, // + "-ext", "bc=ca:true", // + "-ext", + String.format( + "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", + ip, hostName), // + "-genkeypair", // + "-keyalg", "RSA", // + "-keypass", keyPassword, // + "-dname", dName, // + "-validity", "2" // + }).waitFor(); + keyStore.deleteOnExit(); + makePrivate(keyStore); + filesToDelete.add(keyStore); + filesToDelete.add(tmpDir); + factory.setKeyStorePath(keyStore.getAbsolutePath()); + factory.setKeyStorePassword(keyPassword); + factory.setKeyManagerPassword(keyPassword); + factory.setTrustStorePath(keyStore.getAbsolutePath()); + factory.setTrustStorePassword(keyPassword); + } catch (InterruptedException | IOException e) { + throw new RuntimeException("Cannot create ssl key/certificate", e); + } + return factory; + } + + private void makePrivate(File file) { + file.setReadable(false); + file.setWritable(false); + file.setExecutable(false); + file.setReadable(true, true); + file.setWritable(true, true); + if (file.isDirectory()) { + file.setExecutable(true, true); + } + } + + /** + * Create a new servlet context within the server. + *

+ * This method should be invoked before the server is started, once for each + * context the caller wants to register. + * + * @param path + * path of the context; use "/" for the root context if binding + * to the root is desired. + * @return the context to add servlets into. + * @since 7.0 + */ + public ServletContextHandler addContext(String path) { + assertNotYetSetUp(); + if ("".equals(path)) + path = "/"; + + ServletContextHandler ctx = new ServletContextHandler(); + ctx.setContextPath(path); + contexts.addHandler(ctx); + + return ctx; + } + + /** + * Configure basic authentication. + * + * @param ctx + * servlet context handler + * @param methods + * the methods + * @return servlet context handler + * @since 7.0 + */ + public ServletContextHandler authBasic(ServletContextHandler ctx, + String... methods) { + assertNotYetSetUp(); + auth(ctx, new BasicAuthenticator(), methods); + return ctx; + } + + static class TestMappedLoginService extends AbstractLoginService { + private RolePrincipal role; + + protected final Map users = new ConcurrentHashMap<>(); + + TestMappedLoginService(String role) { + this.role = new RolePrincipal(role); + } + + @Override + protected void doStart() throws Exception { + UserPrincipal p = new UserPrincipal(username, + new Password(password)); + users.put(username, p); + super.doStart(); + } + + @Override + protected UserPrincipal loadUserInfo(String user) { + return users.get(user); + } + + @Override + protected List loadRoleInfo(UserPrincipal user) { + if (users.get(user.getName()) == null) { + return null; + } + return Collections.singletonList(role); + } + } + + private ConstraintMapping createConstraintMapping() { + ConstraintMapping cm = new ConstraintMapping(); + cm.setConstraint(new ServletConstraint()); + cm.getConstraint().setAuthenticate(true); + cm.getConstraint().setDataConstraint(ServletConstraint.DC_NONE); + cm.getConstraint().setRoles(new String[] { authRole }); + return cm; + } + + private void auth(ServletContextHandler ctx, Authenticator authType, + String... methods) { + AbstractLoginService users = new TestMappedLoginService(authRole); + List mappings = new ArrayList<>(); + if (methods == null || methods.length == 0) { + ConstraintMapping cm = createConstraintMapping(); + cm.setPathSpec("/*"); + mappings.add(cm); + } else { + for (String method : methods) { + ConstraintMapping cm = createConstraintMapping(); + cm.setMethod(method.toUpperCase(Locale.ROOT)); + cm.setPathSpec("/*"); + mappings.add(cm); + } + } + + ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); + sec.setRealmName(realm); + sec.setAuthenticator(authType); + sec.setLoginService(users); + sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); + ctx.setSecurityHandler(sec); + } + + /** + * Start the server on a random local port. + * + * @throws Exception + * the server cannot be started, testing is not possible. + */ + public void setUp() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.start(); + config.setSecurePort(getSecurePort()); + if (secureConfig != null) { + secureConfig.setSecurePort(getSecurePort()); + } + } + + /** + * Shutdown the server. + * + * @throws Exception + * the server refuses to halt, or wasn't running. + */ + public void tearDown() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.stop(); + for (File f : filesToDelete) { + f.delete(); + } + filesToDelete.clear(); + } + + /** + * Get the URI to reference this server. + *

+ * The returned URI includes the proper host name and port number, but does + * not contain a path. + * + * @return URI to reference this server's root context. + */ + public URI getURI() { + assertAlreadySetUp(); + String host = connector.getHost(); + if (host.contains(":") && !host.startsWith("[")) + host = "[" + host + "]"; + final String uri = "http://" + host + ":" + getPort(); + try { + return new URI(uri); + } catch (URISyntaxException e) { + throw new RuntimeException("Unexpected URI error on " + uri, e); + } + } + + /** + * Get port. + * + * @return the local port number the server is listening on. + */ + public int getPort() { + assertAlreadySetUp(); + return connector.getLocalPort(); + } + + /** + * Get secure port. + * + * @return the HTTPS port or -1 if not configured. + */ + public int getSecurePort() { + assertAlreadySetUp(); + return secureConnector != null ? secureConnector.getLocalPort() : -1; + } + + /** + * Get requests. + * + * @return all requests since the server was started. + */ + public List getRequests() { + return new ArrayList<>(log.getEvents()); + } + + /** + * Get requests. + * + * @param base + * base URI used to access the server. + * @param path + * the path to locate requests for, relative to {@code base}. + * @return all requests which match the given path. + */ + public List getRequests(URIish base, String path) { + return getRequests(HttpTestCase.join(base, path)); + } + + /** + * Get requests. + * + * @param path + * the path to locate requests for. + * @return all requests which match the given path. + */ + public List getRequests(String path) { + ArrayList r = new ArrayList<>(); + for (AccessEvent event : log.getEvents()) { + if (event.getPath().equals(path)) { + r.add(event); + } + } + return r; + } + + private void assertNotYetSetUp() { + assertFalse("server is not running", server.isRunning()); + } + + private void assertAlreadySetUp() { + assertTrue("server is running", server.isRunning()); + } +} diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 17a75701540..8ab98ac5d95 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -1,11 +1,36 @@ load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") package(default_visibility = ["//visibility:public"]) +JUNIT_HTTP_SRCS = glob(["src/**/*.java"]) + +JUNIT_HTTP_EE8_TRANSFORM_SRCS = glob( + ["src/**/*.java"], + exclude = ["src/org/eclipse/jgit/junit/http/AppServer.java"], +) + +filegroup( + name = "srcs", + testonly = 1, + srcs = JUNIT_HTTP_SRCS, + visibility = [ + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "ee8-transform-srcs", + testonly = 1, + srcs = JUNIT_HTTP_EE8_TRANSFORM_SRCS, + visibility = ["//tools/jgit-ee8:__pkg__"], +) + java_library( name = "junit-http", testonly = 1, - srcs = glob(["src/**/*.java"]), + srcs = JUNIT_HTTP_SRCS, resources = glob( ["resources/**"], allow_empty = True, @@ -27,3 +52,14 @@ java_library( "//org.eclipse.jgit.junit:junit", ], ) + +transform_srcjar( + name = "junit-http-ee8-srcs", + direction = "to_javax", + sources = JUNIT_HTTP_EE8_TRANSFORM_SRCS, + src_prefix = "org.eclipse.jgit.junit.http/src/", + visibility = [ + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) diff --git a/org.eclipse.jgit.lfs.server.test.ee8/BUILD b/org.eclipse.jgit.lfs.server.test.ee8/BUILD new file mode 100644 index 00000000000..bb93b79374b --- /dev/null +++ b/org.eclipse.jgit.lfs.server.test.ee8/BUILD @@ -0,0 +1,65 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +transform_srcjar( + name = "test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server.test:test-srcs"], + src_prefix = "org.eclipse.jgit.lfs.server.test/tst/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "base-test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server.test:base-test-srcs"], + src_prefix = "org.eclipse.jgit.lfs.server.test/tst/", +) + +# Keep the helper/base class separate: the canonical LfsServerTest is compiled +# into the helper jar, while the remaining tests are executed from the EE8 +# suite target. +DEPS = [ + "//org.eclipse.jgit.lfs.test:helpers", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + "//org.eclipse.jgit.junit.http.ee8:junit-http-ee8", + "//org.eclipse.jgit.lfs:jgit-lfs", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8", + "//lib:commons-logging", + "//lib:httpcore", + "//lib:httpclient", + "//lib:junit", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-util", + "//lib:javax-servlet-api", +] + +junit_tests( + name = "lfs_server", + jvm_flags = [ + "-Xmx512m", + "-Dfile.encoding=UTF-8", + ], + suite_srcs = ["//org.eclipse.jgit.lfs.server.test:nonbase-test-srcs"], + tags = ["lfs-server"], + srcs = [":test-srcs"], + deps = DEPS + [ + ":helpers", + ], +) + +java_library( + name = "helpers", + testonly = 1, + srcs = [":base-test-srcs"], + deps = DEPS, +) diff --git a/org.eclipse.jgit.lfs.server.test/BUILD b/org.eclipse.jgit.lfs.server.test/BUILD index adc2df63c02..4b698048694 100644 --- a/org.eclipse.jgit.lfs.server.test/BUILD +++ b/org.eclipse.jgit.lfs.server.test/BUILD @@ -6,6 +6,35 @@ load("@rules_java//java:defs.bzl", "java_library") TEST_BASE = ["tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java"] +TEST_SRCS = glob(["tst/**/*.java"]) + +filegroup( + name = "test-srcs", + testonly = 1, + srcs = TEST_SRCS, + visibility = [ + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "base-test-srcs", + testonly = 1, + srcs = TEST_BASE, + visibility = ["//org.eclipse.jgit.lfs.server.test.ee8:__pkg__"], +) + +filegroup( + name = "nonbase-test-srcs", + testonly = 1, + srcs = glob( + ["tst/**/*.java"], + exclude = TEST_BASE, + ), + visibility = ["//org.eclipse.jgit.lfs.server.test.ee8:__pkg__"], +) + DEPS = [ "//org.eclipse.jgit.lfs.test:helpers", "//org.eclipse.jgit:jgit", diff --git a/tools/jgit-ee8/BUILD b/tools/jgit-ee8/BUILD index df5c27cd73d..f6681ccf163 100644 --- a/tools/jgit-ee8/BUILD +++ b/tools/jgit-ee8/BUILD @@ -7,8 +7,11 @@ sh_test( "--forbid", "jakarta\\.servlet", "--forbid", + "org\\.eclipse\\.jetty\\.ee10\\.servlet", + "--forbid", "org\\.eclipse\\.jgit\\..*\\.ee8", - "--require", + "--require-if-source", + "jakarta\\.servlet", "javax\\.servlet", "--module", "org.eclipse.jgit.http.server/src/", @@ -18,11 +21,35 @@ sh_test( "org.eclipse.jgit.lfs.server/src/", "$(location //org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs)", "$(locations //org.eclipse.jgit.lfs.server:srcs)", + "--module", + "org.eclipse.jgit.junit.http/src/", + "$(location //org.eclipse.jgit.junit.http:junit-http-ee8-srcs)", + "$(locations //org.eclipse.jgit.junit.http:ee8-transform-srcs)", + "--module", + "org.eclipse.jgit.http.test/src/", + "$(location //org.eclipse.jgit.http.test.ee8:helpers-srcs)", + "$(locations //org.eclipse.jgit.http.test:helper-srcs)", + "--module", + "org.eclipse.jgit.http.test/tst/", + "$(location //org.eclipse.jgit.http.test.ee8:test-srcs)", + "$(locations //org.eclipse.jgit.http.test:test-srcs)", + "--module", + "org.eclipse.jgit.lfs.server.test/tst/", + "$(location //org.eclipse.jgit.lfs.server.test.ee8:test-srcs)", + "$(locations //org.eclipse.jgit.lfs.server.test:test-srcs)", ], data = [ "//org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs", "//org.eclipse.jgit.http.server:srcs", + "//org.eclipse.jgit.http.test.ee8:helpers-srcs", + "//org.eclipse.jgit.http.test.ee8:test-srcs", + "//org.eclipse.jgit.http.test:helper-srcs", + "//org.eclipse.jgit.http.test:test-srcs", + "//org.eclipse.jgit.junit.http:ee8-transform-srcs", + "//org.eclipse.jgit.junit.http:junit-http-ee8-srcs", "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs", "//org.eclipse.jgit.lfs.server:srcs", + "//org.eclipse.jgit.lfs.server.test.ee8:test-srcs", + "//org.eclipse.jgit.lfs.server.test:test-srcs", ], ) diff --git a/tools/jgit-ee8/README.md b/tools/jgit-ee8/README.md index 5578d6553b5..7bb2f477aa7 100644 --- a/tools/jgit-ee8/README.md +++ b/tools/jgit-ee8/README.md @@ -22,17 +22,18 @@ Generated targets: Do not put one of these generated jars and its canonical Jakarta counterpart on the same classpath. They contain the same JGit classes. -This is intentionally limited to Bazel source consumers. It does not add Maven, -Tycho, p2, or Maven Central publication machinery. Those should be added only if -a non-Bazel consumer needs published EE8 artifacts. +This is intentionally limited to source generation, build, and test. It does +not add Tycho, p2, or Maven Central publication machinery yet. Run: ```sh -bazelisk test //tools/jgit-ee8:generated_srcs_test +bazelisk test \ + //tools/jgit-ee8:generated_srcs_test \ + //org.eclipse.jgit.junit.http.ee8:tests ``` -The test checks: +`//tools/jgit-ee8:generated_srcs_test` checks: * generated sources are derived from the canonical source filegroups * generated srcjar entries use Java package paths @@ -40,10 +41,28 @@ The test checks: * generated sources contain `javax.servlet`, not `jakarta.servlet` * generated sources do not move JGit classes to an `.ee8` package +The dedicated `org.eclipse.jgit.*.ee8` targets follow the Jetty 12 EE8 testing +model in a smaller form. Jetty generates EE8 main and test sources from the +canonical newer-EE modules and then runs the EE8 tests in the EE8 module graph. +JGit does the same for the servlet-facing tests: the HTTP/LFS test sources and +shared `junit-http` helpers are transformed to `javax.servlet`, wired to Jetty +EE8 test dependencies, and run against the generated EE8 JGit jars. + +`//org.eclipse.jgit.http.test.ee8:server_unit` is a fast, focused target for the +three HTTP server utility tests. It is not part of the default EE8 suite because +those classes already run under `//org.eclipse.jgit.http.test.ee8:http`. + +The test rewrite rules also map Jetty test helper imports from +`org.eclipse.jetty.ee10.servlet` to the Jetty EE8 packages needed by the tests. +They are intentionally test-only and separate from the production +`jakarta.servlet` to `javax.servlet` rules. + Next steps: * Keep this source-consumer bridge while Gerrit runs on Jetty 12 EE8. * Reuse these targets for other Bazel source consumers that need EE8 output. +* Move the generated-test JUnit helper to bazlets only if more generated-test + users need the same split between suite source labels and compiled sources. * Add Maven/Tycho/p2 generation only when a non-Bazel consumer needs published EE8 artifacts. * Keep the canonical `srcs` filegroups aligned with each servlet-facing From c2188c2a078df7b4112ef7d95dc8f0e4d76083f2 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 25 Jun 2026 11:32:28 +0200 Subject: [PATCH 162/200] junit.http: Extract AppServerBase to dedupe the EE8 AppServer overlay The EE8 servlet bridge ships a hand-maintained org.eclipse.jgit.junit.http.ee8 AppServer because the canonical AppServer cannot be rewritten into its EE8 form automatically: the Jetty security API (Constraint.Builder + ContextHandler juggling) differs structurally from the Jetty EE8 one (ServletConstraint + setSecurityHandler), which a jakarta->javax string rewrite cannot bridge. The overlay was a 461-line copy; only ~40 lines diverge. Split the common code into an abstract AppServerBase and reduce both AppServers to the generation-specific part: AppServerBase common server/context/login wiring plus the protected abstract configureAuthentication() method; transform-safe (only the ServletContextHandler import renames ee10 -> ee8). AppServer (canonical) EE10: Constraint.Builder + setHandler. AppServer (ee8 overlay) EE8: ServletConstraint + setSecurityHandler. 461 -> 103 lines. Both toolchains pick AppServerBase up for free: the Bazel transform and the Maven antrun copy both exclude only the file name AppServer.java, so AppServerBase.java flows through the jakarta->javax / ee10->ee8 rewrite while the hand-written EE8 AppServer.java stays the overlay. No BUILD or pom changes. The class stays named AppServer in both worlds (separate classpaths), so every "new AppServer(...)" site is untouched. Moving the shared username/password constants into AppServerBase turns the AppServer.username uses in the HTTP tests into an indirect static access, which JGit's ecj settings escalate to a compile error (caught by Maven, not by the Bazel javac build). Reference the declaring class (AppServerBase.username) instead of re-declaring the constants on both AppServers, which would reintroduce the duplication this change removes. Alternative considered: renaming the EE8 overlay to EE8AppServer. Rejected because a distinct name forces rewriting every "new AppServer(...)" site in the transformed EE8 tests and couples the transform to class names instead of imports. Copyright is carried over unchanged from the split file. Change-Id: I1d68bcc7d1d23668696ee91d8910f4940064bb37 --- .../jgit/http/test/HttpClientTests.java | 6 +- .../http/test/SmartClientSmartServerTest.java | 27 +- .../eclipse/jgit/junit/http/AppServer.java | 390 +--------------- .../eclipse/jgit/junit/http/AppServer.java | 389 +-------------- .../jgit/junit/http/AppServerBase.java | 441 ++++++++++++++++++ 5 files changed, 487 insertions(+), 766 deletions(-) create mode 100644 org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java index 3937627f53c..2737a492fc2 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java @@ -41,7 +41,7 @@ import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.http.AccessEvent; -import org.eclipse.jgit.junit.http.AppServer; +import org.eclipse.jgit.junit.http.AppServerBase; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; @@ -266,12 +266,12 @@ public void testListRemote_Dumb_Auth() throws Exception { Repository dst = createBareRepository(); try (Transport t = Transport.open(dst, dumbAuthBasicURI)) { t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, AppServer.password)); + AppServerBase.username, AppServerBase.password)); t.openFetch().close(); } try (Transport t = Transport.open(dst, dumbAuthBasicURI)) { t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, "")); + AppServerBase.username, "")); try { t.openFetch(); fail("connection opened even info/refs needs auth basic and we provide wrong password"); diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index b0d17adb3a0..46a48f7e704 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -68,6 +68,7 @@ import org.eclipse.jgit.junit.TestRng; import org.eclipse.jgit.junit.http.AccessEvent; import org.eclipse.jgit.junit.http.AppServer; +import org.eclipse.jgit.junit.http.AppServerBase; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; @@ -111,7 +112,7 @@ public class SmartClientSmartServerTest extends AllProtocolsHttpTestCase { private Repository remoteRepository; private CredentialsProvider testCredentials = new UsernamePasswordCredentialsProvider( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); private URIish remoteURI; @@ -998,7 +999,7 @@ public void testInitialClone_WithPreAuthentication() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1018,7 +1019,7 @@ public void testInitialClone_WithPreAuthenticationCleared() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); ((TransportHttp) t).setPreemptiveBasicAuthentication(null, null); t.setCredentialsProvider(testCredentials); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); @@ -1043,7 +1044,7 @@ public void testInitialClone_PreAuthenticationTooLate() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1053,7 +1054,7 @@ public void testInitialClone_PreAuthenticationTooLate() throws Exception { assertFetchRequests(requests, 0); assertThrows(IllegalStateException.class, () -> ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password)); + AppServerBase.username, AppServerBase.password)); assertThrows(IllegalStateException.class, () -> ((TransportHttp) t) .setPreemptiveBasicAuthentication(null, null)); } @@ -1066,7 +1067,7 @@ public void testInitialClone_WithWrongPreAuthenticationAndCredentialProvider() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password + 'x'); + AppServerBase.username, AppServerBase.password + 'x'); t.setCredentialsProvider(testCredentials); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); @@ -1090,7 +1091,7 @@ public void testInitialClone_WithWrongPreAuthentication() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password + 'x'); + AppServerBase.username, AppServerBase.password + 'x'); TransportException e = assertThrows(TransportException.class, () -> t.fetch(NullProgressMonitor.INSTANCE, mirror(master))); @@ -1108,8 +1109,8 @@ public void testInitialClone_WithWrongPreAuthentication() throws Exception { @Test public void testInitialClone_WithUserInfo() throws Exception { - URIish withUserInfo = authURI.setUser(AppServer.username) - .setPass(AppServer.password); + URIish withUserInfo = authURI.setUser(AppServerBase.username) + .setPass(AppServerBase.password); try (Repository dst = createBareRepository(); Transport t = Transport.open(dst, withUserInfo)) { assertFalse(dst.getObjectDatabase().has(A_txt)); @@ -1127,13 +1128,13 @@ public void testInitialClone_WithUserInfo() throws Exception { @Test public void testInitialClone_PreAuthOverridesUserInfo() throws Exception { - URIish withUserInfo = authURI.setUser(AppServer.username) - .setPass(AppServer.password + 'x'); + URIish withUserInfo = authURI.setUser(AppServerBase.username) + .setPass(AppServerBase.password + 'x'); try (Repository dst = createBareRepository(); Transport t = Transport.open(dst, withUserInfo)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1174,7 +1175,7 @@ public void testInitialClone_WithAuthenticationWrongCredentials() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, "wrongpassword")); + AppServerBase.username, "wrongpassword")); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); fail("Should not have succeeded -- wrong password"); } catch (TransportException e) { diff --git a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java index 1e4c7966b60..3627d920a89 100644 --- a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java @@ -10,95 +10,34 @@ package org.eclipse.jgit.junit.http; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.nio.file.Files; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jetty.ee8.nested.ServletConstraint; -import org.eclipse.jetty.ee8.security.Authenticator; import org.eclipse.jetty.ee8.security.ConstraintMapping; import org.eclipse.jetty.ee8.security.ConstraintSecurityHandler; import org.eclipse.jetty.ee8.security.authentication.BasicAuthenticator; import org.eclipse.jetty.ee8.servlet.ServletContextHandler; import org.eclipse.jetty.security.AbstractLoginService; -import org.eclipse.jetty.security.RolePrincipal; -import org.eclipse.jetty.security.UserPrincipal; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.util.security.Password; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jgit.transport.URIish; /** - * Tiny web application server for unit testing. + * Tiny web application server for unit testing, wired for the EE8 + * (javax.servlet / Jetty EE8) generation. *

- * Tests should start the server in their {@code setUp()} method and stop the - * server in their {@code tearDown()} method. Only while started the server's - * URL and/or port number can be obtained. + * Only the Jetty security wiring is generation specific; everything else is + * inherited from the generated {@link AppServerBase}. This is the hand + * maintained EE8 overlay that the canonical {@code AppServer} cannot be + * rewritten into automatically, because the Jetty EE8 security API + * ({@code ServletConstraint} + {@code setSecurityHandler}) differs structurally + * from the EE10 one. */ -public class AppServer { - /** Realm name for the secure access areas. */ - public static final String realm = "Secure Area"; - - /** Username for secured access areas. */ - public static final String username = "agitter"; - - /** Password for {@link #username} in secured access areas. */ - public static final String password = "letmein"; - - /** SSL keystore password; must have at least 6 characters. */ - private static final String keyPassword = "mykeys"; - - /** Role for authentication. */ - private static final String authRole = "can-access"; - - static { - // Install a logger that throws warning messages. - // - final String prop = "org.eclipse.jetty.util.log.class"; - System.setProperty(prop, RecordingLogger.class.getName()); - } - - private final Server server; - - private final HttpConfiguration config; - - private final ServerConnector connector; - - private final HttpConfiguration secureConfig; - - private final ServerConnector secureConnector; - - private final ContextHandlerCollection contexts; - - private final TestRequestLog log; - - private List filesToDelete = new ArrayList<>(); - +public class AppServer extends AppServerBase { /** * Constructor for AppServer. */ public AppServer() { - this(0, -1); + super(); } /** @@ -110,7 +49,7 @@ public AppServer() { * @since 4.2 */ public AppServer(int port) { - this(port, -1); + super(port); } /** @@ -124,185 +63,7 @@ public AppServer(int port) { * @since 4.9 */ public AppServer(int port, int sslPort) { - server = new Server(); - - config = new HttpConfiguration(); - config.setSecureScheme("https"); - config.setSecurePort(0); - config.setOutputBufferSize(32768); - - connector = new ServerConnector(server, - new HttpConnectionFactory(config)); - connector.setPort(port); - String ip; - String hostName; - try { - final InetAddress me = InetAddress.getByName("localhost"); - ip = me.getHostAddress(); - connector.setHost(ip); - hostName = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - throw new RuntimeException("Cannot find localhost", e); - } - - if (sslPort >= 0) { - SslContextFactory.Server sslContextFactory = createTestSslContextFactory( - hostName, ip); - secureConfig = new HttpConfiguration(config); - secureConfig.addCustomizer(new SecureRequestCustomizer()); - HttpConnectionFactory http11 = new HttpConnectionFactory( - secureConfig); - SslConnectionFactory tls = new SslConnectionFactory( - sslContextFactory, http11.getProtocol()); - secureConnector = new ServerConnector(server, tls, http11); - secureConnector.setPort(sslPort); - secureConnector.setHost(ip); - } else { - secureConfig = null; - secureConnector = null; - } - - contexts = new ContextHandlerCollection(); - - log = new TestRequestLog(); - log.setHandler(contexts); - - if (secureConnector == null) { - server.setConnectors(new Connector[] { connector }); - } else { - server.setConnectors( - new Connector[] { connector, secureConnector }); - } - server.setHandler(log); - } - - private SslContextFactory.Server createTestSslContextFactory( - String hostName, String ip) { - SslContextFactory.Server factory = new SslContextFactory.Server(); - - String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; - - try { - File tmpDir = Files.createTempDirectory("jks").toFile(); - tmpDir.deleteOnExit(); - makePrivate(tmpDir); - File keyStore = new File(tmpDir, "keystore.jks"); - File keytool = new File( - new File(new File(System.getProperty("java.home")), "bin"), - "keytool"); - Runtime.getRuntime().exec( - new String[] { - keytool.getAbsolutePath(), // - "-keystore", keyStore.getAbsolutePath(), // - "-storepass", keyPassword, - "-alias", hostName, // - "-ext", "bc=ca:true", // - "-ext", - String.format( - "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", - ip, hostName), // - "-genkeypair", // - "-keyalg", "RSA", // - "-keypass", keyPassword, // - "-dname", dName, // - "-validity", "2" // - }).waitFor(); - keyStore.deleteOnExit(); - makePrivate(keyStore); - filesToDelete.add(keyStore); - filesToDelete.add(tmpDir); - factory.setKeyStorePath(keyStore.getAbsolutePath()); - factory.setKeyStorePassword(keyPassword); - factory.setKeyManagerPassword(keyPassword); - factory.setTrustStorePath(keyStore.getAbsolutePath()); - factory.setTrustStorePassword(keyPassword); - } catch (InterruptedException | IOException e) { - throw new RuntimeException("Cannot create ssl key/certificate", e); - } - return factory; - } - - private void makePrivate(File file) { - file.setReadable(false); - file.setWritable(false); - file.setExecutable(false); - file.setReadable(true, true); - file.setWritable(true, true); - if (file.isDirectory()) { - file.setExecutable(true, true); - } - } - - /** - * Create a new servlet context within the server. - *

- * This method should be invoked before the server is started, once for each - * context the caller wants to register. - * - * @param path - * path of the context; use "/" for the root context if binding - * to the root is desired. - * @return the context to add servlets into. - * @since 7.0 - */ - public ServletContextHandler addContext(String path) { - assertNotYetSetUp(); - if ("".equals(path)) - path = "/"; - - ServletContextHandler ctx = new ServletContextHandler(); - ctx.setContextPath(path); - contexts.addHandler(ctx); - - return ctx; - } - - /** - * Configure basic authentication. - * - * @param ctx - * servlet context handler - * @param methods - * the methods - * @return servlet context handler - * @since 7.0 - */ - public ServletContextHandler authBasic(ServletContextHandler ctx, - String... methods) { - assertNotYetSetUp(); - auth(ctx, new BasicAuthenticator(), methods); - return ctx; - } - - static class TestMappedLoginService extends AbstractLoginService { - private RolePrincipal role; - - protected final Map users = new ConcurrentHashMap<>(); - - TestMappedLoginService(String role) { - this.role = new RolePrincipal(role); - } - - @Override - protected void doStart() throws Exception { - UserPrincipal p = new UserPrincipal(username, - new Password(password)); - users.put(username, p); - super.doStart(); - } - - @Override - protected UserPrincipal loadUserInfo(String user) { - return users.get(user); - } - - @Override - protected List loadRoleInfo(UserPrincipal user) { - if (users.get(user.getName()) == null) { - return null; - } - return Collections.singletonList(role); - } + super(port, sslPort); } private ConstraintMapping createConstraintMapping() { @@ -314,8 +75,9 @@ private ConstraintMapping createConstraintMapping() { return cm; } - private void auth(ServletContextHandler ctx, Authenticator authType, - String... methods) { + @Override + protected void configureAuthentication(ServletContextHandler ctx, + String[] methods) { AbstractLoginService users = new TestMappedLoginService(authRole); List mappings = new ArrayList<>(); if (methods == null || methods.length == 0) { @@ -333,129 +95,9 @@ private void auth(ServletContextHandler ctx, Authenticator authType, ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); sec.setRealmName(realm); - sec.setAuthenticator(authType); + sec.setAuthenticator(new BasicAuthenticator()); sec.setLoginService(users); sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); ctx.setSecurityHandler(sec); } - - /** - * Start the server on a random local port. - * - * @throws Exception - * the server cannot be started, testing is not possible. - */ - public void setUp() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.start(); - config.setSecurePort(getSecurePort()); - if (secureConfig != null) { - secureConfig.setSecurePort(getSecurePort()); - } - } - - /** - * Shutdown the server. - * - * @throws Exception - * the server refuses to halt, or wasn't running. - */ - public void tearDown() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.stop(); - for (File f : filesToDelete) { - f.delete(); - } - filesToDelete.clear(); - } - - /** - * Get the URI to reference this server. - *

- * The returned URI includes the proper host name and port number, but does - * not contain a path. - * - * @return URI to reference this server's root context. - */ - public URI getURI() { - assertAlreadySetUp(); - String host = connector.getHost(); - if (host.contains(":") && !host.startsWith("[")) - host = "[" + host + "]"; - final String uri = "http://" + host + ":" + getPort(); - try { - return new URI(uri); - } catch (URISyntaxException e) { - throw new RuntimeException("Unexpected URI error on " + uri, e); - } - } - - /** - * Get port. - * - * @return the local port number the server is listening on. - */ - public int getPort() { - assertAlreadySetUp(); - return connector.getLocalPort(); - } - - /** - * Get secure port. - * - * @return the HTTPS port or -1 if not configured. - */ - public int getSecurePort() { - assertAlreadySetUp(); - return secureConnector != null ? secureConnector.getLocalPort() : -1; - } - - /** - * Get requests. - * - * @return all requests since the server was started. - */ - public List getRequests() { - return new ArrayList<>(log.getEvents()); - } - - /** - * Get requests. - * - * @param base - * base URI used to access the server. - * @param path - * the path to locate requests for, relative to {@code base}. - * @return all requests which match the given path. - */ - public List getRequests(URIish base, String path) { - return getRequests(HttpTestCase.join(base, path)); - } - - /** - * Get requests. - * - * @param path - * the path to locate requests for. - * @return all requests which match the given path. - */ - public List getRequests(String path) { - ArrayList r = new ArrayList<>(); - for (AccessEvent event : log.getEvents()) { - if (event.getPath().equals(path)) { - r.add(event); - } - } - return r; - } - - private void assertNotYetSetUp() { - assertFalse("server is not running", server.isRunning()); - } - - private void assertAlreadySetUp() { - assertTrue("server is running", server.isRunning()); - } } diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 76e437bc3d6..3a4bce7419e 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -10,95 +10,30 @@ package org.eclipse.jgit.junit.http; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.nio.file.Files; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jetty.ee10.servlet.ServletContextHandler; import org.eclipse.jetty.ee10.servlet.security.ConstraintMapping; import org.eclipse.jetty.ee10.servlet.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.AbstractLoginService; -import org.eclipse.jetty.security.Authenticator; import org.eclipse.jetty.security.Constraint; -import org.eclipse.jetty.security.RolePrincipal; -import org.eclipse.jetty.security.UserPrincipal; import org.eclipse.jetty.security.authentication.BasicAuthenticator; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.util.security.Password; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jgit.transport.URIish; /** - * Tiny web application server for unit testing. + * Tiny web application server for unit testing, wired for the Jakarta servlet + * (Jetty EE10) generation. *

- * Tests should start the server in their {@code setUp()} method and stop the - * server in their {@code tearDown()} method. Only while started the server's - * URL and/or port number can be obtained. + * Only the Jetty security wiring is generation specific; everything else lives + * in {@link AppServerBase}. */ -public class AppServer { - /** Realm name for the secure access areas. */ - public static final String realm = "Secure Area"; - - /** Username for secured access areas. */ - public static final String username = "agitter"; - - /** Password for {@link #username} in secured access areas. */ - public static final String password = "letmein"; - - /** SSL keystore password; must have at least 6 characters. */ - private static final String keyPassword = "mykeys"; - - /** Role for authentication. */ - private static final String authRole = "can-access"; - - static { - // Install a logger that throws warning messages. - // - final String prop = "org.eclipse.jetty.util.log.class"; - System.setProperty(prop, RecordingLogger.class.getName()); - } - - private final Server server; - - private final HttpConfiguration config; - - private final ServerConnector connector; - - private final HttpConfiguration secureConfig; - - private final ServerConnector secureConnector; - - private final ContextHandlerCollection contexts; - - private final TestRequestLog log; - - private List filesToDelete = new ArrayList<>(); - +public class AppServer extends AppServerBase { /** * Constructor for AppServer. */ public AppServer() { - this(0, -1); + super(); } /** @@ -110,7 +45,7 @@ public AppServer() { * @since 4.2 */ public AppServer(int port) { - this(port, -1); + super(port); } /** @@ -124,185 +59,7 @@ public AppServer(int port) { * @since 4.9 */ public AppServer(int port, int sslPort) { - server = new Server(); - - config = new HttpConfiguration(); - config.setSecureScheme("https"); - config.setSecurePort(0); - config.setOutputBufferSize(32768); - - connector = new ServerConnector(server, - new HttpConnectionFactory(config)); - connector.setPort(port); - String ip; - String hostName; - try { - final InetAddress me = InetAddress.getByName("localhost"); - ip = me.getHostAddress(); - connector.setHost(ip); - hostName = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - throw new RuntimeException("Cannot find localhost", e); - } - - if (sslPort >= 0) { - SslContextFactory.Server sslContextFactory = createTestSslContextFactory( - hostName, ip); - secureConfig = new HttpConfiguration(config); - secureConfig.addCustomizer(new SecureRequestCustomizer()); - HttpConnectionFactory http11 = new HttpConnectionFactory( - secureConfig); - SslConnectionFactory tls = new SslConnectionFactory( - sslContextFactory, http11.getProtocol()); - secureConnector = new ServerConnector(server, tls, http11); - secureConnector.setPort(sslPort); - secureConnector.setHost(ip); - } else { - secureConfig = null; - secureConnector = null; - } - - contexts = new ContextHandlerCollection(); - - log = new TestRequestLog(); - log.setHandler(contexts); - - if (secureConnector == null) { - server.setConnectors(new Connector[] { connector }); - } else { - server.setConnectors( - new Connector[] { connector, secureConnector }); - } - server.setHandler(log); - } - - private SslContextFactory.Server createTestSslContextFactory( - String hostName, String ip) { - SslContextFactory.Server factory = new SslContextFactory.Server(); - - String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; - - try { - File tmpDir = Files.createTempDirectory("jks").toFile(); - tmpDir.deleteOnExit(); - makePrivate(tmpDir); - File keyStore = new File(tmpDir, "keystore.jks"); - File keytool = new File( - new File(new File(System.getProperty("java.home")), "bin"), - "keytool"); - Runtime.getRuntime().exec( - new String[] { - keytool.getAbsolutePath(), // - "-keystore", keyStore.getAbsolutePath(), // - "-storepass", keyPassword, - "-alias", hostName, // - "-ext", "bc=ca:true", // - "-ext", - String.format( - "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", - ip, hostName), // - "-genkeypair", // - "-keyalg", "RSA", // - "-keypass", keyPassword, // - "-dname", dName, // - "-validity", "2" // - }).waitFor(); - keyStore.deleteOnExit(); - makePrivate(keyStore); - filesToDelete.add(keyStore); - filesToDelete.add(tmpDir); - factory.setKeyStorePath(keyStore.getAbsolutePath()); - factory.setKeyStorePassword(keyPassword); - factory.setKeyManagerPassword(keyPassword); - factory.setTrustStorePath(keyStore.getAbsolutePath()); - factory.setTrustStorePassword(keyPassword); - } catch (InterruptedException | IOException e) { - throw new RuntimeException("Cannot create ssl key/certificate", e); - } - return factory; - } - - private void makePrivate(File file) { - file.setReadable(false); - file.setWritable(false); - file.setExecutable(false); - file.setReadable(true, true); - file.setWritable(true, true); - if (file.isDirectory()) { - file.setExecutable(true, true); - } - } - - /** - * Create a new servlet context within the server. - *

- * This method should be invoked before the server is started, once for each - * context the caller wants to register. - * - * @param path - * path of the context; use "/" for the root context if binding - * to the root is desired. - * @return the context to add servlets into. - * @since 7.0 - */ - public ServletContextHandler addContext(String path) { - assertNotYetSetUp(); - if ("".equals(path)) - path = "/"; - - ServletContextHandler ctx = new ServletContextHandler(); - ctx.setContextPath(path); - contexts.addHandler(ctx); - - return ctx; - } - - /** - * Configure basic authentication. - * - * @param ctx - * servlet context handler - * @param methods - * the methods - * @return servlet context handler - * @since 7.0 - */ - public ServletContextHandler authBasic(ServletContextHandler ctx, - String... methods) { - assertNotYetSetUp(); - auth(ctx, new BasicAuthenticator(), methods); - return ctx; - } - - static class TestMappedLoginService extends AbstractLoginService { - private RolePrincipal role; - - protected final Map users = new ConcurrentHashMap<>(); - - TestMappedLoginService(String role) { - this.role = new RolePrincipal(role); - } - - @Override - protected void doStart() throws Exception { - UserPrincipal p = new UserPrincipal(username, - new Password(password)); - users.put(username, p); - super.doStart(); - } - - @Override - protected UserPrincipal loadUserInfo(String user) { - return users.get(user); - } - - @Override - protected List loadRoleInfo(UserPrincipal user) { - if (users.get(user.getName()) == null) { - return null; - } - return Collections.singletonList(role); - } + super(port, sslPort); } private ConstraintMapping createConstraintMapping() { @@ -315,8 +72,9 @@ private ConstraintMapping createConstraintMapping() { return cm; } - private void auth(ServletContextHandler ctx, Authenticator authType, - String... methods) { + @Override + protected void configureAuthentication(ServletContextHandler ctx, + String[] methods) { AbstractLoginService users = new TestMappedLoginService(authRole); List mappings = new ArrayList<>(); if (methods == null || methods.length == 0) { @@ -331,133 +89,12 @@ private void auth(ServletContextHandler ctx, Authenticator authType, ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); sec.setRealmName(realm); - sec.setAuthenticator(authType); + sec.setAuthenticator(new BasicAuthenticator()); sec.setLoginService(users); - sec.setConstraintMappings( - mappings.toArray(new ConstraintMapping[0])); + sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); sec.setHandler(ctx); contexts.removeHandler(ctx); contexts.addHandler(sec); } - - /** - * Start the server on a random local port. - * - * @throws Exception - * the server cannot be started, testing is not possible. - */ - public void setUp() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.start(); - config.setSecurePort(getSecurePort()); - if (secureConfig != null) { - secureConfig.setSecurePort(getSecurePort()); - } - } - - /** - * Shutdown the server. - * - * @throws Exception - * the server refuses to halt, or wasn't running. - */ - public void tearDown() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.stop(); - for (File f : filesToDelete) { - f.delete(); - } - filesToDelete.clear(); - } - - /** - * Get the URI to reference this server. - *

- * The returned URI includes the proper host name and port number, but does - * not contain a path. - * - * @return URI to reference this server's root context. - */ - public URI getURI() { - assertAlreadySetUp(); - String host = connector.getHost(); - if (host.contains(":") && !host.startsWith("[")) - host = "[" + host + "]"; - final String uri = "http://" + host + ":" + getPort(); - try { - return new URI(uri); - } catch (URISyntaxException e) { - throw new RuntimeException("Unexpected URI error on " + uri, e); - } - } - - /** - * Get port. - * - * @return the local port number the server is listening on. - */ - public int getPort() { - assertAlreadySetUp(); - return connector.getLocalPort(); - } - - /** - * Get secure port. - * - * @return the HTTPS port or -1 if not configured. - */ - public int getSecurePort() { - assertAlreadySetUp(); - return secureConnector != null ? secureConnector.getLocalPort() : -1; - } - - /** - * Get requests. - * - * @return all requests since the server was started. - */ - public List getRequests() { - return new ArrayList<>(log.getEvents()); - } - - /** - * Get requests. - * - * @param base - * base URI used to access the server. - * @param path - * the path to locate requests for, relative to {@code base}. - * @return all requests which match the given path. - */ - public List getRequests(URIish base, String path) { - return getRequests(HttpTestCase.join(base, path)); - } - - /** - * Get requests. - * - * @param path - * the path to locate requests for. - * @return all requests which match the given path. - */ - public List getRequests(String path) { - ArrayList r = new ArrayList<>(); - for (AccessEvent event : log.getEvents()) { - if (event.getPath().equals(path)) { - r.add(event); - } - } - return r; - } - - private void assertNotYetSetUp() { - assertFalse("server is not running", server.isRunning()); - } - - private void assertAlreadySetUp() { - assertTrue("server is running", server.isRunning()); - } } diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java new file mode 100644 index 00000000000..bc2baadd837 --- /dev/null +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java @@ -0,0 +1,441 @@ +/* + * Copyright (C) 2010, 2017 Google Inc. and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.junit.http; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.security.AbstractLoginService; +import org.eclipse.jetty.security.RolePrincipal; +import org.eclipse.jetty.security.UserPrincipal; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.util.security.Password; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.eclipse.jgit.transport.URIish; + +/** + * Tiny web application server for unit testing. + *

+ * Tests should start the server in their {@code setUp()} method and stop the + * server in their {@code tearDown()} method. Only while started the server's + * URL and/or port number can be obtained. + *

+ * The Jetty security API for declaring authentication constraints differs + * between EE generations. That part is therefore isolated in the abstract + * {@link #configureAuthentication(ServletContextHandler, String[])} seam, which + * the concrete {@code AppServer} provides for its servlet generation. + */ +public abstract class AppServerBase { + /** Realm name for the secure access areas. */ + public static final String realm = "Secure Area"; + + /** Username for secured access areas. */ + public static final String username = "agitter"; + + /** Password for {@link #username} in secured access areas. */ + public static final String password = "letmein"; + + /** SSL keystore password; must have at least 6 characters. */ + private static final String keyPassword = "mykeys"; + + /** Role for authentication. */ + protected static final String authRole = "can-access"; + + static { + // Install a logger that throws warning messages. + // + final String prop = "org.eclipse.jetty.util.log.class"; + System.setProperty(prop, RecordingLogger.class.getName()); + } + + private final Server server; + + private final HttpConfiguration config; + + private final ServerConnector connector; + + private final HttpConfiguration secureConfig; + + private final ServerConnector secureConnector; + + /** Collection the servlet contexts are registered in. */ + protected final ContextHandlerCollection contexts; + + private final TestRequestLog log; + + private List filesToDelete = new ArrayList<>(); + + /** + * Constructor for AppServer. + */ + protected AppServerBase() { + this(0, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * the http port number; may be zero to allocate a port + * dynamically + */ + protected AppServerBase(int port) { + this(port, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * for http, may be zero to allocate a port dynamically + * @param sslPort + * for https,may be zero to allocate a port dynamically. If + * negative, the server will be set up without https support. + */ + protected AppServerBase(int port, int sslPort) { + server = new Server(); + + config = new HttpConfiguration(); + config.setSecureScheme("https"); + config.setSecurePort(0); + config.setOutputBufferSize(32768); + + connector = new ServerConnector(server, + new HttpConnectionFactory(config)); + connector.setPort(port); + String ip; + String hostName; + try { + final InetAddress me = InetAddress.getByName("localhost"); + ip = me.getHostAddress(); + connector.setHost(ip); + hostName = InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + throw new RuntimeException("Cannot find localhost", e); + } + + if (sslPort >= 0) { + SslContextFactory.Server sslContextFactory = createTestSslContextFactory( + hostName, ip); + secureConfig = new HttpConfiguration(config); + secureConfig.addCustomizer(new SecureRequestCustomizer()); + HttpConnectionFactory http11 = new HttpConnectionFactory( + secureConfig); + SslConnectionFactory tls = new SslConnectionFactory( + sslContextFactory, http11.getProtocol()); + secureConnector = new ServerConnector(server, tls, http11); + secureConnector.setPort(sslPort); + secureConnector.setHost(ip); + } else { + secureConfig = null; + secureConnector = null; + } + + contexts = new ContextHandlerCollection(); + + log = new TestRequestLog(); + log.setHandler(contexts); + + if (secureConnector == null) { + server.setConnectors(new Connector[] { connector }); + } else { + server.setConnectors( + new Connector[] { connector, secureConnector }); + } + server.setHandler(log); + } + + private SslContextFactory.Server createTestSslContextFactory( + String hostName, String ip) { + SslContextFactory.Server factory = new SslContextFactory.Server(); + + String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; + + try { + File tmpDir = Files.createTempDirectory("jks").toFile(); + tmpDir.deleteOnExit(); + makePrivate(tmpDir); + File keyStore = new File(tmpDir, "keystore.jks"); + File keytool = new File( + new File(new File(System.getProperty("java.home")), "bin"), + "keytool"); + Runtime.getRuntime().exec( + new String[] { + keytool.getAbsolutePath(), // + "-keystore", keyStore.getAbsolutePath(), // + "-storepass", keyPassword, + "-alias", hostName, // + "-ext", "bc=ca:true", // + "-ext", + String.format( + "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", + ip, hostName), // + "-genkeypair", // + "-keyalg", "RSA", // + "-keypass", keyPassword, // + "-dname", dName, // + "-validity", "2" // + }).waitFor(); + keyStore.deleteOnExit(); + makePrivate(keyStore); + filesToDelete.add(keyStore); + filesToDelete.add(tmpDir); + factory.setKeyStorePath(keyStore.getAbsolutePath()); + factory.setKeyStorePassword(keyPassword); + factory.setKeyManagerPassword(keyPassword); + factory.setTrustStorePath(keyStore.getAbsolutePath()); + factory.setTrustStorePassword(keyPassword); + } catch (InterruptedException | IOException e) { + throw new RuntimeException("Cannot create ssl key/certificate", e); + } + return factory; + } + + private void makePrivate(File file) { + file.setReadable(false); + file.setWritable(false); + file.setExecutable(false); + file.setReadable(true, true); + file.setWritable(true, true); + if (file.isDirectory()) { + file.setExecutable(true, true); + } + } + + /** + * Create a new servlet context within the server. + *

+ * This method should be invoked before the server is started, once for each + * context the caller wants to register. + * + * @param path + * path of the context; use "/" for the root context if binding + * to the root is desired. + * @return the context to add servlets into. + * @since 7.0 + */ + public ServletContextHandler addContext(String path) { + assertNotYetSetUp(); + if ("".equals(path)) + path = "/"; + + ServletContextHandler ctx = new ServletContextHandler(); + ctx.setContextPath(path); + contexts.addHandler(ctx); + + return ctx; + } + + /** + * Configure basic authentication. + * + * @param ctx + * servlet context handler + * @param methods + * the methods + * @return servlet context handler + * @since 7.0 + */ + public ServletContextHandler authBasic(ServletContextHandler ctx, + String... methods) { + assertNotYetSetUp(); + configureAuthentication(ctx, methods); + return ctx; + } + + /** + * Install basic-authentication constraints on the given context. + *

+ * The Jetty security API used to build the constraints and attach the + * security handler differs between servlet generations, so each concrete + * {@code AppServer} implements this seam for its Jetty flavor. + * + * @param ctx + * servlet context handler to secure + * @param methods + * HTTP methods to constrain; empty constrains all methods + */ + protected abstract void configureAuthentication(ServletContextHandler ctx, + String[] methods); + + /** Login service mapping the single test user and role. */ + protected static class TestMappedLoginService extends AbstractLoginService { + private RolePrincipal role; + + protected final Map users = new ConcurrentHashMap<>(); + + TestMappedLoginService(String role) { + this.role = new RolePrincipal(role); + } + + @Override + protected void doStart() throws Exception { + UserPrincipal p = new UserPrincipal(username, + new Password(password)); + users.put(username, p); + super.doStart(); + } + + @Override + protected UserPrincipal loadUserInfo(String user) { + return users.get(user); + } + + @Override + protected List loadRoleInfo(UserPrincipal user) { + if (users.get(user.getName()) == null) { + return null; + } + return Collections.singletonList(role); + } + } + + /** + * Start the server on a random local port. + * + * @throws Exception + * the server cannot be started, testing is not possible. + */ + public void setUp() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.start(); + config.setSecurePort(getSecurePort()); + if (secureConfig != null) { + secureConfig.setSecurePort(getSecurePort()); + } + } + + /** + * Shutdown the server. + * + * @throws Exception + * the server refuses to halt, or wasn't running. + */ + public void tearDown() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.stop(); + for (File f : filesToDelete) { + f.delete(); + } + filesToDelete.clear(); + } + + /** + * Get the URI to reference this server. + *

+ * The returned URI includes the proper host name and port number, but does + * not contain a path. + * + * @return URI to reference this server's root context. + */ + public URI getURI() { + assertAlreadySetUp(); + String host = connector.getHost(); + if (host.contains(":") && !host.startsWith("[")) + host = "[" + host + "]"; + final String uri = "http://" + host + ":" + getPort(); + try { + return new URI(uri); + } catch (URISyntaxException e) { + throw new RuntimeException("Unexpected URI error on " + uri, e); + } + } + + /** + * Get port. + * + * @return the local port number the server is listening on. + */ + public int getPort() { + assertAlreadySetUp(); + return connector.getLocalPort(); + } + + /** + * Get secure port. + * + * @return the HTTPS port or -1 if not configured. + */ + public int getSecurePort() { + assertAlreadySetUp(); + return secureConnector != null ? secureConnector.getLocalPort() : -1; + } + + /** + * Get requests. + * + * @return all requests since the server was started. + */ + public List getRequests() { + return new ArrayList<>(log.getEvents()); + } + + /** + * Get requests. + * + * @param base + * base URI used to access the server. + * @param path + * the path to locate requests for, relative to {@code base}. + * @return all requests which match the given path. + */ + public List getRequests(URIish base, String path) { + return getRequests(HttpTestCase.join(base, path)); + } + + /** + * Get requests. + * + * @param path + * the path to locate requests for. + * @return all requests which match the given path. + */ + public List getRequests(String path) { + ArrayList r = new ArrayList<>(); + for (AccessEvent event : log.getEvents()) { + if (event.getPath().equals(path)) { + r.add(event); + } + } + return r; + } + + private void assertNotYetSetUp() { + assertFalse("server is not running", server.isRunning()); + } + + private void assertAlreadySetUp() { + assertTrue("server is running", server.isRunning()); + } +} From 2fa0e33478012b7eb41905b93f07fc2ed9ec97ea Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 1 Jul 2026 07:31:09 +0200 Subject: [PATCH 163/200] Align Jetty environment with Servlet API 6.1 Servlet API 6.0 corresponds to Jetty EE10, while Servlet API 6.1 corresponds to Jetty EE11. JGit already uses jakarta.servlet-api 6.1.0, so update the Jetty servlet dependency, imports, OSGi metadata, and target-platform files from EE10 to EE11. Update the EE8 generated-source check to reject EE11 imports after rewriting. The corresponding bazlets transform maps EE11 Jetty packages back to EE8 for the compatibility build. Jetty EE11 reports a charset parameter for the plain-text HEAD response in the dumb HTTP test. Compare only the media type there, since the test is not about charset selection. AppServerBase methods addContext and authBasic and HttpTestCase.toURIish change signature since they now use ee11 ServletContextHandler. Hence mark them @since 7.8 and suppress the API errors caused by the removal of the old methods using ee10 ServletContextHandler. Change-Id: I78e9a72102002b12c204d52826a53b66c5eaf8f0 --- MODULE.bazel | 4 +-- lib/BUILD | 6 ++--- .../META-INF/MANIFEST.MF | 4 +-- .../META-INF/MANIFEST.MF | 6 ++--- org.eclipse.jgit.http.test/pom.xml | 4 +-- .../jgit/http/test/AdvertiseErrorTest.java | 4 +-- .../http/test/DumbClientDumbServerTest.java | 6 ++--- .../http/test/DumbClientSmartServerTest.java | 13 +++++++--- .../jgit/http/test/ErrorServletTest.java | 4 +-- .../jgit/http/test/GitServletInitTest.java | 4 +-- .../http/test/GitServletResponseTests.java | 4 +-- .../jgit/http/test/HookMessageTest.java | 4 +-- .../jgit/http/test/HttpClientTests.java | 6 ++--- .../jgit/http/test/MeasurePackSizeTest.java | 4 +-- .../jgit/http/test/ProtocolErrorTest.java | 4 +-- .../jgit/http/test/RegexPipelineTest.java | 4 +-- .../http/test/SetAdditionalHeadersTest.java | 6 ++--- .../test/SmartClientSmartServerSslTest.java | 6 ++--- .../http/test/SmartClientSmartServerTest.java | 6 ++--- .../.settings/.api_filters | 25 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 8 +++--- org.eclipse.jgit.junit.http/pom.xml | 4 +-- .../eclipse/jgit/junit/http/AppServer.java | 6 ++--- .../jgit/junit/http/AppServerBase.java | 6 ++--- .../eclipse/jgit/junit/http/HttpTestCase.java | 4 +-- .../jgit/junit/http/SimpleHttpServer.java | 4 +-- .../META-INF/MANIFEST.MF | 6 ++--- org.eclipse.jgit.lfs.server.test/pom.xml | 4 +-- .../jgit/lfs/server/fs/LfsServerTest.java | 4 +-- .../META-INF/MANIFEST.MF | 6 ++--- .../org.eclipse.jgit.repository/category.xml | 4 +-- .../org.eclipse.jgit.target/jgit-4.34.target | 6 ++--- .../org.eclipse.jgit.target/jgit-4.35.target | 6 ++--- .../org.eclipse.jgit.target/jgit-4.36.target | 6 ++--- .../org.eclipse.jgit.target/jgit-4.37.target | 6 ++--- .../org.eclipse.jgit.target/jgit-4.38.target | 6 ++--- .../org.eclipse.jgit.target/jgit-4.39.target | 6 ++--- .../org.eclipse.jgit.target/jgit-4.40.target | 6 ++--- .../maven/dependencies.tpd | 4 +-- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 4 +-- .../org/eclipse/jgit/pgm/debug/LfsStore.java | 4 +-- pom.xml | 4 +-- tools/jgit-ee8/BUILD | 2 +- tools/jgit-ee8/README.md | 2 +- 45 files changed, 139 insertions(+), 107 deletions(-) create mode 100644 org.eclipse.jgit.junit.http/.settings/.api_filters diff --git a/MODULE.bazel b/MODULE.bazel index c4edb7dbc34..aeb38ac1bc6 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,7 +21,7 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g git_repository( name = "com_googlesource_gerrit_bazlets", - commit = "156bae8bb0d329d8886f681c723979cbdb39d37c", + commit = "5ef765b723e81759359048edb43d314046178ac4", remote = "https://gerrit.googlesource.com/bazlets", ) @@ -82,7 +82,7 @@ maven.install( "org.eclipse.jetty.ee8:jetty-ee8-nested:" + JETTY_VERSION, "org.eclipse.jetty.ee8:jetty-ee8-security:" + JETTY_VERSION, "org.eclipse.jetty.ee8:jetty-ee8-servlet:" + JETTY_VERSION, - "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VERSION, + "org.eclipse.jetty.ee11:jetty-ee11-servlet:" + JETTY_VERSION, "org.hamcrest:hamcrest:3.0", "org.mockito:mockito-core:5.23.0", "org.objenesis:objenesis:3.4", diff --git a/lib/BUILD b/lib/BUILD index 4ce0c1adc24..833f2eaf859 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -176,7 +176,7 @@ java_library( # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], exports = [ - "@external_deps//:org_eclipse_jetty_ee10_jetty_ee10_servlet", + "@external_deps//:org_eclipse_jetty_ee11_jetty_ee11_servlet", "@external_deps//:org_eclipse_jetty_jetty_util_ajax", ], ) @@ -218,10 +218,10 @@ java_library( ) java_library( - name = "jetty-ee10-servlet", + name = "jetty-ee11-servlet", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@external_deps//:org_eclipse_jetty_ee10_jetty_ee10_servlet"], + exports = ["@external_deps//:org_eclipse_jetty_ee11_jetty_ee11_servlet"], ) java_library( diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 245289b85d9..cac9050e685 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -18,8 +18,8 @@ Export-Package: org.eclipse.jgit.http.server;version="7.8.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", +Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)", + jakarta.servlet.http;version="[6.1.0,7.0.0)", org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", org.eclipse.jgit.internal.storage.dfs;version="[7.8.0,7.9.0)", diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index c7874e3aeed..aa39fe4db4d 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", +Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)", + jakarta.servlet.http;version="[6.1.0,7.0.0)", net.bytebuddy.agent;version="[1.9.0,2.0.0)", net.bytebuddy.dynamic.loading;version="[1.9.0,2.0.0)", org.apache.commons.codec;version="[1.6.0,2.0.0)", @@ -17,7 +17,7 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.4.0,5.0.0)", org.apache.http.message;version="[4.3.0,5.0.0)", - org.eclipse.jetty.ee10.servlet;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee11.servlet;version="[12.0.0,13.0.0)", org.eclipse.jetty.http;version="[12.0.0,13.0.0)", org.eclipse.jetty.io;version="[12.0.0,13.0.0)", org.eclipse.jetty.security;version="[12.0.0,13.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 66972ee96e1..9f4f49b0ffb 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -82,8 +82,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java index fd78ba888ca..dfc6660032e 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/AdvertiseErrorTest.java @@ -17,8 +17,8 @@ import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.RemoteRepositoryException; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java index 7ccc0e5d9af..2d78f81297c 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientDumbServerTest.java @@ -25,9 +25,9 @@ import java.util.List; import java.util.Map; -import org.eclipse.jetty.ee10.servlet.DefaultServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.DefaultServlet; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.NotSupportedException; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.http.AccessEvent; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java index 9b9f6843dee..b38c7545a98 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Map; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.NotSupportedException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.junit.TestRepository; @@ -140,7 +140,14 @@ public void testListRemote() throws IOException { assertEquals(join(remoteURI, "HEAD"), head.getPath()); assertEquals(0, head.getParameters().size()); assertEquals(200, head.getStatus()); - assertEquals("text/plain", head.getResponseHeader(HDR_CONTENT_TYPE)); + assertEquals("text/plain", + mediaType(head.getResponseHeader(HDR_CONTENT_TYPE))); + } + + private static String mediaType(String contentType) { + int parameterStart = contentType.indexOf(';'); + return parameterStart >= 0 ? contentType.substring(0, parameterStart) + : contentType; } @Test diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ErrorServletTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ErrorServletTest.java index 9a610c6b738..b78451e0a2e 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ErrorServletTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ErrorServletTest.java @@ -15,8 +15,8 @@ import java.net.HttpURLConnection; import java.net.URI; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.http.server.glue.ErrorServlet; import org.eclipse.jgit.junit.http.AppServer; import org.junit.After; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java index c8873606f33..6f9e99f460d 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletInitTest.java @@ -13,8 +13,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.junit.http.AppServer; import org.eclipse.jgit.junit.http.MockServletConfig; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java index 9331efa6030..b3fa32d26d4 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/GitServletResponseTests.java @@ -17,8 +17,8 @@ import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.errors.TooLargePackException; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java index 082d853f42d..af4a2ea9578 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HookMessageTest.java @@ -22,8 +22,8 @@ import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java index 2737a492fc2..9ee91af53f1 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java @@ -30,9 +30,9 @@ import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.DefaultServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.DefaultServlet; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.errors.NoRemoteRepositoryException; import org.eclipse.jgit.errors.RepositoryNotFoundException; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java index 183043b2d42..9165cfe30d2 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/MeasurePackSizeTest.java @@ -16,8 +16,8 @@ import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.http.server.resolver.DefaultReceivePackFactory; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java index 74028d762d5..36865018a18 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java @@ -22,8 +22,8 @@ import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.http.server.GitSmartHttpTools; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/RegexPipelineTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/RegexPipelineTest.java index dfdb975ef61..ee75997fb59 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/RegexPipelineTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/RegexPipelineTest.java @@ -59,8 +59,8 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.http.server.glue.MetaServlet; import org.eclipse.jgit.http.server.glue.RegexGroupFilter; import org.eclipse.jgit.junit.http.AppServer; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java index d5694316845..0cd019133aa 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SetAdditionalHeadersTest.java @@ -20,9 +20,9 @@ import java.util.List; import java.util.Map; -import org.eclipse.jetty.ee10.servlet.DefaultServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.DefaultServlet; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.http.AccessEvent; import org.eclipse.jgit.lib.Repository; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerSslTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerSslTest.java index 13ed36cb8c4..b1857d6e382 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerSslTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerSslTest.java @@ -29,9 +29,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.jetty.ee10.servlet.FilterHolder; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.FilterHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.errors.UnsupportedCredentialItem; import org.eclipse.jgit.http.server.GitServlet; diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 46a48f7e704..84b9fe6e1e0 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -52,9 +52,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.jetty.ee10.servlet.FilterHolder; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.FilterHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.TransportConfigCallback; import org.eclipse.jgit.errors.NoRemoteRepositoryException; diff --git a/org.eclipse.jgit.junit.http/.settings/.api_filters b/org.eclipse.jgit.junit.http/.settings/.api_filters new file mode 100644 index 00000000000..1736f52f9f2 --- /dev/null +++ b/org.eclipse.jgit.junit.http/.settings/.api_filters @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 7c958ea636b..0de8b2edbef 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -9,11 +9,11 @@ Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", +Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)", + jakarta.servlet.http;version="[6.1.0,7.0.0)", org.apache.commons.logging;version="[1.1.1,2.0.0)", - org.eclipse.jetty.ee10.servlet;version="[12.0.0,13.0.0)", - org.eclipse.jetty.ee10.servlet.security;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee11.servlet;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee11.servlet.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.http;version="[12.0.0,13.0.0)", org.eclipse.jetty.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.security.authentication;version="[12.0.0,13.0.0)", diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 0993930d6e9..951ef3e083c 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -58,8 +58,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 3a4bce7419e..710442e2baf 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -14,9 +14,9 @@ import java.util.List; import java.util.Locale; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.security.ConstraintMapping; -import org.eclipse.jetty.ee10.servlet.security.ConstraintSecurityHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.security.ConstraintMapping; +import org.eclipse.jetty.ee11.servlet.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.AbstractLoginService; import org.eclipse.jetty.security.Constraint; import org.eclipse.jetty.security.authentication.BasicAuthenticator; diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java index bc2baadd837..6a71f884ebb 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; import org.eclipse.jetty.security.AbstractLoginService; import org.eclipse.jetty.security.RolePrincipal; import org.eclipse.jetty.security.UserPrincipal; @@ -241,7 +241,7 @@ private void makePrivate(File file) { * path of the context; use "/" for the root context if binding * to the root is desired. * @return the context to add servlets into. - * @since 7.0 + * @since 7.8 */ public ServletContextHandler addContext(String path) { assertNotYetSetUp(); @@ -263,7 +263,7 @@ public ServletContextHandler addContext(String path) { * @param methods * the methods * @return servlet context handler - * @since 7.0 + * @since 7.8 */ public ServletContextHandler authBasic(ServletContextHandler ctx, String... methods) { diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java index f399471b398..ef56b6cfd61 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/HttpTestCase.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; import org.eclipse.jgit.junit.TestRepository; @@ -109,7 +109,7 @@ protected URIish toURIish(String path) throws URISyntaxException { * @return the warnings (if any) from the last execution * @throws URISyntaxException * if URI is invalid - * @since 7.0 + * @since 7.8 */ protected URIish toURIish(ServletContextHandler app, String name) throws URISyntaxException { diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java index bce41383d17..63f7ddf39c0 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/SimpleHttpServer.java @@ -15,8 +15,8 @@ import jakarta.servlet.http.HttpServletRequest; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.http.server.GitServlet; import org.eclipse.jgit.lib.Repository; 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 d7e377253af..5a923f51f77 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -8,14 +8,14 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", +Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)", + jakarta.servlet.http;version="[6.1.0,7.0.0)", org.apache.http;version="[4.4.0,5.0.0)", org.apache.http.client;version="[4.4.0,5.0.0)", org.apache.http.client.methods;version="[4.4.0,5.0.0)", org.apache.http.entity;version="[4.4.0,5.0.0)", org.apache.http.impl.client;version="[4.4.0,5.0.0)", - org.eclipse.jetty.ee10.servlet;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee11.servlet;version="[12.0.0,13.0.0)", org.eclipse.jetty.http;version="[12.0.0,13.0.0)", org.eclipse.jetty.io;version="[12.0.0,13.0.0)", org.eclipse.jetty.security;version="[12.0.0,13.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index af7b471c6ad..3620dd75266 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -74,8 +74,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet test diff --git a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java index 9a49023fcba..f1b070c7586 100644 --- a/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java +++ b/org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java @@ -39,8 +39,8 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.junit.MockSystemReader; import org.eclipse.jgit.junit.http.AppServer; import org.eclipse.jgit.lfs.errors.LfsException; diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index e643a522bfb..68d7877451a 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -21,9 +21,9 @@ Export-Package: org.eclipse.jgit.lfs.server;version="7.8.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Import-Package: com.google.gson;version="[2.8.0,3.0.0)", - jakarta.servlet;version="[6.0.0,7.0.0)", - jakarta.servlet.annotation;version="[6.0.0,7.0.0)", - jakarta.servlet.http;version="[6.0.0,7.0.0)", + jakarta.servlet;version="[6.1.0,7.0.0)", + jakarta.servlet.annotation;version="[6.1.0,7.0.0)", + jakarta.servlet.http;version="[6.1.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", org.eclipse.jgit.internal;version="[7.8.0,7.9.0)", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index ead448d796c..c369bdbfd93 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -105,10 +105,10 @@ - + - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 8c41fe27bc6..7c94ad996ea 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -111,8 +111,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index a2026552c73..015e85ffb62 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -111,8 +111,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 5587f6339a0..5fd49d2c0fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -111,8 +111,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 34a2eae0360..80de5b9a045 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -111,8 +111,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index e453d08bead..39816a48716 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -111,8 +111,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index e246863bb20..d83c59037f1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -111,8 +111,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index ca068bf2bbd..0c2bf1f7bf6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -111,8 +111,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet 12.1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 76f199bb0a1..50572469333 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -152,8 +152,8 @@ maven jetty includeSources { dependency { - groupId = "org.eclipse.jetty.ee10" - artifactId = "jetty-ee10-servlet" + groupId = "org.eclipse.jetty.ee11" + artifactId = "jetty-ee11-servlet" version = "12.1.10" } dependency { diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index a0bace41ebc..83dc25ad146 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", +Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)", org.apache.commons.logging;version="[1.2,2.0)", - org.eclipse.jetty.ee10.servlet;version="[12.0.0,13.0.0)", + org.eclipse.jetty.ee11.servlet;version="[12.0.0,13.0.0)", org.eclipse.jetty.server;version="[12.0.0,13.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index bb437240a31..042033d8c42 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -107,8 +107,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java index 757c4357228..fa40431118f 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java @@ -26,8 +26,8 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lfs.server.LargeFileRepository; import org.eclipse.jgit.lfs.server.LfsProtocolServlet; diff --git a/pom.xml b/pom.xml index bcd85085996..4f20b635093 100644 --- a/pom.xml +++ b/pom.xml @@ -928,8 +928,8 @@ - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet ${jetty-version} diff --git a/tools/jgit-ee8/BUILD b/tools/jgit-ee8/BUILD index f6681ccf163..2c09b5aee48 100644 --- a/tools/jgit-ee8/BUILD +++ b/tools/jgit-ee8/BUILD @@ -7,7 +7,7 @@ sh_test( "--forbid", "jakarta\\.servlet", "--forbid", - "org\\.eclipse\\.jetty\\.ee10\\.servlet", + "org\\.eclipse\\.jetty\\.ee11\\.servlet", "--forbid", "org\\.eclipse\\.jgit\\..*\\.ee8", "--require-if-source", diff --git a/tools/jgit-ee8/README.md b/tools/jgit-ee8/README.md index 7bb2f477aa7..d867a1ddb26 100644 --- a/tools/jgit-ee8/README.md +++ b/tools/jgit-ee8/README.md @@ -53,7 +53,7 @@ three HTTP server utility tests. It is not part of the default EE8 suite because those classes already run under `//org.eclipse.jgit.http.test.ee8:http`. The test rewrite rules also map Jetty test helper imports from -`org.eclipse.jetty.ee10.servlet` to the Jetty EE8 packages needed by the tests. +`org.eclipse.jetty.ee11.servlet` to the Jetty EE8 packages needed by the tests. They are intentionally test-only and separate from the production `jakarta.servlet` to `javax.servlet` rules. From d29c264b2983782418b4c8357a6422750edfa15c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 2 Jul 2026 14:01:29 +0200 Subject: [PATCH 164/200] Document where to find SBOMs for JGit releases Bug: https://gitlab.eclipse.org/eclipsefdn/emo-team/emo/-/work_items/1218 Change-Id: I6173f1f824ac6d507a06155f31d60da51a9ca7fa --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index acd12279b7e..c69aded4df5 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,15 @@ __org.eclipse.jgit.junit.ssh__: Helpers for unit testing - __org.eclipse.jgit.ssh.apache.test__: Unit tests for org.eclipse.jgit.ssh.apache - __org.eclipse.jgit.test__: Unit tests for org.eclipse.jgit +## SBOM + +To enhance supply chain security and offer users clear insight into project components, +Eclipse JGit now generates a Software Bill of Materials (SBOM) for every release. +These are published to the Eclipse Foundation SBOM registry +[Eclipse Foundation SBOM registry](https://sbom.eclipse.org/projects/e315d88f-0474-4a00-a6ed-0b95e62a2acc/collectionprojects), +with access instructions and usage details available in +this [documentation](https://eclipse-csi.github.io/security-handbook/sbom/registry.html). + ## Warnings/Caveats - Native symbolic links are supported, provided the file system supports From 79ba6b83bb0125d8f0b7613ca69a8dc3c387f39f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 7 Jul 2026 11:08:33 +0200 Subject: [PATCH 165/200] PullCommandTest#testPullConflictDiff3: assert pull result to fix errorprone error "UnusedVariable" ``` $ bazelisk test //... ... Did you mean 'assertEquals(MergeStatus.CONFLICTING,' or 'assertEquals(/* expected= */res.getMergeResult().getMergeStatus(),'? org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java:191: error: [UnusedVariable] This assignment to the local variable 'res' is never read. res = target.pull().call(); ^ (see https://errorprone.info/bugpattern/UnusedVariable) ``` Change-Id: I92e53dbe383fc16e9ba1a2fefbe2cf304bf0d8ad --- .../tst/org/eclipse/jgit/api/PullCommandTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java index 5c33f038cf1..2dc77cf509b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java @@ -189,6 +189,9 @@ public void testPullConflictDiff3() throws Exception { CONFIG_KEY_CONFLICTSTYLE, ConflictStyle.DIFF3); res = target.pull().call(); + assertFalse(res.getFetchResult().getTrackingRefUpdates().isEmpty()); + assertTrue(res.getMergeResult().getMergeStatus() + .equals(MergeStatus.CONFLICTING)); String sourceChangeString = "Source change\n>>>>>>> branch 'master' of " + target.getRepository().getConfig().getString("remote", From 120a2ef4e497d22811be1c3444abafb4e5501372 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 24 Jun 2026 17:05:08 +0200 Subject: [PATCH 166/200] Bazel: format build files with buildifier Change-Id: I7a654fe8f138c4e59687d65a3ada4bfee4e51173 --- lib/BUILD | 6 +- lib/jmh/BUILD | 4 +- org.eclipse.jgit.benchmarks/BUILD | 2 +- org.eclipse.jgit.junit.http/BUILD | 5 +- org.eclipse.jgit.junit/BUILD | 5 +- org.eclipse.jgit.pgm.test/BUILD | 2 +- org.eclipse.jgit.test/BUILD | 7 +- org.eclipse.jgit/BUILD | 12 +- tools/BUILD | 783 +++++++++++++++--------------- 9 files changed, 417 insertions(+), 409 deletions(-) diff --git a/lib/BUILD b/lib/BUILD index 20b85dafa17..c1a36721cff 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -264,10 +264,10 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@external_deps//:net_bytebuddy_byte_buddy_agent", + "@external_deps//:junit_junit", "@external_deps//:net_bytebuddy_byte_buddy", + "@external_deps//:net_bytebuddy_byte_buddy_agent", "@external_deps//:org_hamcrest_hamcrest", - "@external_deps//:junit_junit", "@external_deps//:org_mockito_mockito_core", "@external_deps//:org_objenesis_objenesis", ], @@ -278,8 +278,8 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@external_deps//:net_bytebuddy_byte_buddy_agent", "@external_deps//:net_bytebuddy_byte_buddy", + "@external_deps//:net_bytebuddy_byte_buddy_agent", "@external_deps//:org_mockito_mockito_core", "@external_deps//:org_objenesis_objenesis", ], diff --git a/lib/jmh/BUILD b/lib/jmh/BUILD index 2b15300bfbc..e6d39770159 100644 --- a/lib/jmh/BUILD +++ b/lib/jmh/BUILD @@ -4,9 +4,9 @@ java_library( name = "jmh", visibility = ["//visibility:public"], exports = [ - "@external_deps//:org_openjdk_jmh_jmh_generator_annprocess", - "@external_deps//:org_openjdk_jmh_jmh_core", "@external_deps//:net_sf_jopt_simple_jopt_simple", "@external_deps//:org_apache_commons_commons_math3", + "@external_deps//:org_openjdk_jmh_jmh_core", + "@external_deps//:org_openjdk_jmh_jmh_generator_annprocess", ], ) diff --git a/org.eclipse.jgit.benchmarks/BUILD b/org.eclipse.jgit.benchmarks/BUILD index 7c311e79946..91ceb7fe5f7 100644 --- a/org.eclipse.jgit.benchmarks/BUILD +++ b/org.eclipse.jgit.benchmarks/BUILD @@ -6,8 +6,8 @@ SRCS = glob( jmh_java_benchmarks( name = "benchmarks", - srcs = SRCS, testonly = 1, + srcs = SRCS, deps = [ "//lib:javaewah", "//lib:junit", diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 66620cea510..87dcf3ecfce 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -6,7 +6,10 @@ java_library( name = "junit-http", testonly = 1, srcs = glob(["src/**/*.java"]), - resources = glob(["resources/**"], allow_empty=True), + resources = glob( + ["resources/**"], + allow_empty = True, + ), # TODO(davido): we want here provided deps deps = [ "//lib:jetty-http", diff --git a/org.eclipse.jgit.junit/BUILD b/org.eclipse.jgit.junit/BUILD index f4a7165dbbb..8879cd98b69 100644 --- a/org.eclipse.jgit.junit/BUILD +++ b/org.eclipse.jgit.junit/BUILD @@ -7,7 +7,10 @@ java_library( testonly = 1, srcs = glob(["src/**/*.java"]), resource_strip_prefix = "org.eclipse.jgit.junit/resources", - resources = glob(["resources/**"], allow_empty=True), + resources = glob( + ["resources/**"], + allow_empty = True, + ), deps = [ "//lib:junit", # We want these deps to be provided_deps diff --git a/org.eclipse.jgit.pgm.test/BUILD b/org.eclipse.jgit.pgm.test/BUILD index b8ffa695940..fdd87d3e95e 100644 --- a/org.eclipse.jgit.pgm.test/BUILD +++ b/org.eclipse.jgit.pgm.test/BUILD @@ -15,8 +15,8 @@ junit_tests( deps = [ ":helpers", "//lib:args4j", - "//lib:commons-io", "//lib:commons-compress", + "//lib:commons-io", "//lib:javaewah", "//lib:junit", "//lib:slf4j-api", diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index 7755df04996..7dab36d0676 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -53,10 +53,11 @@ tests(tests = glob( exclude = HELPERS + DATA + EXCLUDED, )) - -tests(tests = glob(["exttst/**/*.java"]), +tests( + extra_tags = ["ext"], srcprefix = "exttst/", - extra_tags = ["ext"]) + tests = glob(["exttst/**/*.java"]), +) # Non abstract base classes used for tests by other test classes BASE = [ diff --git a/org.eclipse.jgit/BUILD b/org.eclipse.jgit/BUILD index 1e9b7708a0f..5d4bce4207a 100644 --- a/org.eclipse.jgit/BUILD +++ b/org.eclipse.jgit/BUILD @@ -16,6 +16,12 @@ RESOURCES = glob(["resources/**"]) java_library( name = "jgit_non_stamped", srcs = SRCS, + javacopts = [ + "-Xep:ReferenceEquality:OFF", + "-Xep:StringEquality:OFF", + "-Xep:TypeParameterUnusedInFormals:OFF", + "-Xep:DefaultCharset:OFF", + ], resource_strip_prefix = "org.eclipse.jgit/resources", resources = RESOURCES, deps = [ @@ -24,12 +30,6 @@ java_library( "//lib:javaewah", "//lib:slf4j-api", ], - javacopts = [ - "-Xep:ReferenceEquality:OFF", - "-Xep:StringEquality:OFF", - "-Xep:TypeParameterUnusedInFormals:OFF", - "-Xep:DefaultCharset:OFF", - ] ) genrule( diff --git a/tools/BUILD b/tools/BUILD index 379a9bd34cb..4238054dadf 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -35,398 +35,399 @@ default_java_toolchain( # https://github.com/bazelbuild/BUILD_file_generator/blob/master/tools/bazel_defs/java.bzl # However, feel free to add any additional errors. Thus far they have all been pretty useful. errorprone_checks = [ - "-XepDisableWarningsInGeneratedCode", - # The XepDisableWarningsInGeneratedCode disables only warnings, but - # not errors. We should manually exclude all files generated by - # AutoValue; such files always start $AutoValue_..... - # XepExcludedPaths is a regexp. If you need more paths - use | as - # separator. - "-XepExcludedPaths:.*/\\\\$$AutoValue_.*\\.java", - "-Xep:AlmostJavadoc:ERROR", - "-Xep:AlwaysThrows:ERROR", - "-Xep:AmbiguousMethodReference:ERROR", - # don't want to add dependency to errorprone - "-Xep:AnnotateFormatMethod:OFF", - "-Xep:ArgumentSelectionDefectChecker:ERROR", - "-Xep:ArrayAsKeyOfSetOrMap:ERROR", - "-Xep:ArrayEquals:ERROR", - "-Xep:ArrayFillIncompatibleType:ERROR", - "-Xep:ArrayHashCode:ERROR", - "-Xep:ArraysAsListPrimitiveArray:ERROR", - "-Xep:ArrayToString:ERROR", - "-Xep:AssertEqualsArgumentOrderChecker:WARN", - "-Xep:AssertionFailureIgnored:WARN", - "-Xep:AsyncCallableReturnsNull:ERROR", - "-Xep:AsyncFunctionReturnsNull:ERROR", - "-Xep:AutoValueConstructorOrderChecker:ERROR", - "-Xep:AutoValueFinalMethods:ERROR", - "-Xep:AutoValueImmutableFields:ERROR", - "-Xep:AutoValueSubclassLeaked:WARN", - "-Xep:BadAnnotationImplementation:ERROR", - "-Xep:BadComparable:ERROR", - "-Xep:BadImport:ERROR", - "-Xep:BadInstanceof:ERROR", - "-Xep:BadShiftAmount:ERROR", - "-Xep:BanSerializableRead:ERROR", - "-Xep:BigDecimalEquals:ERROR", - "-Xep:BigDecimalLiteralDouble:ERROR", - "-Xep:BoxedPrimitiveConstructor:ERROR", - "-Xep:BoxedPrimitiveEquality:ERROR", - "-Xep:BundleDeserializationCast:ERROR", - "-Xep:ByteBufferBackingArray:WARN", - "-Xep:CacheLoaderNull:ERROR", - "-Xep:CannotMockFinalClass:ERROR", - "-Xep:CanonicalDuration:ERROR", - "-Xep:CatchAndPrintStackTrace:ERROR", - "-Xep:CatchFail:ERROR", - "-Xep:ChainedAssertionLosesContext:ERROR", - "-Xep:ChainingConstructorIgnoresParameter:ERROR", - "-Xep:CharacterGetNumericValue:ERROR", - "-Xep:CheckNotNullMultipleTimes:ERROR", - "-Xep:CheckReturnValue:ERROR", - "-Xep:ClassCanBeStatic:ERROR", - "-Xep:ClassName:ERROR", - "-Xep:ClassNewInstance:ERROR", - "-Xep:CollectionIncompatibleType:ERROR", - "-Xep:CollectionToArraySafeParameter:ERROR", - "-Xep:CollectionUndefinedEquality:ERROR", - "-Xep:CollectorShouldNotUseState:ERROR", - "-Xep:ComparableAndComparator:ERROR", - "-Xep:ComparableType:ERROR", - "-Xep:CompareToZero:ERROR", - "-Xep:ComparingThisWithNull:ERROR", - "-Xep:ComparisonOutOfRange:ERROR", - "-Xep:CompatibleWithAnnotationMisuse:ERROR", - "-Xep:CompileTimeConstant:ERROR", - "-Xep:ComplexBooleanConstant:ERROR", - "-Xep:ComputeIfAbsentAmbiguousReference:ERROR", - "-Xep:ConditionalExpressionNumericPromotion:ERROR", - "-Xep:ConstantOverflow:ERROR", - "-Xep:DaggerProvidesNull:ERROR", - "-Xep:DangerousLiteralNull:ERROR", - "-Xep:DateChecker:ERROR", - "-Xep:DateFormatConstant:ERROR", - "-Xep:DeadException:ERROR", - "-Xep:DeadThread:ERROR", - "-Xep:DefaultCharset:ERROR", - "-Xep:DefaultPackage:ERROR", - "-Xep:DepAnn:ERROR", - "-Xep:DeprecatedVariable:ERROR", - "-Xep:DiscardedPostfixExpression:ERROR", - "-Xep:DoNotCall:ERROR", - "-Xep:DoNotCallSuggester:ERROR", - "-Xep:DoNotClaimAnnotations:ERROR", - "-Xep:DoNotMock:ERROR", - "-Xep:DoNotMockAutoValue:WARN", - "-Xep:DoubleBraceInitialization:ERROR", - "-Xep:DoubleCheckedLocking:ERROR", - "-Xep:DuplicateMapKeys:ERROR", - "-Xep:DurationFrom:ERROR", - "-Xep:DurationGetTemporalUnit:ERROR", - "-Xep:DurationTemporalUnit:ERROR", - "-Xep:DurationToLongTimeUnit:ERROR", - "-Xep:EmptyBlockTag:WARN", - "-Xep:EmptyCatch:ERROR", - "-Xep:EmptySetMultibindingContributions:ERROR", - "-Xep:EqualsGetClass:ERROR", - "-Xep:EqualsHashCode:ERROR", - "-Xep:EqualsIncompatibleType:ERROR", - "-Xep:EqualsNaN:ERROR", - "-Xep:EqualsNull:ERROR", - "-Xep:EqualsReference:ERROR", - "-Xep:EqualsUnsafeCast:ERROR", - "-Xep:EqualsUsingHashCode:ERROR", - "-Xep:EqualsWrongThing:ERROR", - "-Xep:ErroneousThreadPoolConstructorChecker:ERROR", - "-Xep:EscapedEntity:WARN", - "-Xep:ExpectedExceptionChecker:ERROR", - "-Xep:ExtendingJUnitAssert:ERROR", - "-Xep:ExtendsAutoValue:ERROR", - "-Xep:FallThrough:ERROR", - "-Xep:Finally:ERROR", - "-Xep:FloatCast:ERROR", - "-Xep:FloatingPointAssertionWithinEpsilon:ERROR", - "-Xep:FloatingPointLiteralPrecision:ERROR", - "-Xep:FloggerArgumentToString:ERROR", - "-Xep:FloggerFormatString:ERROR", - "-Xep:FloggerLogVarargs:ERROR", - "-Xep:FloggerSplitLogStatement:ERROR", - "-Xep:FloggerStringConcatenation:ERROR", - "-Xep:FormatString:ERROR", - "-Xep:FormatStringAnnotation:ERROR", - "-Xep:ForOverride:ERROR", - "-Xep:FragmentInjection:ERROR", - "-Xep:FragmentNotInstantiable:ERROR", - "-Xep:FromTemporalAccessor:ERROR", - "-Xep:FunctionalInterfaceClash:ERROR", - "-Xep:FunctionalInterfaceMethodChanged:ERROR", - "-Xep:FutureReturnValueIgnored:ERROR", - "-Xep:FuturesGetCheckedIllegalExceptionType:ERROR", - "-Xep:GetClassOnAnnotation:ERROR", - "-Xep:GetClassOnClass:ERROR", - "-Xep:GetClassOnEnum:ERROR", - "-Xep:GuardedBy:ERROR", - "-Xep:GuiceAssistedInjectScoping:ERROR", - "-Xep:GuiceAssistedParameters:ERROR", - "-Xep:HashtableContains:ERROR", - "-Xep:HidingField:WARN", - "-Xep:IdentityBinaryExpression:ERROR", - "-Xep:IdentityHashMapBoxing:ERROR", - "-Xep:IdentityHashMapUsage:ERROR", - "-Xep:IgnoredPureGetter:ERROR", - "-Xep:Immutable:ERROR", - "-Xep:ImmutableAnnotationChecker:ERROR", - "-Xep:ImmutableEnumChecker:ERROR", - "-Xep:ImmutableModification:ERROR", - "-Xep:Incomparable:ERROR", - "-Xep:IncompatibleArgumentType:ERROR", - "-Xep:IncompatibleModifiers:ERROR", - "-Xep:InconsistentCapitalization:WARN", - "-Xep:InconsistentHashCode:ERROR", - "-Xep:IncrementInForLoopAndHeader:ERROR", - "-Xep:IndexOfChar:ERROR", - "-Xep:InexactVarargsConditional:ERROR", - "-Xep:InfiniteRecursion:ERROR", - "-Xep:InheritDoc:ERROR", - "-Xep:InjectOnConstructorOfAbstractClass:ERROR", - "-Xep:InlineFormatString:ERROR", - "-Xep:InlineMeInliner:ERROR", - # don't want to add dependency to errorprone - "-Xep:InlineMeSuggester:OFF", - "-Xep:InlineMeValidator:ERROR", - "-Xep:InputStreamSlowMultibyteRead:ERROR", - "-Xep:InsecureCryptoUsage:ERROR", - "-Xep:InstanceOfAndCastMatchWrongType:ERROR", - "-Xep:InstantTemporalUnit:ERROR", - "-Xep:IntLongMath:ERROR", - "-Xep:InvalidBlockTag:ERROR", - "-Xep:InvalidInlineTag:ERROR", - "-Xep:InvalidJavaTimeConstant:ERROR", - "-Xep:InvalidLink:ERROR", - "-Xep:InvalidParam:ERROR", - "-Xep:InvalidPatternSyntax:ERROR", - "-Xep:InvalidThrows:ERROR", - "-Xep:InvalidThrowsLink:ERROR", - "-Xep:InvalidTimeZoneID:ERROR", - "-Xep:InvalidZoneId:ERROR", - "-Xep:IsInstanceIncompatibleType:ERROR", - "-Xep:IsInstanceOfClass:ERROR", - "-Xep:IsLoggableTagLength:ERROR", - "-Xep:IterableAndIterator:ERROR", - "-Xep:IterablePathParameter:ERROR", - "-Xep:JavaDurationGetSecondsGetNano:ERROR", - "-Xep:JavaDurationWithNanos:ERROR", - "-Xep:JavaDurationWithSeconds:ERROR", - "-Xep:JavaInstantGetSecondsGetNano:ERROR", - "-Xep:JavaLangClash:ERROR", - "-Xep:JavaLocalDateTimeGetNano:ERROR", - "-Xep:JavaLocalTimeGetNano:ERROR", - "-Xep:JavaPeriodGetDays:ERROR", - "-Xep:JavaTimeDefaultTimeZone:ERROR", - "-Xep:JavaUtilDate:WARN", - "-Xep:JdkObsolete:ERROR", - "-Xep:JodaConstructors:ERROR", - "-Xep:JodaDateTimeConstants:ERROR", - "-Xep:JodaDurationWithMillis:ERROR", - "-Xep:JodaInstantWithMillis:ERROR", - "-Xep:JodaNewPeriod:ERROR", - "-Xep:JodaPlusMinusLong:ERROR", - "-Xep:JodaTimeConverterManager:ERROR", - "-Xep:JodaToSelf:ERROR", - "-Xep:JodaWithDurationAddedLong:ERROR", - "-Xep:JUnit3FloatingPointComparisonWithoutDelta:ERROR", - "-Xep:JUnit3TestNotRun:ERROR", - "-Xep:JUnit4ClassAnnotationNonStatic:ERROR", - "-Xep:JUnit4ClassUsedInJUnit3:ERROR", - "-Xep:JUnit4SetUpNotRun:ERROR", - "-Xep:JUnit4TearDownNotRun:ERROR", - "-Xep:JUnit4TestNotRun:ERROR", - "-Xep:JUnit4TestsNotRunWithinEnclosed:ERROR", - "-Xep:JUnitAmbiguousTestClass:ERROR", - "-Xep:JUnitAssertSameCheck:ERROR", - "-Xep:JUnitParameterMethodNotFound:ERROR", - "-Xep:LiteByteStringUtf8:ERROR", - "-Xep:LiteEnumValueOf:ERROR", - "-Xep:LiteProtoToString:ERROR", - "-Xep:LocalDateTemporalAmount:ERROR", - "-Xep:LockNotBeforeTry:ERROR", - "-Xep:LockOnBoxedPrimitive:ERROR", - "-Xep:LogicalAssignment:ERROR", - "-Xep:LongFloatConversion:ERROR", - "-Xep:LongLiteralLowerCaseSuffix:ERROR", - "-Xep:LoopConditionChecker:ERROR", - "-Xep:LoopOverCharArray:ERROR", - "-Xep:LossyPrimitiveCompare:ERROR", - "-Xep:MathAbsoluteRandom:ERROR", - "-Xep:MathRoundIntLong:ERROR", - "-Xep:MemoizeConstantVisitorStateLookups:ERROR", - "-Xep:MislabeledAndroidString:ERROR", - "-Xep:MissingCasesInEnumSwitch:ERROR", - "-Xep:MissingFail:ERROR", - "-Xep:MissingOverride:ERROR", - "-Xep:MissingSummary:WARN", - "-Xep:MissingSuperCall:ERROR", - "-Xep:MissingTestCall:ERROR", - "-Xep:MisusedDayOfYear:ERROR", - "-Xep:MisusedWeekYear:ERROR", - "-Xep:MixedDescriptors:ERROR", - "-Xep:MixedMutabilityReturnType:WARN", - "-Xep:MockitoUsage:ERROR", - "-Xep:ModifiedButNotUsed:ERROR", - "-Xep:ModifyCollectionInEnhancedForLoop:ERROR", - "-Xep:ModifyingCollectionWithItself:ERROR", - "-Xep:ModifySourceCollectionInStream:ERROR", - "-Xep:MultipleParallelOrSequentialCalls:ERROR", - "-Xep:MultipleUnaryOperatorsInMethodCall:ERROR", - "-Xep:MustBeClosedChecker:ERROR", - "-Xep:MutableConstantField:ERROR", - # Java provides no good alternative - "-Xep:MutablePublicArray:OFF", - "-Xep:NarrowingCompoundAssignment:ERROR", - "-Xep:NCopiesOfChar:ERROR", - "-Xep:NestedInstanceOfConditions:ERROR", - "-Xep:NonAtomicVolatileUpdate:ERROR", - "-Xep:NonCanonicalStaticImport:ERROR", - "-Xep:NonCanonicalType:ERROR", - "-Xep:NonFinalCompileTimeConstant:ERROR", - "-Xep:NonOverridingEquals:ERROR", - "-Xep:NonRuntimeAnnotation:ERROR", - "-Xep:NullableConstructor:ERROR", - "-Xep:NullablePrimitive:ERROR", - "-Xep:NullablePrimitiveArray:ERROR", - "-Xep:NullableVoid:ERROR", - "-Xep:NullOptional:ERROR", - "-Xep:NullTernary:ERROR", - "-Xep:ObjectEqualsForPrimitives:ERROR", - "-Xep:ObjectsHashCodePrimitive:ERROR", - "-Xep:ObjectToString:ERROR", - "-Xep:OperatorPrecedence:ERROR", - "-Xep:OptionalEquality:ERROR", - "-Xep:OptionalMapToOptional:ERROR", - "-Xep:OptionalMapUnusedValue:ERROR", - "-Xep:OptionalNotPresent:ERROR", - "-Xep:OptionalOfRedundantMethod:ERROR", - "-Xep:OrphanedFormatString:ERROR", - "-Xep:OutlineNone:ERROR", - "-Xep:OverlappingQualifierAndScopeAnnotation:ERROR", - "-Xep:Overrides:ERROR", - "-Xep:OverridesGuiceInjectableMethod:ERROR", - "-Xep:OverridesJavaxInjectableMethod:ERROR", - "-Xep:OverrideThrowableToString:ERROR", - "-Xep:PackageInfo:ERROR", - "-Xep:ParameterName:ERROR", - "-Xep:ParametersButNotParameterized:ERROR", - "-Xep:ParcelableCreator:ERROR", - "-Xep:PeriodFrom:ERROR", - "-Xep:PeriodGetTemporalUnit:ERROR", - "-Xep:PeriodTimeMath:ERROR", - "-Xep:PreconditionsCheckNotNullRepeated:ERROR", - "-Xep:PreconditionsInvalidPlaceholder:ERROR", - "-Xep:PreferredInterfaceType:OFF", - "-Xep:PrimitiveAtomicReference:ERROR", - "-Xep:PrivateSecurityContractProtoAccess:ERROR", - "-Xep:ProtectedMembersInFinalClass:ERROR", - "-Xep:ProtoBuilderReturnValueIgnored:ERROR", - "-Xep:ProtocolBufferOrdinal:ERROR", - "-Xep:ProtoDurationGetSecondsGetNano:ERROR", - "-Xep:ProtoFieldNullComparison:ERROR", - "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR", - "-Xep:ProtoRedundantSet:ERROR", - "-Xep:ProtoStringFieldReferenceEquality:ERROR", - "-Xep:ProtoTimestampGetSecondsGetNano:ERROR", - "-Xep:ProtoTruthMixedDescriptors:ERROR", - "-Xep:ProvidesMethodOutsideOfModule:ERROR", - "-Xep:RandomCast:ERROR", - "-Xep:RandomModInteger:ERROR", - "-Xep:ReachabilityFenceUsage:ERROR", - "-Xep:RectIntersectReturnValueIgnored:ERROR", - "-Xep:ReferenceEquality:ERROR", - "-Xep:RefersToDaggerCodegen:ERROR", - "-Xep:RemovedInJDK11:ERROR", - "-Xep:RequiredModifiers:ERROR", - "-Xep:RestrictedApiChecker:ERROR", - "-Xep:RethrowReflectiveOperationExceptionAsLinkageError:ERROR", - "-Xep:ReturnFromVoid:ERROR", - "-Xep:ReturnValueIgnored:ERROR", - "-Xep:RxReturnValueIgnored:ERROR", - "-Xep:SameNameButDifferent:ERROR", - "-Xep:SelfAssignment:ERROR", - "-Xep:SelfComparison:ERROR", - "-Xep:SelfEquals:ERROR", - "-Xep:ShortCircuitBoolean:ERROR", - "-Xep:ShouldHaveEvenArgs:ERROR", - "-Xep:SizeGreaterThanOrEqualsZero:ERROR", - "-Xep:StaticAssignmentInConstructor:ERROR", - "-Xep:StaticGuardedByInstance:ERROR", - "-Xep:StaticMockMember:ERROR", - "-Xep:StaticQualifiedUsingExpression:ERROR", - "-Xep:StreamToString:ERROR", - "-Xep:StringBuilderInitWithChar:ERROR", - "-Xep:StringEquality:ERROR", - "-Xep:StringSplitter:WARN", - "-Xep:SubstringOfZero:ERROR", - "-Xep:SuppressWarningsDeprecated:ERROR", - "-Xep:SwigMemoryLeak:ERROR", - "-Xep:SynchronizeOnNonFinalField:ERROR", - "-Xep:TemporalAccessorGetChronoField:ERROR", - "-Xep:TestParametersNotInitialized:ERROR", - "-Xep:TheoryButNoTheories:ERROR", - "-Xep:ThreadJoinLoop:ERROR", - "-Xep:ThreadLocalUsage:ERROR", - "-Xep:ThreadPriorityCheck:ERROR", - "-Xep:ThreeLetterTimeZoneID:WARN", - "-Xep:ThrowIfUncheckedKnownChecked:ERROR", - "-Xep:ThrowNull:ERROR", - "-Xep:TimeUnitConversionChecker:ERROR", - "-Xep:ToStringReturnsNull:ERROR", - "-Xep:TreeToString:ERROR", - "-Xep:TruthAssertExpected:ERROR", - "-Xep:TruthConstantAsserts:ERROR", - "-Xep:TruthGetOrDefault:ERROR", - "-Xep:TruthIncompatibleType:ERROR", - "-Xep:TruthSelfEquals:ERROR", - "-Xep:TryFailThrowable:ERROR", - "-Xep:TypeEquals:ERROR", - "-Xep:TypeNameShadowing:ERROR", - "-Xep:TypeParameterQualifier:ERROR", - "-Xep:TypeParameterShadowing:ERROR", - "-Xep:TypeParameterUnusedInFormals:ERROR", - "-Xep:UndefinedEquals:WARN", - "-Xep:UnescapedEntity:WARN", - "-Xep:UnnecessaryAssignment:ERROR", - "-Xep:UnnecessaryCheckNotNull:ERROR", - "-Xep:UnnecessaryLambda:ERROR", - "-Xep:UnnecessaryMethodInvocationMatcher:ERROR", - "-Xep:UnnecessaryMethodReference:ERROR", - "-Xep:UnnecessaryParentheses:ERROR", - "-Xep:UnnecessaryTypeArgument:ERROR", - "-Xep:UnrecognisedJavadocTag:ERROR", - "-Xep:UnsafeFinalization:ERROR", - "-Xep:UnsafeReflectiveConstructionCast:ERROR", - "-Xep:UnsynchronizedOverridesSynchronized:ERROR", - "-Xep:UnusedAnonymousClass:ERROR", - "-Xep:UnusedCollectionModifiedInPlace:ERROR", - "-Xep:UnusedException:ERROR", - "-Xep:UnusedMethod:WARN", - "-Xep:UnusedNestedClass:ERROR", - "-Xep:UnusedVariable:ERROR", - "-Xep:URLEqualsHashCode:ERROR", - "-Xep:UseBinds:ERROR", - "-Xep:UseCorrectAssertInTests:ERROR", - "-Xep:VariableNameSameAsType:ERROR", - "-Xep:VarTypeName:ERROR", - "-Xep:WaitNotInLoop:ERROR", - "-Xep:WakelockReleasedDangerously:ERROR", - "-Xep:WildcardImport:ERROR", - "-Xep:WithSignatureDiscouraged:ERROR", - "-Xep:WrongOneof:ERROR", - "-Xep:XorPower:ERROR", - "-Xep:ZoneIdOfZ:ERROR", + "-XepDisableWarningsInGeneratedCode", + # The XepDisableWarningsInGeneratedCode disables only warnings, but + # not errors. We should manually exclude all files generated by + # AutoValue; such files always start $AutoValue_..... + # XepExcludedPaths is a regexp. If you need more paths - use | as + # separator. + "-XepExcludedPaths:.*/\\\\$$AutoValue_.*\\.java", + "-Xep:AlmostJavadoc:ERROR", + "-Xep:AlwaysThrows:ERROR", + "-Xep:AmbiguousMethodReference:ERROR", + # don't want to add dependency to errorprone + "-Xep:AnnotateFormatMethod:OFF", + "-Xep:ArgumentSelectionDefectChecker:ERROR", + "-Xep:ArrayAsKeyOfSetOrMap:ERROR", + "-Xep:ArrayEquals:ERROR", + "-Xep:ArrayFillIncompatibleType:ERROR", + "-Xep:ArrayHashCode:ERROR", + "-Xep:ArraysAsListPrimitiveArray:ERROR", + "-Xep:ArrayToString:ERROR", + "-Xep:AssertEqualsArgumentOrderChecker:WARN", + "-Xep:AssertionFailureIgnored:WARN", + "-Xep:AsyncCallableReturnsNull:ERROR", + "-Xep:AsyncFunctionReturnsNull:ERROR", + "-Xep:AutoValueConstructorOrderChecker:ERROR", + "-Xep:AutoValueFinalMethods:ERROR", + "-Xep:AutoValueImmutableFields:ERROR", + "-Xep:AutoValueSubclassLeaked:WARN", + "-Xep:BadAnnotationImplementation:ERROR", + "-Xep:BadComparable:ERROR", + "-Xep:BadImport:ERROR", + "-Xep:BadInstanceof:ERROR", + "-Xep:BadShiftAmount:ERROR", + "-Xep:BanSerializableRead:ERROR", + "-Xep:BigDecimalEquals:ERROR", + "-Xep:BigDecimalLiteralDouble:ERROR", + "-Xep:BoxedPrimitiveConstructor:ERROR", + "-Xep:BoxedPrimitiveEquality:ERROR", + "-Xep:BundleDeserializationCast:ERROR", + "-Xep:ByteBufferBackingArray:WARN", + "-Xep:CacheLoaderNull:ERROR", + "-Xep:CannotMockFinalClass:ERROR", + "-Xep:CanonicalDuration:ERROR", + "-Xep:CatchAndPrintStackTrace:ERROR", + "-Xep:CatchFail:ERROR", + "-Xep:ChainedAssertionLosesContext:ERROR", + "-Xep:ChainingConstructorIgnoresParameter:ERROR", + "-Xep:CharacterGetNumericValue:ERROR", + "-Xep:CheckNotNullMultipleTimes:ERROR", + "-Xep:CheckReturnValue:ERROR", + "-Xep:ClassCanBeStatic:ERROR", + "-Xep:ClassName:ERROR", + "-Xep:ClassNewInstance:ERROR", + "-Xep:CollectionIncompatibleType:ERROR", + "-Xep:CollectionToArraySafeParameter:ERROR", + "-Xep:CollectionUndefinedEquality:ERROR", + "-Xep:CollectorShouldNotUseState:ERROR", + "-Xep:ComparableAndComparator:ERROR", + "-Xep:ComparableType:ERROR", + "-Xep:CompareToZero:ERROR", + "-Xep:ComparingThisWithNull:ERROR", + "-Xep:ComparisonOutOfRange:ERROR", + "-Xep:CompatibleWithAnnotationMisuse:ERROR", + "-Xep:CompileTimeConstant:ERROR", + "-Xep:ComplexBooleanConstant:ERROR", + "-Xep:ComputeIfAbsentAmbiguousReference:ERROR", + "-Xep:ConditionalExpressionNumericPromotion:ERROR", + "-Xep:ConstantOverflow:ERROR", + "-Xep:DaggerProvidesNull:ERROR", + "-Xep:DangerousLiteralNull:ERROR", + "-Xep:DateChecker:ERROR", + "-Xep:DateFormatConstant:ERROR", + "-Xep:DeadException:ERROR", + "-Xep:DeadThread:ERROR", + "-Xep:DefaultCharset:ERROR", + "-Xep:DefaultPackage:ERROR", + "-Xep:DepAnn:ERROR", + "-Xep:DeprecatedVariable:ERROR", + "-Xep:DiscardedPostfixExpression:ERROR", + "-Xep:DoNotCall:ERROR", + "-Xep:DoNotCallSuggester:ERROR", + "-Xep:DoNotClaimAnnotations:ERROR", + "-Xep:DoNotMock:ERROR", + "-Xep:DoNotMockAutoValue:WARN", + "-Xep:DoubleBraceInitialization:ERROR", + "-Xep:DoubleCheckedLocking:ERROR", + "-Xep:DuplicateMapKeys:ERROR", + "-Xep:DurationFrom:ERROR", + "-Xep:DurationGetTemporalUnit:ERROR", + "-Xep:DurationTemporalUnit:ERROR", + "-Xep:DurationToLongTimeUnit:ERROR", + "-Xep:EmptyBlockTag:WARN", + "-Xep:EmptyCatch:ERROR", + "-Xep:EmptySetMultibindingContributions:ERROR", + "-Xep:EqualsGetClass:ERROR", + "-Xep:EqualsHashCode:ERROR", + "-Xep:EqualsIncompatibleType:ERROR", + "-Xep:EqualsNaN:ERROR", + "-Xep:EqualsNull:ERROR", + "-Xep:EqualsReference:ERROR", + "-Xep:EqualsUnsafeCast:ERROR", + "-Xep:EqualsUsingHashCode:ERROR", + "-Xep:EqualsWrongThing:ERROR", + "-Xep:ErroneousThreadPoolConstructorChecker:ERROR", + "-Xep:EscapedEntity:WARN", + "-Xep:ExpectedExceptionChecker:ERROR", + "-Xep:ExtendingJUnitAssert:ERROR", + "-Xep:ExtendsAutoValue:ERROR", + "-Xep:FallThrough:ERROR", + "-Xep:Finally:ERROR", + "-Xep:FloatCast:ERROR", + "-Xep:FloatingPointAssertionWithinEpsilon:ERROR", + "-Xep:FloatingPointLiteralPrecision:ERROR", + "-Xep:FloggerArgumentToString:ERROR", + "-Xep:FloggerFormatString:ERROR", + "-Xep:FloggerLogVarargs:ERROR", + "-Xep:FloggerSplitLogStatement:ERROR", + "-Xep:FloggerStringConcatenation:ERROR", + "-Xep:FormatString:ERROR", + "-Xep:FormatStringAnnotation:ERROR", + "-Xep:ForOverride:ERROR", + "-Xep:FragmentInjection:ERROR", + "-Xep:FragmentNotInstantiable:ERROR", + "-Xep:FromTemporalAccessor:ERROR", + "-Xep:FunctionalInterfaceClash:ERROR", + "-Xep:FunctionalInterfaceMethodChanged:ERROR", + "-Xep:FutureReturnValueIgnored:ERROR", + "-Xep:FuturesGetCheckedIllegalExceptionType:ERROR", + "-Xep:GetClassOnAnnotation:ERROR", + "-Xep:GetClassOnClass:ERROR", + "-Xep:GetClassOnEnum:ERROR", + "-Xep:GuardedBy:ERROR", + "-Xep:GuiceAssistedInjectScoping:ERROR", + "-Xep:GuiceAssistedParameters:ERROR", + "-Xep:HashtableContains:ERROR", + "-Xep:HidingField:WARN", + "-Xep:IdentityBinaryExpression:ERROR", + "-Xep:IdentityHashMapBoxing:ERROR", + "-Xep:IdentityHashMapUsage:ERROR", + "-Xep:IgnoredPureGetter:ERROR", + "-Xep:Immutable:ERROR", + "-Xep:ImmutableAnnotationChecker:ERROR", + "-Xep:ImmutableEnumChecker:ERROR", + "-Xep:ImmutableModification:ERROR", + "-Xep:Incomparable:ERROR", + "-Xep:IncompatibleArgumentType:ERROR", + "-Xep:IncompatibleModifiers:ERROR", + "-Xep:InconsistentCapitalization:WARN", + "-Xep:InconsistentHashCode:ERROR", + "-Xep:IncrementInForLoopAndHeader:ERROR", + "-Xep:IndexOfChar:ERROR", + "-Xep:InexactVarargsConditional:ERROR", + "-Xep:InfiniteRecursion:ERROR", + "-Xep:InheritDoc:ERROR", + "-Xep:InjectOnConstructorOfAbstractClass:ERROR", + "-Xep:InlineFormatString:ERROR", + "-Xep:InlineMeInliner:ERROR", + # don't want to add dependency to errorprone + "-Xep:InlineMeSuggester:OFF", + "-Xep:InlineMeValidator:ERROR", + "-Xep:InputStreamSlowMultibyteRead:ERROR", + "-Xep:InsecureCryptoUsage:ERROR", + "-Xep:InstanceOfAndCastMatchWrongType:ERROR", + "-Xep:InstantTemporalUnit:ERROR", + "-Xep:IntLongMath:ERROR", + "-Xep:InvalidBlockTag:ERROR", + "-Xep:InvalidInlineTag:ERROR", + "-Xep:InvalidJavaTimeConstant:ERROR", + "-Xep:InvalidLink:ERROR", + "-Xep:InvalidParam:ERROR", + "-Xep:InvalidPatternSyntax:ERROR", + "-Xep:InvalidThrows:ERROR", + "-Xep:InvalidThrowsLink:ERROR", + "-Xep:InvalidTimeZoneID:ERROR", + "-Xep:InvalidZoneId:ERROR", + "-Xep:IsInstanceIncompatibleType:ERROR", + "-Xep:IsInstanceOfClass:ERROR", + "-Xep:IsLoggableTagLength:ERROR", + "-Xep:IterableAndIterator:ERROR", + "-Xep:IterablePathParameter:ERROR", + "-Xep:JavaDurationGetSecondsGetNano:ERROR", + "-Xep:JavaDurationWithNanos:ERROR", + "-Xep:JavaDurationWithSeconds:ERROR", + "-Xep:JavaInstantGetSecondsGetNano:ERROR", + "-Xep:JavaLangClash:ERROR", + "-Xep:JavaLocalDateTimeGetNano:ERROR", + "-Xep:JavaLocalTimeGetNano:ERROR", + "-Xep:JavaPeriodGetDays:ERROR", + "-Xep:JavaTimeDefaultTimeZone:ERROR", + "-Xep:JavaUtilDate:WARN", + "-Xep:JdkObsolete:ERROR", + "-Xep:JodaConstructors:ERROR", + "-Xep:JodaDateTimeConstants:ERROR", + "-Xep:JodaDurationWithMillis:ERROR", + "-Xep:JodaInstantWithMillis:ERROR", + "-Xep:JodaNewPeriod:ERROR", + "-Xep:JodaPlusMinusLong:ERROR", + "-Xep:JodaTimeConverterManager:ERROR", + "-Xep:JodaToSelf:ERROR", + "-Xep:JodaWithDurationAddedLong:ERROR", + "-Xep:JUnit3FloatingPointComparisonWithoutDelta:ERROR", + "-Xep:JUnit3TestNotRun:ERROR", + "-Xep:JUnit4ClassAnnotationNonStatic:ERROR", + "-Xep:JUnit4ClassUsedInJUnit3:ERROR", + "-Xep:JUnit4SetUpNotRun:ERROR", + "-Xep:JUnit4TearDownNotRun:ERROR", + "-Xep:JUnit4TestNotRun:ERROR", + "-Xep:JUnit4TestsNotRunWithinEnclosed:ERROR", + "-Xep:JUnitAmbiguousTestClass:ERROR", + "-Xep:JUnitAssertSameCheck:ERROR", + "-Xep:JUnitParameterMethodNotFound:ERROR", + "-Xep:LiteByteStringUtf8:ERROR", + "-Xep:LiteEnumValueOf:ERROR", + "-Xep:LiteProtoToString:ERROR", + "-Xep:LocalDateTemporalAmount:ERROR", + "-Xep:LockNotBeforeTry:ERROR", + "-Xep:LockOnBoxedPrimitive:ERROR", + "-Xep:LogicalAssignment:ERROR", + "-Xep:LongFloatConversion:ERROR", + "-Xep:LongLiteralLowerCaseSuffix:ERROR", + "-Xep:LoopConditionChecker:ERROR", + "-Xep:LoopOverCharArray:ERROR", + "-Xep:LossyPrimitiveCompare:ERROR", + "-Xep:MathAbsoluteRandom:ERROR", + "-Xep:MathRoundIntLong:ERROR", + "-Xep:MemoizeConstantVisitorStateLookups:ERROR", + "-Xep:MislabeledAndroidString:ERROR", + "-Xep:MissingCasesInEnumSwitch:ERROR", + "-Xep:MissingFail:ERROR", + "-Xep:MissingOverride:ERROR", + "-Xep:MissingSummary:WARN", + "-Xep:MissingSuperCall:ERROR", + "-Xep:MissingTestCall:ERROR", + "-Xep:MisusedDayOfYear:ERROR", + "-Xep:MisusedWeekYear:ERROR", + "-Xep:MixedDescriptors:ERROR", + "-Xep:MixedMutabilityReturnType:WARN", + "-Xep:MockitoUsage:ERROR", + "-Xep:ModifiedButNotUsed:ERROR", + "-Xep:ModifyCollectionInEnhancedForLoop:ERROR", + "-Xep:ModifyingCollectionWithItself:ERROR", + "-Xep:ModifySourceCollectionInStream:ERROR", + "-Xep:MultipleParallelOrSequentialCalls:ERROR", + "-Xep:MultipleUnaryOperatorsInMethodCall:ERROR", + "-Xep:MustBeClosedChecker:ERROR", + "-Xep:MutableConstantField:ERROR", + # Java provides no good alternative + "-Xep:MutablePublicArray:OFF", + "-Xep:NarrowingCompoundAssignment:ERROR", + "-Xep:NCopiesOfChar:ERROR", + "-Xep:NestedInstanceOfConditions:ERROR", + "-Xep:NonAtomicVolatileUpdate:ERROR", + "-Xep:NonCanonicalStaticImport:ERROR", + "-Xep:NonCanonicalType:ERROR", + "-Xep:NonFinalCompileTimeConstant:ERROR", + "-Xep:NonOverridingEquals:ERROR", + "-Xep:NonRuntimeAnnotation:ERROR", + "-Xep:NullableConstructor:ERROR", + "-Xep:NullablePrimitive:ERROR", + "-Xep:NullablePrimitiveArray:ERROR", + "-Xep:NullableVoid:ERROR", + "-Xep:NullOptional:ERROR", + "-Xep:NullTernary:ERROR", + "-Xep:ObjectEqualsForPrimitives:ERROR", + "-Xep:ObjectsHashCodePrimitive:ERROR", + "-Xep:ObjectToString:ERROR", + "-Xep:OperatorPrecedence:ERROR", + "-Xep:OptionalEquality:ERROR", + "-Xep:OptionalMapToOptional:ERROR", + "-Xep:OptionalMapUnusedValue:ERROR", + "-Xep:OptionalNotPresent:ERROR", + "-Xep:OptionalOfRedundantMethod:ERROR", + "-Xep:OrphanedFormatString:ERROR", + "-Xep:OutlineNone:ERROR", + "-Xep:OverlappingQualifierAndScopeAnnotation:ERROR", + "-Xep:Overrides:ERROR", + "-Xep:OverridesGuiceInjectableMethod:ERROR", + "-Xep:OverridesJavaxInjectableMethod:ERROR", + "-Xep:OverrideThrowableToString:ERROR", + "-Xep:PackageInfo:ERROR", + "-Xep:ParameterName:ERROR", + "-Xep:ParametersButNotParameterized:ERROR", + "-Xep:ParcelableCreator:ERROR", + "-Xep:PeriodFrom:ERROR", + "-Xep:PeriodGetTemporalUnit:ERROR", + "-Xep:PeriodTimeMath:ERROR", + "-Xep:PreconditionsCheckNotNullRepeated:ERROR", + "-Xep:PreconditionsInvalidPlaceholder:ERROR", + "-Xep:PreferredInterfaceType:OFF", + "-Xep:PrimitiveAtomicReference:ERROR", + "-Xep:PrivateSecurityContractProtoAccess:ERROR", + "-Xep:ProtectedMembersInFinalClass:ERROR", + "-Xep:ProtoBuilderReturnValueIgnored:ERROR", + "-Xep:ProtocolBufferOrdinal:ERROR", + "-Xep:ProtoDurationGetSecondsGetNano:ERROR", + "-Xep:ProtoFieldNullComparison:ERROR", + "-Xep:ProtoFieldPreconditionsCheckNotNull:ERROR", + "-Xep:ProtoRedundantSet:ERROR", + "-Xep:ProtoStringFieldReferenceEquality:ERROR", + "-Xep:ProtoTimestampGetSecondsGetNano:ERROR", + "-Xep:ProtoTruthMixedDescriptors:ERROR", + "-Xep:ProvidesMethodOutsideOfModule:ERROR", + "-Xep:RandomCast:ERROR", + "-Xep:RandomModInteger:ERROR", + "-Xep:ReachabilityFenceUsage:ERROR", + "-Xep:RectIntersectReturnValueIgnored:ERROR", + "-Xep:ReferenceEquality:ERROR", + "-Xep:RefersToDaggerCodegen:ERROR", + "-Xep:RemovedInJDK11:ERROR", + "-Xep:RequiredModifiers:ERROR", + "-Xep:RestrictedApiChecker:ERROR", + "-Xep:RethrowReflectiveOperationExceptionAsLinkageError:ERROR", + "-Xep:ReturnFromVoid:ERROR", + "-Xep:ReturnValueIgnored:ERROR", + "-Xep:RxReturnValueIgnored:ERROR", + "-Xep:SameNameButDifferent:ERROR", + "-Xep:SelfAssignment:ERROR", + "-Xep:SelfComparison:ERROR", + "-Xep:SelfEquals:ERROR", + "-Xep:ShortCircuitBoolean:ERROR", + "-Xep:ShouldHaveEvenArgs:ERROR", + "-Xep:SizeGreaterThanOrEqualsZero:ERROR", + "-Xep:StaticAssignmentInConstructor:ERROR", + "-Xep:StaticGuardedByInstance:ERROR", + "-Xep:StaticMockMember:ERROR", + "-Xep:StaticQualifiedUsingExpression:ERROR", + "-Xep:StreamToString:ERROR", + "-Xep:StringBuilderInitWithChar:ERROR", + "-Xep:StringEquality:ERROR", + "-Xep:StringSplitter:WARN", + "-Xep:SubstringOfZero:ERROR", + "-Xep:SuppressWarningsDeprecated:ERROR", + "-Xep:SwigMemoryLeak:ERROR", + "-Xep:SynchronizeOnNonFinalField:ERROR", + "-Xep:TemporalAccessorGetChronoField:ERROR", + "-Xep:TestParametersNotInitialized:ERROR", + "-Xep:TheoryButNoTheories:ERROR", + "-Xep:ThreadJoinLoop:ERROR", + "-Xep:ThreadLocalUsage:ERROR", + "-Xep:ThreadPriorityCheck:ERROR", + "-Xep:ThreeLetterTimeZoneID:WARN", + "-Xep:ThrowIfUncheckedKnownChecked:ERROR", + "-Xep:ThrowNull:ERROR", + "-Xep:TimeUnitConversionChecker:ERROR", + "-Xep:ToStringReturnsNull:ERROR", + "-Xep:TreeToString:ERROR", + "-Xep:TruthAssertExpected:ERROR", + "-Xep:TruthConstantAsserts:ERROR", + "-Xep:TruthGetOrDefault:ERROR", + "-Xep:TruthIncompatibleType:ERROR", + "-Xep:TruthSelfEquals:ERROR", + "-Xep:TryFailThrowable:ERROR", + "-Xep:TypeEquals:ERROR", + "-Xep:TypeNameShadowing:ERROR", + "-Xep:TypeParameterQualifier:ERROR", + "-Xep:TypeParameterShadowing:ERROR", + "-Xep:TypeParameterUnusedInFormals:ERROR", + "-Xep:UndefinedEquals:WARN", + "-Xep:UnescapedEntity:WARN", + "-Xep:UnnecessaryAssignment:ERROR", + "-Xep:UnnecessaryCheckNotNull:ERROR", + "-Xep:UnnecessaryLambda:ERROR", + "-Xep:UnnecessaryMethodInvocationMatcher:ERROR", + "-Xep:UnnecessaryMethodReference:ERROR", + "-Xep:UnnecessaryParentheses:ERROR", + "-Xep:UnnecessaryTypeArgument:ERROR", + "-Xep:UnrecognisedJavadocTag:ERROR", + "-Xep:UnsafeFinalization:ERROR", + "-Xep:UnsafeReflectiveConstructionCast:ERROR", + "-Xep:UnsynchronizedOverridesSynchronized:ERROR", + "-Xep:UnusedAnonymousClass:ERROR", + "-Xep:UnusedCollectionModifiedInPlace:ERROR", + "-Xep:UnusedException:ERROR", + "-Xep:UnusedMethod:WARN", + "-Xep:UnusedNestedClass:ERROR", + "-Xep:UnusedVariable:ERROR", + "-Xep:URLEqualsHashCode:ERROR", + "-Xep:UseBinds:ERROR", + "-Xep:UseCorrectAssertInTests:ERROR", + "-Xep:VariableNameSameAsType:ERROR", + "-Xep:VarTypeName:ERROR", + "-Xep:WaitNotInLoop:ERROR", + "-Xep:WakelockReleasedDangerously:ERROR", + "-Xep:WildcardImport:ERROR", + "-Xep:WithSignatureDiscouraged:ERROR", + "-Xep:WrongOneof:ERROR", + "-Xep:XorPower:ERROR", + "-Xep:ZoneIdOfZ:ERROR", ] - -exclude_in_tests = ["-Xep:EmptyBlockTag:WARN", - "-Xep:MissingSummary:WARN"] +exclude_in_tests = [ + "-Xep:EmptyBlockTag:WARN", + "-Xep:MissingSummary:WARN", +] java_package_configuration( name = "error_prone", @@ -436,7 +437,7 @@ java_package_configuration( java_package_configuration( name = "error_prone_tests", - javacopts = [ check for check in errorprone_checks if check not in exclude_in_tests], + javacopts = [check for check in errorprone_checks if check not in exclude_in_tests], packages = ["error_prone_packages_test"], ) From 66f03055758e273677aa995c613f366a8b8c635f Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 18 Jun 2026 09:21:29 +0200 Subject: [PATCH 167/200] Bazel: Rename //lib:servlet-api to //lib:jakarta-servlet-api //lib:servlet-api exported the canonical Jakarta servlet API (jakarta.servlet:jakarta.servlet-api:6.1.0). The name did not distinguish it from //lib:javax-servlet-api, which the EE8 bridge in //org.eclipse.jgit.http.server.ee8 and //org.eclipse.jgit.lfs.server.ee8 uses to depend on javax.servlet:javax.servlet-api:4.0.1. Rename the canonical target to //lib:jakarta-servlet-api so the API flavour is self-evident at consumer sites. Migrate the six in-tree consumers (http.server, http.test, junit.http, lfs.server, lfs.server.test, pgm) in the same change. No compatibility alias is kept: JGit is consumed from source by Gerrit through a git submodule, which has its own //lib:* wrappers, and the EE8 bridge commit added //lib:javax-servlet-api without an alias for the same reason. Change-Id: I764b01d171d2c2dc55fecef89bf4b36ce1cb9c59 --- lib/BUILD | 2 +- org.eclipse.jgit.http.server/BUILD | 2 +- org.eclipse.jgit.http.test/BUILD | 4 ++-- org.eclipse.jgit.junit.http/BUILD | 2 +- org.eclipse.jgit.lfs.server.test/BUILD | 2 +- org.eclipse.jgit.lfs.server/BUILD | 2 +- org.eclipse.jgit.pgm/BUILD | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/BUILD b/lib/BUILD index c1a36721cff..a84d93b9fd3 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -295,7 +295,7 @@ java_library( ) java_library( - name = "servlet-api", + name = "jakarta-servlet-api", visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.server:__pkg__", diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index a0dae488b83..cae8d8847b7 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -13,7 +13,7 @@ java_library( resource_strip_prefix = "org.eclipse.jgit.http.server/resources", resources = [":jgit-servlet-resources"], deps = [ - "//lib:servlet-api", + "//lib:jakarta-servlet-api", # We want these deps to be provided_deps "//org.eclipse.jgit:jgit", ], diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index 732b4fae2c1..bc04d229dd6 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -12,6 +12,7 @@ junit_tests( ":helpers", "//lib:commons-logging", "//lib:httpcore", + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", @@ -19,7 +20,6 @@ junit_tests( "//lib:jetty-servlet", "//lib:jetty-util", "//lib:junit", - "//lib:servlet-api", "//lib:slf4j-api", "//lib:slf4j-simple", "//org.eclipse.jgit.http.apache:http-apache", @@ -35,8 +35,8 @@ java_library( testonly = 1, srcs = glob(["src/**/*.java"]), deps = [ + "//lib:jakarta-servlet-api", "//lib:junit", - "//lib:servlet-api", "//org.eclipse.jgit:jgit", "//org.eclipse.jgit.junit:junit", ], diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 87dcf3ecfce..17a75701540 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -12,6 +12,7 @@ java_library( ), # TODO(davido): we want here provided deps deps = [ + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", @@ -20,7 +21,6 @@ java_library( "//lib:jetty-session", "//lib:jetty-util", "//lib:junit", - "//lib:servlet-api", "//lib:slf4j-api", "//org.eclipse.jgit.http.server:jgit-servlet", "//org.eclipse.jgit:jgit", diff --git a/org.eclipse.jgit.lfs.server.test/BUILD b/org.eclipse.jgit.lfs.server.test/BUILD index 76a0870a881..adc2df63c02 100644 --- a/org.eclipse.jgit.lfs.server.test/BUILD +++ b/org.eclipse.jgit.lfs.server.test/BUILD @@ -23,7 +23,7 @@ DEPS = [ "//lib:jetty-servlet", "//lib:jetty-security", "//lib:jetty-util", - "//lib:servlet-api", + "//lib:jakarta-servlet-api", ] junit_tests( diff --git a/org.eclipse.jgit.lfs.server/BUILD b/org.eclipse.jgit.lfs.server/BUILD index cd1831b8320..c363d52ad15 100644 --- a/org.eclipse.jgit.lfs.server/BUILD +++ b/org.eclipse.jgit.lfs.server/BUILD @@ -10,7 +10,7 @@ java_library( deps = [ "//lib:gson", "//lib:httpcore", - "//lib:servlet-api", + "//lib:jakarta-servlet-api", "//lib:slf4j-api", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit:jgit", diff --git a/org.eclipse.jgit.pgm/BUILD b/org.eclipse.jgit.pgm/BUILD index a267b155ac9..596aed2e24b 100644 --- a/org.eclipse.jgit.pgm/BUILD +++ b/org.eclipse.jgit.pgm/BUILD @@ -16,13 +16,13 @@ java_library( "//lib:commons-logging", "//lib:httpclient", "//lib:httpcore", + "//lib:jakarta-servlet-api", "//lib:jetty-http", "//lib:jetty-io", "//lib:jetty-security", "//lib:jetty-server", "//lib:jetty-servlet", "//lib:jetty-util", - "//lib:servlet-api", "//org.eclipse.jgit.archive:jgit-archive", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit:jgit", From 1a9c7be11fced35e38e5576bd4d77aaaf01af244 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 18 Jun 2026 05:08:19 +0200 Subject: [PATCH 168/200] Bazel: Add EE8 servlet bridge targets Add Bazel-only generated EE8 targets for the HTTP servlet and LFS server modules. The generated jars keep the original JGit Java packages and rewrite only servlet API references from jakarta.servlet to javax.servlet. The rewrite uses the shared servlet-flavour transform toolchain from bazlets (transform_srcjar + generated_srcs_test.sh under //tools). It is a plain sed package-prefix substitution; the universal servlet and Jetty package mapping lives in bazlets and this consumer selects only the direction (to_javax), so it carries no renames data and adds no Maven dependency (no Eclipse Transformer CLI). This supports source consumers that still run on EE8 while JGit master uses Jakarta servlet APIs. Gerrit is the known downstream consumer in that state today and consumes JGit from source through a git submodule. With these targets, Gerrit can track JGit master without a dedicated servlet-4 maintenance branch. The goal is to let the servlet-4 branch be retired for Gerrit's maintenance purposes. That branch was not offered as a stable JGit release line. Keeping Gerrit on it makes JGit updates hard for Gerrit, including updates for important fixes and improvements, and forces repeated merge work from master onto a parallel branch. Keep the maintenance surface small. The EE8 targets consume canonical srcs filegroups backed by glob(["src/**/*.java"]), so new Java sources flow into the generated jars without per-file BUILD updates. Resources are also shared through canonical filegroups. This Bazel change intentionally does not add Maven, Tycho/p2, or Maven Central publication machinery. Maven support is added by the follow-up Maven commit; Tycho/p2 remains out of scope because the EE8 jars export the same packages as their canonical Jakarta counterparts and are not co-installable with them. Also avoid relocating Java packages to org.eclipse.jgit.*.ee8. Keeping the same package names avoids source-consumer import churn, but means the canonical Jakarta jars and generated EE8 jars must not share a classpath. Possible follow-ups are duplicate-classpath enforcement for source consumers and additional generated EE8 modules only when a consumer needs them. Verify generated source layout, line counts, javax servlet rewriting, and the absence of package-renamed .ee8 sources. Change-Id: I897e4facbbae79349e8d1853ea4dab8d7087ba5b --- BUILD | 2 ++ MODULE.bazel | 4 ++- MODULE.bazel.lock | 3 +- lib/BUILD | 11 ++++++ org.eclipse.jgit.http.server.ee8/BUILD | 27 ++++++++++++++ org.eclipse.jgit.http.server/BUILD | 11 +++++- org.eclipse.jgit.lfs.server.ee8/BUILD | 32 +++++++++++++++++ org.eclipse.jgit.lfs.server/BUILD | 18 ++++++++-- tools/jgit-ee8/BUILD | 28 +++++++++++++++ tools/jgit-ee8/README.md | 50 ++++++++++++++++++++++++++ 10 files changed, 181 insertions(+), 5 deletions(-) create mode 100644 org.eclipse.jgit.http.server.ee8/BUILD create mode 100644 org.eclipse.jgit.lfs.server.ee8/BUILD create mode 100644 tools/jgit-ee8/BUILD create mode 100644 tools/jgit-ee8/README.md diff --git a/BUILD b/BUILD index b8d8b9f0b79..b9be9cb2820 100644 --- a/BUILD +++ b/BUILD @@ -10,8 +10,10 @@ genrule( "//org.eclipse.jgit.archive:jgit-archive", "//org.eclipse.jgit.http.apache:http-apache", "//org.eclipse.jgit.http.server:jgit-servlet", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", "//org.eclipse.jgit.lfs:jgit-lfs", "//org.eclipse.jgit.lfs.server:jgit-lfs-server", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8", "//org.eclipse.jgit.junit:junit", "//org.eclipse.jgit.ssh.apache:ssh-apache", "//org.eclipse.jgit.ssh.apache.agent:ssh-apache-agent", diff --git a/MODULE.bazel b/MODULE.bazel index 37077bcc069..e95290a7a5e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -2,6 +2,7 @@ module(name = "jgit") bazel_dep(name = "rules_java", version = "8.11.0") bazel_dep(name = "rules_jvm_external", version = "6.10") +bazel_dep(name = "rules_shell", version = "0.6.1") bazel_dep(name = "rbe_autoconfig") git_override( module_name = "rbe_autoconfig", @@ -17,7 +18,7 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g git_repository( name = "com_googlesource_gerrit_bazlets", - commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f", + commit = "156bae8bb0d329d8886f681c723979cbdb39d37c", remote = "https://gerrit.googlesource.com/bazlets", ) @@ -49,6 +50,7 @@ maven.install( "commons-io:commons-io:2.21.0", "commons-logging:commons-logging:1.3.5", "jakarta.servlet:jakarta.servlet-api:6.1.0", + "javax.servlet:javax.servlet-api:4.0.1", "junit:junit:4.13.2", "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 57178519264..fd0c91e82a2 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -191,7 +191,8 @@ "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c", "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b", "https://bcr.bazel.build/modules/rules_shell/0.4.1/MODULE.bazel": "00e501db01bbf4e3e1dd1595959092c2fadf2087b2852d3f553b5370f5633592", - "https://bcr.bazel.build/modules/rules_shell/0.4.1/source.json": "4757bd277fe1567763991c4425b483477bb82e35e777a56fd846eb5cceda324a", + "https://bcr.bazel.build/modules/rules_shell/0.6.1/MODULE.bazel": "72e76b0eea4e81611ef5452aa82b3da34caca0c8b7b5c0c9584338aa93bae26b", + "https://bcr.bazel.build/modules/rules_shell/0.6.1/source.json": "20ec05cd5e592055e214b2da8ccb283c7f2a421ea0dc2acbf1aa792e11c03d0c", "https://bcr.bazel.build/modules/rules_swift/1.16.0/MODULE.bazel": "4a09f199545a60d09895e8281362b1ff3bb08bbde69c6fc87aff5b92fcc916ca", "https://bcr.bazel.build/modules/rules_swift/2.1.1/MODULE.bazel": "494900a80f944fc7aa61500c2073d9729dff0b764f0e89b824eb746959bc1046", "https://bcr.bazel.build/modules/rules_swift/2.1.1/source.json": "40fc69dfaac64deddbb75bd99cdac55f4427d9ca0afbe408576a65428427a186", diff --git a/lib/BUILD b/lib/BUILD index a84d93b9fd3..2bd92093ca8 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -59,6 +59,7 @@ java_library( visibility = [ "//org.eclipse.jgit.lfs:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", ], exports = ["@external_deps//:com_google_code_gson_gson"], ) @@ -79,6 +80,7 @@ java_library( "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], @@ -308,6 +310,15 @@ java_library( exports = ["@external_deps//:jakarta_servlet_jakarta_servlet_api_6_1_0"], ) +java_library( + name = "javax-servlet-api", + visibility = [ + "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + ], + exports = ["@external_deps//:javax_servlet_javax_servlet_api"], +) + java_library( name = "slf4j-api", visibility = ["//visibility:public"], diff --git a/org.eclipse.jgit.http.server.ee8/BUILD b/org.eclipse.jgit.http.server.ee8/BUILD new file mode 100644 index 00000000000..df39628ccad --- /dev/null +++ b/org.eclipse.jgit.http.server.ee8/BUILD @@ -0,0 +1,27 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +package(default_visibility = ["//visibility:public"]) + +transform_srcjar( + name = "jgit-http-server-ee8-srcs", + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.server:srcs"], + src_prefix = "org.eclipse.jgit.http.server/src/", +) + +filegroup( + name = "jgit-servlet-ee8-srcjar", + srcs = [":jgit-http-server-ee8-srcs"], +) + +java_library( + name = "jgit-servlet-ee8", + srcs = [":jgit-http-server-ee8-srcs"], + resource_strip_prefix = "org.eclipse.jgit.http.server/resources", + resources = ["//org.eclipse.jgit.http.server:jgit-servlet-resources"], + deps = [ + "//lib:javax-servlet-api", + "//org.eclipse.jgit:jgit", + ], +) diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index cae8d8847b7..f6b4a1084fb 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -2,6 +2,15 @@ load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "srcs", + srcs = glob(["src/**/*.java"]), + visibility = [ + "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + filegroup( name = "jgit-servlet-resources", srcs = glob(["resources/**"]), @@ -9,7 +18,7 @@ filegroup( java_library( name = "jgit-servlet", - srcs = glob(["src/**/*.java"]), + srcs = [":srcs"], resource_strip_prefix = "org.eclipse.jgit.http.server/resources", resources = [":jgit-servlet-resources"], deps = [ diff --git a/org.eclipse.jgit.lfs.server.ee8/BUILD b/org.eclipse.jgit.lfs.server.ee8/BUILD new file mode 100644 index 00000000000..b07dae2cde3 --- /dev/null +++ b/org.eclipse.jgit.lfs.server.ee8/BUILD @@ -0,0 +1,32 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +package(default_visibility = ["//visibility:public"]) + +transform_srcjar( + name = "jgit-lfs-server-ee8-srcs", + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server:srcs"], + src_prefix = "org.eclipse.jgit.lfs.server/src/", +) + +filegroup( + name = "jgit-lfs-server-ee8-srcjar", + srcs = [":jgit-lfs-server-ee8-srcs"], +) + +java_library( + name = "jgit-lfs-server-ee8", + srcs = [":jgit-lfs-server-ee8-srcs"], + resource_strip_prefix = "org.eclipse.jgit.lfs.server/resources", + resources = ["//org.eclipse.jgit.lfs.server:jgit-lfs-server-resources"], + deps = [ + "//lib:gson", + "//lib:httpcore", + "//lib:javax-servlet-api", + "//lib:slf4j-api", + "//org.eclipse.jgit.http.apache:http-apache", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.lfs:jgit-lfs", + ], +) diff --git a/org.eclipse.jgit.lfs.server/BUILD b/org.eclipse.jgit.lfs.server/BUILD index c363d52ad15..d6b08a6ee94 100644 --- a/org.eclipse.jgit.lfs.server/BUILD +++ b/org.eclipse.jgit.lfs.server/BUILD @@ -2,11 +2,25 @@ load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "srcs", + srcs = glob(["src/**/*.java"]), + visibility = [ + "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "jgit-lfs-server-resources", + srcs = glob(["resources/**"]), +) + java_library( name = "jgit-lfs-server", - srcs = glob(["src/**/*.java"]), + srcs = [":srcs"], resource_strip_prefix = "org.eclipse.jgit.lfs.server/resources", - resources = glob(["resources/**"]), + resources = [":jgit-lfs-server-resources"], deps = [ "//lib:gson", "//lib:httpcore", diff --git a/tools/jgit-ee8/BUILD b/tools/jgit-ee8/BUILD new file mode 100644 index 00000000000..df5c27cd73d --- /dev/null +++ b/tools/jgit-ee8/BUILD @@ -0,0 +1,28 @@ +load("@rules_shell//shell:sh_test.bzl", "sh_test") + +sh_test( + name = "generated_srcs_test", + srcs = ["@com_googlesource_gerrit_bazlets//tools:generated_srcs_test.sh"], + args = [ + "--forbid", + "jakarta\\.servlet", + "--forbid", + "org\\.eclipse\\.jgit\\..*\\.ee8", + "--require", + "javax\\.servlet", + "--module", + "org.eclipse.jgit.http.server/src/", + "$(location //org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs)", + "$(locations //org.eclipse.jgit.http.server:srcs)", + "--module", + "org.eclipse.jgit.lfs.server/src/", + "$(location //org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs)", + "$(locations //org.eclipse.jgit.lfs.server:srcs)", + ], + data = [ + "//org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs", + "//org.eclipse.jgit.http.server:srcs", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs", + "//org.eclipse.jgit.lfs.server:srcs", + ], +) diff --git a/tools/jgit-ee8/README.md b/tools/jgit-ee8/README.md new file mode 100644 index 00000000000..5578d6553b5 --- /dev/null +++ b/tools/jgit-ee8/README.md @@ -0,0 +1,50 @@ +# JGit EE8 Bazel bridge + +This package contains the Bazel-only bridge for source consumers that still run +on EE8 and `javax.servlet` while JGit master uses `jakarta.servlet`. + +JGit hosts this bridge because Gerrit is a known downstream that consumes JGit +from source through a git submodule and still runs Jetty 12 EE8. Keeping the +bridge in JGit lets Gerrit track JGit master and avoids maintaining a long-lived +servlet-4 branch just for Gerrit. That branch was never a stable JGit release +line, so it is not a sustainable way for Gerrit to receive JGit maintenance +updates. + +The bridge intentionally keeps the original JGit package names. It rewrites only +servlet API references from `jakarta.servlet` to `javax.servlet`, then compiles +generated jars from the rewritten source jars. + +Generated targets: + +* `//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8` +* `//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8` + +Do not put one of these generated jars and its canonical Jakarta counterpart on +the same classpath. They contain the same JGit classes. + +This is intentionally limited to Bazel source consumers. It does not add Maven, +Tycho, p2, or Maven Central publication machinery. Those should be added only if +a non-Bazel consumer needs published EE8 artifacts. + +Run: + +```sh +bazelisk test //tools/jgit-ee8:generated_srcs_test +``` + +The test checks: + +* generated sources are derived from the canonical source filegroups +* generated srcjar entries use Java package paths +* generated sources preserve line counts for debugger breakpoints +* generated sources contain `javax.servlet`, not `jakarta.servlet` +* generated sources do not move JGit classes to an `.ee8` package + +Next steps: + +* Keep this source-consumer bridge while Gerrit runs on Jetty 12 EE8. +* Reuse these targets for other Bazel source consumers that need EE8 output. +* Add Maven/Tycho/p2 generation only when a non-Bazel consumer needs published + EE8 artifacts. +* Keep the canonical `srcs` filegroups aligned with each servlet-facing + `java_library` so new Java sources are transformed automatically. From 6dbcde7b2ff4c1a16a0df9c60d147161d7b52a9a Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 19 Jun 2026 14:26:26 +0200 Subject: [PATCH 169/200] Bazel: Add EE8 servlet test targets Add EE8 variants of the HTTP and LFS servlet test suites and run them against the generated EE8 servlet bridge artifacts. Generate EE8 test sources from the canonical Jakarta-based tests by rewriting servlet API references and Jetty EE10 test helper imports to their EE8 equivalents. Export canonical test source filegroups so the generated tests remain synchronized with the primary test suites. Introduce EE8 Jetty test dependencies, generated junit-http helpers, and JUnit suite generation for the transformed sources. Restore AppServer from the servlet-4 branch because its API usage cannot be converted mechanically. Extend generated-source verification to cover test sources and ensure that no Jakarta or Jetty EE10 servlet references remain in generated EE8 outputs. Test Plan: bazelisk test \ //tools/jgit-ee8:generated_srcs_test \ //org.eclipse.jgit.http.test.ee8/... \ //org.eclipse.jgit.lfs.server.test.ee8/... Change-Id: Id3d9312f0a93d443d83054a81b9d868611e18b27 --- MODULE.bazel | 3 + lib/BUILD | 36 ++ org.eclipse.jgit.http.test.ee8/BUILD | 84 ++++ org.eclipse.jgit.http.test/BUILD | 41 +- org.eclipse.jgit.junit.http.ee8/BUILD | 43 ++ .../eclipse/jgit/junit/http/AppServer.java | 461 ++++++++++++++++++ org.eclipse.jgit.junit.http/BUILD | 38 +- org.eclipse.jgit.lfs.server.test.ee8/BUILD | 65 +++ org.eclipse.jgit.lfs.server.test/BUILD | 29 ++ tools/jgit-ee8/BUILD | 29 +- tools/jgit-ee8/README.md | 29 +- 11 files changed, 849 insertions(+), 9 deletions(-) create mode 100644 org.eclipse.jgit.http.test.ee8/BUILD create mode 100644 org.eclipse.jgit.junit.http.ee8/BUILD create mode 100644 org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java create mode 100644 org.eclipse.jgit.lfs.server.test.ee8/BUILD diff --git a/MODULE.bazel b/MODULE.bazel index e95290a7a5e..ab705cb972c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -76,6 +76,9 @@ maven.install( "org.eclipse.jetty:jetty-session:" + JETTY_VERSION, "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VERSION, "org.eclipse.jetty:jetty-util:" + JETTY_VERSION, + "org.eclipse.jetty.ee8:jetty-ee8-nested:" + JETTY_VERSION, + "org.eclipse.jetty.ee8:jetty-ee8-security:" + JETTY_VERSION, + "org.eclipse.jetty.ee8:jetty-ee8-servlet:" + JETTY_VERSION, "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VERSION, "org.hamcrest:hamcrest:3.0", "org.mockito:mockito-core:5.21.0", diff --git a/lib/BUILD b/lib/BUILD index 2bd92093ca8..4ce0c1adc24 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -69,6 +69,7 @@ java_library( visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], exports = ["@external_deps//:org_apache_httpcomponents_httpclient"], @@ -79,9 +80,11 @@ java_library( visibility = [ "//org.eclipse.jgit.http.apache:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", + "//org.eclipse.jgit.http.test.ee8:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", "//org.eclipse.jgit.lfs.server.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], exports = ["@external_deps//:org_apache_httpcomponents_httpcore"], @@ -178,6 +181,35 @@ java_library( ], ) +java_library( + name = "jetty-ee8-nested", + testonly = 1, + visibility = ["//org.eclipse.jgit.junit.http.ee8:__pkg__"], + exports = ["@external_deps//:org_eclipse_jetty_ee8_jetty_ee8_nested"], +) + +java_library( + name = "jetty-security-ee8", + testonly = 1, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + ], + exports = ["@external_deps//:org_eclipse_jetty_ee8_jetty_ee8_security"], +) + +java_library( + name = "jetty-servlet-ee8", + testonly = 1, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + ], + exports = ["@external_deps//:org_eclipse_jetty_ee8_jetty_ee8_servlet"], +) + java_library( name = "jetty-util", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. @@ -303,6 +335,7 @@ java_library( "//org.eclipse.jgit.http.server:__pkg__", "//org.eclipse.jgit.http.test:__pkg__", "//org.eclipse.jgit.junit.http:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", @@ -314,7 +347,10 @@ java_library( name = "javax-servlet-api", visibility = [ "//org.eclipse.jgit.http.server.ee8:__pkg__", + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//org.eclipse.jgit.junit.http.ee8:__pkg__", "//org.eclipse.jgit.lfs.server.ee8:__pkg__", + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", ], exports = ["@external_deps//:javax_servlet_javax_servlet_api"], ) diff --git a/org.eclipse.jgit.http.test.ee8/BUILD b/org.eclipse.jgit.http.test.ee8/BUILD new file mode 100644 index 00000000000..a6a5506e988 --- /dev/null +++ b/org.eclipse.jgit.http.test.ee8/BUILD @@ -0,0 +1,84 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +transform_srcjar( + name = "helpers-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:helper-srcs"], + src_prefix = "org.eclipse.jgit.http.test/src/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:test-srcs"], + src_prefix = "org.eclipse.jgit.http.test/tst/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "server-unit-test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.http.test:http-server-unit-test-srcs"], + src_prefix = "org.eclipse.jgit.http.test/tst/", +) + +# Fast slice for the server utility tests; the default EE8 suite runs the full +# HTTP test target, which already includes these classes. +junit_tests( + name = "server_unit", + suite_srcs = ["//org.eclipse.jgit.http.test:http-server-unit-test-srcs"], + tags = ["http"], + srcs = [":server-unit-test-srcs"], + deps = [ + "//lib:junit", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) + +junit_tests( + name = "http", + suite_srcs = ["//org.eclipse.jgit.http.test:test-srcs"], + tags = ["http"], + srcs = [":test-srcs"], + deps = [ + ":helpers", + "//lib:commons-logging", + "//lib:httpcore", + "//lib:javax-servlet-api", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-util", + "//lib:junit", + "//lib:slf4j-api", + "//lib:slf4j-simple", + "//org.eclipse.jgit.http.apache:http-apache", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit.http.ee8:junit-http-ee8", + "//org.eclipse.jgit.junit:junit", + ], +) + +java_library( + name = "helpers", + testonly = 1, + srcs = [":helpers-srcs"], + deps = [ + "//lib:javax-servlet-api", + "//lib:junit", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index bc04d229dd6..cb6a738178a 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -4,9 +4,46 @@ load( ) load("@rules_java//java:defs.bzl", "java_library") +HTTP_HELPER_SRCS = glob(["src/**/*.java"]) + +HTTP_TEST_SRCS = glob(["tst/**/*.java"]) + +HTTP_SERVER_UNIT_TEST_SRCS = [ + "tst/org/eclipse/jgit/http/server/ClientVersionUtilTest.java", + "tst/org/eclipse/jgit/http/server/RootLocaleTest.java", + "tst/org/eclipse/jgit/http/server/ServletUtilsTest.java", +] + +filegroup( + name = "helper-srcs", + testonly = 1, + srcs = HTTP_HELPER_SRCS, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "test-srcs", + testonly = 1, + srcs = HTTP_TEST_SRCS, + visibility = [ + "//org.eclipse.jgit.http.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "http-server-unit-test-srcs", + testonly = 1, + srcs = HTTP_SERVER_UNIT_TEST_SRCS, + visibility = ["//org.eclipse.jgit.http.test.ee8:__pkg__"], +) + junit_tests( name = "http", - srcs = glob(["tst/**/*.java"]), + srcs = HTTP_TEST_SRCS, tags = ["http"], deps = [ ":helpers", @@ -33,7 +70,7 @@ junit_tests( java_library( name = "helpers", testonly = 1, - srcs = glob(["src/**/*.java"]), + srcs = HTTP_HELPER_SRCS, deps = [ "//lib:jakarta-servlet-api", "//lib:junit", diff --git a/org.eclipse.jgit.junit.http.ee8/BUILD b/org.eclipse.jgit.junit.http.ee8/BUILD new file mode 100644 index 00000000000..c7f6fb5a537 --- /dev/null +++ b/org.eclipse.jgit.junit.http.ee8/BUILD @@ -0,0 +1,43 @@ +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) + +java_library( + name = "junit-http-ee8", + testonly = 1, + srcs = [ + "//org.eclipse.jgit.junit.http:junit-http-ee8-srcs", + # AppServer diverges from the canonical Jakarta version and is copied + # from the servlet-4 branch as a hand-maintained EE8 overlay. + "src/org/eclipse/jgit/junit/http/AppServer.java", + ], + resources = glob( + ["resources/**"], + allow_empty = True, + ), + deps = [ + "//lib:javax-servlet-api", + "//lib:jetty-ee8-nested", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-session", + "//lib:jetty-util", + "//lib:junit", + "//lib:slf4j-api", + "//org.eclipse.jgit.http.server.ee8:jgit-servlet-ee8", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + ], +) + +test_suite( + name = "tests", + tests = [ + "//org.eclipse.jgit.http.test.ee8:http", + "//org.eclipse.jgit.lfs.server.test.ee8:lfs_server", + ], +) diff --git a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java new file mode 100644 index 00000000000..1e4c7966b60 --- /dev/null +++ b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java @@ -0,0 +1,461 @@ +/* + * Copyright (C) 2010, 2017 Google Inc. and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.junit.http; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.jetty.ee8.nested.ServletConstraint; +import org.eclipse.jetty.ee8.security.Authenticator; +import org.eclipse.jetty.ee8.security.ConstraintMapping; +import org.eclipse.jetty.ee8.security.ConstraintSecurityHandler; +import org.eclipse.jetty.ee8.security.authentication.BasicAuthenticator; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.security.AbstractLoginService; +import org.eclipse.jetty.security.RolePrincipal; +import org.eclipse.jetty.security.UserPrincipal; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.util.security.Password; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.eclipse.jgit.transport.URIish; + +/** + * Tiny web application server for unit testing. + *

+ * Tests should start the server in their {@code setUp()} method and stop the + * server in their {@code tearDown()} method. Only while started the server's + * URL and/or port number can be obtained. + */ +public class AppServer { + /** Realm name for the secure access areas. */ + public static final String realm = "Secure Area"; + + /** Username for secured access areas. */ + public static final String username = "agitter"; + + /** Password for {@link #username} in secured access areas. */ + public static final String password = "letmein"; + + /** SSL keystore password; must have at least 6 characters. */ + private static final String keyPassword = "mykeys"; + + /** Role for authentication. */ + private static final String authRole = "can-access"; + + static { + // Install a logger that throws warning messages. + // + final String prop = "org.eclipse.jetty.util.log.class"; + System.setProperty(prop, RecordingLogger.class.getName()); + } + + private final Server server; + + private final HttpConfiguration config; + + private final ServerConnector connector; + + private final HttpConfiguration secureConfig; + + private final ServerConnector secureConnector; + + private final ContextHandlerCollection contexts; + + private final TestRequestLog log; + + private List filesToDelete = new ArrayList<>(); + + /** + * Constructor for AppServer. + */ + public AppServer() { + this(0, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * the http port number; may be zero to allocate a port + * dynamically + * @since 4.2 + */ + public AppServer(int port) { + this(port, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * for http, may be zero to allocate a port dynamically + * @param sslPort + * for https,may be zero to allocate a port dynamically. If + * negative, the server will be set up without https support. + * @since 4.9 + */ + public AppServer(int port, int sslPort) { + server = new Server(); + + config = new HttpConfiguration(); + config.setSecureScheme("https"); + config.setSecurePort(0); + config.setOutputBufferSize(32768); + + connector = new ServerConnector(server, + new HttpConnectionFactory(config)); + connector.setPort(port); + String ip; + String hostName; + try { + final InetAddress me = InetAddress.getByName("localhost"); + ip = me.getHostAddress(); + connector.setHost(ip); + hostName = InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + throw new RuntimeException("Cannot find localhost", e); + } + + if (sslPort >= 0) { + SslContextFactory.Server sslContextFactory = createTestSslContextFactory( + hostName, ip); + secureConfig = new HttpConfiguration(config); + secureConfig.addCustomizer(new SecureRequestCustomizer()); + HttpConnectionFactory http11 = new HttpConnectionFactory( + secureConfig); + SslConnectionFactory tls = new SslConnectionFactory( + sslContextFactory, http11.getProtocol()); + secureConnector = new ServerConnector(server, tls, http11); + secureConnector.setPort(sslPort); + secureConnector.setHost(ip); + } else { + secureConfig = null; + secureConnector = null; + } + + contexts = new ContextHandlerCollection(); + + log = new TestRequestLog(); + log.setHandler(contexts); + + if (secureConnector == null) { + server.setConnectors(new Connector[] { connector }); + } else { + server.setConnectors( + new Connector[] { connector, secureConnector }); + } + server.setHandler(log); + } + + private SslContextFactory.Server createTestSslContextFactory( + String hostName, String ip) { + SslContextFactory.Server factory = new SslContextFactory.Server(); + + String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; + + try { + File tmpDir = Files.createTempDirectory("jks").toFile(); + tmpDir.deleteOnExit(); + makePrivate(tmpDir); + File keyStore = new File(tmpDir, "keystore.jks"); + File keytool = new File( + new File(new File(System.getProperty("java.home")), "bin"), + "keytool"); + Runtime.getRuntime().exec( + new String[] { + keytool.getAbsolutePath(), // + "-keystore", keyStore.getAbsolutePath(), // + "-storepass", keyPassword, + "-alias", hostName, // + "-ext", "bc=ca:true", // + "-ext", + String.format( + "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", + ip, hostName), // + "-genkeypair", // + "-keyalg", "RSA", // + "-keypass", keyPassword, // + "-dname", dName, // + "-validity", "2" // + }).waitFor(); + keyStore.deleteOnExit(); + makePrivate(keyStore); + filesToDelete.add(keyStore); + filesToDelete.add(tmpDir); + factory.setKeyStorePath(keyStore.getAbsolutePath()); + factory.setKeyStorePassword(keyPassword); + factory.setKeyManagerPassword(keyPassword); + factory.setTrustStorePath(keyStore.getAbsolutePath()); + factory.setTrustStorePassword(keyPassword); + } catch (InterruptedException | IOException e) { + throw new RuntimeException("Cannot create ssl key/certificate", e); + } + return factory; + } + + private void makePrivate(File file) { + file.setReadable(false); + file.setWritable(false); + file.setExecutable(false); + file.setReadable(true, true); + file.setWritable(true, true); + if (file.isDirectory()) { + file.setExecutable(true, true); + } + } + + /** + * Create a new servlet context within the server. + *

+ * This method should be invoked before the server is started, once for each + * context the caller wants to register. + * + * @param path + * path of the context; use "/" for the root context if binding + * to the root is desired. + * @return the context to add servlets into. + * @since 7.0 + */ + public ServletContextHandler addContext(String path) { + assertNotYetSetUp(); + if ("".equals(path)) + path = "/"; + + ServletContextHandler ctx = new ServletContextHandler(); + ctx.setContextPath(path); + contexts.addHandler(ctx); + + return ctx; + } + + /** + * Configure basic authentication. + * + * @param ctx + * servlet context handler + * @param methods + * the methods + * @return servlet context handler + * @since 7.0 + */ + public ServletContextHandler authBasic(ServletContextHandler ctx, + String... methods) { + assertNotYetSetUp(); + auth(ctx, new BasicAuthenticator(), methods); + return ctx; + } + + static class TestMappedLoginService extends AbstractLoginService { + private RolePrincipal role; + + protected final Map users = new ConcurrentHashMap<>(); + + TestMappedLoginService(String role) { + this.role = new RolePrincipal(role); + } + + @Override + protected void doStart() throws Exception { + UserPrincipal p = new UserPrincipal(username, + new Password(password)); + users.put(username, p); + super.doStart(); + } + + @Override + protected UserPrincipal loadUserInfo(String user) { + return users.get(user); + } + + @Override + protected List loadRoleInfo(UserPrincipal user) { + if (users.get(user.getName()) == null) { + return null; + } + return Collections.singletonList(role); + } + } + + private ConstraintMapping createConstraintMapping() { + ConstraintMapping cm = new ConstraintMapping(); + cm.setConstraint(new ServletConstraint()); + cm.getConstraint().setAuthenticate(true); + cm.getConstraint().setDataConstraint(ServletConstraint.DC_NONE); + cm.getConstraint().setRoles(new String[] { authRole }); + return cm; + } + + private void auth(ServletContextHandler ctx, Authenticator authType, + String... methods) { + AbstractLoginService users = new TestMappedLoginService(authRole); + List mappings = new ArrayList<>(); + if (methods == null || methods.length == 0) { + ConstraintMapping cm = createConstraintMapping(); + cm.setPathSpec("/*"); + mappings.add(cm); + } else { + for (String method : methods) { + ConstraintMapping cm = createConstraintMapping(); + cm.setMethod(method.toUpperCase(Locale.ROOT)); + cm.setPathSpec("/*"); + mappings.add(cm); + } + } + + ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); + sec.setRealmName(realm); + sec.setAuthenticator(authType); + sec.setLoginService(users); + sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); + ctx.setSecurityHandler(sec); + } + + /** + * Start the server on a random local port. + * + * @throws Exception + * the server cannot be started, testing is not possible. + */ + public void setUp() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.start(); + config.setSecurePort(getSecurePort()); + if (secureConfig != null) { + secureConfig.setSecurePort(getSecurePort()); + } + } + + /** + * Shutdown the server. + * + * @throws Exception + * the server refuses to halt, or wasn't running. + */ + public void tearDown() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.stop(); + for (File f : filesToDelete) { + f.delete(); + } + filesToDelete.clear(); + } + + /** + * Get the URI to reference this server. + *

+ * The returned URI includes the proper host name and port number, but does + * not contain a path. + * + * @return URI to reference this server's root context. + */ + public URI getURI() { + assertAlreadySetUp(); + String host = connector.getHost(); + if (host.contains(":") && !host.startsWith("[")) + host = "[" + host + "]"; + final String uri = "http://" + host + ":" + getPort(); + try { + return new URI(uri); + } catch (URISyntaxException e) { + throw new RuntimeException("Unexpected URI error on " + uri, e); + } + } + + /** + * Get port. + * + * @return the local port number the server is listening on. + */ + public int getPort() { + assertAlreadySetUp(); + return connector.getLocalPort(); + } + + /** + * Get secure port. + * + * @return the HTTPS port or -1 if not configured. + */ + public int getSecurePort() { + assertAlreadySetUp(); + return secureConnector != null ? secureConnector.getLocalPort() : -1; + } + + /** + * Get requests. + * + * @return all requests since the server was started. + */ + public List getRequests() { + return new ArrayList<>(log.getEvents()); + } + + /** + * Get requests. + * + * @param base + * base URI used to access the server. + * @param path + * the path to locate requests for, relative to {@code base}. + * @return all requests which match the given path. + */ + public List getRequests(URIish base, String path) { + return getRequests(HttpTestCase.join(base, path)); + } + + /** + * Get requests. + * + * @param path + * the path to locate requests for. + * @return all requests which match the given path. + */ + public List getRequests(String path) { + ArrayList r = new ArrayList<>(); + for (AccessEvent event : log.getEvents()) { + if (event.getPath().equals(path)) { + r.add(event); + } + } + return r; + } + + private void assertNotYetSetUp() { + assertFalse("server is not running", server.isRunning()); + } + + private void assertAlreadySetUp() { + assertTrue("server is running", server.isRunning()); + } +} diff --git a/org.eclipse.jgit.junit.http/BUILD b/org.eclipse.jgit.junit.http/BUILD index 17a75701540..8ab98ac5d95 100644 --- a/org.eclipse.jgit.junit.http/BUILD +++ b/org.eclipse.jgit.junit.http/BUILD @@ -1,11 +1,36 @@ load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") package(default_visibility = ["//visibility:public"]) +JUNIT_HTTP_SRCS = glob(["src/**/*.java"]) + +JUNIT_HTTP_EE8_TRANSFORM_SRCS = glob( + ["src/**/*.java"], + exclude = ["src/org/eclipse/jgit/junit/http/AppServer.java"], +) + +filegroup( + name = "srcs", + testonly = 1, + srcs = JUNIT_HTTP_SRCS, + visibility = [ + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "ee8-transform-srcs", + testonly = 1, + srcs = JUNIT_HTTP_EE8_TRANSFORM_SRCS, + visibility = ["//tools/jgit-ee8:__pkg__"], +) + java_library( name = "junit-http", testonly = 1, - srcs = glob(["src/**/*.java"]), + srcs = JUNIT_HTTP_SRCS, resources = glob( ["resources/**"], allow_empty = True, @@ -27,3 +52,14 @@ java_library( "//org.eclipse.jgit.junit:junit", ], ) + +transform_srcjar( + name = "junit-http-ee8-srcs", + direction = "to_javax", + sources = JUNIT_HTTP_EE8_TRANSFORM_SRCS, + src_prefix = "org.eclipse.jgit.junit.http/src/", + visibility = [ + "//org.eclipse.jgit.junit.http.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) diff --git a/org.eclipse.jgit.lfs.server.test.ee8/BUILD b/org.eclipse.jgit.lfs.server.test.ee8/BUILD new file mode 100644 index 00000000000..bb93b79374b --- /dev/null +++ b/org.eclipse.jgit.lfs.server.test.ee8/BUILD @@ -0,0 +1,65 @@ +load("@rules_java//java:defs.bzl", "java_library") +load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests") +load("@com_googlesource_gerrit_bazlets//tools:servlet_transform.bzl", "transform_srcjar") + +transform_srcjar( + name = "test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server.test:test-srcs"], + src_prefix = "org.eclipse.jgit.lfs.server.test/tst/", + visibility = ["//tools/jgit-ee8:__pkg__"], +) + +transform_srcjar( + name = "base-test-srcs", + testonly = 1, + direction = "to_javax", + sources = ["//org.eclipse.jgit.lfs.server.test:base-test-srcs"], + src_prefix = "org.eclipse.jgit.lfs.server.test/tst/", +) + +# Keep the helper/base class separate: the canonical LfsServerTest is compiled +# into the helper jar, while the remaining tests are executed from the EE8 +# suite target. +DEPS = [ + "//org.eclipse.jgit.lfs.test:helpers", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + "//org.eclipse.jgit.junit.http.ee8:junit-http-ee8", + "//org.eclipse.jgit.lfs:jgit-lfs", + "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8", + "//lib:commons-logging", + "//lib:httpcore", + "//lib:httpclient", + "//lib:junit", + "//lib:jetty-http", + "//lib:jetty-io", + "//lib:jetty-server", + "//lib:jetty-servlet-ee8", + "//lib:jetty-security", + "//lib:jetty-security-ee8", + "//lib:jetty-util", + "//lib:javax-servlet-api", +] + +junit_tests( + name = "lfs_server", + jvm_flags = [ + "-Xmx512m", + "-Dfile.encoding=UTF-8", + ], + suite_srcs = ["//org.eclipse.jgit.lfs.server.test:nonbase-test-srcs"], + tags = ["lfs-server"], + srcs = [":test-srcs"], + deps = DEPS + [ + ":helpers", + ], +) + +java_library( + name = "helpers", + testonly = 1, + srcs = [":base-test-srcs"], + deps = DEPS, +) diff --git a/org.eclipse.jgit.lfs.server.test/BUILD b/org.eclipse.jgit.lfs.server.test/BUILD index adc2df63c02..4b698048694 100644 --- a/org.eclipse.jgit.lfs.server.test/BUILD +++ b/org.eclipse.jgit.lfs.server.test/BUILD @@ -6,6 +6,35 @@ load("@rules_java//java:defs.bzl", "java_library") TEST_BASE = ["tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java"] +TEST_SRCS = glob(["tst/**/*.java"]) + +filegroup( + name = "test-srcs", + testonly = 1, + srcs = TEST_SRCS, + visibility = [ + "//org.eclipse.jgit.lfs.server.test.ee8:__pkg__", + "//tools/jgit-ee8:__pkg__", + ], +) + +filegroup( + name = "base-test-srcs", + testonly = 1, + srcs = TEST_BASE, + visibility = ["//org.eclipse.jgit.lfs.server.test.ee8:__pkg__"], +) + +filegroup( + name = "nonbase-test-srcs", + testonly = 1, + srcs = glob( + ["tst/**/*.java"], + exclude = TEST_BASE, + ), + visibility = ["//org.eclipse.jgit.lfs.server.test.ee8:__pkg__"], +) + DEPS = [ "//org.eclipse.jgit.lfs.test:helpers", "//org.eclipse.jgit:jgit", diff --git a/tools/jgit-ee8/BUILD b/tools/jgit-ee8/BUILD index df5c27cd73d..f6681ccf163 100644 --- a/tools/jgit-ee8/BUILD +++ b/tools/jgit-ee8/BUILD @@ -7,8 +7,11 @@ sh_test( "--forbid", "jakarta\\.servlet", "--forbid", + "org\\.eclipse\\.jetty\\.ee10\\.servlet", + "--forbid", "org\\.eclipse\\.jgit\\..*\\.ee8", - "--require", + "--require-if-source", + "jakarta\\.servlet", "javax\\.servlet", "--module", "org.eclipse.jgit.http.server/src/", @@ -18,11 +21,35 @@ sh_test( "org.eclipse.jgit.lfs.server/src/", "$(location //org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs)", "$(locations //org.eclipse.jgit.lfs.server:srcs)", + "--module", + "org.eclipse.jgit.junit.http/src/", + "$(location //org.eclipse.jgit.junit.http:junit-http-ee8-srcs)", + "$(locations //org.eclipse.jgit.junit.http:ee8-transform-srcs)", + "--module", + "org.eclipse.jgit.http.test/src/", + "$(location //org.eclipse.jgit.http.test.ee8:helpers-srcs)", + "$(locations //org.eclipse.jgit.http.test:helper-srcs)", + "--module", + "org.eclipse.jgit.http.test/tst/", + "$(location //org.eclipse.jgit.http.test.ee8:test-srcs)", + "$(locations //org.eclipse.jgit.http.test:test-srcs)", + "--module", + "org.eclipse.jgit.lfs.server.test/tst/", + "$(location //org.eclipse.jgit.lfs.server.test.ee8:test-srcs)", + "$(locations //org.eclipse.jgit.lfs.server.test:test-srcs)", ], data = [ "//org.eclipse.jgit.http.server.ee8:jgit-http-server-ee8-srcs", "//org.eclipse.jgit.http.server:srcs", + "//org.eclipse.jgit.http.test.ee8:helpers-srcs", + "//org.eclipse.jgit.http.test.ee8:test-srcs", + "//org.eclipse.jgit.http.test:helper-srcs", + "//org.eclipse.jgit.http.test:test-srcs", + "//org.eclipse.jgit.junit.http:ee8-transform-srcs", + "//org.eclipse.jgit.junit.http:junit-http-ee8-srcs", "//org.eclipse.jgit.lfs.server.ee8:jgit-lfs-server-ee8-srcs", "//org.eclipse.jgit.lfs.server:srcs", + "//org.eclipse.jgit.lfs.server.test.ee8:test-srcs", + "//org.eclipse.jgit.lfs.server.test:test-srcs", ], ) diff --git a/tools/jgit-ee8/README.md b/tools/jgit-ee8/README.md index 5578d6553b5..7bb2f477aa7 100644 --- a/tools/jgit-ee8/README.md +++ b/tools/jgit-ee8/README.md @@ -22,17 +22,18 @@ Generated targets: Do not put one of these generated jars and its canonical Jakarta counterpart on the same classpath. They contain the same JGit classes. -This is intentionally limited to Bazel source consumers. It does not add Maven, -Tycho, p2, or Maven Central publication machinery. Those should be added only if -a non-Bazel consumer needs published EE8 artifacts. +This is intentionally limited to source generation, build, and test. It does +not add Tycho, p2, or Maven Central publication machinery yet. Run: ```sh -bazelisk test //tools/jgit-ee8:generated_srcs_test +bazelisk test \ + //tools/jgit-ee8:generated_srcs_test \ + //org.eclipse.jgit.junit.http.ee8:tests ``` -The test checks: +`//tools/jgit-ee8:generated_srcs_test` checks: * generated sources are derived from the canonical source filegroups * generated srcjar entries use Java package paths @@ -40,10 +41,28 @@ The test checks: * generated sources contain `javax.servlet`, not `jakarta.servlet` * generated sources do not move JGit classes to an `.ee8` package +The dedicated `org.eclipse.jgit.*.ee8` targets follow the Jetty 12 EE8 testing +model in a smaller form. Jetty generates EE8 main and test sources from the +canonical newer-EE modules and then runs the EE8 tests in the EE8 module graph. +JGit does the same for the servlet-facing tests: the HTTP/LFS test sources and +shared `junit-http` helpers are transformed to `javax.servlet`, wired to Jetty +EE8 test dependencies, and run against the generated EE8 JGit jars. + +`//org.eclipse.jgit.http.test.ee8:server_unit` is a fast, focused target for the +three HTTP server utility tests. It is not part of the default EE8 suite because +those classes already run under `//org.eclipse.jgit.http.test.ee8:http`. + +The test rewrite rules also map Jetty test helper imports from +`org.eclipse.jetty.ee10.servlet` to the Jetty EE8 packages needed by the tests. +They are intentionally test-only and separate from the production +`jakarta.servlet` to `javax.servlet` rules. + Next steps: * Keep this source-consumer bridge while Gerrit runs on Jetty 12 EE8. * Reuse these targets for other Bazel source consumers that need EE8 output. +* Move the generated-test JUnit helper to bazlets only if more generated-test + users need the same split between suite source labels and compiled sources. * Add Maven/Tycho/p2 generation only when a non-Bazel consumer needs published EE8 artifacts. * Keep the canonical `srcs` filegroups aligned with each servlet-facing From 1eb6ed01bf9b705c1a75dbeff08dd9d3dc86ba08 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 25 Jun 2026 11:32:28 +0200 Subject: [PATCH 170/200] junit.http: Extract AppServerBase to dedupe the EE8 AppServer overlay The EE8 servlet bridge ships a hand-maintained org.eclipse.jgit.junit.http.ee8 AppServer because the canonical AppServer cannot be rewritten into its EE8 form automatically: the Jetty security API (Constraint.Builder + ContextHandler juggling) differs structurally from the Jetty EE8 one (ServletConstraint + setSecurityHandler), which a jakarta->javax string rewrite cannot bridge. The overlay was a 461-line copy; only ~40 lines diverge. Split the common code into an abstract AppServerBase and reduce both AppServers to the generation-specific part: AppServerBase common server/context/login wiring plus the protected abstract configureAuthentication() method; transform-safe (only the ServletContextHandler import renames ee10 -> ee8). AppServer (canonical) EE10: Constraint.Builder + setHandler. AppServer (ee8 overlay) EE8: ServletConstraint + setSecurityHandler. 461 -> 103 lines. Both toolchains pick AppServerBase up for free: the Bazel transform and the Maven antrun copy both exclude only the file name AppServer.java, so AppServerBase.java flows through the jakarta->javax / ee10->ee8 rewrite while the hand-written EE8 AppServer.java stays the overlay. No BUILD or pom changes. The class stays named AppServer in both worlds (separate classpaths), so every "new AppServer(...)" site is untouched. Moving the shared username/password constants into AppServerBase turns the AppServer.username uses in the HTTP tests into an indirect static access, which JGit's ecj settings escalate to a compile error (caught by Maven, not by the Bazel javac build). Reference the declaring class (AppServerBase.username) instead of re-declaring the constants on both AppServers, which would reintroduce the duplication this change removes. Alternative considered: renaming the EE8 overlay to EE8AppServer. Rejected because a distinct name forces rewriting every "new AppServer(...)" site in the transformed EE8 tests and couples the transform to class names instead of imports. Copyright is carried over unchanged from the split file. Change-Id: I1d68bcc7d1d23668696ee91d8910f4940064bb37 --- .../jgit/http/test/HttpClientTests.java | 6 +- .../http/test/SmartClientSmartServerTest.java | 27 +- .../eclipse/jgit/junit/http/AppServer.java | 390 +--------------- .../eclipse/jgit/junit/http/AppServer.java | 389 +-------------- .../jgit/junit/http/AppServerBase.java | 441 ++++++++++++++++++ 5 files changed, 487 insertions(+), 766 deletions(-) create mode 100644 org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java index 3937627f53c..2737a492fc2 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/HttpClientTests.java @@ -41,7 +41,7 @@ import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.http.AccessEvent; -import org.eclipse.jgit.junit.http.AppServer; +import org.eclipse.jgit.junit.http.AppServerBase; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; @@ -266,12 +266,12 @@ public void testListRemote_Dumb_Auth() throws Exception { Repository dst = createBareRepository(); try (Transport t = Transport.open(dst, dumbAuthBasicURI)) { t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, AppServer.password)); + AppServerBase.username, AppServerBase.password)); t.openFetch().close(); } try (Transport t = Transport.open(dst, dumbAuthBasicURI)) { t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, "")); + AppServerBase.username, "")); try { t.openFetch(); fail("connection opened even info/refs needs auth basic and we provide wrong password"); diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index b0d17adb3a0..46a48f7e704 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -68,6 +68,7 @@ import org.eclipse.jgit.junit.TestRng; import org.eclipse.jgit.junit.http.AccessEvent; import org.eclipse.jgit.junit.http.AppServer; +import org.eclipse.jgit.junit.http.AppServerBase; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; @@ -111,7 +112,7 @@ public class SmartClientSmartServerTest extends AllProtocolsHttpTestCase { private Repository remoteRepository; private CredentialsProvider testCredentials = new UsernamePasswordCredentialsProvider( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); private URIish remoteURI; @@ -998,7 +999,7 @@ public void testInitialClone_WithPreAuthentication() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1018,7 +1019,7 @@ public void testInitialClone_WithPreAuthenticationCleared() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); ((TransportHttp) t).setPreemptiveBasicAuthentication(null, null); t.setCredentialsProvider(testCredentials); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); @@ -1043,7 +1044,7 @@ public void testInitialClone_PreAuthenticationTooLate() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1053,7 +1054,7 @@ public void testInitialClone_PreAuthenticationTooLate() throws Exception { assertFetchRequests(requests, 0); assertThrows(IllegalStateException.class, () -> ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password)); + AppServerBase.username, AppServerBase.password)); assertThrows(IllegalStateException.class, () -> ((TransportHttp) t) .setPreemptiveBasicAuthentication(null, null)); } @@ -1066,7 +1067,7 @@ public void testInitialClone_WithWrongPreAuthenticationAndCredentialProvider() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password + 'x'); + AppServerBase.username, AppServerBase.password + 'x'); t.setCredentialsProvider(testCredentials); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); @@ -1090,7 +1091,7 @@ public void testInitialClone_WithWrongPreAuthentication() throws Exception { Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password + 'x'); + AppServerBase.username, AppServerBase.password + 'x'); TransportException e = assertThrows(TransportException.class, () -> t.fetch(NullProgressMonitor.INSTANCE, mirror(master))); @@ -1108,8 +1109,8 @@ public void testInitialClone_WithWrongPreAuthentication() throws Exception { @Test public void testInitialClone_WithUserInfo() throws Exception { - URIish withUserInfo = authURI.setUser(AppServer.username) - .setPass(AppServer.password); + URIish withUserInfo = authURI.setUser(AppServerBase.username) + .setPass(AppServerBase.password); try (Repository dst = createBareRepository(); Transport t = Transport.open(dst, withUserInfo)) { assertFalse(dst.getObjectDatabase().has(A_txt)); @@ -1127,13 +1128,13 @@ public void testInitialClone_WithUserInfo() throws Exception { @Test public void testInitialClone_PreAuthOverridesUserInfo() throws Exception { - URIish withUserInfo = authURI.setUser(AppServer.username) - .setPass(AppServer.password + 'x'); + URIish withUserInfo = authURI.setUser(AppServerBase.username) + .setPass(AppServerBase.password + 'x'); try (Repository dst = createBareRepository(); Transport t = Transport.open(dst, withUserInfo)) { assertFalse(dst.getObjectDatabase().has(A_txt)); ((TransportHttp) t).setPreemptiveBasicAuthentication( - AppServer.username, AppServer.password); + AppServerBase.username, AppServerBase.password); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); assertTrue(dst.getObjectDatabase().has(A_txt)); assertEquals(B, dst.exactRef(master).getObjectId()); @@ -1174,7 +1175,7 @@ public void testInitialClone_WithAuthenticationWrongCredentials() Transport t = Transport.open(dst, authURI)) { assertFalse(dst.getObjectDatabase().has(A_txt)); t.setCredentialsProvider(new UsernamePasswordCredentialsProvider( - AppServer.username, "wrongpassword")); + AppServerBase.username, "wrongpassword")); t.fetch(NullProgressMonitor.INSTANCE, mirror(master)); fail("Should not have succeeded -- wrong password"); } catch (TransportException e) { diff --git a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java index 1e4c7966b60..3627d920a89 100644 --- a/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http.ee8/src/org/eclipse/jgit/junit/http/AppServer.java @@ -10,95 +10,34 @@ package org.eclipse.jgit.junit.http; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.nio.file.Files; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jetty.ee8.nested.ServletConstraint; -import org.eclipse.jetty.ee8.security.Authenticator; import org.eclipse.jetty.ee8.security.ConstraintMapping; import org.eclipse.jetty.ee8.security.ConstraintSecurityHandler; import org.eclipse.jetty.ee8.security.authentication.BasicAuthenticator; import org.eclipse.jetty.ee8.servlet.ServletContextHandler; import org.eclipse.jetty.security.AbstractLoginService; -import org.eclipse.jetty.security.RolePrincipal; -import org.eclipse.jetty.security.UserPrincipal; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.util.security.Password; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jgit.transport.URIish; /** - * Tiny web application server for unit testing. + * Tiny web application server for unit testing, wired for the EE8 + * (javax.servlet / Jetty EE8) generation. *

- * Tests should start the server in their {@code setUp()} method and stop the - * server in their {@code tearDown()} method. Only while started the server's - * URL and/or port number can be obtained. + * Only the Jetty security wiring is generation specific; everything else is + * inherited from the generated {@link AppServerBase}. This is the hand + * maintained EE8 overlay that the canonical {@code AppServer} cannot be + * rewritten into automatically, because the Jetty EE8 security API + * ({@code ServletConstraint} + {@code setSecurityHandler}) differs structurally + * from the EE10 one. */ -public class AppServer { - /** Realm name for the secure access areas. */ - public static final String realm = "Secure Area"; - - /** Username for secured access areas. */ - public static final String username = "agitter"; - - /** Password for {@link #username} in secured access areas. */ - public static final String password = "letmein"; - - /** SSL keystore password; must have at least 6 characters. */ - private static final String keyPassword = "mykeys"; - - /** Role for authentication. */ - private static final String authRole = "can-access"; - - static { - // Install a logger that throws warning messages. - // - final String prop = "org.eclipse.jetty.util.log.class"; - System.setProperty(prop, RecordingLogger.class.getName()); - } - - private final Server server; - - private final HttpConfiguration config; - - private final ServerConnector connector; - - private final HttpConfiguration secureConfig; - - private final ServerConnector secureConnector; - - private final ContextHandlerCollection contexts; - - private final TestRequestLog log; - - private List filesToDelete = new ArrayList<>(); - +public class AppServer extends AppServerBase { /** * Constructor for AppServer. */ public AppServer() { - this(0, -1); + super(); } /** @@ -110,7 +49,7 @@ public AppServer() { * @since 4.2 */ public AppServer(int port) { - this(port, -1); + super(port); } /** @@ -124,185 +63,7 @@ public AppServer(int port) { * @since 4.9 */ public AppServer(int port, int sslPort) { - server = new Server(); - - config = new HttpConfiguration(); - config.setSecureScheme("https"); - config.setSecurePort(0); - config.setOutputBufferSize(32768); - - connector = new ServerConnector(server, - new HttpConnectionFactory(config)); - connector.setPort(port); - String ip; - String hostName; - try { - final InetAddress me = InetAddress.getByName("localhost"); - ip = me.getHostAddress(); - connector.setHost(ip); - hostName = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - throw new RuntimeException("Cannot find localhost", e); - } - - if (sslPort >= 0) { - SslContextFactory.Server sslContextFactory = createTestSslContextFactory( - hostName, ip); - secureConfig = new HttpConfiguration(config); - secureConfig.addCustomizer(new SecureRequestCustomizer()); - HttpConnectionFactory http11 = new HttpConnectionFactory( - secureConfig); - SslConnectionFactory tls = new SslConnectionFactory( - sslContextFactory, http11.getProtocol()); - secureConnector = new ServerConnector(server, tls, http11); - secureConnector.setPort(sslPort); - secureConnector.setHost(ip); - } else { - secureConfig = null; - secureConnector = null; - } - - contexts = new ContextHandlerCollection(); - - log = new TestRequestLog(); - log.setHandler(contexts); - - if (secureConnector == null) { - server.setConnectors(new Connector[] { connector }); - } else { - server.setConnectors( - new Connector[] { connector, secureConnector }); - } - server.setHandler(log); - } - - private SslContextFactory.Server createTestSslContextFactory( - String hostName, String ip) { - SslContextFactory.Server factory = new SslContextFactory.Server(); - - String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; - - try { - File tmpDir = Files.createTempDirectory("jks").toFile(); - tmpDir.deleteOnExit(); - makePrivate(tmpDir); - File keyStore = new File(tmpDir, "keystore.jks"); - File keytool = new File( - new File(new File(System.getProperty("java.home")), "bin"), - "keytool"); - Runtime.getRuntime().exec( - new String[] { - keytool.getAbsolutePath(), // - "-keystore", keyStore.getAbsolutePath(), // - "-storepass", keyPassword, - "-alias", hostName, // - "-ext", "bc=ca:true", // - "-ext", - String.format( - "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", - ip, hostName), // - "-genkeypair", // - "-keyalg", "RSA", // - "-keypass", keyPassword, // - "-dname", dName, // - "-validity", "2" // - }).waitFor(); - keyStore.deleteOnExit(); - makePrivate(keyStore); - filesToDelete.add(keyStore); - filesToDelete.add(tmpDir); - factory.setKeyStorePath(keyStore.getAbsolutePath()); - factory.setKeyStorePassword(keyPassword); - factory.setKeyManagerPassword(keyPassword); - factory.setTrustStorePath(keyStore.getAbsolutePath()); - factory.setTrustStorePassword(keyPassword); - } catch (InterruptedException | IOException e) { - throw new RuntimeException("Cannot create ssl key/certificate", e); - } - return factory; - } - - private void makePrivate(File file) { - file.setReadable(false); - file.setWritable(false); - file.setExecutable(false); - file.setReadable(true, true); - file.setWritable(true, true); - if (file.isDirectory()) { - file.setExecutable(true, true); - } - } - - /** - * Create a new servlet context within the server. - *

- * This method should be invoked before the server is started, once for each - * context the caller wants to register. - * - * @param path - * path of the context; use "/" for the root context if binding - * to the root is desired. - * @return the context to add servlets into. - * @since 7.0 - */ - public ServletContextHandler addContext(String path) { - assertNotYetSetUp(); - if ("".equals(path)) - path = "/"; - - ServletContextHandler ctx = new ServletContextHandler(); - ctx.setContextPath(path); - contexts.addHandler(ctx); - - return ctx; - } - - /** - * Configure basic authentication. - * - * @param ctx - * servlet context handler - * @param methods - * the methods - * @return servlet context handler - * @since 7.0 - */ - public ServletContextHandler authBasic(ServletContextHandler ctx, - String... methods) { - assertNotYetSetUp(); - auth(ctx, new BasicAuthenticator(), methods); - return ctx; - } - - static class TestMappedLoginService extends AbstractLoginService { - private RolePrincipal role; - - protected final Map users = new ConcurrentHashMap<>(); - - TestMappedLoginService(String role) { - this.role = new RolePrincipal(role); - } - - @Override - protected void doStart() throws Exception { - UserPrincipal p = new UserPrincipal(username, - new Password(password)); - users.put(username, p); - super.doStart(); - } - - @Override - protected UserPrincipal loadUserInfo(String user) { - return users.get(user); - } - - @Override - protected List loadRoleInfo(UserPrincipal user) { - if (users.get(user.getName()) == null) { - return null; - } - return Collections.singletonList(role); - } + super(port, sslPort); } private ConstraintMapping createConstraintMapping() { @@ -314,8 +75,9 @@ private ConstraintMapping createConstraintMapping() { return cm; } - private void auth(ServletContextHandler ctx, Authenticator authType, - String... methods) { + @Override + protected void configureAuthentication(ServletContextHandler ctx, + String[] methods) { AbstractLoginService users = new TestMappedLoginService(authRole); List mappings = new ArrayList<>(); if (methods == null || methods.length == 0) { @@ -333,129 +95,9 @@ private void auth(ServletContextHandler ctx, Authenticator authType, ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); sec.setRealmName(realm); - sec.setAuthenticator(authType); + sec.setAuthenticator(new BasicAuthenticator()); sec.setLoginService(users); sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); ctx.setSecurityHandler(sec); } - - /** - * Start the server on a random local port. - * - * @throws Exception - * the server cannot be started, testing is not possible. - */ - public void setUp() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.start(); - config.setSecurePort(getSecurePort()); - if (secureConfig != null) { - secureConfig.setSecurePort(getSecurePort()); - } - } - - /** - * Shutdown the server. - * - * @throws Exception - * the server refuses to halt, or wasn't running. - */ - public void tearDown() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.stop(); - for (File f : filesToDelete) { - f.delete(); - } - filesToDelete.clear(); - } - - /** - * Get the URI to reference this server. - *

- * The returned URI includes the proper host name and port number, but does - * not contain a path. - * - * @return URI to reference this server's root context. - */ - public URI getURI() { - assertAlreadySetUp(); - String host = connector.getHost(); - if (host.contains(":") && !host.startsWith("[")) - host = "[" + host + "]"; - final String uri = "http://" + host + ":" + getPort(); - try { - return new URI(uri); - } catch (URISyntaxException e) { - throw new RuntimeException("Unexpected URI error on " + uri, e); - } - } - - /** - * Get port. - * - * @return the local port number the server is listening on. - */ - public int getPort() { - assertAlreadySetUp(); - return connector.getLocalPort(); - } - - /** - * Get secure port. - * - * @return the HTTPS port or -1 if not configured. - */ - public int getSecurePort() { - assertAlreadySetUp(); - return secureConnector != null ? secureConnector.getLocalPort() : -1; - } - - /** - * Get requests. - * - * @return all requests since the server was started. - */ - public List getRequests() { - return new ArrayList<>(log.getEvents()); - } - - /** - * Get requests. - * - * @param base - * base URI used to access the server. - * @param path - * the path to locate requests for, relative to {@code base}. - * @return all requests which match the given path. - */ - public List getRequests(URIish base, String path) { - return getRequests(HttpTestCase.join(base, path)); - } - - /** - * Get requests. - * - * @param path - * the path to locate requests for. - * @return all requests which match the given path. - */ - public List getRequests(String path) { - ArrayList r = new ArrayList<>(); - for (AccessEvent event : log.getEvents()) { - if (event.getPath().equals(path)) { - r.add(event); - } - } - return r; - } - - private void assertNotYetSetUp() { - assertFalse("server is not running", server.isRunning()); - } - - private void assertAlreadySetUp() { - assertTrue("server is running", server.isRunning()); - } } diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 76e437bc3d6..3a4bce7419e 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -10,95 +10,30 @@ package org.eclipse.jgit.junit.http; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.UnknownHostException; -import java.nio.file.Files; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jetty.ee10.servlet.ServletContextHandler; import org.eclipse.jetty.ee10.servlet.security.ConstraintMapping; import org.eclipse.jetty.ee10.servlet.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.AbstractLoginService; -import org.eclipse.jetty.security.Authenticator; import org.eclipse.jetty.security.Constraint; -import org.eclipse.jetty.security.RolePrincipal; -import org.eclipse.jetty.security.UserPrincipal; import org.eclipse.jetty.security.authentication.BasicAuthenticator; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.util.security.Password; -import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jgit.transport.URIish; /** - * Tiny web application server for unit testing. + * Tiny web application server for unit testing, wired for the Jakarta servlet + * (Jetty EE10) generation. *

- * Tests should start the server in their {@code setUp()} method and stop the - * server in their {@code tearDown()} method. Only while started the server's - * URL and/or port number can be obtained. + * Only the Jetty security wiring is generation specific; everything else lives + * in {@link AppServerBase}. */ -public class AppServer { - /** Realm name for the secure access areas. */ - public static final String realm = "Secure Area"; - - /** Username for secured access areas. */ - public static final String username = "agitter"; - - /** Password for {@link #username} in secured access areas. */ - public static final String password = "letmein"; - - /** SSL keystore password; must have at least 6 characters. */ - private static final String keyPassword = "mykeys"; - - /** Role for authentication. */ - private static final String authRole = "can-access"; - - static { - // Install a logger that throws warning messages. - // - final String prop = "org.eclipse.jetty.util.log.class"; - System.setProperty(prop, RecordingLogger.class.getName()); - } - - private final Server server; - - private final HttpConfiguration config; - - private final ServerConnector connector; - - private final HttpConfiguration secureConfig; - - private final ServerConnector secureConnector; - - private final ContextHandlerCollection contexts; - - private final TestRequestLog log; - - private List filesToDelete = new ArrayList<>(); - +public class AppServer extends AppServerBase { /** * Constructor for AppServer. */ public AppServer() { - this(0, -1); + super(); } /** @@ -110,7 +45,7 @@ public AppServer() { * @since 4.2 */ public AppServer(int port) { - this(port, -1); + super(port); } /** @@ -124,185 +59,7 @@ public AppServer(int port) { * @since 4.9 */ public AppServer(int port, int sslPort) { - server = new Server(); - - config = new HttpConfiguration(); - config.setSecureScheme("https"); - config.setSecurePort(0); - config.setOutputBufferSize(32768); - - connector = new ServerConnector(server, - new HttpConnectionFactory(config)); - connector.setPort(port); - String ip; - String hostName; - try { - final InetAddress me = InetAddress.getByName("localhost"); - ip = me.getHostAddress(); - connector.setHost(ip); - hostName = InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - throw new RuntimeException("Cannot find localhost", e); - } - - if (sslPort >= 0) { - SslContextFactory.Server sslContextFactory = createTestSslContextFactory( - hostName, ip); - secureConfig = new HttpConfiguration(config); - secureConfig.addCustomizer(new SecureRequestCustomizer()); - HttpConnectionFactory http11 = new HttpConnectionFactory( - secureConfig); - SslConnectionFactory tls = new SslConnectionFactory( - sslContextFactory, http11.getProtocol()); - secureConnector = new ServerConnector(server, tls, http11); - secureConnector.setPort(sslPort); - secureConnector.setHost(ip); - } else { - secureConfig = null; - secureConnector = null; - } - - contexts = new ContextHandlerCollection(); - - log = new TestRequestLog(); - log.setHandler(contexts); - - if (secureConnector == null) { - server.setConnectors(new Connector[] { connector }); - } else { - server.setConnectors( - new Connector[] { connector, secureConnector }); - } - server.setHandler(log); - } - - private SslContextFactory.Server createTestSslContextFactory( - String hostName, String ip) { - SslContextFactory.Server factory = new SslContextFactory.Server(); - - String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; - - try { - File tmpDir = Files.createTempDirectory("jks").toFile(); - tmpDir.deleteOnExit(); - makePrivate(tmpDir); - File keyStore = new File(tmpDir, "keystore.jks"); - File keytool = new File( - new File(new File(System.getProperty("java.home")), "bin"), - "keytool"); - Runtime.getRuntime().exec( - new String[] { - keytool.getAbsolutePath(), // - "-keystore", keyStore.getAbsolutePath(), // - "-storepass", keyPassword, - "-alias", hostName, // - "-ext", "bc=ca:true", // - "-ext", - String.format( - "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", - ip, hostName), // - "-genkeypair", // - "-keyalg", "RSA", // - "-keypass", keyPassword, // - "-dname", dName, // - "-validity", "2" // - }).waitFor(); - keyStore.deleteOnExit(); - makePrivate(keyStore); - filesToDelete.add(keyStore); - filesToDelete.add(tmpDir); - factory.setKeyStorePath(keyStore.getAbsolutePath()); - factory.setKeyStorePassword(keyPassword); - factory.setKeyManagerPassword(keyPassword); - factory.setTrustStorePath(keyStore.getAbsolutePath()); - factory.setTrustStorePassword(keyPassword); - } catch (InterruptedException | IOException e) { - throw new RuntimeException("Cannot create ssl key/certificate", e); - } - return factory; - } - - private void makePrivate(File file) { - file.setReadable(false); - file.setWritable(false); - file.setExecutable(false); - file.setReadable(true, true); - file.setWritable(true, true); - if (file.isDirectory()) { - file.setExecutable(true, true); - } - } - - /** - * Create a new servlet context within the server. - *

- * This method should be invoked before the server is started, once for each - * context the caller wants to register. - * - * @param path - * path of the context; use "/" for the root context if binding - * to the root is desired. - * @return the context to add servlets into. - * @since 7.0 - */ - public ServletContextHandler addContext(String path) { - assertNotYetSetUp(); - if ("".equals(path)) - path = "/"; - - ServletContextHandler ctx = new ServletContextHandler(); - ctx.setContextPath(path); - contexts.addHandler(ctx); - - return ctx; - } - - /** - * Configure basic authentication. - * - * @param ctx - * servlet context handler - * @param methods - * the methods - * @return servlet context handler - * @since 7.0 - */ - public ServletContextHandler authBasic(ServletContextHandler ctx, - String... methods) { - assertNotYetSetUp(); - auth(ctx, new BasicAuthenticator(), methods); - return ctx; - } - - static class TestMappedLoginService extends AbstractLoginService { - private RolePrincipal role; - - protected final Map users = new ConcurrentHashMap<>(); - - TestMappedLoginService(String role) { - this.role = new RolePrincipal(role); - } - - @Override - protected void doStart() throws Exception { - UserPrincipal p = new UserPrincipal(username, - new Password(password)); - users.put(username, p); - super.doStart(); - } - - @Override - protected UserPrincipal loadUserInfo(String user) { - return users.get(user); - } - - @Override - protected List loadRoleInfo(UserPrincipal user) { - if (users.get(user.getName()) == null) { - return null; - } - return Collections.singletonList(role); - } + super(port, sslPort); } private ConstraintMapping createConstraintMapping() { @@ -315,8 +72,9 @@ private ConstraintMapping createConstraintMapping() { return cm; } - private void auth(ServletContextHandler ctx, Authenticator authType, - String... methods) { + @Override + protected void configureAuthentication(ServletContextHandler ctx, + String[] methods) { AbstractLoginService users = new TestMappedLoginService(authRole); List mappings = new ArrayList<>(); if (methods == null || methods.length == 0) { @@ -331,133 +89,12 @@ private void auth(ServletContextHandler ctx, Authenticator authType, ConstraintSecurityHandler sec = new ConstraintSecurityHandler(); sec.setRealmName(realm); - sec.setAuthenticator(authType); + sec.setAuthenticator(new BasicAuthenticator()); sec.setLoginService(users); - sec.setConstraintMappings( - mappings.toArray(new ConstraintMapping[0])); + sec.setConstraintMappings(mappings.toArray(new ConstraintMapping[0])); sec.setHandler(ctx); contexts.removeHandler(ctx); contexts.addHandler(sec); } - - /** - * Start the server on a random local port. - * - * @throws Exception - * the server cannot be started, testing is not possible. - */ - public void setUp() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.start(); - config.setSecurePort(getSecurePort()); - if (secureConfig != null) { - secureConfig.setSecurePort(getSecurePort()); - } - } - - /** - * Shutdown the server. - * - * @throws Exception - * the server refuses to halt, or wasn't running. - */ - public void tearDown() throws Exception { - RecordingLogger.clear(); - log.clear(); - server.stop(); - for (File f : filesToDelete) { - f.delete(); - } - filesToDelete.clear(); - } - - /** - * Get the URI to reference this server. - *

- * The returned URI includes the proper host name and port number, but does - * not contain a path. - * - * @return URI to reference this server's root context. - */ - public URI getURI() { - assertAlreadySetUp(); - String host = connector.getHost(); - if (host.contains(":") && !host.startsWith("[")) - host = "[" + host + "]"; - final String uri = "http://" + host + ":" + getPort(); - try { - return new URI(uri); - } catch (URISyntaxException e) { - throw new RuntimeException("Unexpected URI error on " + uri, e); - } - } - - /** - * Get port. - * - * @return the local port number the server is listening on. - */ - public int getPort() { - assertAlreadySetUp(); - return connector.getLocalPort(); - } - - /** - * Get secure port. - * - * @return the HTTPS port or -1 if not configured. - */ - public int getSecurePort() { - assertAlreadySetUp(); - return secureConnector != null ? secureConnector.getLocalPort() : -1; - } - - /** - * Get requests. - * - * @return all requests since the server was started. - */ - public List getRequests() { - return new ArrayList<>(log.getEvents()); - } - - /** - * Get requests. - * - * @param base - * base URI used to access the server. - * @param path - * the path to locate requests for, relative to {@code base}. - * @return all requests which match the given path. - */ - public List getRequests(URIish base, String path) { - return getRequests(HttpTestCase.join(base, path)); - } - - /** - * Get requests. - * - * @param path - * the path to locate requests for. - * @return all requests which match the given path. - */ - public List getRequests(String path) { - ArrayList r = new ArrayList<>(); - for (AccessEvent event : log.getEvents()) { - if (event.getPath().equals(path)) { - r.add(event); - } - } - return r; - } - - private void assertNotYetSetUp() { - assertFalse("server is not running", server.isRunning()); - } - - private void assertAlreadySetUp() { - assertTrue("server is running", server.isRunning()); - } } diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java new file mode 100644 index 00000000000..bc2baadd837 --- /dev/null +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServerBase.java @@ -0,0 +1,441 @@ +/* + * Copyright (C) 2010, 2017 Google Inc. and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.junit.http; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.security.AbstractLoginService; +import org.eclipse.jetty.security.RolePrincipal; +import org.eclipse.jetty.security.UserPrincipal; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.util.security.Password; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.eclipse.jgit.transport.URIish; + +/** + * Tiny web application server for unit testing. + *

+ * Tests should start the server in their {@code setUp()} method and stop the + * server in their {@code tearDown()} method. Only while started the server's + * URL and/or port number can be obtained. + *

+ * The Jetty security API for declaring authentication constraints differs + * between EE generations. That part is therefore isolated in the abstract + * {@link #configureAuthentication(ServletContextHandler, String[])} seam, which + * the concrete {@code AppServer} provides for its servlet generation. + */ +public abstract class AppServerBase { + /** Realm name for the secure access areas. */ + public static final String realm = "Secure Area"; + + /** Username for secured access areas. */ + public static final String username = "agitter"; + + /** Password for {@link #username} in secured access areas. */ + public static final String password = "letmein"; + + /** SSL keystore password; must have at least 6 characters. */ + private static final String keyPassword = "mykeys"; + + /** Role for authentication. */ + protected static final String authRole = "can-access"; + + static { + // Install a logger that throws warning messages. + // + final String prop = "org.eclipse.jetty.util.log.class"; + System.setProperty(prop, RecordingLogger.class.getName()); + } + + private final Server server; + + private final HttpConfiguration config; + + private final ServerConnector connector; + + private final HttpConfiguration secureConfig; + + private final ServerConnector secureConnector; + + /** Collection the servlet contexts are registered in. */ + protected final ContextHandlerCollection contexts; + + private final TestRequestLog log; + + private List filesToDelete = new ArrayList<>(); + + /** + * Constructor for AppServer. + */ + protected AppServerBase() { + this(0, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * the http port number; may be zero to allocate a port + * dynamically + */ + protected AppServerBase(int port) { + this(port, -1); + } + + /** + * Constructor for AppServer. + * + * @param port + * for http, may be zero to allocate a port dynamically + * @param sslPort + * for https,may be zero to allocate a port dynamically. If + * negative, the server will be set up without https support. + */ + protected AppServerBase(int port, int sslPort) { + server = new Server(); + + config = new HttpConfiguration(); + config.setSecureScheme("https"); + config.setSecurePort(0); + config.setOutputBufferSize(32768); + + connector = new ServerConnector(server, + new HttpConnectionFactory(config)); + connector.setPort(port); + String ip; + String hostName; + try { + final InetAddress me = InetAddress.getByName("localhost"); + ip = me.getHostAddress(); + connector.setHost(ip); + hostName = InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + throw new RuntimeException("Cannot find localhost", e); + } + + if (sslPort >= 0) { + SslContextFactory.Server sslContextFactory = createTestSslContextFactory( + hostName, ip); + secureConfig = new HttpConfiguration(config); + secureConfig.addCustomizer(new SecureRequestCustomizer()); + HttpConnectionFactory http11 = new HttpConnectionFactory( + secureConfig); + SslConnectionFactory tls = new SslConnectionFactory( + sslContextFactory, http11.getProtocol()); + secureConnector = new ServerConnector(server, tls, http11); + secureConnector.setPort(sslPort); + secureConnector.setHost(ip); + } else { + secureConfig = null; + secureConnector = null; + } + + contexts = new ContextHandlerCollection(); + + log = new TestRequestLog(); + log.setHandler(contexts); + + if (secureConnector == null) { + server.setConnectors(new Connector[] { connector }); + } else { + server.setConnectors( + new Connector[] { connector, secureConnector }); + } + server.setHandler(log); + } + + private SslContextFactory.Server createTestSslContextFactory( + String hostName, String ip) { + SslContextFactory.Server factory = new SslContextFactory.Server(); + + String dName = "CN=localhost,OU=JGit,O=Eclipse,ST=Ontario,L=Toronto,C=CA"; + + try { + File tmpDir = Files.createTempDirectory("jks").toFile(); + tmpDir.deleteOnExit(); + makePrivate(tmpDir); + File keyStore = new File(tmpDir, "keystore.jks"); + File keytool = new File( + new File(new File(System.getProperty("java.home")), "bin"), + "keytool"); + Runtime.getRuntime().exec( + new String[] { + keytool.getAbsolutePath(), // + "-keystore", keyStore.getAbsolutePath(), // + "-storepass", keyPassword, + "-alias", hostName, // + "-ext", "bc=ca:true", // + "-ext", + String.format( + "san=ip:%s,ip:127.0.0.1,ip:[::1],DNS:%s", + ip, hostName), // + "-genkeypair", // + "-keyalg", "RSA", // + "-keypass", keyPassword, // + "-dname", dName, // + "-validity", "2" // + }).waitFor(); + keyStore.deleteOnExit(); + makePrivate(keyStore); + filesToDelete.add(keyStore); + filesToDelete.add(tmpDir); + factory.setKeyStorePath(keyStore.getAbsolutePath()); + factory.setKeyStorePassword(keyPassword); + factory.setKeyManagerPassword(keyPassword); + factory.setTrustStorePath(keyStore.getAbsolutePath()); + factory.setTrustStorePassword(keyPassword); + } catch (InterruptedException | IOException e) { + throw new RuntimeException("Cannot create ssl key/certificate", e); + } + return factory; + } + + private void makePrivate(File file) { + file.setReadable(false); + file.setWritable(false); + file.setExecutable(false); + file.setReadable(true, true); + file.setWritable(true, true); + if (file.isDirectory()) { + file.setExecutable(true, true); + } + } + + /** + * Create a new servlet context within the server. + *

+ * This method should be invoked before the server is started, once for each + * context the caller wants to register. + * + * @param path + * path of the context; use "/" for the root context if binding + * to the root is desired. + * @return the context to add servlets into. + * @since 7.0 + */ + public ServletContextHandler addContext(String path) { + assertNotYetSetUp(); + if ("".equals(path)) + path = "/"; + + ServletContextHandler ctx = new ServletContextHandler(); + ctx.setContextPath(path); + contexts.addHandler(ctx); + + return ctx; + } + + /** + * Configure basic authentication. + * + * @param ctx + * servlet context handler + * @param methods + * the methods + * @return servlet context handler + * @since 7.0 + */ + public ServletContextHandler authBasic(ServletContextHandler ctx, + String... methods) { + assertNotYetSetUp(); + configureAuthentication(ctx, methods); + return ctx; + } + + /** + * Install basic-authentication constraints on the given context. + *

+ * The Jetty security API used to build the constraints and attach the + * security handler differs between servlet generations, so each concrete + * {@code AppServer} implements this seam for its Jetty flavor. + * + * @param ctx + * servlet context handler to secure + * @param methods + * HTTP methods to constrain; empty constrains all methods + */ + protected abstract void configureAuthentication(ServletContextHandler ctx, + String[] methods); + + /** Login service mapping the single test user and role. */ + protected static class TestMappedLoginService extends AbstractLoginService { + private RolePrincipal role; + + protected final Map users = new ConcurrentHashMap<>(); + + TestMappedLoginService(String role) { + this.role = new RolePrincipal(role); + } + + @Override + protected void doStart() throws Exception { + UserPrincipal p = new UserPrincipal(username, + new Password(password)); + users.put(username, p); + super.doStart(); + } + + @Override + protected UserPrincipal loadUserInfo(String user) { + return users.get(user); + } + + @Override + protected List loadRoleInfo(UserPrincipal user) { + if (users.get(user.getName()) == null) { + return null; + } + return Collections.singletonList(role); + } + } + + /** + * Start the server on a random local port. + * + * @throws Exception + * the server cannot be started, testing is not possible. + */ + public void setUp() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.start(); + config.setSecurePort(getSecurePort()); + if (secureConfig != null) { + secureConfig.setSecurePort(getSecurePort()); + } + } + + /** + * Shutdown the server. + * + * @throws Exception + * the server refuses to halt, or wasn't running. + */ + public void tearDown() throws Exception { + RecordingLogger.clear(); + log.clear(); + server.stop(); + for (File f : filesToDelete) { + f.delete(); + } + filesToDelete.clear(); + } + + /** + * Get the URI to reference this server. + *

+ * The returned URI includes the proper host name and port number, but does + * not contain a path. + * + * @return URI to reference this server's root context. + */ + public URI getURI() { + assertAlreadySetUp(); + String host = connector.getHost(); + if (host.contains(":") && !host.startsWith("[")) + host = "[" + host + "]"; + final String uri = "http://" + host + ":" + getPort(); + try { + return new URI(uri); + } catch (URISyntaxException e) { + throw new RuntimeException("Unexpected URI error on " + uri, e); + } + } + + /** + * Get port. + * + * @return the local port number the server is listening on. + */ + public int getPort() { + assertAlreadySetUp(); + return connector.getLocalPort(); + } + + /** + * Get secure port. + * + * @return the HTTPS port or -1 if not configured. + */ + public int getSecurePort() { + assertAlreadySetUp(); + return secureConnector != null ? secureConnector.getLocalPort() : -1; + } + + /** + * Get requests. + * + * @return all requests since the server was started. + */ + public List getRequests() { + return new ArrayList<>(log.getEvents()); + } + + /** + * Get requests. + * + * @param base + * base URI used to access the server. + * @param path + * the path to locate requests for, relative to {@code base}. + * @return all requests which match the given path. + */ + public List getRequests(URIish base, String path) { + return getRequests(HttpTestCase.join(base, path)); + } + + /** + * Get requests. + * + * @param path + * the path to locate requests for. + * @return all requests which match the given path. + */ + public List getRequests(String path) { + ArrayList r = new ArrayList<>(); + for (AccessEvent event : log.getEvents()) { + if (event.getPath().equals(path)) { + r.add(event); + } + } + return r; + } + + private void assertNotYetSetUp() { + assertFalse("server is not running", server.isRunning()); + } + + private void assertAlreadySetUp() { + assertTrue("server is running", server.isRunning()); + } +} From 481e3aca279e503d8de0f5ed532dba0d0bf990d2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 7 Jul 2026 15:57:57 +0200 Subject: [PATCH 171/200] JGit v7.8.0.202607071357-m1 Signed-off-by: Matthias Sohn Change-Id: Ic869797d084030879d63aa2e4c05c0e59f3e7ca4 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 29a2d3e84b5..d69ece66991 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index f9caf9430df..78f3dffc4ec 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 ce0918dd76c..6a810d99546 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index b59816381bf..e1d60c36f73 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index f08201344d8..3381d5b479a 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 6052ba70204..1661c8920c8 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 41795216d4a..7b499a23112 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index cd93dc089f4..266733a6fa8 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 0313e52f0c5..0ae17a0be7d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 6a12964f4f5..52526b2b0de 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.ant - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.archive - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.ui - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.test - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 8bed084244e..cd86c72eaed 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index b4e096442af..d90daacff8a 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 80ae7fcc64f..c2d3062b8e4 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 7dd65e27821..96b4726a8fe 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 74d9d1a9deb..a9303527cad 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 30d22e1dfae..985d07f35e9 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 9c108b338be..94d79944533 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 5ae175baf3f..e0bcf353b32 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 cac9050e685..9ad3498c22e 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 6bb08e3336d..ef0e7517c5a 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f9e847baab7..ae3baf6b183 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 aa39fe4db4d..05ae774d5cb 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9f4f49b0ffb..bf836b6b538 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 0de8b2edbef..48f688f8f52 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: OSGI-INF/l10n/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 45634067f51..6f81b67cd23 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 951ef3e083c..95909180ebf 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 f50f3d2b60c..6b9d19afc6a 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: OSGI-INF/l10n/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 d52282f694c..e9409eba5b9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 5ac4ae7db0d..7480f1dc0cf 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 6d7b85e20cd..0742164f40c 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: OSGI-INF/l10n/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 4ccd459f50a..7b5f7a8db93 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index ac83f533922..e271f342906 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 5a923f51f77..98fabaca9f3 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3620dd75266..683b6b7ae31 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 68d7877451a..8054dc9b73a 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 5e4c9cf7bb6..293efbe341e 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 67b1bf22e6a..d959a0df48c 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 82b1403fc3c..0282ac84f9c 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2380339358c..1df5e2beec2 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 4a1012758f5..b301739b8c7 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index b468bc3b2b2..c215d91971c 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 78d3b3990e0..c1534287981 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 1c04cc8f141..826e975bb60 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 62ebf8218d2..b069d18f642 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 17a3e8f06a9..907258fd4b9 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 e52ff556ba5..80a36c709a7 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 81e9291d983..c47b0868ecc 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 e54d0ad38fb..ac8f7f1faeb 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 4bdf2678fb3..34e10ba3d23 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 9d0108b0595..5c60ba8b141 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 811948aa1fd..5c1c2bf0c3c 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 062837d5175..6e51394c98a 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 feb04004e08..0c14bbd2780 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 e305823bfeb..19aa5cc2d45 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 4b597ea6f45..c28206ce541 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 59085683575..849cc675a7a 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 5a13758e0b5..dec3907de3a 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 2cd6ac85f6e..b55f449566c 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 f022882c7d9..83f35a8d7d8 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 c14e4a31fd4..3a26cd8623b 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 dbee9fe8dae..7c4f10ab60e 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index a31b9288d90..308d777724e 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 a28a4efb467..1bc9cc1c5ab 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 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 5319d3e79b5..38b5a0c38ec 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 83dc25ad146..3a8f12793b5 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index e9a6b049971..e3aeafd42bf 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 042033d8c42..8769494d405 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 7df322ed6c4..b7287e2e6b7 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.8.0,7.9.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 9a8ae16ca80..dd5196b65fe 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 8769f646466..dc490fa9e4f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit.ssh.apache.agent 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 d48c4a2a596..1e5ad632028 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index c42eb2bea1d..492afc72ee7 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 c090c4d5ad4..a4a69c36214 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 3b936a8cf8f..404e174f348 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index d5cff8da7fa..e9885d7cf27 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 85d12abdf26..ccded643481 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index a5e57f69f60..bdd6a6736c8 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 8eaf94dbf78..18ef443537c 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.8.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 9d08701fc5e..1f7b852f04e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 865298d9ecc..2afcca342e2 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 5cab045aa0e..5d40fedf045 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 531bdcbf065..fb57f4a1342 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 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 e376952db1c..9f826265b88 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 54a8d561d1e..68dd974e8e1 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 40056db33ca..a4f399fc352 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 - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 8e92528f808..156d59392b1 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 09b1ed35b42..6fc8421b2b3 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607071357-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.202607071357-m1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index d893037f5dc..469ca2dde00 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 4f20b635093..5c934ae76c1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.8.0-SNAPSHOT + 7.8.0.202607071357-m1 JGit - Parent ${jgit-url} From 01720b510607dae2d8e873349d0ebbaaf35460a0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 8 Jul 2026 01:26:42 +0200 Subject: [PATCH 172/200] Prepare 7.8.0-SNAPSHOT builds Change-Id: If95cb19d246de7314ebd2e948d2b4c981f43d144 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index d69ece66991..29a2d3e84b5 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 78f3dffc4ec..f9caf9430df 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 - 7.8.0.202607071357-m1 + 7.8.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 6a810d99546..ce0918dd76c 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index e1d60c36f73..b59816381bf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 3381d5b479a..f08201344d8 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 - 7.8.0.202607071357-m1 + 7.8.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 1661c8920c8..6052ba70204 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 7b499a23112..41795216d4a 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 266733a6fa8..cd93dc089f4 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 - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 0ae17a0be7d..0313e52f0c5 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 52526b2b0de..6a12964f4f5 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 - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.8.0.202607071357-m1 + 7.8.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 cd86c72eaed..8bed084244e 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index d90daacff8a..b4e096442af 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 - 7.8.0.202607071357-m1 + 7.8.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 c2d3062b8e4..80ae7fcc64f 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 96b4726a8fe..7dd65e27821 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index a9303527cad..74d9d1a9deb 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 - 7.8.0.202607071357-m1 + 7.8.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 985d07f35e9..30d22e1dfae 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 94d79944533..9c108b338be 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index e0bcf353b32..5ae175baf3f 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 - 7.8.0.202607071357-m1 + 7.8.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 9ad3498c22e..cac9050e685 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 ef0e7517c5a..6bb08e3336d 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index ae3baf6b183..f9e847baab7 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 - 7.8.0.202607071357-m1 + 7.8.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 05ae774d5cb..aa39fe4db4d 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index bf836b6b538..9f4f49b0ffb 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 - 7.8.0.202607071357-m1 + 7.8.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 48f688f8f52..0de8b2edbef 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 6f81b67cd23..45634067f51 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 95909180ebf..951ef3e083c 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 - 7.8.0.202607071357-m1 + 7.8.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 6b9d19afc6a..f50f3d2b60c 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 e9409eba5b9..d52282f694c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 7480f1dc0cf..5ac4ae7db0d 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 - 7.8.0.202607071357-m1 + 7.8.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 0742164f40c..6d7b85e20cd 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 7b5f7a8db93..4ccd459f50a 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index e271f342906..ac83f533922 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 - 7.8.0.202607071357-m1 + 7.8.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 98fabaca9f3..5a923f51f77 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 683b6b7ae31..3620dd75266 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 - 7.8.0.202607071357-m1 + 7.8.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 8054dc9b73a..68d7877451a 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 293efbe341e..5e4c9cf7bb6 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index d959a0df48c..67b1bf22e6a 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 - 7.8.0.202607071357-m1 + 7.8.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 0282ac84f9c..82b1403fc3c 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 1df5e2beec2..2380339358c 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 - 7.8.0.202607071357-m1 + 7.8.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 b301739b8c7..4a1012758f5 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index c215d91971c..b468bc3b2b2 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index c1534287981..78d3b3990e0 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 - 7.8.0.202607071357-m1 + 7.8.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 826e975bb60..1c04cc8f141 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 b069d18f642..62ebf8218d2 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 - 7.8.0.202607071357-m1 + 7.8.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 907258fd4b9..17a3e8f06a9 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 80a36c709a7..e52ff556ba5 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 - 7.8.0.202607071357-m1 + 7.8.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 c47b0868ecc..81e9291d983 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 ac8f7f1faeb..e54d0ad38fb 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 - 7.8.0.202607071357-m1 + 7.8.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 34e10ba3d23..4bdf2678fb3 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 5c60ba8b141..9d0108b0595 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 - 7.8.0.202607071357-m1 + 7.8.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 5c1c2bf0c3c..811948aa1fd 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 6e51394c98a..062837d5175 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 - 7.8.0.202607071357-m1 + 7.8.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 0c14bbd2780..feb04004e08 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 19aa5cc2d45..e305823bfeb 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 - 7.8.0.202607071357-m1 + 7.8.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 c28206ce541..4b597ea6f45 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 - 7.8.0.202607071357-m1 + 7.8.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 849cc675a7a..59085683575 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 dec3907de3a..5a13758e0b5 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 - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.8.0.202607071357-m1 + 7.8.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 b55f449566c..2cd6ac85f6e 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 83f35a8d7d8..f022882c7d9 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 - 7.8.0.202607071357-m1 + 7.8.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 3a26cd8623b..c14e4a31fd4 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 7c4f10ab60e..dbee9fe8dae 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 - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 308d777724e..a31b9288d90 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 - 7.8.0.202607071357-m1 + 7.8.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 1bc9cc1c5ab..a28a4efb467 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier 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 38b5a0c38ec..5319d3e79b5 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 - 7.8.0.202607071357-m1 + 7.8.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 3a8f12793b5..83dc25ad146 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index e3aeafd42bf..e9a6b049971 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 8769494d405..042033d8c42 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 - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index b7287e2e6b7..7df322ed6c4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.8.0,7.9.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index dd5196b65fe..9a8ae16ca80 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index dc490fa9e4f..8769f646466 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 1e5ad632028..d48c4a2a596 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 492afc72ee7..c42eb2bea1d 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 - 7.8.0.202607071357-m1 + 7.8.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 a4a69c36214..c090c4d5ad4 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 404e174f348..3b936a8cf8f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e9885d7cf27..d5cff8da7fa 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 - 7.8.0.202607071357-m1 + 7.8.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 ccded643481..85d12abdf26 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index bdd6a6736c8..a5e57f69f60 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 - 7.8.0.202607071357-m1 + 7.8.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 18ef443537c..8eaf94dbf78 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.8.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 1f7b852f04e..9d08701fc5e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 2afcca342e2..865298d9ecc 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 - 7.8.0.202607071357-m1 + 7.8.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 5d40fedf045..5cab045aa0e 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index fb57f4a1342..531bdcbf065 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 - 7.8.0.202607071357-m1 + 7.8.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 9f826265b88..e376952db1c 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 68dd974e8e1..54a8d561d1e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a4f399fc352..40056db33ca 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 - 7.8.0.202607071357-m1 + 7.8.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 156d59392b1..8e92528f808 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: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 6fc8421b2b3..09b1ed35b42 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607071357-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.202607071357-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 469ca2dde00..d893037f5dc 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 5c934ae76c1..4f20b635093 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.8.0.202607071357-m1 + 7.8.0-SNAPSHOT JGit - Parent ${jgit-url} From 29e15e93ab86b7166dc07608bb6d794cd307cdc1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 8 Jul 2026 01:08:25 +0200 Subject: [PATCH 173/200] Package org.apache.commons.commons-logging 1.4.0 into p2 repo Change-Id: I1d9aa60b24a584aabbab063d98e3be76a44cb8d4 --- .../org.eclipse.jgit.repository/category.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index c369bdbfd93..e6a9c638415 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -147,7 +147,7 @@ - + From 601d50dd1594f9749a5e6c35dc45fd251949ae06 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 8 Jul 2026 01:27:10 +0200 Subject: [PATCH 174/200] JGit v7.8.0.202607072310-m1 Signed-off-by: Matthias Sohn Change-Id: Ib5ffd94f7cc993870b7ab94456230f204c69bac4 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 29a2d3e84b5..628773665e7 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index f9caf9430df..9625d208fb0 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 ce0918dd76c..306b59ab61f 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index b59816381bf..4976b60ae8c 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index f08201344d8..ed11c550ade 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 6052ba70204..08868b21d10 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 41795216d4a..de5477b7d49 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index cd93dc089f4..25350c2efbe 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 0313e52f0c5..decb8f0a593 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 6a12964f4f5..9cfd46db6c2 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.ant - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.archive - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.ui - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.test - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 8bed084244e..768ed87219c 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index b4e096442af..0778158f329 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 80ae7fcc64f..a05a608009e 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 7dd65e27821..fca43d77bf4 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 74d9d1a9deb..981140a22ac 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 30d22e1dfae..d69a5075db0 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 9c108b338be..be9c1dae1b8 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 5ae175baf3f..b7dd5a32c3d 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 cac9050e685..767d5352948 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 6bb08e3336d..f1dbb51d397 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f9e847baab7..7cae233ae1c 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 aa39fe4db4d..33f9e3509bd 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9f4f49b0ffb..78054d67b40 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 0de8b2edbef..b3e39b2be9d 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: OSGI-INF/l10n/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 45634067f51..591a277f395 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 951ef3e083c..a4dd077ea0d 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 f50f3d2b60c..7f158e008d8 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: OSGI-INF/l10n/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 d52282f694c..fb0254a1cf2 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 5ac4ae7db0d..26aa563aa4f 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 6d7b85e20cd..d450c455738 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: OSGI-INF/l10n/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 4ccd459f50a..6ba7b596020 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index ac83f533922..d8f408b6675 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 5a923f51f77..de8db3a2dc3 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3620dd75266..1520744cdc8 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 68d7877451a..bb75d0cf0c7 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 5e4c9cf7bb6..5c74b9c93bd 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 67b1bf22e6a..6853317cf55 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 82b1403fc3c..10fd54c7ca1 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2380339358c..4c1536633d7 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 4a1012758f5..787373c2ee9 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index b468bc3b2b2..cc21d7c84d7 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 78d3b3990e0..34578a9caab 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 1c04cc8f141..5280ca69d11 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 62ebf8218d2..33ecc5e9132 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 17a3e8f06a9..9d8cca8a52f 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 e52ff556ba5..e4106671d7c 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 81e9291d983..1d1b85eed38 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 e54d0ad38fb..f5eca611dab 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 4bdf2678fb3..6ba294a1345 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 9d0108b0595..b9168c3ab17 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 811948aa1fd..9d5dcded0a4 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 062837d5175..04c38227e7e 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 feb04004e08..cb8a11b2185 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 e305823bfeb..fe05a6853af 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 4b597ea6f45..896924e2bad 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 59085683575..f0ee0071284 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 5a13758e0b5..4bd720f0a30 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 2cd6ac85f6e..2d490c49adc 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 f022882c7d9..0f066803471 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 c14e4a31fd4..0ae306a9e56 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 dbee9fe8dae..1b32c8e6de2 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index a31b9288d90..11bf90c06c9 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 a28a4efb467..8e0b34e83af 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 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 5319d3e79b5..5e8b02d999a 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 83dc25ad146..51eb33d9f42 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index e9a6b049971..7c4c741bb20 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 042033d8c42..98dddcbab43 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 7df322ed6c4..dc1f22d71a8 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.8.0,7.9.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 9a8ae16ca80..d9dabee9f91 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 8769f646466..b7d9b1681b1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit.ssh.apache.agent 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 d48c4a2a596..65cc9ceb6a5 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index c42eb2bea1d..d2feebf1380 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 c090c4d5ad4..32ab51c3935 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 3b936a8cf8f..558f13277c8 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index d5cff8da7fa..b1af5352ddb 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 85d12abdf26..9fe90ad8822 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index a5e57f69f60..bb94c54774a 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 8eaf94dbf78..fdbb33737db 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.8.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 9d08701fc5e..6f29d377a0b 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 865298d9ecc..21971bec705 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 5cab045aa0e..27011981ff0 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 531bdcbf065..87033bb239c 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 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 e376952db1c..acba7d20001 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 54a8d561d1e..cc3ec1a4e32 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 40056db33ca..3e46e1c8c34 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 - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 8e92528f808..c89a244291b 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 09b1ed35b42..11f65c2ba6d 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607072310-m1 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.202607072310-m1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index d893037f5dc..cd8428d07a9 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 4f20b635093..fe5f646b91f 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.8.0-SNAPSHOT + 7.8.0.202607072310-m1 JGit - Parent ${jgit-url} From 97c0b65efcf99fc2c60f8cea3c548bf0431e8146 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 8 Jul 2026 11:13:34 +0200 Subject: [PATCH 175/200] Prepare 7.8.0-SNAPSHOT builds Change-Id: Ic80e67bd8283d00d38edcdad9f3c9897afc78995 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 628773665e7..29a2d3e84b5 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 9625d208fb0..f9caf9430df 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 - 7.8.0.202607072310-m1 + 7.8.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 306b59ab61f..ce0918dd76c 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 4976b60ae8c..b59816381bf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index ed11c550ade..f08201344d8 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 - 7.8.0.202607072310-m1 + 7.8.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 08868b21d10..6052ba70204 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index de5477b7d49..41795216d4a 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 25350c2efbe..cd93dc089f4 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 - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index decb8f0a593..0313e52f0c5 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 9cfd46db6c2..6a12964f4f5 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 - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.8.0.202607072310-m1 + 7.8.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 768ed87219c..8bed084244e 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 0778158f329..b4e096442af 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 - 7.8.0.202607072310-m1 + 7.8.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 a05a608009e..80ae7fcc64f 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 fca43d77bf4..7dd65e27821 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 981140a22ac..74d9d1a9deb 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 - 7.8.0.202607072310-m1 + 7.8.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 d69a5075db0..30d22e1dfae 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 be9c1dae1b8..9c108b338be 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index b7dd5a32c3d..5ae175baf3f 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 - 7.8.0.202607072310-m1 + 7.8.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 767d5352948..cac9050e685 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 f1dbb51d397..6bb08e3336d 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 7cae233ae1c..f9e847baab7 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 - 7.8.0.202607072310-m1 + 7.8.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 33f9e3509bd..aa39fe4db4d 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 78054d67b40..9f4f49b0ffb 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 - 7.8.0.202607072310-m1 + 7.8.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 b3e39b2be9d..0de8b2edbef 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 591a277f395..45634067f51 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index a4dd077ea0d..951ef3e083c 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 - 7.8.0.202607072310-m1 + 7.8.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 7f158e008d8..f50f3d2b60c 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 fb0254a1cf2..d52282f694c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 26aa563aa4f..5ac4ae7db0d 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 - 7.8.0.202607072310-m1 + 7.8.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 d450c455738..6d7b85e20cd 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 6ba7b596020..4ccd459f50a 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index d8f408b6675..ac83f533922 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 - 7.8.0.202607072310-m1 + 7.8.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 de8db3a2dc3..5a923f51f77 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 1520744cdc8..3620dd75266 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 - 7.8.0.202607072310-m1 + 7.8.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 bb75d0cf0c7..68d7877451a 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 5c74b9c93bd..5e4c9cf7bb6 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 6853317cf55..67b1bf22e6a 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 - 7.8.0.202607072310-m1 + 7.8.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 10fd54c7ca1..82b1403fc3c 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 4c1536633d7..2380339358c 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 - 7.8.0.202607072310-m1 + 7.8.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 787373c2ee9..4a1012758f5 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index cc21d7c84d7..b468bc3b2b2 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 34578a9caab..78d3b3990e0 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 - 7.8.0.202607072310-m1 + 7.8.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 5280ca69d11..1c04cc8f141 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 33ecc5e9132..62ebf8218d2 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 - 7.8.0.202607072310-m1 + 7.8.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 9d8cca8a52f..17a3e8f06a9 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 e4106671d7c..e52ff556ba5 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 - 7.8.0.202607072310-m1 + 7.8.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 1d1b85eed38..81e9291d983 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 f5eca611dab..e54d0ad38fb 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 - 7.8.0.202607072310-m1 + 7.8.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 6ba294a1345..4bdf2678fb3 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 b9168c3ab17..9d0108b0595 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 - 7.8.0.202607072310-m1 + 7.8.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 9d5dcded0a4..811948aa1fd 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 04c38227e7e..062837d5175 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 - 7.8.0.202607072310-m1 + 7.8.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 cb8a11b2185..feb04004e08 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 fe05a6853af..e305823bfeb 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 - 7.8.0.202607072310-m1 + 7.8.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 896924e2bad..4b597ea6f45 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 - 7.8.0.202607072310-m1 + 7.8.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 f0ee0071284..59085683575 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 4bd720f0a30..5a13758e0b5 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 - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.8.0.202607072310-m1 + 7.8.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 2d490c49adc..2cd6ac85f6e 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 0f066803471..f022882c7d9 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 - 7.8.0.202607072310-m1 + 7.8.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 0ae306a9e56..c14e4a31fd4 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 1b32c8e6de2..dbee9fe8dae 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 - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 11bf90c06c9..a31b9288d90 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 - 7.8.0.202607072310-m1 + 7.8.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 8e0b34e83af..a28a4efb467 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier 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 5e8b02d999a..5319d3e79b5 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 - 7.8.0.202607072310-m1 + 7.8.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 51eb33d9f42..83dc25ad146 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 7c4c741bb20..e9a6b049971 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 98dddcbab43..042033d8c42 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 - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index dc1f22d71a8..7df322ed6c4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.8.0,7.9.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index d9dabee9f91..9a8ae16ca80 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index b7d9b1681b1..8769f646466 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 65cc9ceb6a5..d48c4a2a596 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index d2feebf1380..c42eb2bea1d 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 - 7.8.0.202607072310-m1 + 7.8.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 32ab51c3935..c090c4d5ad4 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 558f13277c8..3b936a8cf8f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index b1af5352ddb..d5cff8da7fa 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 - 7.8.0.202607072310-m1 + 7.8.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 9fe90ad8822..85d12abdf26 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index bb94c54774a..a5e57f69f60 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 - 7.8.0.202607072310-m1 + 7.8.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 fdbb33737db..8eaf94dbf78 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.8.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 6f29d377a0b..9d08701fc5e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 21971bec705..865298d9ecc 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 - 7.8.0.202607072310-m1 + 7.8.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 27011981ff0..5cab045aa0e 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 87033bb239c..531bdcbf065 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 - 7.8.0.202607072310-m1 + 7.8.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 acba7d20001..e376952db1c 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index cc3ec1a4e32..54a8d561d1e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 3e46e1c8c34..40056db33ca 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 - 7.8.0.202607072310-m1 + 7.8.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 c89a244291b..8e92528f808 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: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 11f65c2ba6d..09b1ed35b42 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607072310-m1 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.202607072310-m1";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index cd8428d07a9..d893037f5dc 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index fe5f646b91f..4f20b635093 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.8.0.202607072310-m1 + 7.8.0-SNAPSHOT JGit - Parent ${jgit-url} From 39988b4f78ad6227aea02119226e46863efe6775 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 11 Jul 2026 01:35:50 +0200 Subject: [PATCH 176/200] Update bytebuddy to 1.18.11 Change-Id: I750d1865a5133cf168162432ff73a969c09807cd --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +++--- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index aeb38ac1bc6..f60d9d0a4a4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -27,7 +27,7 @@ git_repository( BOUNCYCASTLE_VERSION = "1.84" -BYTE_BUDDY_VERSION = "1.18.10" +BYTE_BUDDY_VERSION = "1.18.11" JETTY_VERSION = "12.1.10" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 7c94ad996ea..d53bc5c8a99 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.10 + 1.18.11 jar net.bytebuddy byte-buddy-agent - 1.18.10 + 1.18.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 015e85ffb62..32ca74466d8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.10 + 1.18.11 jar net.bytebuddy byte-buddy-agent - 1.18.10 + 1.18.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 5fd49d2c0fe..a698b392751 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.10 + 1.18.11 jar net.bytebuddy byte-buddy-agent - 1.18.10 + 1.18.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 80de5b9a045..bbcef4c3894 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.10 + 1.18.11 jar net.bytebuddy byte-buddy-agent - 1.18.10 + 1.18.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 39816a48716..550654f1efb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.10 + 1.18.11 jar net.bytebuddy byte-buddy-agent - 1.18.10 + 1.18.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index d83c59037f1..c801ac87fa1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.10 + 1.18.11 jar net.bytebuddy byte-buddy-agent - 1.18.10 + 1.18.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 0c2bf1f7bf6..10ff7081b59 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -201,13 +201,13 @@ net.bytebuddy byte-buddy - 1.18.10 + 1.18.11 jar net.bytebuddy byte-buddy-agent - 1.18.10 + 1.18.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 50572469333..cb7da03bee9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.18.10" + version = "1.18.11" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.18.10" + version = "1.18.11" } } diff --git a/pom.xml b/pom.xml index 4f20b635093..7d507b22f57 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 3.0 3.27.7 5.19.1 - 1.18.10 + 1.18.11 jacoco From 986dd12c130e7e2e01f281f4582908155b2be0b5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 11 Jul 2026 01:37:14 +0200 Subject: [PATCH 177/200] Update org.apache.sshd to 2.19.0 Change-Id: I79696eeb353117aa376986dfabdeb13822548686 --- MODULE.bazel | 2 +- .../META-INF/MANIFEST.MF | 50 ++++----- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +- .../maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 36 +++--- .../META-INF/MANIFEST.MF | 104 +++++++++--------- pom.xml | 2 +- 13 files changed, 120 insertions(+), 120 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index f60d9d0a4a4..e9b29d68eab 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -37,7 +37,7 @@ JNA_VERSION = "5.19.1" SLF4J_VERSION = "2.0.18" -SSHD_VERSION = "2.18.0" +SSHD_VERSION = "2.19.0" maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index f50f3d2b60c..77e5c1d924b 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -9,31 +9,31 @@ Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.apache.sshd.common;version="[2.18.0,2.19.0)", - org.apache.sshd.common.config.keys;version="[2.18.0,2.19.0)", - org.apache.sshd.common.file.virtualfs;version="[2.18.0,2.19.0)", - org.apache.sshd.common.helpers;version="[2.18.0,2.19.0)", - org.apache.sshd.common.io;version="[2.18.0,2.19.0)", - org.apache.sshd.common.kex;version="[2.18.0,2.19.0)", - org.apache.sshd.common.keyprovider;version="[2.18.0,2.19.0)", - org.apache.sshd.common.session;version="[2.18.0,2.19.0)", - org.apache.sshd.common.signature;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.buffer;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.logging;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.security;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.threads;version="[2.18.0,2.19.0)", - org.apache.sshd.core;version="[2.18.0,2.19.0)", - org.apache.sshd.server;version="[2.18.0,2.19.0)", - org.apache.sshd.server.auth;version="[2.18.0,2.19.0)", - org.apache.sshd.server.auth.gss;version="[2.18.0,2.19.0)", - org.apache.sshd.server.auth.keyboard;version="[2.18.0,2.19.0)", - org.apache.sshd.server.auth.password;version="[2.18.0,2.19.0)", - org.apache.sshd.server.command;version="[2.18.0,2.19.0)", - org.apache.sshd.server.session;version="[2.18.0,2.19.0)", - org.apache.sshd.server.shell;version="[2.18.0,2.19.0)", - org.apache.sshd.server.subsystem;version="[2.18.0,2.19.0)", - org.apache.sshd.sftp;version="[2.18.0,2.19.0)", - org.apache.sshd.sftp.server;version="[2.18.0,2.19.0)", +Import-Package: org.apache.sshd.common;version="[2.19.0,2.20.0)", + org.apache.sshd.common.config.keys;version="[2.19.0,2.20.0)", + org.apache.sshd.common.file.virtualfs;version="[2.19.0,2.20.0)", + org.apache.sshd.common.helpers;version="[2.19.0,2.20.0)", + org.apache.sshd.common.io;version="[2.19.0,2.20.0)", + org.apache.sshd.common.kex;version="[2.19.0,2.20.0)", + org.apache.sshd.common.keyprovider;version="[2.19.0,2.20.0)", + org.apache.sshd.common.session;version="[2.19.0,2.20.0)", + org.apache.sshd.common.signature;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.buffer;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.logging;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.security;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.threads;version="[2.19.0,2.20.0)", + org.apache.sshd.core;version="[2.19.0,2.20.0)", + org.apache.sshd.server;version="[2.19.0,2.20.0)", + org.apache.sshd.server.auth;version="[2.19.0,2.20.0)", + org.apache.sshd.server.auth.gss;version="[2.19.0,2.20.0)", + org.apache.sshd.server.auth.keyboard;version="[2.19.0,2.20.0)", + org.apache.sshd.server.auth.password;version="[2.19.0,2.20.0)", + org.apache.sshd.server.command;version="[2.19.0,2.20.0)", + org.apache.sshd.server.session;version="[2.19.0,2.20.0)", + org.apache.sshd.server.shell;version="[2.19.0,2.20.0)", + org.apache.sshd.server.subsystem;version="[2.19.0,2.20.0)", + org.apache.sshd.sftp;version="[2.19.0,2.20.0)", + org.apache.sshd.sftp.server;version="[2.19.0,2.20.0)", org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", org.eclipse.jgit.api;version="[7.8.0,7.9.0)", org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index d53bc5c8a99..fa08e63c180 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.18.0 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 32ca74466d8..83b0513e0c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.18.0 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index a698b392751..79860cf14aa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.18.0 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index bbcef4c3894..4cf51feeb1e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.18.0 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 550654f1efb..dc4aa5205eb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.18.0 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index c801ac87fa1..7629279755a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.18.0 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 10ff7081b59..4b3e5fe5a9b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.18.0 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.18.0 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index cb7da03bee9..4a6fdb8ec59 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -238,12 +238,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.18.0" + version = "2.19.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.18.0" + version = "2.19.0" } } 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 d48c4a2a596..7bd58433c6b 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,24 +8,24 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.apache.sshd.agent;version="[2.18.0,2.19.0)", - org.apache.sshd.certificate;version="[2.18.0,2.19.0)", - org.apache.sshd.client.config.hosts;version="[2.18.0,2.19.0)", - org.apache.sshd.common;version="[2.18.0,2.19.0)", - org.apache.sshd.common.auth;version="[2.18.0,2.19.0)", - org.apache.sshd.common.cipher;version="[2.18.0,2.19.0)", - org.apache.sshd.common.config.keys;version="[2.18.0,2.19.0)", - org.apache.sshd.common.helpers;version="[2.18.0,2.19.0)", - org.apache.sshd.common.kex;version="[2.18.0,2.19.0)", - org.apache.sshd.common.keyprovider;version="[2.18.0,2.19.0)", - org.apache.sshd.common.session;version="[2.18.0,2.19.0)", - org.apache.sshd.common.signature;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.buffer;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.net;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.security;version="[2.18.0,2.19.0)", - org.apache.sshd.core;version="[2.18.0,2.19.0)", - org.apache.sshd.server;version="[2.18.0,2.19.0)", - org.apache.sshd.server.forward;version="[2.18.0,2.19.0)", +Import-Package: org.apache.sshd.agent;version="[2.19.0,2.20.0)", + org.apache.sshd.certificate;version="[2.19.0,2.20.0)", + org.apache.sshd.client.config.hosts;version="[2.19.0,2.20.0)", + org.apache.sshd.common;version="[2.19.0,2.20.0)", + org.apache.sshd.common.auth;version="[2.19.0,2.20.0)", + org.apache.sshd.common.cipher;version="[2.19.0,2.20.0)", + org.apache.sshd.common.config.keys;version="[2.19.0,2.20.0)", + org.apache.sshd.common.helpers;version="[2.19.0,2.20.0)", + org.apache.sshd.common.kex;version="[2.19.0,2.20.0)", + org.apache.sshd.common.keyprovider;version="[2.19.0,2.20.0)", + org.apache.sshd.common.session;version="[2.19.0,2.20.0)", + org.apache.sshd.common.signature;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.buffer;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.net;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.security;version="[2.19.0,2.20.0)", + org.apache.sshd.core;version="[2.19.0,2.20.0)", + org.apache.sshd.server;version="[2.19.0,2.20.0)", + org.apache.sshd.server.forward;version="[2.19.0,2.20.0)", org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", org.eclipse.jgit.api;version="[7.8.0,7.9.0)", org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index c090c4d5ad4..809c4993726 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -39,58 +39,58 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends: org.apache.sshd.client.keyverifier", org.eclipse.jgit.transport.sshd.agent;version="7.8.0" Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", - org.apache.sshd.agent;version="[2.18.0,2.19.0)", - org.apache.sshd.client;version="[2.18.0,2.19.0)", - org.apache.sshd.client.auth;version="[2.18.0,2.19.0)", - org.apache.sshd.client.auth.keyboard;version="[2.18.0,2.19.0)", - org.apache.sshd.client.auth.password;version="[2.18.0,2.19.0)", - org.apache.sshd.client.auth.pubkey;version="[2.18.0,2.19.0)", - org.apache.sshd.client.channel;version="[2.18.0,2.19.0)", - org.apache.sshd.client.config.hosts;version="[2.18.0,2.19.0)", - org.apache.sshd.client.config.keys;version="[2.18.0,2.19.0)", - org.apache.sshd.client.future;version="[2.18.0,2.19.0)", - org.apache.sshd.client.keyverifier;version="[2.18.0,2.19.0)", - org.apache.sshd.client.session;version="[2.18.0,2.19.0)", - org.apache.sshd.client.session.forward;version="[2.18.0,2.19.0)", - org.apache.sshd.common;version="[2.18.0,2.19.0)", - org.apache.sshd.common.auth;version="[2.18.0,2.19.0)", - org.apache.sshd.common.channel;version="[2.18.0,2.19.0)", - org.apache.sshd.common.cipher;version="[2.18.0,2.19.0)", - org.apache.sshd.common.compression;version="[2.18.0,2.19.0)", - org.apache.sshd.common.config.keys;version="[2.18.0,2.19.0)", - org.apache.sshd.common.config.keys.loader;version="[2.18.0,2.19.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.18.0,2.19.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.18.0,2.19.0)", - org.apache.sshd.common.digest;version="[2.18.0,2.19.0)", - org.apache.sshd.common.forward;version="[2.18.0,2.19.0)", - org.apache.sshd.common.future;version="[2.18.0,2.19.0)", - org.apache.sshd.common.helpers;version="[2.18.0,2.19.0)", - org.apache.sshd.common.io;version="[2.18.0,2.19.0)", - org.apache.sshd.common.kex;version="[2.18.0,2.19.0)", - org.apache.sshd.common.kex.extension;version="[2.18.0,2.19.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.18.0,2.19.0)", - org.apache.sshd.common.keyprovider;version="[2.18.0,2.19.0)", - org.apache.sshd.common.mac;version="[2.18.0,2.19.0)", - org.apache.sshd.common.random;version="[2.18.0,2.19.0)", - org.apache.sshd.common.session;version="[2.18.0,2.19.0)", - org.apache.sshd.common.session.helpers;version="[2.18.0,2.19.0)", - org.apache.sshd.common.signature;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.buffer;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.closeable;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.io;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.io.der;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.io.functors;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.io.resource;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.logging;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.net;version="[2.18.0,2.19.0)", - org.apache.sshd.common.util.security;version="[2.18.0,2.19.0)", - org.apache.sshd.core;version="[2.18.0,2.19.0)", - org.apache.sshd.server.auth;version="[2.18.0,2.19.0)", - org.apache.sshd.sftp;version="[2.18.0,2.19.0)", - org.apache.sshd.sftp.client;version="[2.18.0,2.19.0)", - org.apache.sshd.sftp.common;version="[2.18.0,2.19.0)", + org.apache.sshd.agent;version="[2.19.0,2.20.0)", + org.apache.sshd.client;version="[2.19.0,2.20.0)", + org.apache.sshd.client.auth;version="[2.19.0,2.20.0)", + org.apache.sshd.client.auth.keyboard;version="[2.19.0,2.20.0)", + org.apache.sshd.client.auth.password;version="[2.19.0,2.20.0)", + org.apache.sshd.client.auth.pubkey;version="[2.19.0,2.20.0)", + org.apache.sshd.client.channel;version="[2.19.0,2.20.0)", + org.apache.sshd.client.config.hosts;version="[2.19.0,2.20.0)", + org.apache.sshd.client.config.keys;version="[2.19.0,2.20.0)", + org.apache.sshd.client.future;version="[2.19.0,2.20.0)", + org.apache.sshd.client.keyverifier;version="[2.19.0,2.20.0)", + org.apache.sshd.client.session;version="[2.19.0,2.20.0)", + org.apache.sshd.client.session.forward;version="[2.19.0,2.20.0)", + org.apache.sshd.common;version="[2.19.0,2.20.0)", + org.apache.sshd.common.auth;version="[2.19.0,2.20.0)", + org.apache.sshd.common.channel;version="[2.19.0,2.20.0)", + org.apache.sshd.common.cipher;version="[2.19.0,2.20.0)", + org.apache.sshd.common.compression;version="[2.19.0,2.20.0)", + org.apache.sshd.common.config.keys;version="[2.19.0,2.20.0)", + org.apache.sshd.common.config.keys.loader;version="[2.19.0,2.20.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.19.0,2.20.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.19.0,2.20.0)", + org.apache.sshd.common.digest;version="[2.19.0,2.20.0)", + org.apache.sshd.common.forward;version="[2.19.0,2.20.0)", + org.apache.sshd.common.future;version="[2.19.0,2.20.0)", + org.apache.sshd.common.helpers;version="[2.19.0,2.20.0)", + org.apache.sshd.common.io;version="[2.19.0,2.20.0)", + org.apache.sshd.common.kex;version="[2.19.0,2.20.0)", + org.apache.sshd.common.kex.extension;version="[2.19.0,2.20.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.19.0,2.20.0)", + org.apache.sshd.common.keyprovider;version="[2.19.0,2.20.0)", + org.apache.sshd.common.mac;version="[2.19.0,2.20.0)", + org.apache.sshd.common.random;version="[2.19.0,2.20.0)", + org.apache.sshd.common.session;version="[2.19.0,2.20.0)", + org.apache.sshd.common.session.helpers;version="[2.19.0,2.20.0)", + org.apache.sshd.common.signature;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.buffer;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.closeable;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.io;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.io.der;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.io.functors;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.io.resource;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.logging;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.net;version="[2.19.0,2.20.0)", + org.apache.sshd.common.util.security;version="[2.19.0,2.20.0)", + org.apache.sshd.core;version="[2.19.0,2.20.0)", + org.apache.sshd.server.auth;version="[2.19.0,2.20.0)", + org.apache.sshd.sftp;version="[2.19.0,2.20.0)", + org.apache.sshd.sftp.client;version="[2.19.0,2.20.0)", + org.apache.sshd.sftp.common;version="[2.19.0,2.20.0)", org.eclipse.jgit.annotations;version="[7.8.0,7.9.0)", org.eclipse.jgit.api.errors;version="[7.8.0,7.9.0)", org.eclipse.jgit.errors;version="[7.8.0,7.9.0)", diff --git a/pom.xml b/pom.xml index 7d507b22f57..37f93db4b17 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 7.7.0.202606012155-r 1.10.15 - 2.18.0 + 2.19.0 0.1.55 1.1.3 1.2.3 From 9a42ec437daf5f38c0419dce487eb0b5bbd26000 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 11 Jul 2026 02:14:53 +0200 Subject: [PATCH 178/200] Update jetty to 12.1.11 Change-Id: I508889e9a8bab673b1d358fe9fc42494c5958e2a --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.35.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.36.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.37.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.38.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.39.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.40.target | 18 +++++++++--------- .../maven/dependencies.tpd | 16 ++++++++-------- pom.xml | 2 +- 10 files changed, 73 insertions(+), 73 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index e9b29d68eab..fc492e69017 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -29,7 +29,7 @@ BOUNCYCASTLE_VERSION = "1.84" BYTE_BUDDY_VERSION = "1.18.11" -JETTY_VERSION = "12.1.10" +JETTY_VERSION = "12.1.11" JMH_VERSION = "1.37" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index fa08e63c180..61291cc6c1a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee11 jetty-ee11-servlet - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-http - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-io - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-security - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-server - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-session - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util-ajax - 12.1.10 + 12.1.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 83b0513e0c1..866fa783cbd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee11 jetty-ee11-servlet - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-http - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-io - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-security - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-server - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-session - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util-ajax - 12.1.10 + 12.1.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 79860cf14aa..bb4fcaa6df2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee11 jetty-ee11-servlet - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-http - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-io - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-security - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-server - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-session - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util-ajax - 12.1.10 + 12.1.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 4cf51feeb1e..dc02fa4ef76 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee11 jetty-ee11-servlet - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-http - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-io - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-security - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-server - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-session - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util-ajax - 12.1.10 + 12.1.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index dc4aa5205eb..0422d35b45e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee11 jetty-ee11-servlet - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-http - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-io - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-security - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-server - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-session - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util-ajax - 12.1.10 + 12.1.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 7629279755a..77f282e057e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee11 jetty-ee11-servlet - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-http - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-io - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-security - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-server - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-session - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util-ajax - 12.1.10 + 12.1.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 4b3e5fe5a9b..35a59ac5bed 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -113,49 +113,49 @@ org.eclipse.jetty.ee11 jetty-ee11-servlet - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-http - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-io - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-security - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-server - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-session - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util - 12.1.10 + 12.1.11 jar org.eclipse.jetty jetty-util-ajax - 12.1.10 + 12.1.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 4a6fdb8ec59..3654c3f6ee5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee11" artifactId = "jetty-ee11-servlet" - version = "12.1.10" + version = "12.1.11" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.1.10" + version = "12.1.11" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.1.10" + version = "12.1.11" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.1.10" + version = "12.1.11" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.1.10" + version = "12.1.11" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.1.10" + version = "12.1.11" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.1.10" + version = "12.1.11" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.1.10" + version = "12.1.11" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 37f93db4b17..8ccba05eeff 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.28.0 6.0.0 6.1.0 - 12.1.10 + 12.1.11 0.25.0 4.5.14 4.4.16 From be6db1d4b0ca2cc52ad4853d07288474708de707 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 11 Jul 2026 02:29:08 +0200 Subject: [PATCH 179/200] Add target platform 4.41 for Eclipse IDE 2026-09 Change-Id: I19ada9d6f3d9e58bc7f3e5e54edc7e83fda8fa9c --- .../org.eclipse.jgit.target/jgit-4.41.target | 298 ++++++++++++++++++ .../org.eclipse.jgit.target/jgit-4.41.tpd | 8 + .../orbit/orbit-4.41.tpd | 29 ++ 3 files changed, 335 insertions(+) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.41.tpd diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target new file mode 100644 index 00000000000..c5115c638c0 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.tukaani + xz + 1.12 + jar + + + + + + + org.slf4j + slf4j-api + 2.0.18 + jar + + + org.slf4j + slf4j-simple + 2.0.18 + jar + + + org.slf4j + jcl-over-slf4j + 2.0.18 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.19.0 + jar + + + org.apache.sshd + sshd-sftp + 2.19.0 + jar + + + + + + + org.mockito + mockito-core + 5.23.0 + jar + + + + + + + net.java.dev.jna + jna + 5.19.1 + jar + + + net.java.dev.jna + jna-platform + 5.19.1 + jar + + + + + + + org.eclipse.jetty.ee11 + jetty-ee11-servlet + 12.1.11 + jar + + + org.eclipse.jetty + jetty-http + 12.1.11 + jar + + + org.eclipse.jetty + jetty-io + 12.1.11 + jar + + + org.eclipse.jetty + jetty-security + 12.1.11 + jar + + + org.eclipse.jetty + jetty-server + 12.1.11 + jar + + + org.eclipse.jetty + jetty-session + 12.1.11 + jar + + + org.eclipse.jetty + jetty-util + 12.1.11 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.1.11 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + org.hamcrest + hamcrest + 3.0 + jar + + + + + + + com.google.code.gson + gson + 2.14.0 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.18.11 + jar + + + net.bytebuddy + byte-buddy-agent + 1.18.11 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.84 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.84 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.84 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.84 + jar + + + + + + + org.assertj + assertj-core + 3.27.7 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.22.0 + jar + + + org.apache.commons + commons-compress + 1.28.0 + jar + + + org.apache.commons + commons-lang3 + 3.20.0 + jar + + + commons-io + commons-io + 2.22.0 + jar + + + commons-logging + commons-logging + 1.4.0 + jar + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.tpd new file mode 100644 index 00000000000..1670b1bc762 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.tpd @@ -0,0 +1,8 @@ +target "jgit-4.41" with source configurePhase + +include "orbit/orbit-4.41.tpd" +include "maven/dependencies.tpd" + +location "https://download.eclipse.org/staging/2026-09/" { + org.eclipse.osgi lazy +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.41.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.41.tpd new file mode 100644 index 00000000000..f38ad9452e8 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.41.tpd @@ -0,0 +1,29 @@ +target "orbit-4.41" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2026-09" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + org.apache.ant [1.10.17.v20260410-1000,1.10.17.v20260410-1000] + org.apache.ant.source [1.10.17.v20260410-1000,1.10.17.v20260410-1000] + org.apache.aries.spifly.dynamic.bundle [1.3.7,1.3.7] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.hamcrest [3.0.0,3.0.0] + org.hamcrest.source [3.0.0,3.0.0] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.objectweb.asm [9.10.1,9.10.1] + org.objectweb.asm.commons [9.10.1,9.10.1] + org.objectweb.asm.util [9.10.1,9.10.1] + org.objectweb.asm.tree [9.10.1,9.10.1] + org.objectweb.asm.tree.analysis [9.10.1,9.10.1] + org.objenesis [3.5.0,3.5.0] + org.objenesis.source [3.5.0,3.5.0] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} From bf0f0ad1cc2ce422604383272a4a4b8b3947b465 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 11 Jul 2026 02:46:56 +0200 Subject: [PATCH 180/200] Switch to releases p2 repo for Eclipse IDE 2026-06 (4.40) Change-Id: I031c02d2be7dd56298a6480717f6cbd9c0ed8bfd --- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.tpd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 35a59ac5bed..6085cb8d073 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.tpd index 62e9f38698d..267a671766e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.tpd @@ -3,6 +3,6 @@ target "jgit-4.40" with source configurePhase include "orbit/orbit-4.40.tpd" include "maven/dependencies.tpd" -location "https://download.eclipse.org/staging/2026-06/" { +location "https://download.eclipse.org/releases/2026-06/" { org.eclipse.osgi lazy } From e1696147ce23ef9e0d11d26c23efba7dc22c5782 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 15 Jul 2026 00:53:08 +0200 Subject: [PATCH 181/200] Update bouncycastle to 1.85 Change-Id: I63b032ff321ca9f4cffff9aeefcebab9ceacbaa2 --- MODULE.bazel | 2 +- .../META-INF/MANIFEST.MF | 12 +++---- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 34 +++++++++---------- .../org.eclipse.jgit.target/jgit-4.34.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.35.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.36.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.37.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.38.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.39.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.40.target | 10 +++--- .../org.eclipse.jgit.target/jgit-4.41.target | 10 +++--- .../maven/dependencies.tpd | 8 ++--- pom.xml | 2 +- 13 files changed, 69 insertions(+), 69 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index fc492e69017..865135e9564 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -25,7 +25,7 @@ git_repository( remote = "https://gerrit.googlesource.com/bazlets", ) -BOUNCYCASTLE_VERSION = "1.84" +BOUNCYCASTLE_VERSION = "1.85" BYTE_BUDDY_VERSION = "1.18.11" 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 8bed084244e..284f95c2801 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -8,12 +8,12 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.84.0,2.0.0)", - org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.84.0,2.0.0)", - org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)", - org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", - org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", +Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.85.0,2.0.0)", + org.bouncycastle.jce.provider;version="[1.85.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.85.0,2.0.0)", + org.bouncycastle.openpgp.operator;version="[1.85.0,2.0.0)", + org.bouncycastle.openpgp.operator.jcajce;version="[1.85.0,2.0.0)", + org.bouncycastle.util.encoders;version="[1.85.0,2.0.0)", org.eclipse.jgit.gpg.bc.internal;version="[7.8.0,7.9.0)", org.eclipse.jgit.gpg.bc.internal.keys;version="[7.8.0,7.9.0)", org.eclipse.jgit.util.sha1;version="[7.8.0,7.9.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 80ae7fcc64f..e0dd44b9074 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -9,23 +9,23 @@ Bundle-Localization: OSGI-INF/l10n/gpg_bc Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)", - org.bouncycastle.asn1.x9;version="[1.84.0,2.0.0)", - org.bouncycastle.bcpg;version="[1.84.0,2.0.0)", - org.bouncycastle.bcpg.sig;version="[1.84.0,2.0.0)", - org.bouncycastle.crypto.ec;version="[1.84.0,2.0.0)", - org.bouncycastle.gpg;version="[1.84.0,2.0.0)", - org.bouncycastle.gpg.keybox;version="[1.84.0,2.0.0)", - org.bouncycastle.gpg.keybox.jcajce;version="[1.84.0,2.0.0)", - org.bouncycastle.jcajce.interfaces;version="[1.84.0,2.0.0)", - org.bouncycastle.jcajce.util;version="[1.84.0,2.0.0)", - org.bouncycastle.math.ec;version="[1.84.0,2.0.0)", - org.bouncycastle.math.field;version="[1.84.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.84.0,2.0.0)", - org.bouncycastle.openpgp.jcajce;version="[1.84.0,2.0.0)", - org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)", - org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", - org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", +Import-Package: org.bouncycastle.asn1;version="[1.85.0,2.0.0)", + org.bouncycastle.asn1.x9;version="[1.85.0,2.0.0)", + org.bouncycastle.bcpg;version="[1.85.0,2.0.0)", + org.bouncycastle.bcpg.sig;version="[1.85.0,2.0.0)", + org.bouncycastle.crypto.ec;version="[1.85.0,2.0.0)", + org.bouncycastle.gpg;version="[1.85.0,2.0.0)", + org.bouncycastle.gpg.keybox;version="[1.85.0,2.0.0)", + org.bouncycastle.gpg.keybox.jcajce;version="[1.85.0,2.0.0)", + org.bouncycastle.jcajce.interfaces;version="[1.85.0,2.0.0)", + org.bouncycastle.jcajce.util;version="[1.85.0,2.0.0)", + org.bouncycastle.math.ec;version="[1.85.0,2.0.0)", + org.bouncycastle.math.field;version="[1.85.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.85.0,2.0.0)", + org.bouncycastle.openpgp.jcajce;version="[1.85.0,2.0.0)", + org.bouncycastle.openpgp.operator;version="[1.85.0,2.0.0)", + org.bouncycastle.openpgp.operator.jcajce;version="[1.85.0,2.0.0)", + org.bouncycastle.util.encoders;version="[1.85.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.8.0";x-friends:="org.eclipse.jgit.gpg.bc.test", org.eclipse.jgit.gpg.bc.internal.keys;version="7.8.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 61291cc6c1a..d49c23490f7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcprov-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcpkix-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcutil-jdk18on - 1.84 + 1.85 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 866fa783cbd..65b305c9bba 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcprov-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcpkix-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcutil-jdk18on - 1.84 + 1.85 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index bb4fcaa6df2..16e63cc99ac 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcprov-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcpkix-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcutil-jdk18on - 1.84 + 1.85 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index dc02fa4ef76..15e188adc84 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcprov-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcpkix-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcutil-jdk18on - 1.84 + 1.85 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 0422d35b45e..177b47e0a96 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcprov-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcpkix-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcutil-jdk18on - 1.84 + 1.85 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 77f282e057e..acf36c7ce7b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcprov-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcpkix-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcutil-jdk18on - 1.84 + 1.85 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 6085cb8d073..232122a8391 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcprov-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcpkix-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcutil-jdk18on - 1.84 + 1.85 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target index c5115c638c0..6dc9701ee06 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target @@ -1,7 +1,7 @@ - + @@ -217,25 +217,25 @@ org.bouncycastle bcpg-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcprov-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcpkix-jdk18on - 1.84 + 1.85 jar org.bouncycastle bcutil-jdk18on - 1.84 + 1.85 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 3654c3f6ee5..3516ee9622b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -69,22 +69,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.84" + version = "1.85" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.84" + version = "1.85" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.84" + version = "1.85" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.84" + version = "1.85" } } diff --git a/pom.xml b/pom.xml index 8ccba05eeff..5f81bd8898c 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 2.0.18 3.12.0 2.14.0 - 1.84 + 1.85 4.9.8.2 3.9.0 3.6.0 From 3764cd5711679e328499656c760ebda40a42a1f0 Mon Sep 17 00:00:00 2001 From: Florian Schwabe Date: Sat, 21 Mar 2026 15:35:42 +0100 Subject: [PATCH 182/200] RevWalk: Make createCommit(AnyObjectId, int) protected API This allows sub-types of RevWalk to implement this method and create instances of sub-types of RevCommit that know their position in the Commit Graph. Marked createCommit(AnyObjectId) as @nooverride Existing sub-types of RevWalk within jgit have been updated to override the new method. Sub-types of RevWalk outside of jgit will only receive a warning, that the createCommit(AnyObjectId) method is no longer intended to be overridden and that the new createCommit(AnyObjectId, int) method should be overridden instead. Bug: jgit-250 Change-Id: I0a2115bfef7e73a299780a2c28ef5a01aa1d00e0 --- .../org/eclipse/jgit/api/NameRevCommand.java | 2 +- .../src/org/eclipse/jgit/blame/ReverseWalk.java | 2 +- .../src/org/eclipse/jgit/revplot/PlotWalk.java | 2 +- .../src/org/eclipse/jgit/revwalk/DepthWalk.java | 4 ++-- .../src/org/eclipse/jgit/revwalk/RevWalk.java | 17 ++++++++++++++++- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java index 1ff6e98b12a..f72a451a46e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java @@ -96,7 +96,7 @@ protected NameRevCommand(Repository repo) { revs = new ArrayList<>(2); walk = new RevWalk(repo) { @Override - public NameRevCommit createCommit(AnyObjectId id) { + protected RevCommit createCommit(AnyObjectId id, int graphPos) { return new NameRevCommit(id); } }; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/ReverseWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/ReverseWalk.java index fafc4fb1ecc..582313f7d18 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/ReverseWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/ReverseWalk.java @@ -36,7 +36,7 @@ public ReverseCommit next() throws MissingObjectException, } @Override - protected RevCommit createCommit(AnyObjectId id) { + protected RevCommit createCommit(AnyObjectId id, int graphPos) { return new ReverseCommit(id); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java index c8c454a228e..99022f05ab3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java @@ -105,7 +105,7 @@ public void sort(RevSort s, boolean use) { } @Override - protected RevCommit createCommit(AnyObjectId id) { + protected RevCommit createCommit(AnyObjectId id, int graphPos) { return new PlotCommit(id); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DepthWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DepthWalk.java index 7795ce2d3bd..442087de0c2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DepthWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DepthWalk.java @@ -196,7 +196,7 @@ public void markRoot(RevCommit c) throws MissingObjectException, } @Override - protected RevCommit createCommit(AnyObjectId id) { + protected RevCommit createCommit(AnyObjectId id, int graphPos) { return new Commit(id); } @@ -367,7 +367,7 @@ public void markUnshallow(RevObject c) throws MissingObjectException, } @Override - protected RevCommit createCommit(AnyObjectId id) { + protected RevCommit createCommit(AnyObjectId id, int graphPos) { return new Commit(id); } 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 8e604baa638..4f558bc1a63 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -1764,12 +1764,27 @@ public ObjectWalk toObjectWalkWithSameObjects() { * @param id * the object this walker requires a commit reference for. * @return a new unparsed reference for the object. + * + * @nooverride Since 7.8 This method is not intended to be re-implemented or + * extended by clients. Override + * {@link #createCommit(AnyObjectId, int)} instead. */ protected RevCommit createCommit(AnyObjectId id) { return createCommit(id, commitGraph().findGraphPosition(id)); } - private RevCommit createCommit(AnyObjectId id, int graphPos) { + /** + * Construct a new unparsed commit for the given object. + * + * @param id + * the object this walker requires a commit reference for. + * @param graphPos + * the position of the commit in the commit graph or {@code -1} + * if the commit is not present in the commit graph + * @return a new unparsed reference for the object. + * @since 7.8 + */ + protected RevCommit createCommit(AnyObjectId id, int graphPos) { if (graphPos >= 0) { return new RevCommitCG(id, graphPos); } From ce5d067b94dd8af7ab41a8264fc78c02dd050108 Mon Sep 17 00:00:00 2001 From: Florian Schwabe Date: Sat, 21 Mar 2026 15:37:49 +0100 Subject: [PATCH 183/200] RevCommit: Remove RevCommitCG and move Commit Graph info to RevCommit * The graphPosition and generation fields were moved to RevCommit and the package-private RevCommitCG has been removed. * A new constructor allows creating RevCommit instances that know their position in the commit graph. * RevCommit.parseCanonical() will now parse the data from the commit graph, if the commit graph position is known. * RevCommit's implementations of getGeneration() and getChangedPathFilter() now also no longer return default values, if the position within the commit graph is known. This way, sub-types of RevCommit and RevWalk must only override the createCommit(AnyObjectId, int) method instead and add a new constructor. Existing sub-types of RevCommit within jgit have been extended with the new constructor. The respective RevWalk implementations within jgit have been adjusted to call these new constructors. Bug: jgit-250 Change-Id: I568df510784672c2c2b452b2030a916064ea173a --- .../jgit/revwalk/RevWalkCommitGraphTest.java | 6 - .../org/eclipse/jgit/api/NameRevCommand.java | 6 +- .../org/eclipse/jgit/blame/ReverseWalk.java | 6 +- .../org/eclipse/jgit/revplot/PlotCommit.java | 15 ++- .../org/eclipse/jgit/revplot/PlotWalk.java | 2 +- .../org/eclipse/jgit/revwalk/DepthWalk.java | 20 +++- .../org/eclipse/jgit/revwalk/RevCommit.java | 79 ++++++++++++- .../org/eclipse/jgit/revwalk/RevCommitCG.java | 110 ------------------ .../src/org/eclipse/jgit/revwalk/RevWalk.java | 13 +-- 9 files changed, 116 insertions(+), 141 deletions(-) delete mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitCG.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkCommitGraphTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkCommitGraphTest.java index e47dd898b06..c390405b520 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkCommitGraphTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkCommitGraphTest.java @@ -60,7 +60,6 @@ public void testParseHeaders() throws Exception { RevCommit notParseInGraph = rw.lookupCommit(c1); rw.parseHeaders(notParseInGraph); - assertFalse(notParseInGraph instanceof RevCommitCG); assertNotNull(notParseInGraph.getRawBuffer()); assertEquals(Constants.COMMIT_GENERATION_UNKNOWN, notParseInGraph.getGeneration()); @@ -71,7 +70,6 @@ public void testParseHeaders() throws Exception { RevCommit parseInGraph = rw.lookupCommit(c1); parseInGraph.parseHeaders(rw); - assertTrue(parseInGraph instanceof RevCommitCG); assertNotNull(parseInGraph.getRawBuffer()); assertEquals(1, parseInGraph.getGeneration()); assertEquals(notParseInGraph.getId(), parseInGraph.getId()); @@ -84,7 +82,6 @@ public void testParseHeaders() throws Exception { RevCommit noBody = rw.lookupCommit(c1); noBody.parseHeaders(rw); - assertTrue(noBody instanceof RevCommitCG); assertNull(noBody.getRawBuffer()); assertEquals(1, noBody.getGeneration()); assertEquals(notParseInGraph.getId(), noBody.getId()); @@ -105,7 +102,6 @@ public void testParseCanonical() throws Exception { RevCommit parseInGraph = rw.lookupCommit(c1); parseInGraph.parseCanonical(rw, rw.getCachedBytes(c1)); - assertTrue(parseInGraph instanceof RevCommitCG); assertNotNull(parseInGraph.getRawBuffer()); assertEquals(1, parseInGraph.getGeneration()); assertEquals(notParseInGraph.getId(), parseInGraph.getId()); @@ -120,7 +116,6 @@ public void testParseCanonical() throws Exception { RevCommit noBody = rw.lookupCommit(c1); noBody.parseCanonical(rw, rw.getCachedBytes(c1)); - assertTrue(noBody instanceof RevCommitCG); assertNull(noBody.getRawBuffer()); assertEquals(1, noBody.getGeneration()); assertEquals(notParseInGraph.getId(), noBody.getId()); @@ -140,7 +135,6 @@ public void testInitializeShallowCommits() throws Exception { RevCommit parseInGraph = rw.lookupCommit(c1); parseInGraph.parseHeaders(rw); - assertTrue(parseInGraph instanceof RevCommitCG); assertNotNull(parseInGraph.getRawBuffer()); assertEquals(2, parseInGraph.getGeneration()); assertEquals(0, parseInGraph.getParentCount()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java index f72a451a46e..83c063b2ffa 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java @@ -51,8 +51,8 @@ private static class NameRevCommit extends RevCommit { private int distance; private long cost; - private NameRevCommit(AnyObjectId id) { - super(id); + private NameRevCommit(AnyObjectId id, int graphPosition) { + super(id, graphPosition); } private StringBuilder format() { @@ -97,7 +97,7 @@ protected NameRevCommand(Repository repo) { walk = new RevWalk(repo) { @Override protected RevCommit createCommit(AnyObjectId id, int graphPos) { - return new NameRevCommit(id); + return new NameRevCommit(id, graphPos); } }; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/ReverseWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/ReverseWalk.java index 582313f7d18..8d534e938d2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/ReverseWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/ReverseWalk.java @@ -37,7 +37,7 @@ public ReverseCommit next() throws MissingObjectException, @Override protected RevCommit createCommit(AnyObjectId id, int graphPos) { - return new ReverseCommit(id); + return new ReverseCommit(id, graphPos); } static final class ReverseCommit extends RevCommit { @@ -45,8 +45,8 @@ static final class ReverseCommit extends RevCommit { private ReverseCommit[] children = NO_CHILDREN; - ReverseCommit(AnyObjectId id) { - super(id); + ReverseCommit(AnyObjectId id, int graphPosition) { + super(id, graphPosition); } void addChild(ReverseCommit c) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java index fa109e82086..d301b47376a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommit.java @@ -47,7 +47,20 @@ public class PlotCommit extends RevCommit { * the identity of this commit. */ protected PlotCommit(AnyObjectId id) { - super(id); + this(id, -1); + } + + /** + * Create a new commit. + * + * @param id + * the identity of this commit. + * @param graphPosition + * the position of this commit in the commit graph + * @since 7.8 + */ + protected PlotCommit(AnyObjectId id, int graphPosition) { + super(id, graphPosition); forkingOffLanes = NO_LANES; passingLanes = NO_LANES; mergingLanes = NO_LANES; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java index 99022f05ab3..88c2d23e731 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java @@ -106,7 +106,7 @@ public void sort(RevSort s, boolean use) { @Override protected RevCommit createCommit(AnyObjectId id, int graphPos) { - return new PlotCommit(id); + return new PlotCommit(id, graphPos); } @Override diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DepthWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DepthWalk.java index 442087de0c2..cd0bd234944 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DepthWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/DepthWalk.java @@ -125,9 +125,23 @@ public boolean isBoundary() { * object name for the commit. */ protected Commit(AnyObjectId id) { - super(id); + this(id, -1); + } + + /** + * Initialize a new commit. + * + * @param id + * object name for the commit. + * @param graphPosition + * the position of this commit in the commit graph + * @since 7.8 + */ + protected Commit(AnyObjectId id, int graphPosition) { + super(id, graphPosition); depth = -1; } + } /** Subclass of RevWalk that performs depth filtering. */ @@ -197,7 +211,7 @@ public void markRoot(RevCommit c) throws MissingObjectException, @Override protected RevCommit createCommit(AnyObjectId id, int graphPos) { - return new Commit(id); + return new Commit(id, graphPos); } @Override @@ -368,7 +382,7 @@ public void markUnshallow(RevObject c) throws MissingObjectException, @Override protected RevCommit createCommit(AnyObjectId id, int graphPos) { - return new Commit(id); + return new Commit(id, graphPos); } @Override diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java index 871545fca2b..3248fe1196e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java @@ -23,9 +23,11 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.storage.commitgraph.ChangedPathFilter; +import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.MutableObjectId; +import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.PersonIdent; @@ -133,6 +135,10 @@ public static RevCommit parse(RevWalk rw, byte[] raw) throws IOException { */ protected byte[] buffer; + private final int graphPosition; + + private int generation = Constants.COMMIT_GENERATION_UNKNOWN; + /** * Create a new commit reference. * @@ -140,17 +146,31 @@ public static RevCommit parse(RevWalk rw, byte[] raw) throws IOException { * object name for the commit. */ protected RevCommit(AnyObjectId id) { + this(id, -1); + } + + /** + * Create a new commit reference. + * + * @param id + * object name for the commit. + * @param graphPosition + * the position of this commit in the commit graph + * @since 7.8 + */ + protected RevCommit(AnyObjectId id, int graphPosition) { super(id); + this.graphPosition = graphPosition; } @Override - void parseHeaders(RevWalk walk) throws MissingObjectException, + final void parseHeaders(RevWalk walk) throws MissingObjectException, IncorrectObjectTypeException, IOException { parseCanonical(walk, walk.getCachedBytes(this)); } @Override - void parseBody(RevWalk walk) throws MissingObjectException, + final void parseBody(RevWalk walk) throws MissingObjectException, IncorrectObjectTypeException, IOException { if (buffer == null) { buffer = walk.getCachedBytes(this); @@ -159,11 +179,25 @@ void parseBody(RevWalk walk) throws MissingObjectException, } } - void parseCanonical(RevWalk walk, byte[] raw) throws IOException { + final void parseCanonical(RevWalk walk, byte[] raw) throws IOException { if (!walk.shallowCommitsInitialized) { walk.initializeShallowCommits(this); } + if (graphPosition >= 0) { + if (walk.isRetainBody()) { + buffer = raw; + } + + parseInGraph(walk); + } else { + parseFromObject(walk, raw); + } + + flags |= PARSED; + } + + final void parseFromObject(RevWalk walk, byte[] raw) { final MutableObjectId idBuffer = walk.idBuffer; idBuffer.fromString(raw, 5); tree = walk.lookupTree(idBuffer); @@ -217,7 +251,36 @@ void parseCanonical(RevWalk walk, byte[] raw) throws IOException { if (walk.isRetainBody()) { buffer = raw; } - flags |= PARSED; + } + + final void parseInGraph(RevWalk walk) { + CommitGraph graph = walk.commitGraph(); + CommitGraph.CommitData data = graph.getCommitData(graphPosition); + if (data == null) { + // parseInGraph was called because we know this commit's + // position in the commit graph. If now the commit-graph doesn't + // know about it, something went wrong. + throw new IllegalStateException(); + } + + this.tree = walk.lookupTree(data.getTree()); + this.commitTime = (int) data.getCommitTime(); + this.generation = data.getGeneration(); + + if (getParents() == null) { + int[] pGraphList = data.getParents(); + if (pGraphList.length == 0) { + this.parents = RevCommit.NO_PARENTS; + } else { + RevCommit[] pList = new RevCommit[pGraphList.length]; + for (int i = 0; i < pList.length; i++) { + int graphPos = pGraphList[i]; + ObjectId objId = graph.getObjectId(graphPos); + pList[i] = walk.lookupCommit(objId, graphPos); + } + this.parents = pList; + } + } } @Override @@ -655,8 +718,8 @@ public final List getFooterLines(FooterKey key) { * @return the generation number * @since 6.5 */ - int getGeneration() { - return Constants.COMMIT_GENERATION_UNKNOWN; + final int getGeneration() { + return generation; } /** @@ -671,6 +734,10 @@ int getGeneration() { * @since 6.7 */ public ChangedPathFilter getChangedPathFilter(RevWalk rw) { + if (graphPosition >= 0) { + return rw.commitGraph().getChangedPathFilter(graphPosition); + } + return null; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitCG.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitCG.java deleted file mode 100644 index c7a03992b76..00000000000 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommitCG.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (C) 2023, Tencent. - * - * 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.revwalk; - -import java.io.IOException; - -import org.eclipse.jgit.errors.IncorrectObjectTypeException; -import org.eclipse.jgit.errors.MissingObjectException; -import org.eclipse.jgit.internal.storage.commitgraph.ChangedPathFilter; -import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; -import org.eclipse.jgit.lib.AnyObjectId; -import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.ObjectId; - -/** - * RevCommit parsed from - * {@link org.eclipse.jgit.internal.storage.commitgraph.CommitGraph}. - * - * @since 6.5 - */ -class RevCommitCG extends RevCommit { - - private final int graphPosition; - - private int generation = Constants.COMMIT_GENERATION_UNKNOWN; - - /** - * Create a new commit reference. - * - * @param id - * object name for the commit. - * @param graphPosition - * the position in the commit-graph of the object. - */ - protected RevCommitCG(AnyObjectId id, int graphPosition) { - super(id); - this.graphPosition = graphPosition; - } - - @Override - void parseCanonical(RevWalk walk, byte[] raw) throws IOException { - if (walk.isRetainBody()) { - buffer = raw; - } - parseInGraph(walk); - } - - @Override - void parseHeaders(RevWalk walk) throws MissingObjectException, - IncorrectObjectTypeException, IOException { - if (walk.isRetainBody()) { - super.parseBody(walk); // This parses header and body - return; - } - parseInGraph(walk); - } - - private void parseInGraph(RevWalk walk) throws IOException { - CommitGraph graph = walk.commitGraph(); - CommitGraph.CommitData data = graph.getCommitData(graphPosition); - if (data == null) { - // RevCommitCG was created because we got its graphPosition from - // commit-graph. If now the commit-graph doesn't know about it, - // something went wrong. - throw new IllegalStateException(); - } - if (!walk.shallowCommitsInitialized) { - walk.initializeShallowCommits(this); - } - - this.tree = walk.lookupTree(data.getTree()); - this.commitTime = (int) data.getCommitTime(); - this.generation = data.getGeneration(); - - if (getParents() == null) { - int[] pGraphList = data.getParents(); - if (pGraphList.length == 0) { - this.parents = RevCommit.NO_PARENTS; - } else { - RevCommit[] pList = new RevCommit[pGraphList.length]; - for (int i = 0; i < pList.length; i++) { - int graphPos = pGraphList[i]; - ObjectId objId = graph.getObjectId(graphPos); - pList[i] = walk.lookupCommit(objId, graphPos); - } - this.parents = pList; - } - } - flags |= PARSED; - } - - @Override - int getGeneration() { - return generation; - } - - /** {@inheritDoc} */ - @Override - public ChangedPathFilter getChangedPathFilter(RevWalk rw) { - return rw.commitGraph().getChangedPathFilter(graphPosition); - } -} 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 4f558bc1a63..4b28045cf35 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -971,10 +971,10 @@ public RevCommit lookupCommit(AnyObjectId id) { } /** - * This method is intended to be invoked only by {@link RevCommitCG}, in - * order to give commit the correct graphPosition before accessing the - * commit-graph. In this way, the headers of the commit can be obtained in - * constant time. + * This method is intended to be invoked only by + * {@link RevCommit#parseInGraph(RevWalk)}, in order to give commit the + * correct graphPosition before accessing the commit-graph. In this way, the + * headers of the commit can be obtained in constant time. * * @param id * name of the commit object. @@ -1785,10 +1785,7 @@ protected RevCommit createCommit(AnyObjectId id) { * @since 7.8 */ protected RevCommit createCommit(AnyObjectId id, int graphPos) { - if (graphPos >= 0) { - return new RevCommitCG(id, graphPos); - } - return new RevCommit(id); + return new RevCommit(id, graphPos); } void carryFlagsImpl(RevCommit c) { From d2f310f19c8973e3d6ba8bf5d0524b53872d7482 Mon Sep 17 00:00:00 2001 From: Florian Schwabe Date: Mon, 11 May 2026 15:34:21 +0200 Subject: [PATCH 184/200] RewriteGenerator: Extract rewriting logic to a separate component This Change is in preparation for a three-walk topological sorting algorithm, which will have its own commit history rewriting logic Change-Id: I6b07796759fe73728e87149c064285d1d894fe99 --- .../jgit/revwalk/AbstractCommitRewriter.java | 149 ++++++++++++++++ .../jgit/revwalk/RewriteGenerator.java | 165 ++++-------------- 2 files changed, 185 insertions(+), 129 deletions(-) create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/revwalk/AbstractCommitRewriter.java diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/AbstractCommitRewriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/AbstractCommitRewriter.java new file mode 100644 index 00000000000..b33c846a27e --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/AbstractCommitRewriter.java @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2008, Shawn O. Pearce and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.revwalk; + +import java.io.IOException; + +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; + +abstract class AbstractCommitRewriter { + + /** For {@link #cleanup(RevCommit[])} to remove duplicate parents. */ + private static final int DUPLICATE = RevWalk.TEMP_MARK; + + private final boolean firstParent; + + AbstractCommitRewriter(boolean firstParent) { + this.firstParent = firstParent; + } + + /** + * Makes sure that the {@link TreeRevFilter} has been applied to all parents + * of this commit + * + * @param c + * given commit + * @throws MissingObjectException + * if an object is missing + * @throws IncorrectObjectTypeException + * if an object has an unexpected type + * @throws IOException + * if an IO error occurred + */ + abstract void applyFilterToParents(RevCommit c) + throws MissingObjectException, IncorrectObjectTypeException, + IOException; + + final RevCommit rewriteParents(RevCommit c) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + applyFilterToParents(c); + + boolean rewrote = false; + RevCommit[] pList = c.getParents(); + int nParents = pList.length; + for (int i = 0; i < nParents; i++) { + RevCommit oldp = pList[i]; + RevCommit newp = rewrite(oldp); + if (firstParent) { + if (newp == null) { + c.parents = RevCommit.NO_PARENTS; + } else { + c.parents = new RevCommit[] { newp }; + } + return c; + } + if (oldp != newp) { + pList[i] = newp; + rewrote = true; + } + } + if (rewrote) { + c.parents = cleanup(pList); + } + return c; + } + + private RevCommit rewrite(RevCommit p) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + while (true) { + + if (p.getParentCount() > 1) { + // This parent is a merge, so keep it. + // + return p; + } + + if ((p.flags & RevWalk.UNINTERESTING) != 0) { + // Retain uninteresting parents. They show where the + // DAG was cut off because it wasn't interesting. + // + return p; + } + + if ((p.flags & RevWalk.REWRITE) == 0) { + // This parent was not eligible for rewriting. We + // need to keep it in the DAG. + // + return p; + } + + if (p.getParentCount() == 0) { + // We can't go back any further, other than to + // just delete the parent entirely. + // + return null; + } + + applyFilterToParents(p.getParent(0)); + p = p.getParent(0); + + } + } + + private RevCommit[] cleanup(RevCommit[] oldList) { + // Remove any duplicate parents caused due to rewrites (e.g. a merge + // with two sides that both simplified back into the merge base). + // We also may have deleted a parent by marking it null. + // + int newCnt = 0; + for (int o = 0; o < oldList.length; o++) { + RevCommit p = oldList[o]; + if (p == null) { + continue; + } + if ((p.flags & DUPLICATE) != 0) { + oldList[o] = null; + continue; + } + p.flags |= DUPLICATE; + newCnt++; + } + + if (newCnt == oldList.length) { + for (RevCommit p : oldList) { + p.flags &= ~DUPLICATE; + } + return oldList; + } + + RevCommit[] newList = new RevCommit[newCnt]; + newCnt = 0; + for (RevCommit p : oldList) { + if (p != null) { + newList[newCnt++] = p; + p.flags &= ~DUPLICATE; + } + } + + return newList; + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java index 4a93f4d745c..0e18f942ec6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RewriteGenerator.java @@ -29,19 +29,18 @@ * @see TreeRevFilter */ class RewriteGenerator extends Generator { - private static final int REWRITE = RevWalk.REWRITE; - - /** For {@link #cleanup(RevCommit[])} to remove duplicate parents. */ - private static final int DUPLICATE = RevWalk.TEMP_MARK; private final Generator source; private final FIFORevQueue pending; + private final AbstractCommitRewriter rewriter; + RewriteGenerator(Generator s) { super(s.firstParent); source = s; pending = new FIFORevQueue(s.firstParent); + rewriter = new PendingRewriter(); } @Override @@ -54,7 +53,6 @@ int outputType() { return source.outputType() & ~NEEDS_REWRITE; } - @SuppressWarnings("ReferenceEquality") @Override RevCommit next() throws MissingObjectException, IncorrectObjectTypeException, IOException { @@ -69,137 +67,46 @@ RevCommit next() throws MissingObjectException, } } - applyFilterToParents(c); - - boolean rewrote = false; - final RevCommit[] pList = c.getParents(); - final int nParents = pList.length; - for (int i = 0; i < nParents; i++) { - final RevCommit oldp = pList[i]; - final RevCommit newp = rewrite(oldp); - if (firstParent) { - if (newp == null) { - c.parents = RevCommit.NO_PARENTS; - } else { - c.parents = new RevCommit[] { newp }; - } - return c; - } - if (oldp != newp) { - pList[i] = newp; - rewrote = true; - } - } - if (rewrote) { - c.parents = cleanup(pList); - } - return c; - } - - /** - * Makes sure that the {@link TreeRevFilter} has been applied to all parents - * of this commit by the previous {@link PendingGenerator}. - * - * @param c - * given commit - * @throws MissingObjectException - * if an object is missing - * @throws IncorrectObjectTypeException - * if an object has an unexpected type - * @throws IOException - * if an IO error occurred - */ - private void applyFilterToParents(RevCommit c) - throws MissingObjectException, IncorrectObjectTypeException, - IOException { - for (RevCommit parent : c.getParents()) { - while ((parent.flags & RevWalk.TREE_REV_FILTER_APPLIED) == 0) { - - RevCommit n = source.next(); - - if (n != null) { - pending.add(n); - } else { - // Source generator is exhausted; filter has been applied to - // all commits - return; - } - - } - - } + return rewriter.rewriteParents(c); } - private RevCommit rewrite(RevCommit p) throws MissingObjectException, - IncorrectObjectTypeException, IOException { - for (;;) { - - if (p.getParentCount() > 1) { - // This parent is a merge, so keep it. - // - return p; - } - - if ((p.flags & RevWalk.UNINTERESTING) != 0) { - // Retain uninteresting parents. They show where the - // DAG was cut off because it wasn't interesting. - // - return p; - } - - if ((p.flags & REWRITE) == 0) { - // This parent was not eligible for rewriting. We - // need to keep it in the DAG. - // - return p; - } - - if (p.getParentCount() == 0) { - // We can't go back any further, other than to - // just delete the parent entirely. - // - return null; - } - - applyFilterToParents(p.getParent(0)); - p = p.getParent(0); - + class PendingRewriter extends AbstractCommitRewriter { + PendingRewriter() { + super(firstParent); } - } - private RevCommit[] cleanup(RevCommit[] oldList) { - // Remove any duplicate parents caused due to rewrites (e.g. a merge - // with two sides that both simplified back into the merge base). - // We also may have deleted a parent by marking it null. - // - int newCnt = 0; - for (int o = 0; o < oldList.length; o++) { - final RevCommit p = oldList[o]; - if (p == null) - continue; - if ((p.flags & DUPLICATE) != 0) { - oldList[o] = null; - continue; - } - p.flags |= DUPLICATE; - newCnt++; - } + /** + * Makes sure that the {@link TreeRevFilter} has been applied to all + * parents of this commit by the previous {@link PendingGenerator}. + * + * @param c + * given commit + * @throws MissingObjectException + * if an object is missing + * @throws IncorrectObjectTypeException + * if an object has an unexpected type + * @throws IOException + * if an IO error occurred + */ + @Override + void applyFilterToParents(RevCommit c) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + for (RevCommit parent : c.getParents()) { + while ((parent.flags & RevWalk.TREE_REV_FILTER_APPLIED) == 0) { + + RevCommit n = source.next(); + + if (n != null) { + pending.add(n); + } else { + // Source generator is exhausted; filter has been + // applied to all commits + return; + } - if (newCnt == oldList.length) { - for (RevCommit p : oldList) - p.flags &= ~DUPLICATE; - return oldList; - } + } - final RevCommit[] newList = new RevCommit[newCnt]; - newCnt = 0; - for (RevCommit p : oldList) { - if (p != null) { - newList[newCnt++] = p; - p.flags &= ~DUPLICATE; } } - - return newList; } } From ab51fe2bdb9d7f05287b686e75be7afc46d0c8f5 Mon Sep 17 00:00:00 2001 From: Florian Schwabe Date: Mon, 11 May 2026 13:54:00 +0200 Subject: [PATCH 185/200] RevWalk: Use an incremental topological sorting algorithm When RevSort TOPO is given, instead of the previous combination of PendingGenerator->RewriteGenerator->TopoSortGenerator, a specialized Generator is now used, which (given a commit-graph file is present) doesn't need to fully process the entire history first The new TopoSortPendingGenerator uses a modified version of the three-walk algorithm used by git and performs the tasks previously done by the Pending-, Rewrite- and TopoSortGenerator: - The RevFilter is applied in the explore Phase - Rewriting commits (only when rewriteParents is set) is performed after exploring, but before calculating in-degree numbers - Commits are only sorted topologically up to the lowest generation number seen up to that point Change-Id: I7e38a8f866bb8f46e455aedd82c3985c256841e0 --- .../AbstractRevWalkWithCommitGraphTest.java | 150 +++++++++++++++ .../jgit/revwalk/RevWalkCommitGraphTest.java | 122 +----------- .../RevWalkSortTopoWithCommitGraphTest.java | 163 ++++++++++++++++ .../jgit/revwalk/PendingGenerator.java | 16 +- .../org/eclipse/jgit/revwalk/RevCommit.java | 26 ++- .../eclipse/jgit/revwalk/RevWalkUtils.java | 23 +++ .../eclipse/jgit/revwalk/StartGenerator.java | 42 +++-- .../jgit/revwalk/TopoExplorePhase.java | 75 ++++++++ .../jgit/revwalk/TopoInDegreePhase.java | 175 ++++++++++++++++++ .../org/eclipse/jgit/revwalk/TopoPhase.java | 80 ++++++++ .../revwalk/TopoSortPendingGenerator.java | 64 +++++++ 11 files changed, 788 insertions(+), 148 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/AbstractRevWalkWithCommitGraphTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTopoWithCommitGraphTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoExplorePhase.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoInDegreePhase.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoPhase.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/AbstractRevWalkWithCommitGraphTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/AbstractRevWalkWithCommitGraphTest.java new file mode 100644 index 00000000000..4276f10543b --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/AbstractRevWalkWithCommitGraphTest.java @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2023, Tencent and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.revwalk; + +import static org.eclipse.jgit.internal.storage.commitgraph.CommitGraph.EMPTY; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.errors.AmbiguousObjectException; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.internal.storage.file.GC; +import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.revwalk.filter.RevFilter; +import org.eclipse.jgit.storage.file.FileBasedConfig; +import org.eclipse.jgit.treewalk.filter.TreeFilter; + +public abstract class AbstractRevWalkWithCommitGraphTest extends RevWalkTestCase { + + @Override + public void setUp() throws Exception { + super.setUp(); + reinitializeRevWalk(); + mockSystemReader.setJGitConfig(new MockConfig()); + } + + protected final void assertCommitCntInGraph(int expect) { + assertEquals(expect, rw.commitGraph().getCommitCnt()); + } + + protected final void assertCommits(List expect, + List actual) { + assertEquals(expect.size(), actual.size()); + + for (int i = 0; i < expect.size(); i++) { + RevCommit c1 = expect.get(i); + RevCommit c2 = actual.get(i); + assertEquals(c1.getId(), c2.getId()); + assertEquals(c1.getTree(), c2.getTree()); + assertEquals(c1.getCommitTime(), c2.getCommitTime()); + assertArrayEquals(c1.getParents(), c2.getParents()); + assertArrayEquals(c1.getRawBuffer(), c2.getRawBuffer()); + } + } + + protected final Ref branch(RevCommit commit, String name) throws Exception { + return Git.wrap(db).branchCreate().setName(name) + .setStartPoint(commit.name()).call(); + } + + protected final List travel(TreeFilter treeFilter, + RevFilter revFilter, RevSort revSort, boolean enableCommitGraph, + String... starts) + throws MissingObjectException, IncorrectObjectTypeException, + IOException, AmbiguousObjectException { + db.getConfig().setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_COMMIT_GRAPH, enableCommitGraph); + + try (RevWalk walk = new RevWalk(db)) { + walk.setTreeFilter(treeFilter); + walk.setRevFilter(revFilter); + walk.sort(revSort); + walk.setRetainBody(false); + for (String start : starts) { + walk.markStart(walk.lookupCommit(db.resolve(start))); + } + List commits = new ArrayList<>(); + + if (enableCommitGraph) { + assertTrue(walk.commitGraph().getCommitCnt() > 0); + } else { + assertEquals(EMPTY, walk.commitGraph()); + } + + for (RevCommit commit : walk) { + commits.add(commit); + } + return commits; + } + } + + protected final void enableAndWriteCommitGraph() throws Exception { + db.getConfig().setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_COMMIT_GRAPH, true); + db.getConfig().setBoolean(ConfigConstants.CONFIG_GC_SECTION, null, + ConfigConstants.CONFIG_KEY_WRITE_COMMIT_GRAPH, true); + db.getConfig().setBoolean(ConfigConstants.CONFIG_GC_SECTION, null, + ConfigConstants.CONFIG_KEY_WRITE_CHANGED_PATHS, true); + GC gc = new GC(db); + gc.gc().get(); + } + + protected final void reinitializeRevWalk() { + rw.close(); + rw = new RevWalk(db); + } + + private static final class MockConfig extends FileBasedConfig { + private MockConfig() { + super(null, null); + } + + @Override + public void load() throws IOException, ConfigInvalidException { + // Do nothing + } + + @Override + public void save() throws IOException { + // Do nothing + } + + @Override + public boolean isOutdated() { + return false; + } + + @Override + public String toString() { + return "MockConfig"; + } + + @Override + public boolean getBoolean(final String section, final String name, + final boolean defaultValue) { + if (section.equals(ConfigConstants.CONFIG_COMMIT_GRAPH_SECTION) + && name.equals( + ConfigConstants.CONFIG_KEY_READ_CHANGED_PATHS)) { + return true; + } + return defaultValue; + } + } + +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkCommitGraphTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkCommitGraphTest.java index c390405b520..41b2c2432cc 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkCommitGraphTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkCommitGraphTest.java @@ -11,7 +11,6 @@ package org.eclipse.jgit.revwalk; import static java.util.Arrays.asList; -import static org.eclipse.jgit.internal.storage.commitgraph.CommitGraph.EMPTY; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -20,22 +19,17 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; -import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.eclipse.jgit.api.Git; import org.eclipse.jgit.diff.DiffConfig; -import org.eclipse.jgit.errors.ConfigInvalidException; -import org.eclipse.jgit.internal.storage.file.GC; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.revwalk.filter.MessageRevFilter; import org.eclipse.jgit.revwalk.filter.RevFilter; -import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.treewalk.filter.AndTreeFilter; import org.eclipse.jgit.treewalk.filter.ChangedPathTreeFilter; import org.eclipse.jgit.treewalk.filter.OrTreeFilter; @@ -43,16 +37,7 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.junit.Test; -public class RevWalkCommitGraphTest extends RevWalkTestCase { - - private RevWalk rw; - - @Override - public void setUp() throws Exception { - super.setUp(); - rw = new RevWalk(db); - mockSystemReader.setJGitConfig(new MockConfig()); - } +public class RevWalkCommitGraphTest extends AbstractRevWalkWithCommitGraphTest { @Test public void testParseHeaders() throws Exception { @@ -801,109 +786,4 @@ void testRevWalkBehavior(String branch, String compare) throws Exception { false, compare)); } - void assertCommitCntInGraph(int expect) { - assertEquals(expect, rw.commitGraph().getCommitCnt()); - } - - void assertCommits(List expect, List actual) { - assertEquals(expect.size(), actual.size()); - - for (int i = 0; i < expect.size(); i++) { - RevCommit c1 = expect.get(i); - RevCommit c2 = actual.get(i); - - assertEquals(c1.getId(), c2.getId()); - assertEquals(c1.getTree(), c2.getTree()); - assertEquals(c1.getCommitTime(), c2.getCommitTime()); - assertArrayEquals(c1.getParents(), c2.getParents()); - assertArrayEquals(c1.getRawBuffer(), c2.getRawBuffer()); - } - } - - Ref branch(RevCommit commit, String name) throws Exception { - return Git.wrap(db).branchCreate().setName(name) - .setStartPoint(commit.name()).call(); - } - - List travel(TreeFilter treeFilter, RevFilter revFilter, - RevSort revSort, boolean enableCommitGraph, String... starts) - throws Exception { - db.getConfig().setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, - ConfigConstants.CONFIG_COMMIT_GRAPH, enableCommitGraph); - - try (RevWalk walk = new RevWalk(db)) { - walk.setTreeFilter(treeFilter); - walk.setRevFilter(revFilter); - walk.sort(revSort); - walk.setRetainBody(false); - for (String start : starts) { - walk.markStart(walk.lookupCommit(db.resolve(start))); - } - List commits = new ArrayList<>(); - - if (enableCommitGraph) { - assertTrue(walk.commitGraph().getCommitCnt() > 0); - } else { - assertEquals(EMPTY, walk.commitGraph()); - } - - for (RevCommit commit : walk) { - commits.add(commit); - } - return commits; - } - } - - void enableAndWriteCommitGraph() throws Exception { - db.getConfig().setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, - ConfigConstants.CONFIG_COMMIT_GRAPH, true); - db.getConfig().setBoolean(ConfigConstants.CONFIG_GC_SECTION, null, - ConfigConstants.CONFIG_KEY_WRITE_COMMIT_GRAPH, true); - db.getConfig().setBoolean(ConfigConstants.CONFIG_GC_SECTION, null, - ConfigConstants.CONFIG_KEY_WRITE_CHANGED_PATHS, true); - GC gc = new GC(db); - gc.gc().get(); - } - - private void reinitializeRevWalk() { - rw.close(); - rw = new RevWalk(db); - } - - private static final class MockConfig extends FileBasedConfig { - private MockConfig() { - super(null, null); - } - - @Override - public void load() throws IOException, ConfigInvalidException { - // Do nothing - } - - @Override - public void save() throws IOException { - // Do nothing - } - - @Override - public boolean isOutdated() { - return false; - } - - @Override - public String toString() { - return "MockConfig"; - } - - @Override - public boolean getBoolean(final String section, final String name, - final boolean defaultValue) { - if (section.equals(ConfigConstants.CONFIG_COMMIT_GRAPH_SECTION) - && name.equals( - ConfigConstants.CONFIG_KEY_READ_CHANGED_PATHS)) { - return true; - } - return defaultValue; - } - } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTopoWithCommitGraphTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTopoWithCommitGraphTest.java new file mode 100644 index 00000000000..5886f5fb557 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTopoWithCommitGraphTest.java @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2026, Vector Informatik GmbH + * + * 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.revwalk; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.fail; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +import org.assertj.core.api.ThrowingConsumer; +import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.treewalk.filter.ChangedPathTreeFilter; +import org.junit.Test; + +public class RevWalkSortTopoWithCommitGraphTest + extends AbstractRevWalkWithCommitGraphTest { + + @Test + public void testSort_TOPO_WithTreeFilter() throws Exception { + RevCommit a = commit(tree(file("a", blob("1")))); + RevCommit b = commit(tree(file("a", blob("2"))), a); + RevCommit c1 = commit(-5, tree(file("a", blob("3"))), b); + RevCommit c2 = commit(10, + tree(file("a", blob("2")), file("b", blob("1"))), b); + RevCommit d = commit(tree(file("a", blob("3")), file("b", blob("1"))), + c1, c2); + RevCommit e = commit(tree(file("a", blob("4")), file("b", blob("2"))), + d); + branch(e, "main"); + + testWalkBehavior( // + walk -> { + walk.sort(RevSort.TOPO); + walk.setTreeFilter(ChangedPathTreeFilter.create("a")); + walk.markStart(walk.lookupCommit(e)); + }, // + actual -> { + assertEquals(4, actual.size()); + + assertRewrittenCommit(actual.get(0), e, c1); + assertRewrittenCommit(actual.get(1), c1, b); + assertRewrittenCommit(actual.get(2), b, a); + assertRewrittenCommit(actual.get(3), a); + } // + ); + } + + @Test + public void testSort_TOPO_WithTreeFilter_Reachable() throws Exception { + RevCommit a = commit(tree(file("a", blob("1")))); + RevCommit b = commit(tree(file("a", blob("2"))), a); + RevCommit c1 = commit(-5, tree(file("a", blob("3"))), b); + RevCommit c2 = commit(10, + tree(file("a", blob("2")), file("b", blob("1"))), b); + RevCommit d = commit(tree(file("a", blob("3")), file("b", blob("1"))), + c1, c2); + RevCommit e = commit(tree(file("a", blob("4")), file("b", blob("2"))), + d); + branch(e, "main"); + + testWalkBehavior( // + walk -> { + walk.sort(RevSort.TOPO); + walk.setTreeFilter(ChangedPathTreeFilter.create("a")); + walk.markStart(walk.lookupCommit(e)); + walk.markUninteresting(walk.lookupCommit(b)); + }, // + actual -> { + assertEquals(2, actual.size()); + + assertRewrittenCommit(actual.get(0), e, c1); + assertRewrittenCommit(actual.get(1), c1, b); + } // + ); + } + + @Test + public void testSort_TOPO_WithTreeFilter_Reachable2() throws Exception { + RevCommit a = commit(tree(file("a", blob("1")))); + RevCommit b = commit(tree(file("a", blob("2"))), a); + RevCommit c1 = commit(-5, tree(file("a", blob("3"))), b); + RevCommit c2 = commit(10, + tree(file("a", blob("2")), file("b", blob("1"))), b); + RevCommit d = commit(tree(file("a", blob("3")), file("b", blob("1"))), + c1, c2); + RevCommit e = commit(tree(file("a", blob("4")), file("b", blob("2"))), + d); + branch(e, "main"); + + testWalkBehavior( // + walk -> { + walk.sort(RevSort.TOPO); + walk.setTreeFilter(ChangedPathTreeFilter.create("a")); + walk.markStart(walk.lookupCommit(e)); + walk.markUninteresting(walk.lookupCommit(e)); + }, // + actual -> { + assertEquals(0, actual.size()); + } // + ); + } + + // Test the RevWalk behavior with and without enabled commit graph + private void testWalkBehavior(ThrowingConsumer configureWalker, + Consumer> assertResult) throws Exception { + configureWalker.accept(rw); + List actual = new ArrayList<>(); + rw.forEach(actual::add); + + assertEquals(CommitGraph.EMPTY, rw.commitGraph()); + for (RevCommit c : actual) { + assertEquals(Constants.COMMIT_GENERATION_UNKNOWN, + c.getGeneration()); + } + + assertResult.accept(actual); + + enableAndWriteCommitGraph(); + reinitializeRevWalk(); + + configureWalker.accept(rw); + actual.clear(); + rw.forEach(actual::add); + + assertNotEquals(0, rw.commitGraph().getCommitCnt()); + for (RevCommit c : actual) { + assertNotEquals(Constants.COMMIT_GENERATION_UNKNOWN, + c.getGeneration()); + } + + assertResult.accept(actual); + } + + private void assertRewrittenCommit(RevCommit actual, AnyObjectId expectId, + RevCommit... expectParents) { + assertObjectId(actual, expectId); + assertEquals(expectParents.length, actual.getParentCount()); + + for (int i = 0; i < expectParents.length; i++) { + assertObjectId(actual.getParent(i), expectParents[i]); + } + } + + private void assertObjectId(AnyObjectId actual, AnyObjectId expectId) { + if (!AnyObjectId.isEqual(expectId, actual)) { + fail("Expected object id <%s>, got <%s>".formatted(expectId.name(), + actual.name())); + } + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java index 926e45d9313..add181d3cc6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/PendingGenerator.java @@ -72,16 +72,16 @@ class PendingGenerator extends Generator { */ private int overScan = OVER_SCAN; - boolean canDispose; + private final boolean canDispose; - PendingGenerator(final RevWalk w, final DateRevQueue p, - final RevFilter f, final int out) { + PendingGenerator(RevWalk w, DateRevQueue p, RevFilter f, int out, + boolean canDispose) { super(w.isFirstParent()); - walker = w; - pending = p; - filter = f; - output = out; - canDispose = true; + this.walker = w; + this.pending = p; + this.filter = f; + this.output = out; + this.canDispose = canDispose; } @Override diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java index 3248fe1196e..17896543d7a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java @@ -722,6 +722,29 @@ final int getGeneration() { return generation; } + /** + * Get the distance of the commit from the root, as defined in + * {@link CommitGraph} + *

+ * This method differs from {@link #getGeneration()} in that it will never + * return {@link Constants#COMMIT_GENERATION_NOT_COMPUTED}. If the + * Generation number was not calculated for this commit, then + * {@link Constants#COMMIT_GENERATION_UNKNOWN} will be returned instead. + * + * @return the generation number, never + * {@link Constants#COMMIT_GENERATION_NOT_COMPUTED} + * @since 7.8 + */ + final int getEffectiveGeneration() { + int gen = getGeneration(); + + if (gen == Constants.COMMIT_GENERATION_NOT_COMPUTED) { + return Constants.COMMIT_GENERATION_UNKNOWN; + } + + return gen; + } + /** * Get the changed path filter of the commit. *

@@ -729,7 +752,8 @@ final int getGeneration() { * commit graph file, or the commit graph file was generated without changed * path filters. * - * @param rw A revwalk to load the commit graph (if available) + * @param rw + * A revwalk to load the commit graph (if available) * @return the changed path filter * @since 6.7 */ 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 4bfe2fda021..2da163b719b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java @@ -195,4 +195,27 @@ public static List findBranchesReachableFrom(RevCommit commit, return result; } + /** + * If not already parsed, parses the headers of the given commit using the + * given Rev Walker + * + * @param commit + * The commit to parse + * @param walker + * The RevWalk to be used + * @throws MissingObjectException + * if the object is missing + * @throws IncorrectObjectTypeException + * if the object has an unexpected type + * @throws IOException + * if an IO error occurred + */ + static void ensureHeadersParsed(RevCommit commit, RevWalk walker) + throws MissingObjectException, IncorrectObjectTypeException, + IOException { + if ((commit.flags & RevWalk.PARSED) == 0) { + commit.parseHeaders(walker); + } + } + } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java index 6854b6083df..2d4cc09837f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java @@ -110,18 +110,33 @@ RevCommit next() throws MissingObjectException, walker.queue = q; + if (walker.hasRevSort(RevSort.TOPO) + && walker.hasRevSort(RevSort.TOPO_KEEP_BRANCH_TOGETHER)) { + throw new IllegalStateException(JGitText + .get().cannotCombineTopoSortWithTopoKeepBranchTogetherSort); + } + if (walker instanceof DepthWalk) { DepthWalk dw = (DepthWalk) walker; g = new DepthGenerator(dw, pending); + + if (walker.hasRevSort(RevSort.TOPO)) { + g = new TopoSortGenerator(g); + } } else { - g = new PendingGenerator(w, pending, rf, pendingOutputType); - - if (walker.hasRevSort(RevSort.BOUNDARY)) { - // Because the boundary generator may produce uninteresting - // commits we cannot allow the pending generator to dispose - // of them early. - // - ((PendingGenerator) g).canDispose = false; + // Because the boundary generator may produce uninteresting + // commits we cannot allow the pending generator to dispose + // of them early. + // + boolean canDispose = !walker.hasRevSort(RevSort.BOUNDARY); + + if (walker.hasRevSort(RevSort.TOPO)) { + // Doesn't need rewrite + g = new TopoSortPendingGenerator(w, pending, rf, + pendingOutputType, canDispose); + } else { + g = new PendingGenerator(w, pending, rf, pendingOutputType, + canDispose); } } @@ -129,16 +144,7 @@ RevCommit next() throws MissingObjectException, g = new RewriteGenerator(g); } - if (walker.hasRevSort(RevSort.TOPO) - && walker.hasRevSort(RevSort.TOPO_KEEP_BRANCH_TOGETHER)) { - throw new IllegalStateException(JGitText - .get().cannotCombineTopoSortWithTopoKeepBranchTogetherSort); - } - - if (walker.hasRevSort(RevSort.TOPO) - && (g.outputType() & SORT_TOPO) == 0) { - g = new TopoSortGenerator(g); - } else if (walker.hasRevSort(RevSort.TOPO_KEEP_BRANCH_TOGETHER) + if (walker.hasRevSort(RevSort.TOPO_KEEP_BRANCH_TOGETHER) && (g.outputType() & SORT_TOPO) == 0) { g = new TopoNonIntermixSortGenerator(g); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoExplorePhase.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoExplorePhase.java new file mode 100644 index 00000000000..ca6fcbb1952 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoExplorePhase.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2026 Vector Informatik GmbH + * + * 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.revwalk; + +import java.io.IOException; + +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.revwalk.filter.RevFilter; + +final class TopoExplorePhase extends TopoPhase { + + private final RevFlag topoPassedFilterFlag; + + private final RevFilter filter; + + private final boolean canDispose; + + TopoExplorePhase(RevWalk walker, RevFilter filter, + boolean canDispose) { + super(walker, "EXPLORE"); //$NON-NLS-1$ + this.topoPassedFilterFlag = walker.newFlag("TOPO_PASSED_FILTER"); //$NON-NLS-1$ + this.filter = filter; + this.canDispose = canDispose; + } + + void explore(int minGeneration) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + RevCommit c; + while ((c = tryRemove(minGeneration)) != null) { + if (!propagateUninteresting(c) && passThroughFilter(c)) { + c.add(topoPassedFilterFlag); + } + + for (RevCommit p : c.getParents()) { + enqueue(p); + } + } + } + + boolean hasPassedFilter(RevCommit c) { + return c.has(topoPassedFilterFlag); + } + + private boolean propagateUninteresting(RevCommit c) { + walker.carryFlagsImpl(c); + return c.has(RevFlag.UNINTERESTING); + } + + private boolean passThroughFilter(RevCommit c) + throws MissingObjectException, + IncorrectObjectTypeException, IOException { + boolean hadBody = c.getRawBuffer() != null; + + if (filter.requiresCommitBody() && !hadBody) { + c.parseBody(walker); + } + + boolean passesFilter = filter.include(walker, c); + + if (!hadBody && canDispose) { + c.disposeBody(); + } + + return passesFilter; + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoInDegreePhase.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoInDegreePhase.java new file mode 100644 index 00000000000..112d9e7954d --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoInDegreePhase.java @@ -0,0 +1,175 @@ +/* + * Copyright (c) 2026 Vector Informatik GmbH + * + * 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.revwalk; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.Constants; + +final class TopoInDegreePhase extends TopoPhase { + + private final TopoExplorePhase explorePhase; + + private final AbstractCommitRewriter rewriter; + + private final RevFlag topoSeen; + + private final AbstractRevQueue ready; + + private int minGeneration = Constants.COMMIT_GENERATION_UNKNOWN; + + TopoInDegreePhase(RevWalk walker, TopoExplorePhase explorePhase, + boolean needsRewrite) { + super(walker, "INDEGREE"); //$NON-NLS-1$ + + this.explorePhase = explorePhase; + this.rewriter = needsRewrite ? new TopoRewriter() : null; + this.topoSeen = walker.newFlag("TOPO_SEEN"); //$NON-NLS-1$ + this.ready = RevWalk.newDateRevQueue(walker.isFirstParent()); + } + + void initialize(AbstractRevQueue p) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + List roots = new ArrayList<>(); + + for (RevCommit root = p.next(); root != null; root = p.next()) { + roots.add(root); + checkUpdateMinGeneration(root); + + explorePhase.enqueue(root); + enqueue(root); + } + + calculateInDegrees(minGeneration); + + for (RevCommit root : roots) { + checkAddReady(root); + } + } + + void calculateInDegrees(int cutoff) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + RevCommit c; + + while ((c = tryRemove(cutoff)) != null) { + // Only perform inDegree calculation on commits, whose history has + // been rewritten + c = rewriteIfNeeded(c); + + visitChild(c); + } + } + + private RevCommit rewriteIfNeeded(RevCommit c) + throws MissingObjectException, IncorrectObjectTypeException, + IOException { + explorePhase.explore(c.getEffectiveGeneration()); + + if (rewriter != null) { + return rewriter.rewriteParents(c); + } + + return c; + } + + private void visitChild(RevCommit c) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + for (RevCommit p : c.getParents()) { + if (p.has(RevFlag.UNINTERESTING) || p.has(RevFlag.UNSHALLOW)) { + continue; + } + + p.inDegree++; + enqueue(p); + + if (walker.isFirstParent()) { + break; + } + } + } + + RevCommit nextReady() throws MissingObjectException, + IncorrectObjectTypeException, IOException { + RevCommit c = ready.next(); + + if (c == null) { + return null; + } + + expand(c); + return c; + } + + private void expand(RevCommit c) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + for (RevCommit p : c.getParents()) { + if (p.has(RevFlag.UNINTERESTING)) { + continue; + } + + if (checkUpdateMinGeneration(p)) { + calculateInDegrees(minGeneration); + } + + p.inDegree--; + checkAddReady(p); + + if (walker.isFirstParent()) { + return; + } + } + } + + private void checkAddReady(RevCommit p) { + if (p.inDegree == 0 && !p.has(topoSeen)) { + p.add(topoSeen); + ready.add(p); + } + } + + private boolean checkUpdateMinGeneration(RevCommit c) + throws MissingObjectException, IncorrectObjectTypeException, + IOException { + RevWalkUtils.ensureHeadersParsed(c, walker); + int generation = c.getEffectiveGeneration(); + + if (generation < minGeneration) { + minGeneration = generation; + return true; + } + + return false; + } + + private class TopoRewriter extends AbstractCommitRewriter { + + TopoRewriter() { + super(walker.isFirstParent()); + } + + @Override + void applyFilterToParents(RevCommit c) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + for (RevCommit p : c.getParents()) { + if ((p.flags & RevWalk.TREE_REV_FILTER_APPLIED) == 0) { + RevWalkUtils.ensureHeadersParsed(p, walker); + explorePhase.explore(p.getEffectiveGeneration()); + } + } + + } + + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoPhase.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoPhase.java new file mode 100644 index 00000000000..6d8421c1d03 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoPhase.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2026 Vector Informatik GmbH + * + * 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.revwalk; + +import java.io.IOException; +import java.util.PriorityQueue; + +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; + +class TopoPhase { + + private final RevFlag testFlag; + + private final PriorityQueue queue; + + protected final RevWalk walker; + + TopoPhase(RevWalk walker, String name) { + this.walker = walker; + this.testFlag = walker.newFlag(name + "_SEEN"); //$NON-NLS-1$ + this.queue = new PriorityQueue<>(TopoPhase::compareGenThenDate); + } + + private static int compareGenThenDate(RevCommit a, RevCommit b) { + int genCompare = Integer.compare(b.getEffectiveGeneration(), + a.getEffectiveGeneration()); + + if (genCompare != 0) { + return genCompare; + } + + return Integer.compare(b.commitTime, a.commitTime); + } + + final void enqueue(RevCommit c) throws MissingObjectException, + IncorrectObjectTypeException, IOException { + if (!c.has(testFlag)) { + RevWalkUtils.ensureHeadersParsed(c, walker); + c.add(testFlag); + queue.offer(c); + } + } + + /** + * If the queue is not empty and the head of the queue has an effective + * generation equal to or higher than {@code minGeneration}, it is removed + * from the queue and returned. + *

+ * Otherwise, {@code null} is returned + * + * @param minGeneration + * The minimum desired generation number + * @return The head of the queue or {@code null} + */ + final RevCommit tryRemove(int minGeneration) { + RevCommit candidate = queue.peek(); + + if (candidate == null) { + return null; + } + + // No need to parse the commit before querying generation, since only + // parsed commits can be added to the queue + if (candidate.getEffectiveGeneration() >= minGeneration) { + queue.remove(); + return candidate; + } + + return null; + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java new file mode 100644 index 00000000000..5d43c5bb338 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2026 Vector Informatik GmbH + * + * 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.revwalk; + +import java.io.IOException; + +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.revwalk.filter.RevFilter; + +class TopoSortPendingGenerator extends Generator { + + private final int output; + + private final TopoExplorePhase explorePhase; + + private final TopoInDegreePhase inDegreePhase; + + protected TopoSortPendingGenerator(RevWalk walker, AbstractRevQueue pending, + RevFilter filter, int output, boolean canDispose) + throws MissingObjectException, IncorrectObjectTypeException, + IOException { + super(walker.isFirstParent()); + + this.output = (output | SORT_COMMIT_TIME_DESC | SORT_TOPO) + & ~(NEEDS_REWRITE); + this.explorePhase = new TopoExplorePhase(walker, filter, canDispose); + this.inDegreePhase = new TopoInDegreePhase(walker, explorePhase, + (output & NEEDS_REWRITE) != 0); + + inDegreePhase.initialize(pending); + } + + @Override + int outputType() { + return output; + } + + @Override + RevCommit next() throws MissingObjectException, + IncorrectObjectTypeException, IOException { + while (true) { + RevCommit c = inDegreePhase.nextReady(); + + if (c == null) { + return null; + } + + c.add(RevFlag.SEEN); + + if (explorePhase.hasPassedFilter(c)) { + return c; + } + } + } + +} From 5fe179cee97b947a49228dd7170fc3b9c65a498c Mon Sep 17 00:00:00 2001 From: Florian Schwabe Date: Wed, 13 May 2026 13:53:48 +0200 Subject: [PATCH 186/200] ResolveMerger: Retrieve Attributes lazily during Three-way merge Instead of eagerly retrieving the attributes of the current path for the three trees (BASE, OURS, THEIRS), the attributes are now only retrieved lazily when needed. This can significantly improve performance of the Cherry-Pick, Merge, Apply Stash and Revert actions in repositories with large worktrees and many attribute rules. Bug: jgit-266 Change-Id: I4698eee2ff36711267683a9925d1b1d268aac4a4 --- .../eclipse/jgit/merge/MergeAttributes.java | 70 ++++++++++++++ .../org/eclipse/jgit/merge/ResolveMerger.java | 96 ++++++++++++------- 2 files changed, 132 insertions(+), 34 deletions(-) create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAttributes.java diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAttributes.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAttributes.java new file mode 100644 index 00000000000..3d0c0a5d4b2 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAttributes.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2026 Vector Informatik GmbH + * + * 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.merge; + +import org.eclipse.jgit.attributes.Attributes; +import org.eclipse.jgit.attributes.AttributesNodeProvider; +import org.eclipse.jgit.treewalk.TreeWalk; + +/** + * Provides {@link Attributes} for the trees during content-merge of a three way + * merge + * + * @since 7.8 + */ +public interface MergeAttributes { + + /** + * Attributes used when the {@link TreeWalk} has no + * {@link AttributesNodeProvider} + */ + static MergeAttributes NO_ATTRIBUTES = new MergeAttributes() { + + private static final Attributes EMPTY_ATTRIBUTES = new Attributes(); + + @Override + public Attributes base() { + return EMPTY_ATTRIBUTES; + } + + @Override + public Attributes ours() { + return EMPTY_ATTRIBUTES; + } + + @Override + public Attributes theirs() { + return EMPTY_ATTRIBUTES; + } + }; + + /** + * Retrieve the {@link Attributes} for the common base between ours and + * theirs + * + * @return {@link Attributes} for the common base between ours and theirs + */ + Attributes base(); + + /** + * Retrieve the {@link Attributes} for the 'ours' side of the merge + * + * @return {@link Attributes} for the 'ours' side of the merge + */ + Attributes ours(); + + /** + * Retrieve the {@link Attributes} for the 'theirs' side of the merge + * + * @return {@link Attributes} for the 'theirs' side of the merge + */ + Attributes theirs(); + +} \ No newline at end of file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index cb825771928..8aeb7bfb724 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -862,8 +862,6 @@ private static String[] defaultCommitNames() { return new String[]{"BASE", "OURS", "THEIRS"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - private static final Attributes NO_ATTRIBUTES = new Attributes(); - /** * Constructor for ResolveMerger. * @@ -1021,20 +1019,23 @@ private DirCacheEntry keep(DirCacheEntry e) { * @param entry * to add * @param attributes - * the {@link Attributes} of the trees + * the {@link Attributes} of the trees. Must not be retained + * outside of the scope of the method invocation * @throws IOException * if the {@link CheckoutMetadata} cannot be determined - * @since 6.1 + * @since 7.8 */ protected void addToCheckout(String path, DirCacheEntry entry, - Attributes[] attributes) - throws IOException { - EolStreamType cleanupStreamType = workTreeUpdater.detectCheckoutStreamType(attributes[T_OURS]); - String cleanupSmudgeCommand = tw.getSmudgeCommand(attributes[T_OURS]); - EolStreamType checkoutStreamType = workTreeUpdater.detectCheckoutStreamType(attributes[T_THEIRS]); - String checkoutSmudgeCommand = tw.getSmudgeCommand(attributes[T_THEIRS]); - workTreeUpdater.addToCheckout(path, entry, cleanupStreamType, cleanupSmudgeCommand, - checkoutStreamType, checkoutSmudgeCommand); + MergeAttributes attributes) throws IOException { + EolStreamType cleanupStreamType = workTreeUpdater + .detectCheckoutStreamType(attributes.ours()); + String cleanupSmudgeCommand = tw.getSmudgeCommand(attributes.ours()); + EolStreamType checkoutStreamType = workTreeUpdater + .detectCheckoutStreamType(attributes.theirs()); + String checkoutSmudgeCommand = tw.getSmudgeCommand(attributes.theirs()); + workTreeUpdater.addToCheckout(path, entry, cleanupStreamType, + cleanupSmudgeCommand, checkoutStreamType, + checkoutSmudgeCommand); } /** @@ -1099,18 +1100,19 @@ protected void addDeletion(String path, boolean isFile, * see * {@link org.eclipse.jgit.merge.ResolveMerger#mergeTrees(AbstractTreeIterator, RevTree, RevTree, boolean)} * @param attributes - * the {@link Attributes} for the three trees + * the {@link Attributes} for the three trees. Must not be + * retained outside of the scope of the method invocation * @return false if the merge will fail because the index entry * didn't match ours or the working-dir file was dirty and a * conflict occurred * @throws java.io.IOException * if an IO error occurred - * @since 6.1 + * @since 7.8 */ protected boolean processEntry(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs, DirCacheBuildIterator index, WorkingTreeIterator work, - boolean ignoreConflicts, Attributes[] attributes) + boolean ignoreConflicts, MergeAttributes attributes) throws IOException { enterSubtree = true; final int modeO = tw.getRawMode(T_OURS); @@ -1228,7 +1230,7 @@ protected boolean processEntry(CanonicalTreeParser base, // Base, ours, and theirs all contain a folder: don't delete return true; } - addDeletion(tw.getPathString(), nonTree(modeO), attributes[T_OURS]); + addDeletion(tw.getPathString(), nonTree(modeO), attributes.ours()); return true; } @@ -1275,7 +1277,7 @@ protected boolean processEntry(CanonicalTreeParser base, if (nonTree(modeO) && nonTree(modeT)) { // Check worktree before modifying files boolean worktreeDirty = isWorktreeDirty(work, ourDce); - if (!attributes[T_OURS].canBeContentMerged() && worktreeDirty) { + if (!attributes.ours().canBeContentMerged() && worktreeDirty) { return false; } @@ -1292,7 +1294,7 @@ protected boolean processEntry(CanonicalTreeParser base, mergeResults.put(tw.getPathString(), result); unmergedPaths.add(tw.getPathString()); return true; - } else if (!attributes[T_OURS].canBeContentMerged()) { + } else if (!attributes.ours().canBeContentMerged()) { // File marked as binary switch (getContentMergeStrategy()) { case OURS: @@ -1346,7 +1348,7 @@ protected boolean processEntry(CanonicalTreeParser base, } else if (ignoreConflicts) { result.setContainsConflicts(false); } - updateIndex(base, ours, theirs, result, attributes[T_OURS]); + updateIndex(base, ours, theirs, result, attributes.ours()); workTreeUpdater.markAsModified(currentPath); // Entry is null - only add the metadata addToCheckout(currentPath, null, attributes); @@ -1461,7 +1463,7 @@ protected boolean processEntry(CanonicalTreeParser base, // conflict markers). But also stage 0 of the index // is filled with that content. updateIndex(base, ours, theirs, result, - attributes[T_OURS]); + attributes.ours()); } } else { DirCacheEntry e = addConflict(base, ours, theirs); @@ -1513,7 +1515,8 @@ private static MergeResult createGitLinksMergeResult( * @param theirs * used to parse theirs tree * @param attributes - * attributes for the different stages + * attributes for the different stages. Must not be retained + * outside of the scope of the method invocation * @param strategy * merge strategy * @@ -1525,19 +1528,18 @@ private static MergeResult createGitLinksMergeResult( */ private MergeResult contentMerge(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs, - Attributes[] attributes, ContentMergeStrategy strategy) + MergeAttributes attributes, ContentMergeStrategy strategy) throws BinaryBlobException, IOException { // TW: The attributes here are used to determine the LFS smudge filter. // Is doing a content merge on LFS items really a good idea?? RawText baseText = base == null ? RawText.EMPTY_TEXT - : getRawText(base.getEntryObjectId(), attributes[T_BASE]); + : getRawText(base.getEntryObjectId(), attributes.base()); RawText ourText = ours == null ? RawText.EMPTY_TEXT - : getRawText(ours.getEntryObjectId(), attributes[T_OURS]); + : getRawText(ours.getEntryObjectId(), attributes.ours()); RawText theirsText = theirs == null ? RawText.EMPTY_TEXT - : getRawText(theirs.getEntryObjectId(), attributes[T_THEIRS]); + : getRawText(theirs.getEntryObjectId(), attributes.theirs()); mergeAlgorithm.setContentMergeStrategy( - getAttributesContentMergeStrategy(attributes[T_OURS], - strategy)); + getAttributesContentMergeStrategy(attributes.ours(), strategy)); return mergeAlgorithm.merge(RawTextComparator.DEFAULT, baseText, ourText, theirsText); } @@ -2008,14 +2010,11 @@ protected boolean mergeTreeWalk(TreeWalk treeWalk, boolean ignoreConflicts) boolean hasWorkingTreeIterator = tw.getTreeCount() > T_FILE; boolean hasAttributeNodeProvider = treeWalk .getAttributesNodeProvider() != null; + MergeAttributes attributes = hasAttributeNodeProvider + ? new CurrentTreeWalkEntryMergeAttributes(treeWalk) + : MergeAttributes.NO_ATTRIBUTES; + while (treeWalk.next()) { - Attributes[] attributes = {NO_ATTRIBUTES, NO_ATTRIBUTES, - NO_ATTRIBUTES}; - if (hasAttributeNodeProvider) { - attributes[T_BASE] = treeWalk.getAttributes(T_BASE); - attributes[T_OURS] = treeWalk.getAttributes(T_OURS); - attributes[T_THEIRS] = treeWalk.getAttributes(T_THEIRS); - } if (!processEntry( treeWalk.getTree(T_BASE, CanonicalTreeParser.class), treeWalk.getTree(T_OURS, CanonicalTreeParser.class), @@ -2033,4 +2032,33 @@ protected boolean mergeTreeWalk(TreeWalk treeWalk, boolean ignoreConflicts) } return true; } + + // Uses the caching mechanism in TreeWalk.getAttributes() to retrieve the + // Attributes of the current path only when requested. When the TreeWalk + // advances to the next entry, the mapping of tree index -> cached + // attributes is also cleared + private static final class CurrentTreeWalkEntryMergeAttributes implements MergeAttributes { + + private final TreeWalk walk; + + public CurrentTreeWalkEntryMergeAttributes(TreeWalk treeWalk) { + walk = treeWalk; + } + + @Override + public Attributes base() { + return walk.getAttributes(T_BASE); + } + + @Override + public Attributes ours() { + return walk.getAttributes(T_OURS); + } + + @Override + public Attributes theirs() { + return walk.getAttributes(T_THEIRS); + } + + } } From 50b9cb2d0e19172e01ae29a28764a02c3c60e0e8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 23 Jul 2026 16:48:28 +0200 Subject: [PATCH 187/200] Update org.apache.sshd to 2.19.0 This fixes CVE-2026-56624. See https://lists.apache.org/thread/o4c2jml522j3z80gbryqzc2f1253ltp6 Widen allowed version range to [2.19.0,3.0.0). This allows applications using JGit to update org.apache.sshd to a newer version without us needing to provide an update. See https://github.com/eclipse-jgit/jgit/discussions/278 Change-Id: Id51cd96c4a526227bfa18a0e603f60d6014cb2d9 --- MODULE.bazel | 2 +- .../META-INF/MANIFEST.MF | 50 ++++----- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +- .../org.eclipse.jgit.target/jgit-4.36.target | 6 +- .../org.eclipse.jgit.target/jgit-4.37.target | 6 +- .../org.eclipse.jgit.target/jgit-4.38.target | 6 +- .../org.eclipse.jgit.target/jgit-4.39.target | 6 +- .../org.eclipse.jgit.target/jgit-4.40.target | 6 +- .../maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 36 +++--- .../META-INF/MANIFEST.MF | 104 +++++++++--------- pom.xml | 2 +- 13 files changed, 120 insertions(+), 120 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 58d86f53517..778873ae6d5 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -36,7 +36,7 @@ JNA_VERSION = "5.18.1" SLF4J_VERSION = "2.0.18" -SSHD_VERSION = "2.17.1" +SSHD_VERSION = "2.19.0" maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 97073289d77..71b5aeb332b 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -9,31 +9,31 @@ Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.apache.sshd.common;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.common.file.virtualfs;version="[2.17.1,2.18.0)", - org.apache.sshd.common.helpers;version="[2.17.1,2.18.0)", - org.apache.sshd.common.io;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex;version="[2.17.1,2.18.0)", - org.apache.sshd.common.keyprovider;version="[2.17.1,2.18.0)", - org.apache.sshd.common.session;version="[2.17.1,2.18.0)", - org.apache.sshd.common.signature;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.buffer;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.logging;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.security;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.threads;version="[2.17.1,2.18.0)", - org.apache.sshd.core;version="[2.17.1,2.18.0)", - org.apache.sshd.server;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth.gss;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth.keyboard;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth.password;version="[2.17.1,2.18.0)", - org.apache.sshd.server.command;version="[2.17.1,2.18.0)", - org.apache.sshd.server.session;version="[2.17.1,2.18.0)", - org.apache.sshd.server.shell;version="[2.17.1,2.18.0)", - org.apache.sshd.server.subsystem;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp.server;version="[2.17.1,2.18.0)", +Import-Package: org.apache.sshd.common;version="[2.19.0,3.0.0)", + org.apache.sshd.common.config.keys;version="[2.19.0,3.0.0)", + org.apache.sshd.common.file.virtualfs;version="[2.19.0,3.0.0)", + org.apache.sshd.common.helpers;version="[2.19.0,3.0.0)", + org.apache.sshd.common.io;version="[2.19.0,3.0.0)", + org.apache.sshd.common.kex;version="[2.19.0,3.0.0)", + org.apache.sshd.common.keyprovider;version="[2.19.0,3.0.0)", + org.apache.sshd.common.session;version="[2.19.0,3.0.0)", + org.apache.sshd.common.signature;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.buffer;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.logging;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.security;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.threads;version="[2.19.0,3.0.0)", + org.apache.sshd.core;version="[2.19.0,3.0.0)", + org.apache.sshd.server;version="[2.19.0,3.0.0)", + org.apache.sshd.server.auth;version="[2.19.0,3.0.0)", + org.apache.sshd.server.auth.gss;version="[2.19.0,3.0.0)", + org.apache.sshd.server.auth.keyboard;version="[2.19.0,3.0.0)", + org.apache.sshd.server.auth.password;version="[2.19.0,3.0.0)", + org.apache.sshd.server.command;version="[2.19.0,3.0.0)", + org.apache.sshd.server.session;version="[2.19.0,3.0.0)", + org.apache.sshd.server.shell;version="[2.19.0,3.0.0)", + org.apache.sshd.server.subsystem;version="[2.19.0,3.0.0)", + org.apache.sshd.sftp;version="[2.19.0,3.0.0)", + org.apache.sshd.sftp.server;version="[2.19.0,3.0.0)", org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", org.eclipse.jgit.api;version="[7.7.1,7.8.0)", org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 0ed6ad9fc02..ecc31ea510f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index a3469d1e3d4..b2c1290ad6e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index ae957d4bf86..89001464a52 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index bdf955c3e88..1386b22222d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index cbd8dcb82ab..cb3d0195b40 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index dd38a8c2e91..4300c832e0d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index a00c7d0d9d9..e2205599a70 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -71,13 +71,13 @@ org.apache.sshd sshd-osgi - 2.17.1 + 2.19.0 jar org.apache.sshd sshd-sftp - 2.17.1 + 2.19.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 367d4a34b94..c30cfae376a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -238,12 +238,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.17.1" + version = "2.19.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.17.1" + version = "2.19.0" } } 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 404ed80450c..488e02dbf7d 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,24 +8,24 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.apache.sshd.agent;version="[2.17.1,2.18.0)", - org.apache.sshd.certificate;version="[2.17.1,2.18.0)", - org.apache.sshd.client.config.hosts;version="[2.17.1,2.18.0)", - org.apache.sshd.common;version="[2.17.1,2.18.0)", - org.apache.sshd.common.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.common.cipher;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.common.helpers;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex;version="[2.17.1,2.18.0)", - org.apache.sshd.common.keyprovider;version="[2.17.1,2.18.0)", - org.apache.sshd.common.session;version="[2.17.1,2.18.0)", - org.apache.sshd.common.signature;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.buffer;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.net;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.security;version="[2.17.1,2.18.0)", - org.apache.sshd.core;version="[2.17.1,2.18.0)", - org.apache.sshd.server;version="[2.17.1,2.18.0)", - org.apache.sshd.server.forward;version="[2.17.1,2.18.0)", +Import-Package: org.apache.sshd.agent;version="[2.19.0,3.0.0)", + org.apache.sshd.certificate;version="[2.19.0,3.0.0)", + org.apache.sshd.client.config.hosts;version="[2.19.0,3.0.0)", + org.apache.sshd.common;version="[2.19.0,3.0.0)", + org.apache.sshd.common.auth;version="[2.19.0,3.0.0)", + org.apache.sshd.common.cipher;version="[2.19.0,3.0.0)", + org.apache.sshd.common.config.keys;version="[2.19.0,3.0.0)", + org.apache.sshd.common.helpers;version="[2.19.0,3.0.0)", + org.apache.sshd.common.kex;version="[2.19.0,3.0.0)", + org.apache.sshd.common.keyprovider;version="[2.19.0,3.0.0)", + org.apache.sshd.common.session;version="[2.19.0,3.0.0)", + org.apache.sshd.common.signature;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.buffer;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.net;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.security;version="[2.19.0,3.0.0)", + org.apache.sshd.core;version="[2.19.0,3.0.0)", + org.apache.sshd.server;version="[2.19.0,3.0.0)", + org.apache.sshd.server.forward;version="[2.19.0,3.0.0)", org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", org.eclipse.jgit.api;version="[7.7.1,7.8.0)", org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index ec464311599..a5136e44aaa 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -39,58 +39,58 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.1";x-friends: org.apache.sshd.client.keyverifier", org.eclipse.jgit.transport.sshd.agent;version="7.7.1" Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", - org.apache.sshd.agent;version="[2.17.1,2.18.0)", - org.apache.sshd.client;version="[2.17.1,2.18.0)", - org.apache.sshd.client.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.client.auth.keyboard;version="[2.17.1,2.18.0)", - org.apache.sshd.client.auth.password;version="[2.17.1,2.18.0)", - org.apache.sshd.client.auth.pubkey;version="[2.17.1,2.18.0)", - org.apache.sshd.client.channel;version="[2.17.1,2.18.0)", - org.apache.sshd.client.config.hosts;version="[2.17.1,2.18.0)", - org.apache.sshd.client.config.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.client.future;version="[2.17.1,2.18.0)", - org.apache.sshd.client.keyverifier;version="[2.17.1,2.18.0)", - org.apache.sshd.client.session;version="[2.17.1,2.18.0)", - org.apache.sshd.client.session.forward;version="[2.17.1,2.18.0)", - org.apache.sshd.common;version="[2.17.1,2.18.0)", - org.apache.sshd.common.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.common.channel;version="[2.17.1,2.18.0)", - org.apache.sshd.common.cipher;version="[2.17.1,2.18.0)", - org.apache.sshd.common.compression;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys.loader;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.17.1,2.18.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.17.1,2.18.0)", - org.apache.sshd.common.digest;version="[2.17.1,2.18.0)", - org.apache.sshd.common.forward;version="[2.17.1,2.18.0)", - org.apache.sshd.common.future;version="[2.17.1,2.18.0)", - org.apache.sshd.common.helpers;version="[2.17.1,2.18.0)", - org.apache.sshd.common.io;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex.extension;version="[2.17.1,2.18.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.17.1,2.18.0)", - org.apache.sshd.common.keyprovider;version="[2.17.1,2.18.0)", - org.apache.sshd.common.mac;version="[2.17.1,2.18.0)", - org.apache.sshd.common.random;version="[2.17.1,2.18.0)", - org.apache.sshd.common.session;version="[2.17.1,2.18.0)", - org.apache.sshd.common.session.helpers;version="[2.17.1,2.18.0)", - org.apache.sshd.common.signature;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.buffer;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.closeable;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.io;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.io.der;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.io.functors;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.io.resource;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.logging;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.net;version="[2.17.1,2.18.0)", - org.apache.sshd.common.util.security;version="[2.17.1,2.18.0)", - org.apache.sshd.core;version="[2.17.1,2.18.0)", - org.apache.sshd.server.auth;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp.client;version="[2.17.1,2.18.0)", - org.apache.sshd.sftp.common;version="[2.17.1,2.18.0)", + org.apache.sshd.agent;version="[2.19.0,3.0.0)", + org.apache.sshd.client;version="[2.19.0,3.0.0)", + org.apache.sshd.client.auth;version="[2.19.0,3.0.0)", + org.apache.sshd.client.auth.keyboard;version="[2.19.0,3.0.0)", + org.apache.sshd.client.auth.password;version="[2.19.0,3.0.0)", + org.apache.sshd.client.auth.pubkey;version="[2.19.0,3.0.0)", + org.apache.sshd.client.channel;version="[2.19.0,3.0.0)", + org.apache.sshd.client.config.hosts;version="[2.19.0,3.0.0)", + org.apache.sshd.client.config.keys;version="[2.19.0,3.0.0)", + org.apache.sshd.client.future;version="[2.19.0,3.0.0)", + org.apache.sshd.client.keyverifier;version="[2.19.0,3.0.0)", + org.apache.sshd.client.session;version="[2.19.0,3.0.0)", + org.apache.sshd.client.session.forward;version="[2.19.0,3.0.0)", + org.apache.sshd.common;version="[2.19.0,3.0.0)", + org.apache.sshd.common.auth;version="[2.19.0,3.0.0)", + org.apache.sshd.common.channel;version="[2.19.0,3.0.0)", + org.apache.sshd.common.cipher;version="[2.19.0,3.0.0)", + org.apache.sshd.common.compression;version="[2.19.0,3.0.0)", + org.apache.sshd.common.config.keys;version="[2.19.0,3.0.0)", + org.apache.sshd.common.config.keys.loader;version="[2.19.0,3.0.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.19.0,3.0.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.19.0,3.0.0)", + org.apache.sshd.common.digest;version="[2.19.0,3.0.0)", + org.apache.sshd.common.forward;version="[2.19.0,3.0.0)", + org.apache.sshd.common.future;version="[2.19.0,3.0.0)", + org.apache.sshd.common.helpers;version="[2.19.0,3.0.0)", + org.apache.sshd.common.io;version="[2.19.0,3.0.0)", + org.apache.sshd.common.kex;version="[2.19.0,3.0.0)", + org.apache.sshd.common.kex.extension;version="[2.19.0,3.0.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.19.0,3.0.0)", + org.apache.sshd.common.keyprovider;version="[2.19.0,3.0.0)", + org.apache.sshd.common.mac;version="[2.19.0,3.0.0)", + org.apache.sshd.common.random;version="[2.19.0,3.0.0)", + org.apache.sshd.common.session;version="[2.19.0,3.0.0)", + org.apache.sshd.common.session.helpers;version="[2.19.0,3.0.0)", + org.apache.sshd.common.signature;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.buffer;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.closeable;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.io;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.io.der;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.io.functors;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.io.resource;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.logging;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.net;version="[2.19.0,3.0.0)", + org.apache.sshd.common.util.security;version="[2.19.0,3.0.0)", + org.apache.sshd.core;version="[2.19.0,3.0.0)", + org.apache.sshd.server.auth;version="[2.19.0,3.0.0)", + org.apache.sshd.sftp;version="[2.19.0,3.0.0)", + org.apache.sshd.sftp.client;version="[2.19.0,3.0.0)", + org.apache.sshd.sftp.common;version="[2.19.0,3.0.0)", org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", diff --git a/pom.xml b/pom.xml index eae45351169..9e69152b1a9 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 7.6.0.202603022253-r 1.10.15 - 2.17.1 + 2.19.0 0.1.55 1.1.3 1.2.3 From ec341eceb301110cda4cce7c3a9983b380b004bf Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 Jul 2026 08:35:12 +0200 Subject: [PATCH 188/200] JGit v7.7.1.202607240634-r Signed-off-by: Matthias Sohn Change-Id: I3e38f30515288fb32a011c475afbb5311c8d7d5d --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 388021776f0..fb186a3934a 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 44ffa1515e7..28568ed2845 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 8afb379bc93..ffa97e92a75 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 2a88ae0111f..ee553618c4a 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index f863b44d682..197f5367157 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 e926ab523b9..64a5e4d3a5f 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 417b563e33e..d51d4fcab6c 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 16d3c6940e7..9c38ddf536d 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index eaa3787590a..1f05407f5aa 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 2abe2ae0776..cbf455f480c 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.ant - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.archive - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.ui - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.test - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 add1d61d869..63eb43e9a1c 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index f551a552b59..74fecb5e8b0 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 5646d759bd5..c91d6c03516 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="[7.7.1,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.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 c3e578ee3bb..bbd2522d727 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 056159c4fdd..ec2538abb7a 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 caa10d1e74a..79e4c92d713 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 7bf7c7f4c40..1a27674c0ca 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 2834b869ab4..514d339ac95 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 1a82f050d35..4b5676ad75a 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 6ee07958fb7..3fdf0a80a18 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index e841c44a335..9273c17fdff 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 d88dd16d822..5c4a9d76fbc 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index ca012729342..5dc5cbc89c8 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 4cd26861225..24aa173cea3 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: OSGI-INF/l10n/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 91621629bff..ded82f39a6f 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ace7792b6d5..7a4eed383a8 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 71b5aeb332b..07262ca36a9 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: OSGI-INF/l10n/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 8aaf647b470..51f61ec43f1 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 788fb71ad20..ea79aedc7a2 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 d51e131bcfc..93067df5343 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: OSGI-INF/l10n/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 802e220d4a6..dc09e6e491b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index ed0ed462562..b71b22756bc 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 22186e8d292..7f510b36ebe 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index c1e3a5913ce..e47ae570106 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 8b3044bd9d8..ed5e3b34df4 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 1695ce7f064..48e3f29a35c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 2d9078e9057..0c71367080d 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 0cdb3e0a64d..c191ecb117b 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index a02b3300a93..a89fec33594 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 76dd31a0429..d4a396bc613 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 2aaf4f88dde..0189ae01114 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 42997bfd213..9079a8c995a 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 6842c6acf78..4d1e02a9df1 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 84aa0fd2f83..32dcf7e80a4 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 963d9f898c1..4150bf08612 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 5f6a40e5b6e..dcfd2b9f9c0 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 42082b2e7a5..b7b91c87fd4 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 b543f6e5171..b8fa9e7c970 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 031737390d9..c30b296611d 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 16888b6e28c..319c7190f7a 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 a0134c218b2..5205081e3a3 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 2fac2966d03..606c588f498 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 9d2e088c48b..444dc03377c 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 59ae58406e7..dd329751d7d 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 2ebfa076c17..b7f4d8e0a7a 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 ca741cd1496..476ca4a80ff 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 79ce2b37fa7..8fd2ff2fc2d 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 161b24b06ee..a66a6f9bd2c 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 c143558aa34..6bdf0f4158f 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 9cb3df65626..feb9cccf512 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 f3634b343fa..06168835cca 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 9e5c476e73d..807e16030ae 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 8367261c572..efd68eb9551 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-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 bf845bfd5a3..28e9b384e02 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 939f4c1c15f..d5c5ef7a974 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index c35643bdbf8..150ce9f49b2 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 07edcab602b..cbb89e5ffcd 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 18a92655a53..424e94664e0 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.1,7.8.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 3990cc56758..09b626c58b8 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 95d9ed91762..2b9fb4ade4b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit.ssh.apache.agent 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 488e02dbf7d..baec44341c9 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 835eb2486e8..924b53f5f68 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 a5136e44aaa..5f9441b9fd7 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 8810ecfc268..c9b0145eec4 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index d1309d91d53..ddf408493d0 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 dd45a66d85f..0fae491e6a0 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 69ccfdb3fd0..c91ea7e345f 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 ad296f63d0e..f1891ec7ddc 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="[7.7.1,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.1" 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 aa40ca65273..636255a0ae0 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index f295078ecdf..0babc05454e 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 3a04b546527..9ed6dfab78f 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index a8451c6f074..ecf0ca5b204 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-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 adab468a0b9..4e12165b51e 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 88ad3da08b8..a01ee1e9c20 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 0ea359bfd95..b6a3b1598f6 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 - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 2b7411a414f..bc07cbb1d57 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: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 6c7e6a736d3..781bd1151c5 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.qualifier +Bundle-Version: 7.7.1.202607240634-r Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.1.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.1.202607240634-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index f4c8a4be044..e2947ebfc73 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 9e69152b1a9..60f936cace6 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.1-SNAPSHOT + 7.7.1.202607240634-r JGit - Parent ${jgit-url} From 0949523777090272f088efd412b7c375b7d274bc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 Jul 2026 09:59:32 +0200 Subject: [PATCH 189/200] Prepare 7.7.2-SNAPSHOT builds Change-Id: I884e484c0f06fe9503c002ef3ba165b732184bd1 --- .../META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++--- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 42 +++--- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 44 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++--- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 32 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 88 ++++++------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 ++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 40 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 122 +++++++++--------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 116 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 549 insertions(+), 549 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index fb186a3934a..e547cf4de6e 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,14 +5,14 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.ant.tasks;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.hamcrest;version="[3.0.0,4.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 28568ed2845..d829c08d72c 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 - 7.7.1.202607240634-r + 7.7.2-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 ffa97e92a75..634d6ae7643 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)" + org.eclipse.jgit.storage.file;version="[7.7.2,7.8.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.7.1", - org.eclipse.jgit.ant.tasks;version="7.7.1"; +Export-Package: org.eclipse.jgit.ant;version="7.7.2", + org.eclipse.jgit.ant.tasks;version="7.7.2"; 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 ee553618c4a..c729c2268fb 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 197f5367157..dc4fc308f14 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 - 7.7.1.202607240634-r + 7.7.2-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 64a5e4d3a5f..f9de8fe6d62 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,18 +14,18 @@ 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="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.7.1"; +Export-Package: org.eclipse.jgit.archive;version="7.7.2"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.7.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.7.2";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 d51d4fcab6c..461e36a2ab5 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 9c38ddf536d..97b242b5511 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 - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 1f05407f5aa..1a91e1d3f4b 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index cbf455f480c..3e2900db16c 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 - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.7.1.202607240634-r + 7.7.2-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 63eb43e9a1c..4962ab06105 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.sha1;version="[7.7.1,7.8.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.sha1;version="[7.7.2,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;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 74fecb5e8b0..557fd0ca44e 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 - 7.7.1.202607240634-r + 7.7.2-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 c91d6c03516..91f4b467900 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="[7.7.1,7.8.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.7.2,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)", @@ -27,5 +27,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.2";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.2";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 bbd2522d727..4a352cc3d07 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index ec2538abb7a..236ddd516a3 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 - 7.7.1.202607240634-r + 7.7.2-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 79e4c92d713..7c207cd2463 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin @@ -27,11 +27,11 @@ Import-Package: javax.net.ssl, 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="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.7.1"; + org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.7.2"; 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 1a27674c0ca..284e89d1e5f 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 514d339ac95..08cbecfd797 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 - 7.7.1.202607240634-r + 7.7.2-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 4b5676ad75a..cca7f359b44 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.http.server;version="7.7.1", - org.eclipse.jgit.http.server.glue;version="7.7.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.7.2", + org.eclipse.jgit.http.server.glue;version="7.7.2"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.7.1"; + org.eclipse.jgit.http.server.resolver;version="7.7.2"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)" + org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.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 3fdf0a80a18..7675985f304 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 9273c17fdff..387fc4b2c18 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 - 7.7.1.202607240634-r + 7.7.2-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 5c4a9d76fbc..f12a7a37ec7 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -28,26 +28,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.http.server;version="[7.7.1,7.8.0)", - org.eclipse.jgit.http.server.glue;version="[7.7.1,7.8.0)", - org.eclipse.jgit.http.server.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.http.server;version="[7.7.2,7.8.0)", + org.eclipse.jgit.http.server.glue;version="[7.7.2,7.8.0)", + org.eclipse.jgit.http.server.resolver;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.hamcrest;version="[3.0.0,4.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.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 5dc5cbc89c8..8290395cb96 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 - 7.7.1.202607240634-r + 7.7.2-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 24aa173cea3..014a2a04550 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -23,17 +23,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.http.server;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.http.server;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.2,7.8.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.7.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.7.2"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.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 ded82f39a6f..3270e6fd822 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 7a4eed383a8..8a94ef076f5 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 - 7.7.1.202607240634-r + 7.7.2-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 07262ca36a9..c7099c5167b 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -34,16 +34,16 @@ Import-Package: org.apache.sshd.common;version="[2.19.0,3.0.0)", org.apache.sshd.server.subsystem;version="[2.19.0,3.0.0)", org.apache.sshd.sftp;version="[2.19.0,3.0.0)", org.apache.sshd.sftp.server;version="[2.19.0,3.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.7.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.7.2" 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 51f61ec43f1..554e50f2e55 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index ea79aedc7a2..14f2321cd03 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 - 7.7.1.202607240634-r + 7.7.2-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 93067df5343..ce151b97384 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,38 +3,38 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="7.7.1", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.time;version="[7.7.1,7.8.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.util;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="7.7.2", + org.eclipse.jgit.treewalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.time;version="[7.7.2,7.8.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,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.7.1"; +Export-Package: org.eclipse.jgit.junit;version="7.7.2"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -47,4 +47,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.7.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.7.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.7.2";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 dc09e6e491b..46a0949f290 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index b71b22756bc..92d47e79dbe 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 - 7.7.1.202607240634-r + 7.7.2-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 7f510b36ebe..3df1a6f74fa 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -27,24 +27,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.test;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.server;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.test;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.hamcrest;version="[3.0.0,4.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 e47ae570106..49e38347eae 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 - 7.7.1.202607240634-r + 7.7.2-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 ed5e3b34df4..e546b5d41d8 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs.server;version="7.7.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.7.2"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.7.1"; + org.eclipse.jgit.lfs.server.fs;version="7.7.2"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.7.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.7.1"; + org.eclipse.jgit.lfs.server.internal;version="7.7.2";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.7.2"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Import-Package: com.google.gson;version="[2.8.0,3.0.0)", @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.slf4j;version="[1.7.0,3.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 48e3f29a35c..f8dfdb51692 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 0c71367080d..e66ea6bba69 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 - 7.7.1.202607240634-r + 7.7.2-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 c191ecb117b..66bcdcc4026 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,29 +3,29 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", +Import-Package: org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.hamcrest;version="[3.0.0,4.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="7.7.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.7.2";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 a89fec33594..e5952565f72 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 - 7.7.1.202607240634-r + 7.7.2-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 d4a396bc613..e2975e47ef8 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.lfs;version="7.7.1", - org.eclipse.jgit.lfs.errors;version="7.7.1", - org.eclipse.jgit.lfs.internal;version="7.7.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="7.7.1" +Export-Package: org.eclipse.jgit.lfs;version="7.7.2", + org.eclipse.jgit.lfs.errors;version="7.7.2", + org.eclipse.jgit.lfs.internal;version="7.7.2";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="7.7.2" Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.hooks;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)" + org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.2,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.2,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.hooks;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.2,7.8.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 0189ae01114..8b53b3d06aa 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 9079a8c995a..71613141ed2 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 - 7.7.1.202607240634-r + 7.7.2-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 4d1e02a9df1..c41629b2d06 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 32dcf7e80a4..af1cf1de106 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 - 7.7.1.202607240634-r + 7.7.2-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 4150bf08612..91713f6bcaf 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 - 7.7.1.202607240634-r + 7.7.2-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 b7b91c87fd4..057f3d12fbe 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 - 7.7.1.202607240634-r + 7.7.2-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 c30b296611d..374d16f5d8c 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 - 7.7.1.202607240634-r + 7.7.2-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 5205081e3a3..6c5383e88d3 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 - 7.7.1.202607240634-r + 7.7.2-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 444dc03377c..634544463d8 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 - 7.7.1.202607240634-r + 7.7.2-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 b7f4d8e0a7a..73834e2df98 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 - 7.7.1.202607240634-r + 7.7.2-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 476ca4a80ff..1dbeb449c95 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 - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.7.1.202607240634-r + 7.7.2-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 a66a6f9bd2c..ae14a63cec1 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 - 7.7.1.202607240634-r + 7.7.2-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 feb9cccf512..bb2cb10f0dc 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 - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 807e16030ae..6f5c86f4d8d 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 - 7.7.1.202607240634-r + 7.7.2-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 efd68eb9551..0f86e875fdf 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm.opt;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", +Import-Package: org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.2,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.2,7.8.0)", + org.eclipse.jgit.pgm;version="[7.7.2,7.8.0)", + org.eclipse.jgit.pgm.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.pgm.opt;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.2,7.8.0)", org.hamcrest.core;bundle-version="[1.1.0,3.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 28e9b384e02..318a4a54689 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 - 7.7.1.202607240634-r + 7.7.2-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 d5c5ef7a974..4a83db8e2aa 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -15,50 +15,50 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.archive;version="[7.7.1,7.8.0)", - org.eclipse.jgit.awtui;version="[7.7.1,7.8.0)", - org.eclipse.jgit.blame;version="[7.7.1,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.gitrepo;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.io;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.notes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http.apache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", + org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.archive;version="[7.7.2,7.8.0)", + org.eclipse.jgit.awtui;version="[7.7.2,7.8.0)", + org.eclipse.jgit.blame;version="[7.7.2,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.2,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.gitrepo;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.io;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.server;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.notes;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http.apache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.sshd;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.2,7.8.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="7.7.1"; +Export-Package: org.eclipse.jgit.console;version="7.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.7.1"; + org.eclipse.jgit.pgm;version="7.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -70,14 +70,14 @@ Export-Package: org.eclipse.jgit.console;version="7.7.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.7.1"; + org.eclipse.jgit.pgm.debug;version="7.7.2"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.7.1"; + org.eclipse.jgit.pgm.internal;version="7.7.2"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.7.1"; + org.eclipse.jgit.pgm.opt;version="7.7.2"; 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 150ce9f49b2..4a29f5b4ac0 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index cbb89e5ffcd..66fefdca732 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 - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 424e94664e0..79e99df1da7 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.1,7.8.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.7.2,7.8.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.7.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.7.2";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 09b626c58b8..5a47ca575e4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 2b9fb4ade4b..e8e7c7a7ea4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 baec44341c9..6ee695bfa97 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,22 +26,22 @@ Import-Package: org.apache.sshd.agent;version="[2.19.0,3.0.0)", org.apache.sshd.core;version="[2.19.0,3.0.0)", org.apache.sshd.server;version="[2.19.0,3.0.0)", org.apache.sshd.server.forward;version="[2.19.0,3.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.sshd;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.sshd;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.sshd;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit.ssh;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.sshd;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 924b53f5f68..ef74fb25d21 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 - 7.7.1.202607240634-r + 7.7.2-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 5f9441b9fd7..11eab591319 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test"; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.2";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.7.2";x-friends:="org.eclipse.jgit.ssh.apache.test"; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -25,19 +25,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.7.1";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.7.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.7.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.7.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.7.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.7.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.7.2";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.7.2";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.7.2";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.7.2";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.7.2";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.7.2"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.7.1" + org.eclipse.jgit.transport.sshd.agent;version="7.7.2" Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", org.apache.sshd.agent;version="[2.19.0,3.0.0)", org.apache.sshd.client;version="[2.19.0,3.0.0)", @@ -91,14 +91,14 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)", org.apache.sshd.sftp;version="[2.19.0,3.0.0)", org.apache.sshd.sftp.client;version="[2.19.0,3.0.0)", org.apache.sshd.sftp.common;version="[2.19.0,3.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.fnmatch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.fnmatch;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.slf4j;version="[1.7.0,3.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 c9b0145eec4..8e9fdf3827c 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index ddf408493d0..31da284dcfd 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 - 7.7.1.202607240634-r + 7.7.2-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 0fae491e6a0..0f6a0f6fbfd 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit.ssh;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;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 c91ea7e345f..925d7d85ff7 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 - 7.7.1.202607240634-r + 7.7.2-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 f1891ec7ddc..abb36903450 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ 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="[7.7.1,7.8.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.7.2,7.8.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.7.2" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.2,7.8.0)", org.slf4j;version="[1.7.0,3.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 636255a0ae0..4568eaa0dbe 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 0babc05454e..356bf98c6cc 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 - 7.7.1.202607240634-r + 7.7.2-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 9ed6dfab78f..9b2b3739eb4 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,66 +21,66 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.apache.commons.lang3;version="[3.17.0,4.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api;version="[7.7.1,7.8.0)", - org.eclipse.jgit.api.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.archive;version="[7.7.1,7.8.0)", - org.eclipse.jgit.attributes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.awtui;version="[7.7.1,7.8.0)", - org.eclipse.jgit.blame;version="[7.7.1,7.8.0)", - org.eclipse.jgit.blame.cache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.dircache;version="[7.7.1,7.8.0)", - org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.events;version="[7.7.1,7.8.0)", - org.eclipse.jgit.fnmatch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.gitrepo;version="[7.7.1,7.8.0)", - org.eclipse.jgit.hooks;version="[7.7.1,7.8.0)", - org.eclipse.jgit.ignore;version="[7.7.1,7.8.0)", - org.eclipse.jgit.ignore.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.diff;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.fsck;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.7.1", - org.eclipse.jgit.internal.storage.dfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.io;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.7.1,7.8.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit;version="[7.7.1,7.8.0)", - org.eclipse.jgit.junit.time;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lfs;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.logging;version="[7.7.1,7.8.0)", - org.eclipse.jgit.merge;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.notes;version="[7.7.1,7.8.0)", - org.eclipse.jgit.patch;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm;version="[7.7.1,7.8.0)", - org.eclipse.jgit.pgm.internal;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.file;version="[7.7.1,7.8.0)", - org.eclipse.jgit.storage.pack;version="[7.7.1,7.8.0)", - org.eclipse.jgit.submodule;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.http;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport.resolver;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.treewalk.filter;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.io;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util.sha1;version="[7.7.1,7.8.0)", + org.eclipse.jgit.annotations;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api;version="[7.7.2,7.8.0)", + org.eclipse.jgit.api.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.archive;version="[7.7.2,7.8.0)", + org.eclipse.jgit.attributes;version="[7.7.2,7.8.0)", + org.eclipse.jgit.awtui;version="[7.7.2,7.8.0)", + org.eclipse.jgit.blame;version="[7.7.2,7.8.0)", + org.eclipse.jgit.blame.cache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.diff;version="[7.7.2,7.8.0)", + org.eclipse.jgit.dircache;version="[7.7.2,7.8.0)", + org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.events;version="[7.7.2,7.8.0)", + org.eclipse.jgit.fnmatch;version="[7.7.2,7.8.0)", + org.eclipse.jgit.gitrepo;version="[7.7.2,7.8.0)", + org.eclipse.jgit.hooks;version="[7.7.2,7.8.0)", + org.eclipse.jgit.ignore;version="[7.7.2,7.8.0)", + org.eclipse.jgit.ignore.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.diff;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.fsck;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.7.2", + org.eclipse.jgit.internal.storage.dfs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.io;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.7.2,7.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit;version="[7.7.2,7.8.0)", + org.eclipse.jgit.junit.time;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lfs;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.logging;version="[7.7.2,7.8.0)", + org.eclipse.jgit.merge;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.notes;version="[7.7.2,7.8.0)", + org.eclipse.jgit.patch;version="[7.7.2,7.8.0)", + org.eclipse.jgit.pgm;version="[7.7.2,7.8.0)", + org.eclipse.jgit.pgm.internal;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk.filter;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.file;version="[7.7.2,7.8.0)", + org.eclipse.jgit.storage.pack;version="[7.7.2,7.8.0)", + org.eclipse.jgit.submodule;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.http;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport.resolver;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.treewalk.filter;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.io;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util.sha1;version="[7.7.2,7.8.0)", org.hamcrest;version="[3.0.0,4.0.0)", org.hamcrest.collection;version="[3.0.0,4.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index ecf0ca5b204..5da607cb1e3 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 - 7.7.1.202607240634-r + 7.7.2-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 4e12165b51e..3c5a8f0425a 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,15 +4,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Export-Package: org.eclipse.jgit.awtui;version="7.7.1" -Import-Package: org.eclipse.jgit.errors;version="[7.7.1,7.8.0)", - org.eclipse.jgit.lib;version="[7.7.1,7.8.0)", - org.eclipse.jgit.nls;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revplot;version="[7.7.1,7.8.0)", - org.eclipse.jgit.revwalk;version="[7.7.1,7.8.0)", - org.eclipse.jgit.transport;version="[7.7.1,7.8.0)", - org.eclipse.jgit.util;version="[7.7.1,7.8.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.7.2" +Import-Package: org.eclipse.jgit.errors;version="[7.7.2,7.8.0)", + org.eclipse.jgit.lib;version="[7.7.2,7.8.0)", + org.eclipse.jgit.nls;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revplot;version="[7.7.2,7.8.0)", + org.eclipse.jgit.revwalk;version="[7.7.2,7.8.0)", + org.eclipse.jgit.transport;version="[7.7.2,7.8.0)", + org.eclipse.jgit.util;version="[7.7.2,7.8.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index a01ee1e9c20..9e80a741735 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index b6a3b1598f6..26717e8d981 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 - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index bc07cbb1d57..ccb4a5072e9 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: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -11,8 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.7.1", - org.eclipse.jgit.api;version="7.7.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.7.2", + org.eclipse.jgit.api;version="7.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -27,21 +27,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.7.1"; + org.eclipse.jgit.api.errors;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.7.1"; + org.eclipse.jgit.attributes;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.7.1"; + org.eclipse.jgit.blame;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.blame.cache, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.blame.cache;version="7.7.1"; + org.eclipse.jgit.blame.cache;version="7.7.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.diff;version="7.7.1"; + org.eclipse.jgit.diff;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.patch, @@ -49,55 +49,55 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.7.1"; + org.eclipse.jgit.dircache;version="7.7.2"; 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="7.7.1"; + org.eclipse.jgit.errors;version="7.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib", - org.eclipse.jgit.events;version="7.7.1"; + org.eclipse.jgit.events;version="7.7.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.7.1", - org.eclipse.jgit.gitrepo;version="7.7.1"; + org.eclipse.jgit.fnmatch;version="7.7.2", + org.eclipse.jgit.gitrepo;version="7.7.2"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.api.errors, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.7.1";x-internal:=true, - org.eclipse.jgit.hooks;version="7.7.1"; + org.eclipse.jgit.gitrepo.internal;version="7.7.2";x-internal:=true, + org.eclipse.jgit.hooks;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.ignore;version="7.7.1", - org.eclipse.jgit.ignore.internal;version="7.7.1"; + org.eclipse.jgit.ignore;version="7.7.2", + org.eclipse.jgit.ignore.internal;version="7.7.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.7.1"; + org.eclipse.jgit.internal;version="7.7.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.7.1"; + org.eclipse.jgit.internal.diff;version="7.7.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.7.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.7.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.7.1"; + org.eclipse.jgit.internal.fsck;version="7.7.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.7.1"; + org.eclipse.jgit.internal.revwalk;version="7.7.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.7.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.7.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.7.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.7.2"; 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="7.7.1"; + org.eclipse.jgit.internal.storage.file;version="7.7.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -109,39 +109,39 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.apache.test, org.eclipse.jgit.ssh.jsch.test", - org.eclipse.jgit.internal.storage.io;version="7.7.1"; + org.eclipse.jgit.internal.storage.io;version="7.7.2"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.7.1"; + org.eclipse.jgit.internal.storage.memory;version="7.7.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.7.1"; + org.eclipse.jgit.internal.storage.midx;version="7.7.2"; x-friends:="org.eclipse.jgit.pgm, org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.7.1"; + org.eclipse.jgit.internal.storage.pack;version="7.7.2"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.7.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.7.2"; 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="7.7.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.7.1"; + org.eclipse.jgit.internal.submodule;version="7.7.2";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.7.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.7.1"; + org.eclipse.jgit.internal.transport.http;version="7.7.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.7.1"; + org.eclipse.jgit.internal.transport.parser;version="7.7.2"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.7.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.7.2"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.7.1"; + org.eclipse.jgit.internal.util;version="7.7.2"; x-friends:="org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.7.1"; + org.eclipse.jgit.lib;version="7.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -156,12 +156,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.7.1"; + org.eclipse.jgit.lib.internal;version="7.7.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.7.1", - org.eclipse.jgit.merge;version="7.7.1"; + org.eclipse.jgit.logging;version="7.7.2", + org.eclipse.jgit.merge;version="7.7.2"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -170,42 +170,42 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.7.1", - org.eclipse.jgit.notes;version="7.7.1"; + org.eclipse.jgit.nls;version="7.7.2", + org.eclipse.jgit.notes;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.7.1"; + org.eclipse.jgit.patch;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.7.1"; + org.eclipse.jgit.revplot;version="7.7.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib", - org.eclipse.jgit.revwalk;version="7.7.1"; + org.eclipse.jgit.revwalk;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.internal.storage.commitgraph", - org.eclipse.jgit.revwalk.filter;version="7.7.1"; + org.eclipse.jgit.revwalk.filter;version="7.7.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.7.1"; + org.eclipse.jgit.storage.file;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.7.1"; + org.eclipse.jgit.storage.pack;version="7.7.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.7.1"; + org.eclipse.jgit.submodule;version="7.7.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.7.1"; + org.eclipse.jgit.transport;version="7.7.2"; uses:="javax.crypto, org.eclipse.jgit.hooks, org.eclipse.jgit.util.io, @@ -218,21 +218,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.7.1"; + org.eclipse.jgit.transport.http;version="7.7.2"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.7.1"; + org.eclipse.jgit.transport.resolver;version="7.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.7.1"; + org.eclipse.jgit.treewalk;version="7.7.2"; 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="7.7.1"; + org.eclipse.jgit.treewalk.filter;version="7.7.2"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.7.1"; + org.eclipse.jgit.util;version="7.7.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -245,12 +245,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.7.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.7.1"; + org.eclipse.jgit.util.io;version="7.7.2"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.7.1", - org.eclipse.jgit.util.time;version="7.7.1" + org.eclipse.jgit.util.sha1;version="7.7.2", + org.eclipse.jgit.util.time;version="7.7.2" Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, javax.management, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 781bd1151c5..c7addafc5d2 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.7.1.202607240634-r +Bundle-Version: 7.7.2.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.1.202607240634-r";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.7.2.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e2947ebfc73..7b55f92de10 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 60f936cace6..d1a6196e650 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.7.1.202607240634-r + 7.7.2-SNAPSHOT JGit - Parent ${jgit-url} From a3a8b97857c36eaa2a8a71367f0dd434eed7d2bf Mon Sep 17 00:00:00 2001 From: Daniele Sassoli Date: Thu, 23 Jul 2026 21:17:48 +0100 Subject: [PATCH 190/200] Include time negotating in total time in UploadPack The total time in UploadPack counter was not considering the time spent negotating, often a crucial and lengthy part of any git operation. Include time negotating in the total time for UploadPack calculation to more accurately represent the actual total time spent in this operation. Change-Id: I88dee5b0ba01e0ac311cb11cb83a68ae1e8f2957 --- .../src/org/eclipse/jgit/storage/pack/PackStatistics.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackStatistics.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackStatistics.java index 64a1eb2e1a1..bc68daf9a84 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackStatistics.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackStatistics.java @@ -690,7 +690,8 @@ public long getOffloadedPackfilesSize() { * @return total time spent processing this pack. */ public long getTimeTotal() { - return statistics.timeCounting + statistics.timeSearchingForReuse + return statistics.timeNegotiating + statistics.timeCounting + + statistics.timeSearchingForReuse + statistics.timeSearchingForSizes + statistics.timeCompressing + statistics.timeWriting; } From d0c16f090a260d15c150bf82259024816e840236 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 Jul 2026 09:46:21 +0200 Subject: [PATCH 191/200] JGit v7.8.0.202607290745-m2 Signed-off-by: Matthias Sohn Change-Id: Ic1c32dec47f40c3130d303cce43e3d0fca687760 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 29a2d3e84b5..ab410f5f3a5 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index f9caf9430df..b15c9e73754 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 ce0918dd76c..f1e31d34758 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index b59816381bf..1c7537685c2 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index f08201344d8..defea81351f 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 6052ba70204..d6027371ccc 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 41795216d4a..431e96aa665 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index cd93dc089f4..63996812cd1 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 0313e52f0c5..f2633a0148a 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 6a12964f4f5..35157d358bc 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.ant - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.archive - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.http.server - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.lfs - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.pgm - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.ui - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.test - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.http.test - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 284f95c2801..dccb086232f 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index b4e096442af..8f8821f021a 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 e0dd44b9074..a0ead290fd0 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.85.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 7dd65e27821..59fc9f38748 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 74d9d1a9deb..676b79a01c6 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 30d22e1dfae..d31bfc752f3 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 9c108b338be..29cc7fb4352 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 5ae175baf3f..ae3d456d7f4 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 cac9050e685..b809a2f60e5 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 6bb08e3336d..31d604b134b 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f9e847baab7..c50ece9b6f3 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 aa39fe4db4d..78f80e02fb5 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9f4f49b0ffb..bf3ffff852c 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 0de8b2edbef..2f918a0be7a 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: OSGI-INF/l10n/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 45634067f51..fbac2870bd7 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 951ef3e083c..ff42839cceb 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 77e5c1d924b..4043f0aa514 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: OSGI-INF/l10n/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 d52282f694c..8b68ea0dfac 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 5ac4ae7db0d..12852a0a4ec 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 6d7b85e20cd..9309e77aac1 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: OSGI-INF/l10n/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 4ccd459f50a..52f6b6c8a9f 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index ac83f533922..9d046829a9e 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 5a923f51f77..eb8527901cf 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3620dd75266..7d17a728eb1 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 68d7877451a..cd6563fed6c 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 5e4c9cf7bb6..d145c3d0847 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 67b1bf22e6a..fc468a39208 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 82b1403fc3c..a9faa67f8c6 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2380339358c..1763640b803 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 4a1012758f5..06a24533a9a 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index b468bc3b2b2..77c69e75b07 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 78d3b3990e0..4b530a366fe 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 1c04cc8f141..690558a4d8d 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 62ebf8218d2..6f2d6cd8d7b 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 17a3e8f06a9..2e681d38b9a 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 e52ff556ba5..1f0bd966352 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 81e9291d983..fe880bf53d0 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 e54d0ad38fb..e2a1a5cef0c 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 4bdf2678fb3..c72e56c9681 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 9d0108b0595..aa7c61a20ed 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 811948aa1fd..9ace3e261df 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 062837d5175..50ef1372b60 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 feb04004e08..c607c521c22 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 e305823bfeb..8984e173a56 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 4b597ea6f45..2f7e0e558f0 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 59085683575..9a1ee9fe1cb 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 5a13758e0b5..67b8de8d77b 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 2cd6ac85f6e..dedb8a9c20c 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 f022882c7d9..193f2c13e73 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 c14e4a31fd4..5a98124c392 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 dbee9fe8dae..5b53efc68b8 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index a31b9288d90..050dd3a749b 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 a28a4efb467..d9697bb959a 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 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 5319d3e79b5..f0f861cafdb 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 83dc25ad146..a1347ff9587 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index e9a6b049971..74052ecb961 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 042033d8c42..8bdcdb537b4 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 35e15336296..43ee697c342 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.8.0,7.9.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 9a8ae16ca80..0bfff810fda 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 8769f646466..c59af8a0656 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit.ssh.apache.agent 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 b83e577d742..f901ef6ff91 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index c42eb2bea1d..d2c72e9e93c 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 37f2ab96433..dddd9f17448 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 3b936a8cf8f..b8718e2386e 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index d5cff8da7fa..406c70d3a37 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 85d12abdf26..b1027705d70 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index a5e57f69f60..8caedd5d19e 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 8eaf94dbf78..e9d3c76d1c1 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.8.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 9d08701fc5e..bbe6ebed5c4 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 865298d9ecc..b033ad3013f 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 5cab045aa0e..68e5d614bcc 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 531bdcbf065..3a30d19cb44 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 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 e376952db1c..e8ada9895b1 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 54a8d561d1e..7762af1c4f9 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 40056db33ca..d4adb5abf4a 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 - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 8e92528f808..50e39401db2 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: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 09b1ed35b42..39868388611 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.qualifier +Bundle-Version: 7.8.0.202607290745-m2 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.qualifier";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.202607290745-m2";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index d893037f5dc..4122316f4e3 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 5f81bd8898c..19e45311592 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.8.0-SNAPSHOT + 7.8.0.202607290745-m2 JGit - Parent ${jgit-url} From c0d2065bc19a2adcba33ab629e66a7c4bb2d00ab Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Aug 2026 10:26:46 +0200 Subject: [PATCH 192/200] Prepare 7.8.0-SNAPSHOT builds Change-Id: Ib40daee809780b2626f8204c603d663f28f0bc97 --- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- .../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 +++++++++---------- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- .../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 +- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../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 +- .../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 +- .../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 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index ab410f5f3a5..29a2d3e84b5 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index b15c9e73754..f9caf9430df 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 - 7.8.0.202607290745-m2 + 7.8.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 f1e31d34758..ce0918dd76c 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 1c7537685c2..b59816381bf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index defea81351f..f08201344d8 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 - 7.8.0.202607290745-m2 + 7.8.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 d6027371ccc..6052ba70204 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 431e96aa665..41795216d4a 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 63996812cd1..cd93dc089f4 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 - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index f2633a0148a..0313e52f0c5 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 35157d358bc..6a12964f4f5 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 - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.8.0.202607290745-m2 + 7.8.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 dccb086232f..284f95c2801 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 8f8821f021a..b4e096442af 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 - 7.8.0.202607290745-m2 + 7.8.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 a0ead290fd0..e0dd44b9074 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Import-Package: org.bouncycastle.asn1;version="[1.85.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 59fc9f38748..7dd65e27821 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 676b79a01c6..74d9d1a9deb 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 - 7.8.0.202607290745-m2 + 7.8.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 d31bfc752f3..30d22e1dfae 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Bundle-Localization: OSGI-INF/l10n/plugin 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 29cc7fb4352..9c108b338be 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index ae3d456d7f4..5ae175baf3f 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 - 7.8.0.202607290745-m2 + 7.8.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 b809a2f60e5..cac9050e685 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy 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 31d604b134b..6bb08e3336d 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index c50ece9b6f3..f9e847baab7 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 - 7.8.0.202607290745-m2 + 7.8.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 78f80e02fb5..aa39fe4db4d 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index bf3ffff852c..9f4f49b0ffb 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 - 7.8.0.202607290745-m2 + 7.8.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 2f918a0be7a..0de8b2edbef 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 fbac2870bd7..45634067f51 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ff42839cceb..951ef3e083c 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 - 7.8.0.202607290745-m2 + 7.8.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 4043f0aa514..77e5c1d924b 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 8b68ea0dfac..d52282f694c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 12852a0a4ec..5ac4ae7db0d 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 - 7.8.0.202607290745-m2 + 7.8.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 9309e77aac1..6d7b85e20cd 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/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 52f6b6c8a9f..4ccd459f50a 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9d046829a9e..ac83f533922 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 - 7.8.0.202607290745-m2 + 7.8.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 eb8527901cf..5a923f51f77 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 7d17a728eb1..3620dd75266 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 - 7.8.0.202607290745-m2 + 7.8.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 cd6563fed6c..68d7877451a 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 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 d145c3d0847..5e4c9cf7bb6 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index fc468a39208..67b1bf22e6a 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 - 7.8.0.202607290745-m2 + 7.8.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 a9faa67f8c6..82b1403fc3c 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 1763640b803..2380339358c 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 - 7.8.0.202607290745-m2 + 7.8.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 06a24533a9a..4a1012758f5 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 77c69e75b07..b468bc3b2b2 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 4b530a366fe..78d3b3990e0 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 - 7.8.0.202607290745-m2 + 7.8.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 690558a4d8d..1c04cc8f141 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 6f2d6cd8d7b..62ebf8218d2 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 - 7.8.0.202607290745-m2 + 7.8.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 2e681d38b9a..17a3e8f06a9 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 1f0bd966352..e52ff556ba5 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 - 7.8.0.202607290745-m2 + 7.8.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 fe880bf53d0..81e9291d983 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 e2a1a5cef0c..e54d0ad38fb 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 - 7.8.0.202607290745-m2 + 7.8.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 c72e56c9681..4bdf2678fb3 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 aa7c61a20ed..9d0108b0595 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 - 7.8.0.202607290745-m2 + 7.8.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 9ace3e261df..811948aa1fd 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 50ef1372b60..062837d5175 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 - 7.8.0.202607290745-m2 + 7.8.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 c607c521c22..feb04004e08 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 8984e173a56..e305823bfeb 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 - 7.8.0.202607290745-m2 + 7.8.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 2f7e0e558f0..4b597ea6f45 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 - 7.8.0.202607290745-m2 + 7.8.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 9a1ee9fe1cb..59085683575 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 67b8de8d77b..5a13758e0b5 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 - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.8.0.202607290745-m2 + 7.8.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 dedb8a9c20c..2cd6ac85f6e 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 193f2c13e73..f022882c7d9 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 - 7.8.0.202607290745-m2 + 7.8.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 5a98124c392..c14e4a31fd4 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 5b53efc68b8..dbee9fe8dae 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 - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 050dd3a749b..a31b9288d90 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 - 7.8.0.202607290745-m2 + 7.8.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 d9697bb959a..a28a4efb467 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier 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 f0f861cafdb..5319d3e79b5 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 - 7.8.0.202607290745-m2 + 7.8.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 a1347ff9587..83dc25ad146 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 74052ecb961..e9a6b049971 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 8bdcdb537b4..042033d8c42 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 - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 43ee697c342..35e15336296 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.8.0,7.9.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 0bfff810fda..9a8ae16ca80 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index c59af8a0656..8769f646466 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent 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 f901ef6ff91..b83e577d742 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index d2c72e9e93c..c42eb2bea1d 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 - 7.8.0.202607290745-m2 + 7.8.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 dddd9f17448..37f2ab96433 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: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.8.0";x-friends:="org.eclipse.jgit.ssh.apache.test", 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 b8718e2386e..3b936a8cf8f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 406c70d3a37..d5cff8da7fa 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 - 7.8.0.202607290745-m2 + 7.8.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 b1027705d70..85d12abdf26 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 8caedd5d19e..a5e57f69f60 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 - 7.8.0.202607290745-m2 + 7.8.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 e9d3c76d1c1..8eaf94dbf78 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="[7.8.0,7.9.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.8.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 bbe6ebed5c4..9d08701fc5e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index b033ad3013f..865298d9ecc 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 - 7.8.0.202607290745-m2 + 7.8.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 68e5d614bcc..5cab045aa0e 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 3a30d19cb44..531bdcbf065 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 - 7.8.0.202607290745-m2 + 7.8.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 e8ada9895b1..e376952db1c 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 7762af1c4f9..54a8d561d1e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d4adb5abf4a..40056db33ca 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 - 7.8.0.202607290745-m2 + 7.8.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 50e39401db2..8e92528f808 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: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 39868388611..09b1ed35b42 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.8.0.202607290745-m2 +Bundle-Version: 7.8.0.qualifier Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git -Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.202607290745-m2";roots="." +Eclipse-SourceBundle: org.eclipse.jgit;version="7.8.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 4122316f4e3..d893037f5dc 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 19e45311592..5f81bd8898c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.8.0.202607290745-m2 + 7.8.0-SNAPSHOT JGit - Parent ${jgit-url} From d70a4254771d89495e5e1482887f94f588dda800 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Aug 2026 17:52:30 +0200 Subject: [PATCH 193/200] Update commons-codec to 1.22.1 Change-Id: I074c8207b0b69973e615b76e77286faa5acd03e2 --- MODULE.bazel | 2 +- .../org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.36.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.37.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.38.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.39.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.40.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.41.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 865135e9564..061e5a2faa3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -49,7 +49,7 @@ maven.install( "com.googlecode.javaewah:JavaEWAH:1.2.3", "com.jcraft:jsch:0.1.55", "com.jcraft:jzlib:1.1.3", - "commons-codec:commons-codec:1.22.0", + "commons-codec:commons-codec:1.22.1", "commons-io:commons-io:2.22.0", "commons-logging:commons-logging:1.4.0", "jakarta.servlet:jakarta.servlet-api:6.1.0", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index d49c23490f7..a73d53ecacf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 65b305c9bba..21e3598257a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 16e63cc99ac..d9ec645d946 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index 15e188adc84..890f285aeac 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index 177b47e0a96..644e0930453 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index acf36c7ce7b..13eb7a30b75 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target index 232122a8391..3669f822ff3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target index 6dc9701ee06..0fe9ebc4109 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.41.target @@ -1,7 +1,7 @@ - + @@ -265,7 +265,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 3516ee9622b..1aa1518bc62 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -10,7 +10,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.22.0" + version = "1.22.1" } dependency { groupId = "org.apache.commons" diff --git a/pom.xml b/pom.xml index 5f81bd8898c..975e7f99054 100644 --- a/pom.xml +++ b/pom.xml @@ -899,7 +899,7 @@ commons-codec commons-codec - 1.22.0 + 1.22.1 From b857ccc30be3140661a7c384f93fcbb5659946b1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Aug 2026 21:33:27 +0200 Subject: [PATCH 194/200] Fix invalid version range format in OSGi manifest This was broken when resolving merge conflict in https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1243201/1/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF Change-Id: Ib1b29c568187dce55c3bbf232bfc220f06d67c8e --- org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b83e577d742..8bef119bebb 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Import-Package: org.apache.sshd.agent;version="[2.19.0,3.0.0)", org.apache.sshd.common.signature;version="[2.19.0,3.0.0)", org.apache.sshd.common.util.buffer;version="[2.19.0,3.0.0)", org.apache.sshd.common.util.net;version="[2.19.0,3.0.0)", - org.apache.sshd.common.util.security;version="[2.19.0,3.0.0", + org.apache.sshd.common.util.security;version="[2.19.0,3.0.0]", org.apache.sshd.core;version="[2.19.0,3.0.0)", org.apache.sshd.server;version="[2.19.0,3.0.0)", org.apache.sshd.server.forward;version="[2.19.0,3.0.0)", From 235ba0500dc7e440b4cac559116e1e6363f85bc8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Aug 2026 21:50:28 +0200 Subject: [PATCH 195/200] Silence API errors raised for breaking changes on protected methods Eclipse IDE API tooling raises breaking changes errors on changes done in 5fe179cee97b947a49228dd7170fc3b9c65a498c. We follow OSGi semantic versioning which allows breaking changes which only affect providers of an API in minor releases. Hence silence these errors. See https://docs.osgi.org/whitepaper/semantic-versioning/040-semantic-versions.html Change-Id: Ice4742bbc445143a03db21e9f55180779fac7eb2 --- org.eclipse.jgit/.settings/.api_filters | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 6a7d44a7f4c..641eb50b3ef 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -8,6 +8,20 @@ + + + + + + + + + + + + + + From 45373936a598a4f1bd143e44296a30512ae5e09e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Aug 2026 22:02:49 +0200 Subject: [PATCH 196/200] [errorprone] Demote InvalidBlockTag to WARN Since 3764cd5711679e328499656c760ebda40a42a1f0 raises an error org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java:1768: error: [InvalidBlockTag] Tag name `nooverride` is unknown. If this is a commonly-used custom tag, please click 'not useful' and file a bug. * @nooverride Since 7.8 This method is not intended to be re-implemented or ^ (see https://errorprone.info/bugpattern/InvalidBlockTag) `RevWalk.createCommit(AnyObjectId)` was marked with the javadoc tag @nooverride which is understood by Eclipse API tooling [1]. It will ensure that API tools raise an error if another bundle extends or re-implements the method marked with this tag. Hence demote the severity of InvalidBlockTag to WARN. [1] https://github.com/eclipse-pde/eclipse.pde/blob/master/docs/API_Tools.md Change-Id: I95ade650c3ac1e2301654970cae09cc49f6d3af9 --- tools/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/BUILD b/tools/BUILD index 4238054dadf..ff71fb502d3 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -199,7 +199,7 @@ errorprone_checks = [ "-Xep:InstanceOfAndCastMatchWrongType:ERROR", "-Xep:InstantTemporalUnit:ERROR", "-Xep:IntLongMath:ERROR", - "-Xep:InvalidBlockTag:ERROR", + "-Xep:InvalidBlockTag:WARN", "-Xep:InvalidInlineTag:ERROR", "-Xep:InvalidJavaTimeConstant:ERROR", "-Xep:InvalidLink:ERROR", From 86d06851da54db5e9c087066cae01c9d2cc462d4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Aug 2026 22:07:48 +0200 Subject: [PATCH 197/200] [errorprone] Fix UnnecessaryParentheses error caused by ab51fe2bdb See https://errorprone.info/bugpattern/UnnecessaryParentheses Change-Id: I621aad148bef7b51fb00ff23ff75f5af5843af33 --- .../src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java index 5d43c5bb338..e1cc065e394 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java @@ -30,7 +30,7 @@ protected TopoSortPendingGenerator(RevWalk walker, AbstractRevQueue pending, super(walker.isFirstParent()); this.output = (output | SORT_COMMIT_TIME_DESC | SORT_TOPO) - & ~(NEEDS_REWRITE); + & ~NEEDS_REWRITE; this.explorePhase = new TopoExplorePhase(walker, filter, canDispose); this.inDegreePhase = new TopoInDegreePhase(walker, explorePhase, (output & NEEDS_REWRITE) != 0); From fd248162f4f8ca8a6fc4cac657b77713fd31f30b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 5 Aug 2026 09:40:59 +0200 Subject: [PATCH 198/200] Fix running RevWalkSortTopoWithCommitGraphTest with bazel - add missing additional dependency to assertj-core - exclude abstract base class AbstractRevWalkWithCommitGraphTest This problem was introduced in ab51fe2bdb9d7f05287b686e75be7afc46d0c8f5. Change-Id: Ib8c199af664e6c03a251556ac70aaa8bdcafdef8 --- org.eclipse.jgit.test/BUILD | 1 + org.eclipse.jgit.test/tests.bzl | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index 7dab36d0676..a3765da1b67 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -24,6 +24,7 @@ HELPERS = glob( "nls/MissingPropertyBundle.java", "nls/NoPropertiesBundle.java", "nls/NonTranslatedBundle.java", + "revwalk/AbstractRevWalkWithCommitGraphTest.java", "revwalk/RevQueueTestCase.java", "revwalk/RevWalkTestCase.java", "transport/ObjectIdMatcher.java", diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl index 41f76d090ac..a532ac36b72 100644 --- a/org.eclipse.jgit.test/tests.bzl +++ b/org.eclipse.jgit.test/tests.bzl @@ -72,6 +72,10 @@ def tests(tests, srcprefix="tst/", extra_tags=[]): "//lib:xz", "//org.eclipse.jgit.archive:jgit-archive", ] + if src.endswith("RevWalkSortTopoWithCommitGraphTest.java"): + additional_deps = [ + "//lib:assertj-core", + ] if src.endswith("FileRepositoryBuilderAfterOpenConfigTest.java") or \ src.endswith("RefDirectoryAfterOpenConfigTest.java") or \ src.endswith("SnapshottingRefDirectoryTest.java"): From 653a4db0be0995ffd075546b5b907077591278a4 Mon Sep 17 00:00:00 2001 From: Alexander Hendrich Date: Mon, 15 Jun 2026 11:34:54 +0000 Subject: [PATCH 199/200] Parse and record remote review host in .gitattributes This change enhances RepoCommand to read the "review" attribute from and elements in a repo manifest. The parsed review URL is then used to add a "remote-review=" entry to the .gitattributes file for each project, where the host identifier is extracted from the review URL. This allows tools to associate submodules with their respective Gerrit review hosts. Change-Id: I40406cdf4a5bbe08aa7b551136b75009f4c5b0bf Signed-off-by: Alexander Hendrich --- .../jgit/gitrepo/ManifestParserTest.java | 22 +++++ .../eclipse/jgit/gitrepo/RepoCommandTest.java | 98 +++++++++++++++++++ .../jgit/gitrepo/BareSuperprojectWriter.java | 38 +++++++ .../eclipse/jgit/gitrepo/ManifestParser.java | 15 ++- .../org/eclipse/jgit/gitrepo/RepoCommand.java | 1 + .../org/eclipse/jgit/gitrepo/RepoProject.java | 22 +++++ 6 files changed, 194 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java index 0949d040e91..d8ac28ceee6 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java @@ -254,4 +254,26 @@ public void testXXE() throws Exception { assertTrue(e.getCause().getMessage().contains("DOCTYPE")); } + @Test + public void testManifestParserWithReview() throws Exception { + String baseUrl = "https://git.google.com/"; + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + + ManifestParser parser = new ManifestParser(null, null, "master", baseUrl, null, null); + parser.read(new ByteArrayInputStream(xmlContent.toString().getBytes(UTF_8))); + + Map map = parser.getProjects().stream() + .collect(Collectors.toMap(RepoProject::getPath, Function.identity())); + assertEquals("https://review-1.com", map.get("foo").getReview()); + assertEquals("https://review-2.com", map.get("bar").getReview()); + } + } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java index 3162e7910b2..ceb18e65b6c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java @@ -1301,6 +1301,104 @@ public void testRecordSubmoduleLabels() throws Exception { } } + @Test + public void testRecordSubmoduleLabelsWithRemoteReview() throws Exception { + Repository remoteDb = createBareRepository(); + Repository tempDb = createWorkRepository(); + + StringBuilder xmlContent = new StringBuilder(); + xmlContent + .append("\n") + .append("") + .append( + "") + .append("") + .append("") + .append(""); + JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", xmlContent.toString()); + + RepoCommand command = new RepoCommand(remoteDb); + command + .setPath(tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") + .setURI(rootUri) + .setRecordSubmoduleLabels(true) + .call(); + // Clone it + File directory = createTempDirectory("testBareRepo"); + try (Repository localDb = + Git.cloneRepository() + .setDirectory(directory) + .setURI(remoteDb.getDirectory().toURI().toString()) + .call() + .getRepository(); ) { + // The .gitattributes file should exist + File gitattributes = new File(localDb.getWorkTree(), ".gitattributes"); + assertTrue("The .gitattributes file should exist", gitattributes.exists()); + try (BufferedReader reader = Files.newBufferedReader(gitattributes.toPath(), UTF_8)) { + String content = reader.readLine(); + assertEquals( + ".gitattributes content should be as expected", + "/test a1 a2 remote-review=googleplex-android", + content); + } + } + } + + @Test + public void testRecordSubmoduleLabelsWithDefaultReview() throws Exception { + Repository remoteDb = createBareRepository(); + Repository tempDb = createWorkRepository(); + + StringBuilder xmlContent = new StringBuilder(); + xmlContent + .append("\n") + .append("") + .append("") + .append( + "") + .append("") + .append(""); + JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", xmlContent.toString()); + + RepoCommand command = new RepoCommand(remoteDb); + command + .setPath(tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") + .setURI(rootUri) + .setRecordSubmoduleLabels(true) + .call(); + // Clone it + File directory = createTempDirectory("testBareRepo"); + try (Repository localDb = + Git.cloneRepository() + .setDirectory(directory) + .setURI(remoteDb.getDirectory().toURI().toString()) + .call() + .getRepository(); ) { + // The .gitattributes file should exist + File gitattributes = new File(localDb.getWorkTree(), ".gitattributes"); + assertTrue("The .gitattributes file should exist", gitattributes.exists()); + try (BufferedReader reader = Files.newBufferedReader(gitattributes.toPath(), UTF_8)) { + String content = reader.readLine(); + assertEquals( + ".gitattributes content should be as expected", + "/test a1 a2 remote-review=googleplex-android", + content); + } + } + } + @Test public void testRecordShallowRecommendation() throws Exception { Repository remoteDb = createBareRepository(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java index e511a68d2e7..bfc7c9cdc7b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java @@ -192,6 +192,11 @@ private void prepareIndex(List projects, DirCache index, rec.append(" "); //$NON-NLS-1$ rec.append(group); } + String reviewHost = getPlainHost(proj.getReview()); + if (reviewHost != null && !reviewHost.isEmpty()) { + rec.append(" remote-review="); //$NON-NLS-1$ + rec.append(reviewHost); + } rec.append("\n"); //$NON-NLS-1$ attributes.append(rec.toString()); } @@ -320,4 +325,37 @@ private RevCommit commitTreeOnCurrentTip(ObjectInserter inserter, return rw.parseCommit(commitId); } + + private static String getReviewHost(String reviewUrl) { + if (reviewUrl == null) { + return null; + } + try { + if (!reviewUrl.contains("://")) { //$NON-NLS-1$ + reviewUrl = "https://" + reviewUrl; //$NON-NLS-1$ + } + return URI.create(reviewUrl).getHost(); + } catch (IllegalArgumentException e) { + return null; + } + } + + /** + * Return the host name without "-review" suffix. + * + * @param reviewUrl + * the review URL + * @return host name without "-review" suffix + */ + private static String getPlainHost(String reviewUrl) { + String host = getReviewHost(reviewUrl); + if (host == null) { + return null; + } + int reviewIdx = host.indexOf("-review"); //$NON-NLS-1$ + if (reviewIdx != -1) { + return host.substring(0, reviewIdx); + } + return host; + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java index 12ba893c602..32234a05a9b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java @@ -61,6 +61,7 @@ public class ManifestParser extends DefaultHandler { private String defaultRemote; private String defaultRevision; + private String defaultReview; private int xmlInRead; private RepoProject currentProject; @@ -195,7 +196,8 @@ public void startElement( String alias = attributes.getValue("alias"); String fetch = attributes.getValue("fetch"); String revision = attributes.getValue("revision"); - Remote remote = new Remote(fetch, revision); + String review = attributes.getValue("review"); + Remote remote = new Remote(fetch, revision, review); remotes.put(attributes.getValue("name"), remote); if (alias != null) { remotes.put(alias, remote); @@ -204,6 +206,7 @@ public void startElement( case "default": defaultRemote = attributes.getValue("remote"); defaultRevision = attributes.getValue("revision"); + defaultReview = attributes.getValue("review"); break; case "copyfile": if (currentProject == null) { @@ -314,6 +317,12 @@ public void endDocument() throws SAXException { } proj.setUrl(remoteUrl.resolve(proj.getName()).toString()) .setDefaultRevision(revision); + Remote r = remotes.get(remote); + if (r != null && r.review != null) { + proj.setReview(r.review); + } else if (defaultReview != null) { + proj.setReview(defaultReview); + } } filteredProjects.addAll(projects); @@ -440,10 +449,12 @@ private boolean isNestedReferencefile(ReferenceFile referencefile) { private static class Remote { final String fetch; final String revision; + final String review; - Remote(String fetch, String revision) { + Remote(String fetch, String revision, String review) { this.fetch = fetch; this.revision = revision; + this.review = review; } } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index 392ca926772..32f2ad1bf0a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -591,6 +591,7 @@ private List renameProjects(List projects) { p.addCopyFiles(proj.getCopyFiles()); p.addLinkFiles(proj.getLinkFiles()); p.setUpstream(proj.getUpstream()); + p.setReview(proj.getReview()); ret.add(p); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index 07eb12de5ee..97f461c319f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -41,6 +41,7 @@ public class RepoProject implements Comparable { private String upstream; private String destBranch; private String recommendShallow; + private String review; private String url; private String defaultRevision; @@ -332,6 +333,27 @@ public void setRecommendShallow(String recommendShallow) { this.recommendShallow = recommendShallow; } + /** + * Return the Gerrit review server URL defined by the project's remote. + * + * @return the review server URL + * @since 7.8 + */ + public String getReview() { + return review; + } + + /** + * Sets the Gerrit review server URL. + * + * @param review the review server URL + * @since 7.8 + */ + public void setReview(String review) { + this.review = review; + } + + /** * Add a copy file configuration. * From d2e115ee637a88b087653ed71e78e055e6cbe5be Mon Sep 17 00:00:00 2001 From: Florian Schwabe Date: Wed, 5 Aug 2026 09:21:36 +0200 Subject: [PATCH 200/200] TopoSortPendingGenerator: Free flags on RevWalk.reset() The 4 flags allocated by TopoSortPendingGenerator were not freed when calling reset() on the RevWalk. They are now added to the delayFree flags. Added a Unit test for flag allocation and freeing Change-Id: I73155421e1963e04a607a8fe550bc52b74ef6056 --- org.eclipse.jgit.test/tests.bzl | 14 +++++---- .../eclipse/jgit/revwalk/RevWalkSortTest.java | 30 +++++++++++++++++++ .../src/org/eclipse/jgit/revwalk/RevWalk.java | 28 ++++++++++++++++- .../jgit/revwalk/TopoExplorePhase.java | 5 ++++ .../jgit/revwalk/TopoInDegreePhase.java | 5 ++++ .../org/eclipse/jgit/revwalk/TopoPhase.java | 4 +++ .../revwalk/TopoSortPendingGenerator.java | 4 +++ 7 files changed, 83 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl index a532ac36b72..537ee8adee8 100644 --- a/org.eclipse.jgit.test/tests.bzl +++ b/org.eclipse.jgit.test/tests.bzl @@ -1,13 +1,14 @@ -''' +""" Expose each test as a bazel target -''' +""" + load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) -def tests(tests, srcprefix="tst/", extra_tags=[]): - ''' +def tests(tests, srcprefix = "tst/", extra_tags = []): + """ Create a target each of the tests Each target is the full push (removing srcprefix) replacing directory @@ -21,7 +22,7 @@ def tests(tests, srcprefix="tst/", extra_tags=[]): srcprefix: prefix between org.eclipse.jgit.tests and the package start extra_tags: additional tags to add to the generated targets - ''' + """ for src in tests: name = src[len(srcprefix):len(src) - len(".java")].replace("/", "_") labels = [] @@ -72,7 +73,8 @@ def tests(tests, srcprefix="tst/", extra_tags=[]): "//lib:xz", "//org.eclipse.jgit.archive:jgit-archive", ] - if src.endswith("RevWalkSortTopoWithCommitGraphTest.java"): + if src.endswith("RevWalkSortTest.java") or \ + src.endswith("RevWalkSortTopoWithCommitGraphTest.java"): additional_deps = [ "//lib:assertj-core", ] diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java index d27d5c73fc4..744a063cf38 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java @@ -10,6 +10,7 @@ package org.eclipse.jgit.revwalk; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -364,4 +365,33 @@ public void testSort_TOPO_NON_INTERMIX_and_TOPO_throws() throws Exception { e.getMessage()); } } + + @Test + public void testSort_TOPO_reset_doesNotLeakFlags() throws Exception { + final RevCommit a = commit(); + final RevCommit b = commit(a); + final RevCommit c = commit(b); + final RevCommit d = commit(c); + + int appFlags = Integer.bitCount(RevWalk.APP_FLAGS); + + rw.sort(RevSort.TOPO); + markStart(d); + assertCommit(d, rw.next()); + assertCommit(c, rw.next()); + assertCommit(b, rw.next()); + assertCommit(a, rw.next()); + assertNull(rw.next()); + + + assertThat(Integer.bitCount(rw.freeFlags)) + .as("4 Flags should be allocated by TopoSortPendingGenerator") + .isEqualTo(appFlags - 4); + + rw.reset(); + + assertThat(Integer.bitCount(rw.freeFlags)) // + .as("Flags allocated by TopoSortPendingGenerator should be freed when calling RevWalk.reset()") + .isEqualTo(appFlags); + } } 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 4b28045cf35..448e6e02366 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -179,7 +179,7 @@ public class RevWalk implements Iterable, AutoCloseable { */ static final int RESERVED_FLAGS = 9; - private static final int APP_FLAGS = -1 & ~((1 << RESERVED_FLAGS) - 1); + static final int APP_FLAGS = -1 & ~((1 << RESERVED_FLAGS) - 1); final ObjectReader reader; @@ -1526,6 +1526,32 @@ void freeFlag(int mask) { } } + /** + * Arrange for flags to be recycled at the next {@code reset}. + *

+ * Unlike {@link #freeFlag(int)}, this always defers: the flags + * join the {@link #delayFreeFlags} set and are only returned to the + * {@link #freeFlags} by an invocation of a {@code reset} method. If the + * flags were marked {@code retainOnReset}, that request is cleared. + *

+ * Only call this while a {@link Generator} is under + * construction - i.e. from within the call chain of + * {@link StartGenerator#next()}. At that point {@link #pending} is still + * the {@link StartGenerator}, so {@link #isNotStarted()} reports + * {@code true} and {@link #freeFlag(int)} would return the flags to + * {@link #freeFlags} immediately. The next {@link #newFlag(String)} would + * then hand the same bits to an unrelated caller, silently corrupting both + * walks. Calling this from anywhere else is almost certainly a mistake; use + * {@link #disposeFlag(RevFlag)} instead. + * + * @param mask + * the flag bits to recycle at the next {@code reset}. + */ + final void freeFlagOnReset(int mask) { + retainOnReset &= ~mask; + delayFreeFlags |= mask; + } + private void finishDelayedFreeFlags() { if (delayFreeFlags != 0) { freeFlags |= delayFreeFlags; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoExplorePhase.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoExplorePhase.java index ca6fcbb1952..ca810731eef 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoExplorePhase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoExplorePhase.java @@ -45,6 +45,11 @@ void explore(int minGeneration) throws MissingObjectException, } } + @Override + int getAllocatedFlags() { + return super.getAllocatedFlags() | topoPassedFilterFlag.mask; + } + boolean hasPassedFilter(RevCommit c) { return c.has(topoPassedFilterFlag); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoInDegreePhase.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoInDegreePhase.java index 112d9e7954d..0efcc359bac 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoInDegreePhase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoInDegreePhase.java @@ -111,6 +111,11 @@ RevCommit nextReady() throws MissingObjectException, return c; } + @Override + int getAllocatedFlags() { + return super.getAllocatedFlags() | topoSeen.mask; + } + private void expand(RevCommit c) throws MissingObjectException, IncorrectObjectTypeException, IOException { for (RevCommit p : c.getParents()) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoPhase.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoPhase.java index 6d8421c1d03..ea1a3ab5bdd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoPhase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoPhase.java @@ -77,4 +77,8 @@ final RevCommit tryRemove(int minGeneration) { return null; } + int getAllocatedFlags() { + return testFlag.mask; + } + } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java index e1cc065e394..80b0de81813 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TopoSortPendingGenerator.java @@ -36,6 +36,10 @@ protected TopoSortPendingGenerator(RevWalk walker, AbstractRevQueue pending, (output & NEEDS_REWRITE) != 0); inDegreePhase.initialize(pending); + + int allocatedFlags = explorePhase.getAllocatedFlags(); + allocatedFlags |= inDegreePhase.getAllocatedFlags(); + walker.freeFlagOnReset(allocatedFlags); } @Override