From 9072103f3b3cf64dd12ad2949836ab98f62dabf1 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 11 Aug 2023 21:40:13 +0200 Subject: [PATCH 1/3] Checkout: better directory handling When checking out a file into the working tree ensure that all parent directories of the file below the working tree root are actually directories and do exist before we try to create the file. When multiple files are to be checked out (or even a whole tree), this may check the same directories over and over again. Asking the file system every time for file attributes is a potentially expensive operation. As a remedy, introduce an in-memory cache of directory states for a particular check-out operation. Apply the same fix also in the ResolveMerger, which may also check out files, and also in the PatchApplier. In PatchApplier, also validate paths. Change-Id: Ie12864c54c9f901a2ccee7caddec73027f353111 Signed-off-by: Thomas Wolf Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/diff/dotgit.patch | Bin 0 -> 124 bytes .../org/eclipse/jgit/diff/dotgit2.patch | Bin 0 -> 124 bytes .../org/eclipse/jgit/symlinks/.gitattributes | 1 + .../org/eclipse/jgit/symlinks/dirtest.patch | Bin 0 -> 115 bytes .../jgit/dircache/DirCacheEntryTest.java | 12 +- .../dircache/InvalidPathCheckoutTest.java | 61 ++++ .../eclipse/jgit/patch/PatchApplierTest.java | 26 ++ .../eclipse/jgit/symlinks/DirectoryTest.java | 259 +++++++++++++++ org.eclipse.jgit/.settings/.api_filters | 16 + .../eclipse/jgit/internal/JGitText.properties | 2 + .../org/eclipse/jgit/api/CheckoutCommand.java | 26 +- .../eclipse/jgit/api/StashApplyCommand.java | 23 +- .../org/eclipse/jgit/dircache/Checkout.java | 238 ++++++++++++++ .../jgit/dircache/DirCacheCheckout.java | 111 +------ .../org/eclipse/jgit/internal/JGitText.java | 2 + .../org/eclipse/jgit/lib/FileModeCache.java | 309 ++++++++++++++++++ .../org/eclipse/jgit/merge/ResolveMerger.java | 47 +-- .../org/eclipse/jgit/patch/PatchApplier.java | 33 +- 18 files changed, 1017 insertions(+), 149 deletions(-) create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/dotgit.patch create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/dotgit2.patch create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/symlinks/.gitattributes create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/symlinks/dirtest.patch create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/dircache/InvalidPathCheckoutTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/symlinks/DirectoryTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/FileModeCache.java diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/dotgit.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/dotgit.patch new file mode 100644 index 0000000000000000000000000000000000000000..802fa15465d12ff4887068fae2045b8d6d9e108e GIT binary patch literal 124 zcmYL>OA5m<3ZRooA}u{0lu8NAugF|12U1=I_v7tr0Vyj~F33D0mt!h> 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.dircache; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; + +import java.io.File; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.ResetCommand.ResetType; +import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevBlob; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Test; + +/** + * Tests for checking out with invalid paths. + */ +public class InvalidPathCheckoutTest extends RepositoryTestCase { + + private DirCacheEntry brokenEntry(String fileName, RevBlob blob) { + DirCacheEntry entry = new DirCacheEntry("XXXX/" + fileName); + entry.path[0] = '.'; + entry.path[1] = 'g'; + entry.path[2] = 'i'; + entry.path[3] = 't'; + entry.setFileMode(FileMode.REGULAR_FILE); + entry.setObjectId(blob); + return entry; + } + + @Test + public void testCheckoutIntoDotGit() throws Exception { + try (TestRepository repo = new TestRepository<>(db)) { + db.incrementOpen(); + // DirCacheEntry does not allow any path component to contain + // ".git". C git also forbids this. But what if somebody creates + // such an entry explicitly? + RevCommit base = repo + .commit(repo.tree(brokenEntry("b", repo.blob("test")))); + try (Git git = new Git(db)) { + assertThrows(InvalidPathException.class, () -> git.reset() + .setMode(ResetType.HARD).setRef(base.name()).call()); + File b = new File(new File(trash, ".git"), "b"); + assertFalse(".git/b should not exist", b.exists()); + } + } + } + +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java index e2637257c..92d47c296 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java @@ -24,6 +24,7 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; + import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.attributes.FilterCommand; @@ -892,5 +893,30 @@ public void testFiltering() throws Exception { FilterCommandRegistry.unregister("jgit://builtin/a2e/smudge"); } } + + private void dotGitTest(String fileName) throws Exception { + init(fileName, false, false); + Result result = null; + IOException ex = null; + try { + result = applyPatch(); + } catch (IOException e) { + ex = e; + } + assertTrue(ex != null + || (result != null && !result.getErrors().isEmpty())); + File b = new File(new File(trash, ".git"), "b"); + assertFalse(".git/b should not exist", b.exists()); + } + + @Test + public void testDotGit() throws Exception { + dotGitTest("dotgit"); + } + + @Test + public void testDotGit2() throws Exception { + dotGitTest("dotgit2"); + } } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/symlinks/DirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/symlinks/DirectoryTest.java new file mode 100644 index 000000000..490c45b55 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/symlinks/DirectoryTest.java @@ -0,0 +1,259 @@ +/* + * Copyright (C) 2023 Thomas Wolf 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.symlinks; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.ResetCommand.ResetType; +import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.StoredConfig; +import org.eclipse.jgit.patch.Patch; +import org.eclipse.jgit.patch.PatchApplier; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.FileUtils; +import org.junit.Assume; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; + +@RunWith(Parameterized.class) +public class DirectoryTest extends RepositoryTestCase { + + @BeforeClass + public static void checkPrecondition() throws Exception { + Assume.assumeTrue(FS.DETECTED.supportsSymlinks()); + Path tempDir = Files.createTempDirectory("jgit"); + try { + Path a = tempDir.resolve("a"); + Files.writeString(a, "test"); + Path b = tempDir.resolve("A"); + Assume.assumeTrue(Files.exists(b)); + } finally { + FileUtils.delete(tempDir.toFile(), + FileUtils.RECURSIVE | FileUtils.IGNORE_ERRORS); + } + } + + @Parameters(name = "core.symlinks={0}") + public static Boolean[] parameters() { + return new Boolean[] { Boolean.TRUE, Boolean.FALSE }; + } + + @Parameter(0) + public boolean useSymlinks; + + private void checkFiles() throws Exception { + File a = new File(trash, "a"); + assertTrue("a should be a directory", + Files.isDirectory(a.toPath(), LinkOption.NOFOLLOW_LINKS)); + File b = new File(a, "b"); + assertTrue("a/b should exist", b.isFile()); + File x = new File(trash, "x"); + assertTrue("x should be a directory", + Files.isDirectory(x.toPath(), LinkOption.NOFOLLOW_LINKS)); + File y = new File(x, "y"); + assertTrue("x/y should exist", y.isFile()); + } + + @Test + public void testCheckout() throws Exception { + StoredConfig config = db.getConfig(); + config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_SYMLINKS, useSymlinks); + config.save(); + try (TestRepository repo = new TestRepository<>(db)) { + db.incrementOpen(); + // Create links directly in the git repo, then use a hard reset + // to get them into the workspace. + RevCommit base = repo.commit( + repo.tree( + repo.link("A", repo.blob(".git")), + repo.file("a/b", repo.blob("test")), + repo.file("x/y", repo.blob("test2")))); + try (Git git = new Git(db)) { + git.reset().setMode(ResetType.HARD).setRef(base.name()).call(); + File b = new File(new File(trash, ".git"), "b"); + assertFalse(".git/b should not exist", b.exists()); + checkFiles(); + } + } + } + + @Test + public void testCheckout2() throws Exception { + StoredConfig config = db.getConfig(); + config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_SYMLINKS, useSymlinks); + config.save(); + try (TestRepository repo = new TestRepository<>(db)) { + db.incrementOpen(); + RevCommit base = repo.commit( + repo.tree( + repo.link("A/B", repo.blob("../.git")), + repo.file("a/b/a/b", repo.blob("test")), + repo.file("x/y", repo.blob("test2")))); + try (Git git = new Git(db)) { + boolean testFiles = true; + try { + git.reset().setMode(ResetType.HARD).setRef(base.name()) + .call(); + } catch (Exception e) { + if (!useSymlinks) { + // There is a file in the middle of the path where we'd + // expect a directory. This case is not handled + // anywhere. What would be a better reply than an IOE? + testFiles = false; + } else { + throw e; + } + } + File a = new File(new File(trash, ".git"), "a"); + assertFalse(".git/a should not exist", a.exists()); + if (testFiles) { + a = new File(trash, "a"); + assertTrue("a should be a directory", Files.isDirectory( + a.toPath(), LinkOption.NOFOLLOW_LINKS)); + File b = new File(a, "b"); + assertTrue("a/b should be a directory", Files.isDirectory( + a.toPath(), LinkOption.NOFOLLOW_LINKS)); + a = new File(b, "a"); + assertTrue("a/b/a should be a directory", Files.isDirectory( + a.toPath(), LinkOption.NOFOLLOW_LINKS)); + b = new File(a, "b"); + assertTrue("a/b/a/b should exist", b.isFile()); + File x = new File(trash, "x"); + assertTrue("x should be a directory", Files.isDirectory( + x.toPath(), LinkOption.NOFOLLOW_LINKS)); + File y = new File(x, "y"); + assertTrue("x/y should exist", y.isFile()); + } + } + } + } + + @Test + public void testMerge() throws Exception { + StoredConfig config = db.getConfig(); + config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_SYMLINKS, useSymlinks); + config.save(); + try (TestRepository repo = new TestRepository<>(db)) { + db.incrementOpen(); + RevCommit base = repo.commit( + repo.tree(repo.file("q", repo.blob("test")))); + RevCommit side = repo.commit( + repo.tree( + repo.link("A", repo.blob(".git")), + repo.file("a/b", repo.blob("test")), + repo.file("x/y", repo.blob("test2")))); + try (Git git = new Git(db)) { + git.reset().setMode(ResetType.HARD).setRef(base.name()).call(); + git.merge().include(side) + .setMessage("merged").call(); + File b = new File(new File(trash, ".git"), "b"); + assertFalse(".git/b should not exist", b.exists()); + checkFiles(); + } + } + } + + @Test + public void testMerge2() throws Exception { + StoredConfig config = db.getConfig(); + config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_SYMLINKS, useSymlinks); + config.save(); + try (TestRepository repo = new TestRepository<>(db)) { + db.incrementOpen(); + RevCommit base = repo.commit( + repo.tree( + repo.file("q", repo.blob("test")), + repo.link("A", repo.blob(".git")))); + RevCommit side = repo.commit( + repo.tree( + repo.file("a/b", repo.blob("test")), + repo.file("x/y", repo.blob("test2")))); + try (Git git = new Git(db)) { + git.reset().setMode(ResetType.HARD).setRef(base.name()).call(); + git.merge().include(side) + .setMessage("merged").call(); + File b = new File(new File(trash, ".git"), "b"); + assertFalse(".git/b should not exist", b.exists()); + checkFiles(); + } + } + } + + @Test + public void testApply() throws Exception { + StoredConfig config = db.getConfig(); + config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_SYMLINKS, useSymlinks); + config.save(); + // PatchApplier doesn't do symlinks yet. + try (TestRepository repo = new TestRepository<>(db)) { + db.incrementOpen(); + RevCommit base = repo.commit( + repo.tree( + repo.file("x", repo.blob("test")), + repo.link("A", repo.blob(".git")))); + try (Git git = new Git(db)) { + git.reset().setMode(ResetType.HARD).setRef(base.name()).call(); + Patch patch = new Patch(); + try (InputStream patchStream = this.getClass() + .getResourceAsStream("dirtest.patch")) { + patch.parse(patchStream); + } + boolean testFiles = true; + try { + PatchApplier.Result result = new PatchApplier(db) + .applyPatch(patch); + assertNotNull(result); + } catch (IOException e) { + if (!useSymlinks) { + // There is a file there, so the patch won't apply. + // Unclear whether an IOE is the correct response, + // though. Probably some negative PatchApplier.Result is + // more appropriate. + testFiles = false; + } else { + throw e; + } + } + File b = new File(new File(trash, ".git"), "b"); + assertFalse(".git/b should not exist", b.exists()); + if (testFiles) { + File a = new File(trash, "a"); + assertTrue("a should be a directory", + Files.isDirectory(a.toPath(), LinkOption.NOFOLLOW_LINKS)); + b = new File(a, "b"); + assertTrue("a/b should exist", b.isFile()); + } + } + } + } +} diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 75697fd88..35a3a0aeb 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,5 +1,13 @@ + + + + + + + + @@ -22,6 +30,14 @@ + + + + + + + + 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 bc8144f1c..3ac1fde6f 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -20,6 +20,8 @@ applyBinaryPatchTypeNotSupported=Couldn't apply binary patch of type {0} applyTextPatchCannotApplyHunk=Hunk cannot be applied applyTextPatchSingleClearingHunk=Expected a single hunk for clearing all content applyBinaryResultOidWrong=Result of binary patch for file {0} has wrong OID +applyPatchDestInvalid=Destination path in patch is invalid +applyPatchSourceInvalid==Source path in patch is invalid applyPatchWithoutSourceOnAlreadyExistingSource=Cannot perform {0} action on an existing file applyPatchWithCreationOverAlreadyExistingDestination=Cannot perform {0} action which overrides an existing file applyPatchWithSourceOnNonExistentSource=Cannot perform {0} action on a non-existent file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java index 7319ff4b2..8edae5a58 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2010, Chris Aniszczyk - * Copyright (C) 2011, 2020 Matthias Sohn and others + * Copyright (C) 2011, 2023 Matthias Sohn 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 @@ -28,6 +28,7 @@ import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.RefAlreadyExistsException; import org.eclipse.jgit.api.errors.RefNotFoundException; +import org.eclipse.jgit.dircache.Checkout; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.dircache.DirCacheCheckout.CheckoutMetadata; @@ -55,7 +56,6 @@ import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; -import org.eclipse.jgit.treewalk.WorkingTreeOptions; import org.eclipse.jgit.treewalk.filter.PathFilterGroup; /** @@ -412,8 +412,7 @@ public CheckoutCommand setAllPaths(boolean all) { protected CheckoutCommand checkoutPaths() throws IOException, RefNotFoundException { actuallyModifiedPaths = new HashSet<>(); - WorkingTreeOptions options = repo.getConfig() - .get(WorkingTreeOptions.KEY); + Checkout checkout = new Checkout(repo).setRecursiveDeletion(true); DirCache dc = repo.lockDirCache(); try (RevWalk revWalk = new RevWalk(repo); TreeWalk treeWalk = new TreeWalk(repo, @@ -422,10 +421,10 @@ protected CheckoutCommand checkoutPaths() throws IOException, if (!checkoutAllPaths) treeWalk.setFilter(PathFilterGroup.createFromStrings(paths)); if (isCheckoutIndex()) - checkoutPathsFromIndex(treeWalk, dc, options); + checkoutPathsFromIndex(treeWalk, dc, checkout); else { RevCommit commit = revWalk.parseCommit(getStartPointObjectId()); - checkoutPathsFromCommit(treeWalk, dc, commit, options); + checkoutPathsFromCommit(treeWalk, dc, commit, checkout); } } finally { try { @@ -443,7 +442,7 @@ protected CheckoutCommand checkoutPaths() throws IOException, } private void checkoutPathsFromIndex(TreeWalk treeWalk, DirCache dc, - WorkingTreeOptions options) + Checkout checkout) throws IOException { DirCacheIterator dci = new DirCacheIterator(dc); treeWalk.addTree(dci); @@ -469,7 +468,7 @@ public void apply(DirCacheEntry ent) { if (stage > DirCacheEntry.STAGE_0) { if (checkoutStage != null) { if (stage == checkoutStage.number) { - checkoutPath(ent, r, options, + checkoutPath(ent, r, checkout, path, new CheckoutMetadata(eolStreamType, filterCommand)); actuallyModifiedPaths.add(path); @@ -480,7 +479,7 @@ public void apply(DirCacheEntry ent) { throw new JGitInternalException(e.getMessage(), e); } } else { - checkoutPath(ent, r, options, + checkoutPath(ent, r, checkout, path, new CheckoutMetadata(eolStreamType, filterCommand)); actuallyModifiedPaths.add(path); @@ -494,7 +493,7 @@ public void apply(DirCacheEntry ent) { } private void checkoutPathsFromCommit(TreeWalk treeWalk, DirCache dc, - RevCommit commit, WorkingTreeOptions options) throws IOException { + RevCommit commit, Checkout checkout) throws IOException { treeWalk.addTree(commit.getTree()); final ObjectReader r = treeWalk.getObjectReader(); DirCacheEditor editor = dc.editor(); @@ -516,7 +515,7 @@ public void apply(DirCacheEntry ent) { } ent.setObjectId(blobId); ent.setFileMode(mode); - checkoutPath(ent, r, options, + checkoutPath(ent, r, checkout, path, new CheckoutMetadata(eolStreamType, filterCommand)); actuallyModifiedPaths.add(path); } @@ -526,10 +525,9 @@ public void apply(DirCacheEntry ent) { } private void checkoutPath(DirCacheEntry entry, ObjectReader reader, - WorkingTreeOptions options, CheckoutMetadata checkoutMetadata) { + Checkout checkout, String path, CheckoutMetadata checkoutMetadata) { try { - DirCacheCheckout.checkoutEntry(repo, entry, reader, true, - checkoutMetadata, options); + checkout.checkout(entry, checkoutMetadata, reader, path); } catch (IOException e) { throw new JGitInternalException(MessageFormat.format( JGitText.get().checkoutConflictWithFile, 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 17036a9cd..e4157286f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2021 GitHub Inc. and others + * Copyright (C) 2012, 2023 GitHub 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 @@ -23,6 +23,7 @@ import org.eclipse.jgit.api.errors.NoHeadException; import org.eclipse.jgit.api.errors.StashApplyFailureException; import org.eclipse.jgit.api.errors.WrongRepositoryStateException; +import org.eclipse.jgit.dircache.Checkout; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheBuilder; import org.eclipse.jgit.dircache.DirCacheCheckout; @@ -48,7 +49,6 @@ import org.eclipse.jgit.treewalk.AbstractTreeIterator; import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.treewalk.TreeWalk; -import org.eclipse.jgit.treewalk.WorkingTreeOptions; /** * Command class to apply a stashed commit. @@ -383,8 +383,7 @@ private void resetIndex(RevTree tree) throws IOException { private void resetUntracked(RevTree tree) throws CheckoutConflictException, IOException { Set actuallyModifiedPaths = new HashSet<>(); - WorkingTreeOptions options = repo.getConfig() - .get(WorkingTreeOptions.KEY); + Checkout checkout = new Checkout(repo).setRecursiveDeletion(true); // TODO maybe NameConflictTreeWalk ? try (TreeWalk walk = new TreeWalk(repo)) { walk.addTree(tree); @@ -408,17 +407,17 @@ private void resetUntracked(RevTree tree) throws CheckoutConflictException, FileTreeIterator fIter = walk .getTree(1, FileTreeIterator.class); + String gitPath = entry.getPathString(); if (fIter != null) { if (fIter.isModified(entry, true, reader)) { // file exists and is dirty - throw new CheckoutConflictException( - entry.getPathString()); + throw new CheckoutConflictException(gitPath); } } - checkoutPath(entry, reader, options, + checkoutPath(entry, gitPath, reader, checkout, new CheckoutMetadata(eolStreamType, null)); - actuallyModifiedPaths.add(entry.getPathString()); + actuallyModifiedPaths.add(gitPath); } } finally { if (!actuallyModifiedPaths.isEmpty()) { @@ -428,11 +427,11 @@ private void resetUntracked(RevTree tree) throws CheckoutConflictException, } } - private void checkoutPath(DirCacheEntry entry, ObjectReader reader, - WorkingTreeOptions options, CheckoutMetadata checkoutMetadata) { + private void checkoutPath(DirCacheEntry entry, String gitPath, + ObjectReader reader, + Checkout checkout, CheckoutMetadata checkoutMetadata) { try { - DirCacheCheckout.checkoutEntry(repo, entry, reader, true, - checkoutMetadata, options); + checkout.checkout(entry, checkoutMetadata, reader, gitPath); } catch (IOException e) { throw new JGitInternalException(MessageFormat.format( JGitText.get().checkoutConflictWithFile, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java new file mode 100644 index 000000000..accf732dc --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java @@ -0,0 +1,238 @@ +/* + * Copyright (C) 2023, Thomas Wolf 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.dircache; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.StandardCopyOption; +import java.text.MessageFormat; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.dircache.DirCacheCheckout.CheckoutMetadata; +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.FileModeCache; +import org.eclipse.jgit.lib.ObjectLoader; +import org.eclipse.jgit.lib.ObjectReader; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.CoreConfig.EolStreamType; +import org.eclipse.jgit.lib.CoreConfig.SymLinks; +import org.eclipse.jgit.lib.FileModeCache.CacheItem; +import org.eclipse.jgit.treewalk.WorkingTreeOptions; +import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.FileUtils; +import org.eclipse.jgit.util.RawParseUtils; + +/** + * An object that can be used to check out many files. + * + * @since 6.6.1 + */ +public class Checkout { + + private final FileModeCache cache; + + private final WorkingTreeOptions options; + + private boolean recursiveDelete; + + /** + * Creates a new {@link Checkout} for checking out from the given + * repository. + * + * @param repo + * the {@link Repository} to check out from + */ + public Checkout(@NonNull Repository repo) { + this(repo, null); + } + + /** + * Creates a new {@link Checkout} for checking out from the given + * repository. + * + * @param repo + * the {@link Repository} to check out from + * @param options + * the {@link WorkingTreeOptions} to use; if {@code null}, + * read from the {@code repo} config when this object is + * created + */ + public Checkout(@NonNull Repository repo, WorkingTreeOptions options) { + this.cache = new FileModeCache(repo); + this.options = options != null ? options + : repo.getConfig().get(WorkingTreeOptions.KEY); + } + + /** + * Retrieves the {@link WorkingTreeOptions} of the repository that are + * used. + * + * @return the {@link WorkingTreeOptions} + */ + public WorkingTreeOptions getWorkingTreeOptions() { + return options; + } + + /** + * Defines whether directories that are in the way of the file to be checked + * out shall be deleted recursively. + * + * @param recursive + * whether to delete such directories recursively + * @return {@code this} + */ + public Checkout setRecursiveDeletion(boolean recursive) { + this.recursiveDelete = recursive; + return this; + } + + /** + * Ensure that the given parent directory exists, and cache the information + * that gitPath refers to a file. + * + * @param gitPath + * of the file to be written + * @param parentDir + * directory in which the file shall be placed, assumed to be the + * parent of the {@code gitPath} + * @param makeSpace + * whether to delete a possibly existing file at + * {@code parentDir} + * @throws IOException + * if the directory cannot be created, if necessary + */ + public void safeCreateParentDirectory(String gitPath, File parentDir, + boolean makeSpace) throws IOException { + cache.safeCreateParentDirectory(gitPath, parentDir, makeSpace); + } + + /** + * Checks out the gitlink given by the {@link DirCacheEntry}. + * + * @param entry + * {@link DirCacheEntry} to check out + * @param gitPath + * the git path of the entry, if known already; otherwise + * {@code null} and it's read from the entry itself + * @throws IOException + * if the gitlink cannot be checked out + */ + public void checkoutGitlink(DirCacheEntry entry, String gitPath) + throws IOException { + FS fs = cache.getRepository().getFS(); + File workingTree = cache.getRepository().getWorkTree(); + String path = gitPath != null ? gitPath : entry.getPathString(); + File gitlinkDir = new File(workingTree, path); + File parentDir = gitlinkDir.getParentFile(); + CacheItem cachedParent = cache.safeCreateDirectory(path, parentDir, + false); + FileUtils.mkdirs(gitlinkDir, true); + cachedParent.insert(path.substring(path.lastIndexOf('/') + 1), + FileMode.GITLINK); + entry.setLastModified(fs.lastModifiedInstant(gitlinkDir)); + } + + /** + * Checks out the file given by the {@link DirCacheEntry}. + * + * @param entry + * {@link DirCacheEntry} to check out + * @param metadata + * {@link CheckoutMetadata} to use for CR/LF handling and + * smudge filtering + * @param reader + * {@link ObjectReader} to use + * @param gitPath + * the git path of the entry, if known already; otherwise + * {@code null} and it's read from the entry itself + * @throws IOException + * if the file cannot be checked out + */ + public void checkout(DirCacheEntry entry, CheckoutMetadata metadata, + ObjectReader reader, String gitPath) throws IOException { + if (metadata == null) { + metadata = CheckoutMetadata.EMPTY; + } + FS fs = cache.getRepository().getFS(); + ObjectLoader ol = reader.open(entry.getObjectId()); + String path = gitPath != null ? gitPath : entry.getPathString(); + File f = new File(cache.getRepository().getWorkTree(), path); + File parentDir = f.getParentFile(); + CacheItem cachedParent = cache.safeCreateDirectory(path, parentDir, + true); + if (entry.getFileMode() == FileMode.SYMLINK + && options.getSymLinks() == SymLinks.TRUE) { + byte[] bytes = ol.getBytes(); + String target = RawParseUtils.decode(bytes); + if (recursiveDelete && Files.isDirectory(f.toPath(), + LinkOption.NOFOLLOW_LINKS)) { + FileUtils.delete(f, FileUtils.RECURSIVE); + } + fs.createSymLink(f, target); + cachedParent.insert(f.getName(), FileMode.SYMLINK); + entry.setLength(bytes.length); + entry.setLastModified(fs.lastModifiedInstant(f)); + return; + } + + String name = f.getName(); + if (name.length() > 200) { + name = name.substring(0, 200); + } + File tmpFile = File.createTempFile("._" + name, null, parentDir); //$NON-NLS-1$ + + DirCacheCheckout.getContent(cache.getRepository(), path, metadata, ol, + options, + new FileOutputStream(tmpFile)); + + // The entry needs to correspond to the on-disk file size. If the + // content was filtered (either by autocrlf handling or smudge + // filters) ask the file system again for the length. Otherwise the + // object loader knows the size + if (metadata.eolStreamType == EolStreamType.DIRECT + && metadata.smudgeFilterCommand == null) { + entry.setLength(ol.getSize()); + } else { + entry.setLength(tmpFile.length()); + } + + if (options.isFileMode() && fs.supportsExecute()) { + if (FileMode.EXECUTABLE_FILE.equals(entry.getRawMode())) { + if (!fs.canExecute(tmpFile)) + fs.setExecute(tmpFile, true); + } else { + if (fs.canExecute(tmpFile)) + fs.setExecute(tmpFile, false); + } + } + try { + if (recursiveDelete && Files.isDirectory(f.toPath(), + LinkOption.NOFOLLOW_LINKS)) { + FileUtils.delete(f, FileUtils.RECURSIVE); + } + FileUtils.rename(tmpFile, f, StandardCopyOption.ATOMIC_MOVE); + cachedParent.remove(f.getName()); + } catch (IOException e) { + throw new IOException( + MessageFormat.format(JGitText.get().renameFileFailed, + tmpFile.getPath(), f.getPath()), + e); + } finally { + if (tmpFile.exists()) { + FileUtils.delete(tmpFile); + } + } + entry.setLastModified(fs.lastModifiedInstant(f)); + } +} \ No newline at end of file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index 1fb81b71e..d54df8d20 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -5,7 +5,7 @@ * Copyright (C) 2006, Shawn O. Pearce * Copyright (C) 2010, Chrisian Halstrick * Copyright (C) 2019, 2020, Andre Bossert - * Copyright (C) 2017, 2022, Thomas Wolf and others + * Copyright (C) 2017, 2023, Thomas Wolf 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 @@ -19,11 +19,9 @@ import static org.eclipse.jgit.treewalk.TreeWalk.OperationType.CHECKOUT_OP; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.nio.file.StandardCopyOption; import java.text.MessageFormat; import java.time.Instant; import java.util.ArrayList; @@ -49,7 +47,6 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.CoreConfig.AutoCRLF; import org.eclipse.jgit.lib.CoreConfig.EolStreamType; -import org.eclipse.jgit.lib.CoreConfig.SymLinks; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectChecker; @@ -69,9 +66,7 @@ import org.eclipse.jgit.treewalk.filter.PathFilter; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS.ExecutionResult; -import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.IntList; -import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.SystemReader; import org.eclipse.jgit.util.io.EolStreamTypeUtil; import org.slf4j.Logger; @@ -144,7 +139,7 @@ public CheckoutMetadata(EolStreamType eolStreamType, private boolean performingCheckout; - private WorkingTreeOptions options; + private Checkout checkout; private ProgressMonitor monitor = NullProgressMonitor.INSTANCE; @@ -495,9 +490,8 @@ private boolean doCheckout() throws CorruptObjectException, IOException, MissingObjectException, IncorrectObjectTypeException, CheckoutConflictException, IndexWriteException, CanceledException { toBeDeleted.clear(); - options = repo.getConfig() - .get(WorkingTreeOptions.KEY); try (ObjectReader objectReader = repo.getObjectDatabase().newReader()) { + checkout = new Checkout(repo, null); if (headCommitTree != null) preScanTwoTrees(); else @@ -564,10 +558,9 @@ private boolean doCheckout() throws CorruptObjectException, IOException, CheckoutMetadata meta = e.getValue(); DirCacheEntry entry = dc.getEntry(path); if (FileMode.GITLINK.equals(entry.getRawMode())) { - checkoutGitlink(path, entry); + checkout.checkoutGitlink(entry, path); } else { - checkoutEntry(repo, entry, objectReader, false, meta, - options); + checkout.checkout(entry, meta, objectReader, path); } e = null; @@ -602,8 +595,8 @@ private boolean doCheckout() throws CorruptObjectException, IOException, break; } if (entry.getStage() == DirCacheEntry.STAGE_3) { - checkoutEntry(repo, entry, objectReader, false, - null, options); + checkout.checkout(entry, null, objectReader, + conflict); break; } ++entryIdx; @@ -626,14 +619,6 @@ private boolean doCheckout() throws CorruptObjectException, IOException, return toBeDeleted.isEmpty(); } - private void checkoutGitlink(String path, DirCacheEntry entry) - throws IOException { - File gitlinkDir = new File(repo.getWorkTree(), path); - FileUtils.mkdirs(gitlinkDir, true); - FS fs = repo.getFS(); - entry.setLastModified(fs.lastModifiedInstant(gitlinkDir)); - } - private static ArrayList filterOut(ArrayList strings, IntList indicesToRemove) { int n = indicesToRemove.size(); @@ -1232,10 +1217,11 @@ private void keep(String path, DirCacheEntry e, WorkingTreeIterator f) if (force) { if (f == null || f.isModified(e, true, walk.getObjectReader())) { kept.add(path); - checkoutEntry(repo, e, walk.getObjectReader(), false, + checkout.checkout(e, new CheckoutMetadata(walk.getEolStreamType(CHECKOUT_OP), walk.getFilterCommand( - Constants.ATTR_FILTER_TYPE_SMUDGE)), options); + Constants.ATTR_FILTER_TYPE_SMUDGE)), + walk.getObjectReader(), path); } } } @@ -1494,83 +1480,16 @@ public static void checkoutEntry(Repository repo, DirCacheEntry entry, * they are loaded from the repository config * @throws java.io.IOException * @since 6.3 + * @deprecated since 6.6.1; use {@link Checkout} instead */ + @Deprecated public static void checkoutEntry(Repository repo, DirCacheEntry entry, ObjectReader or, boolean deleteRecursive, CheckoutMetadata checkoutMetadata, WorkingTreeOptions options) throws IOException { - if (checkoutMetadata == null) { - checkoutMetadata = CheckoutMetadata.EMPTY; - } - ObjectLoader ol = or.open(entry.getObjectId()); - File f = new File(repo.getWorkTree(), entry.getPathString()); - File parentDir = f.getParentFile(); - if (parentDir.isFile()) { - FileUtils.delete(parentDir); - } - FileUtils.mkdirs(parentDir, true); - FS fs = repo.getFS(); - WorkingTreeOptions opt = options != null ? options - : repo.getConfig().get(WorkingTreeOptions.KEY); - if (entry.getFileMode() == FileMode.SYMLINK - && opt.getSymLinks() == SymLinks.TRUE) { - byte[] bytes = ol.getBytes(); - String target = RawParseUtils.decode(bytes); - if (deleteRecursive && f.isDirectory()) { - FileUtils.delete(f, FileUtils.RECURSIVE); - } - fs.createSymLink(f, target); - entry.setLength(bytes.length); - entry.setLastModified(fs.lastModifiedInstant(f)); - return; - } - - String name = f.getName(); - if (name.length() > 200) { - name = name.substring(0, 200); - } - File tmpFile = File.createTempFile( - "._" + name, null, parentDir); //$NON-NLS-1$ - - getContent(repo, entry.getPathString(), checkoutMetadata, ol, opt, - new FileOutputStream(tmpFile)); - - // The entry needs to correspond to the on-disk filesize. If the content - // was filtered (either by autocrlf handling or smudge filters) ask the - // filesystem again for the length. Otherwise the objectloader knows the - // size - if (checkoutMetadata.eolStreamType == EolStreamType.DIRECT - && checkoutMetadata.smudgeFilterCommand == null) { - entry.setLength(ol.getSize()); - } else { - entry.setLength(tmpFile.length()); - } - - if (opt.isFileMode() && fs.supportsExecute()) { - if (FileMode.EXECUTABLE_FILE.equals(entry.getRawMode())) { - if (!fs.canExecute(tmpFile)) - fs.setExecute(tmpFile, true); - } else { - if (fs.canExecute(tmpFile)) - fs.setExecute(tmpFile, false); - } - } - try { - if (deleteRecursive && f.isDirectory()) { - FileUtils.delete(f, FileUtils.RECURSIVE); - } - FileUtils.rename(tmpFile, f, StandardCopyOption.ATOMIC_MOVE); - } catch (IOException e) { - throw new IOException( - MessageFormat.format(JGitText.get().renameFileFailed, - tmpFile.getPath(), f.getPath()), - e); - } finally { - if (tmpFile.exists()) { - FileUtils.delete(tmpFile); - } - } - entry.setLastModified(fs.lastModifiedInstant(f)); + Checkout checkout = new Checkout(repo, options) + .setRecursiveDeletion(deleteRecursive); + checkout.checkout(entry, checkoutMetadata, or, null); } /** 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 518e0b7d9..3b5cc3d1f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -46,6 +46,8 @@ public static JGitText get() { /***/ public String applyBinaryOidTooShort; /***/ public String applyBinaryPatchTypeNotSupported; /***/ public String applyBinaryResultOidWrong; + /***/ public String applyPatchDestInvalid; + /***/ public String applyPatchSourceInvalid; /***/ public String applyPatchWithoutSourceOnAlreadyExistingSource; /***/ public String applyPatchWithCreationOverAlreadyExistingDestination; /***/ public String applyPatchWithSourceOnNonExistentSource; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileModeCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileModeCache.java new file mode 100644 index 000000000..073bf7a0c --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/FileModeCache.java @@ -0,0 +1,309 @@ +/* + * Copyright (C) 2023, Thomas Wolf 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.lib; + +import java.io.File; +import java.io.IOException; +import java.nio.file.InvalidPathException; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.attribute.BasicFileAttributeView; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.FileUtils; + +/** + * A hierarchical cache of {@link FileMode}s per git path. + * + * @since 6.6.1 + */ +public class FileModeCache { + + @NonNull + private final CacheItem root = new CacheItem(FileMode.TREE); + + @NonNull + private final Repository repo; + + /** + * Creates a new {@link FileModeCache} for a {@link Repository}. + * + * @param repo + * {@link Repository} this cache is for + */ + public FileModeCache(@NonNull Repository repo) { + this.repo = repo; + } + + /** + * Retrieves the {@link Repository}. + * + * @return the {@link Repository} this {@link FileModeCache} was created for + */ + @NonNull + public Repository getRepository() { + return repo; + } + + /** + * Obtains the {@link CacheItem} for the working tree root. + * + * @return the {@link CacheItem} + */ + @NonNull + public CacheItem getRoot() { + return root; + } + + /** + * Ensure that the given parent directory exists, and cache the information + * that gitPath refers to a file. + * + * @param gitPath + * of the file to be written + * @param parentDir + * directory in which the file shall be placed, assumed to be the + * parent of the {@code gitPath} + * @param makeSpace + * whether to delete a possibly existing file at + * {@code parentDir} + * @throws IOException + * if the directory cannot be created, if necessary + */ + public void safeCreateParentDirectory(String gitPath, File parentDir, + boolean makeSpace) throws IOException { + CacheItem cachedParent = safeCreateDirectory(gitPath, parentDir, + makeSpace); + cachedParent.remove(gitPath.substring(gitPath.lastIndexOf('/') + 1)); + } + + /** + * Ensures the given directory {@code dir} with the given git path exists. + * + * @param gitPath + * of a file to be written + * @param dir + * directory in which the file shall be placed, assumed to be the + * parent of the {@code gitPath} + * @param makeSpace + * whether to remove a file that already at that name + * @return A {@link CacheItem} describing the directory, which is guaranteed + * to exist + * @throws IOException + * if the directory cannot be made to exist at the given + * location + */ + public CacheItem safeCreateDirectory(String gitPath, File dir, + boolean makeSpace) throws IOException { + FS fs = repo.getFS(); + int i = gitPath.lastIndexOf('/'); + String parentPath = null; + if (i >= 0) { + if ((makeSpace && dir.isFile()) || fs.isSymLink(dir)) { + FileUtils.delete(dir); + } + parentPath = gitPath.substring(0, i); + deleteSymlinkParent(fs, parentPath, repo.getWorkTree()); + } + FileUtils.mkdirs(dir, true); + CacheItem cachedParent = getRoot(); + if (parentPath != null) { + cachedParent = add(parentPath, FileMode.TREE); + } + return cachedParent; + } + + private void deleteSymlinkParent(FS fs, String gitPath, File workingTree) + throws IOException { + if (!fs.supportsSymlinks()) { + return; + } + String[] parts = gitPath.split("/"); //$NON-NLS-1$ + int n = parts.length; + CacheItem cached = getRoot(); + File p = workingTree; + for (int i = 0; i < n; i++) { + p = new File(p, parts[i]); + CacheItem cachedChild = cached != null ? cached.child(parts[i]) + : null; + boolean delete = false; + if (cachedChild != null) { + if (FileMode.SYMLINK.equals(cachedChild.getMode())) { + delete = true; + } + } else { + try { + Path nioPath = FileUtils.toPath(p); + BasicFileAttributes attributes = nioPath.getFileSystem() + .provider() + .getFileAttributeView(nioPath, + BasicFileAttributeView.class, + LinkOption.NOFOLLOW_LINKS) + .readAttributes(); + if (attributes.isSymbolicLink()) { + delete = p.isDirectory(); + } else if (attributes.isRegularFile()) { + break; + } + } catch (InvalidPathException | IOException e) { + // If we can't get the attributes the path does not exist, + // or if it does a subsequent mkdirs() will also throw an + // exception. + break; + } + } + if (delete) { + // Deletes the symlink + FileUtils.delete(p, FileUtils.SKIP_MISSING); + if (cached != null) { + cached.remove(parts[i]); + } + break; + } + cached = cachedChild; + } + } + + /** + * Records the given {@link FileMode} for the given git path in the cache. + * If an entry already exists for the given path, the previously cached file + * mode is overwritten. + * + * @param gitPath + * to cache the {@link FileMode} for + * @param finalMode + * {@link FileMode} to cache + * @return the {@link CacheItem} for the path + */ + @NonNull + private CacheItem add(String gitPath, FileMode finalMode) { + if (gitPath.isEmpty()) { + throw new IllegalArgumentException(); + } + String[] parts = gitPath.split("/"); //$NON-NLS-1$ + int n = parts.length; + int i = 0; + CacheItem curr = getRoot(); + while (i < n) { + CacheItem next = curr.child(parts[i]); + if (next == null) { + break; + } + curr = next; + i++; + } + if (i == n) { + curr.setMode(finalMode); + } else { + while (i < n) { + curr = curr.insert(parts[i], + i + 1 == n ? finalMode : FileMode.TREE); + i++; + } + } + return curr; + } + + /** + * An item from a {@link FileModeCache}, recording information about a git + * path (known from context). + */ + public static class CacheItem { + + @NonNull + private FileMode mode; + + private Map children; + + /** + * Creates a new {@link CacheItem}. + * + * @param mode + * {@link FileMode} to cache + */ + public CacheItem(@NonNull FileMode mode) { + this.mode = mode; + } + + /** + * Retrieves the cached {@link FileMode}. + * + * @return the {@link FileMode} + */ + @NonNull + public FileMode getMode() { + return mode; + } + + /** + * Retrieves an immediate child of this {@link CacheItem} by name. + * + * @param childName + * name of the child to get + * @return the {@link CacheItem}, or {@code null} if no such child is + * known + */ + public CacheItem child(String childName) { + if (children == null) { + return null; + } + return children.get(childName); + } + + /** + * Inserts a new cached {@link FileMode} as an immediate child of this + * {@link CacheItem}. If there is already a child with the same name, it + * is overwritten. + * + * @param childName + * name of the child to create + * @param childMode + * {@link FileMode} to cache + * @return the new {@link CacheItem} created for the child + */ + public CacheItem insert(String childName, @NonNull FileMode childMode) { + if (!FileMode.TREE.equals(mode)) { + throw new IllegalArgumentException(); + } + if (children == null) { + children = new HashMap<>(); + } + CacheItem newItem = new CacheItem(childMode); + children.put(childName, newItem); + return newItem; + } + + /** + * Removes the immediate child with the given name. + * + * @param childName + * name of the child to remove + * @return the previously cached {@link CacheItem}, if any + */ + public CacheItem remove(String childName) { + if (children == null) { + return null; + } + return children.remove(childName); + } + + void setMode(@NonNull FileMode mode) { + this.mode = mode; + if (!FileMode.TREE.equals(mode)) { + children = null; + } + } + } + +} 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 e56513d4e..04c17be39 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -3,8 +3,8 @@ * Copyright (C) 2010-2012, Matthias Sohn * Copyright (C) 2012, Research In Motion Limited * Copyright (C) 2017, Obeo (mathieu.cartaud@obeo.fr) - * Copyright (C) 2018, 2022 Thomas Wolf - * Copyright (C) 2022, Google Inc. and others + * Copyright (C) 2018, 2023 Thomas Wolf + * Copyright (C) 2023, 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 @@ -47,6 +47,7 @@ import org.eclipse.jgit.diff.RawText; import org.eclipse.jgit.diff.RawTextComparator; import org.eclipse.jgit.diff.Sequence; +import org.eclipse.jgit.dircache.Checkout; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheBuildIterator; import org.eclipse.jgit.dircache.DirCacheBuilder; @@ -79,7 +80,6 @@ import org.eclipse.jgit.treewalk.WorkingTreeIterator; import org.eclipse.jgit.treewalk.WorkingTreeOptions; import org.eclipse.jgit.treewalk.filter.TreeFilter; -import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.LfsFactory; import org.eclipse.jgit.util.LfsFactory.LfsInputStream; import org.eclipse.jgit.util.TemporaryBuffer; @@ -204,6 +204,12 @@ public List getModifiedFiles() { */ private boolean indexChangesWritten; + /** + * {@link Checkout} to use for actually checking out files if + * {@link #inCore} is {@code false}. + */ + private Checkout checkout; + /** * @param repo * the {@link Repository}. @@ -223,6 +229,7 @@ private WorkTreeUpdater(Repository repo, DirCache dirCache) { this.inCoreFileSizeLimit = getInCoreFileSizeLimit(config); this.checkoutMetadataByPath = new HashMap<>(); this.cleanupMetadataByPath = new HashMap<>(); + this.checkout = new Checkout(nonNullRepo(), workingTreeOptions); } /** @@ -350,9 +357,8 @@ public void writeWorkTreeChanges(boolean shouldCheckoutTheirs) } // All content operations are successfully done. If we can now write - // the - // new index we are on quite safe ground. Even if the checkout of - // files coming from "theirs" fails the user can work around such + // the new index we are on quite safe ground. Even if the checkout + // of files coming from "theirs" fails the user can work around such // failures by checking out the index again. if (!builder.commit()) { revertModifiedFiles(); @@ -518,14 +524,14 @@ private void checkout() throws NoWorkTreeException, IOException { for (Map.Entry entry : toBeCheckedOut .entrySet()) { DirCacheEntry dirCacheEntry = entry.getValue(); + String gitPath = entry.getKey(); if (dirCacheEntry.getFileMode() == FileMode.GITLINK) { - new File(nonNullRepo().getWorkTree(), entry.getKey()) - .mkdirs(); + checkout.checkoutGitlink(dirCacheEntry, gitPath); } else { - DirCacheCheckout.checkoutEntry(repo, dirCacheEntry, reader, - false, checkoutMetadataByPath.get(entry.getKey()), - workingTreeOptions); - result.modifiedFiles.add(entry.getKey()); + checkout.checkout(dirCacheEntry, + checkoutMetadataByPath.get(gitPath), reader, + gitPath); + result.modifiedFiles.add(gitPath); } } } @@ -550,9 +556,8 @@ public void revertModifiedFiles() throws IOException { for (String path : result.modifiedFiles) { DirCacheEntry entry = dirCache.getEntry(path); if (entry != null) { - DirCacheCheckout.checkoutEntry(repo, entry, reader, false, - cleanupMetadataByPath.get(path), - workingTreeOptions); + checkout.checkout(entry, cleanupMetadataByPath.get(path), + reader, path); } } } @@ -586,6 +591,8 @@ public void updateFileWithContent(StreamSupplier inputStream, if (inCore) { return; } + checkout.safeCreateParentDirectory(path, file.getParentFile(), + false); CheckoutMetadata metadata = new CheckoutMetadata(streamType, smudgeCommand); @@ -1576,15 +1583,11 @@ private File writeMergedFile(TemporaryBuffer rawMerged, Attributes attributes) throws IOException { File workTree = nonNullRepo().getWorkTree(); - FS fs = nonNullRepo().getFS(); - File of = new File(workTree, tw.getPathString()); - File parentFolder = of.getParentFile(); + String gitPath = tw.getPathString(); + File of = new File(workTree, gitPath); EolStreamType eol = workTreeUpdater.detectCheckoutStreamType(attributes); - if (!fs.exists(parentFolder)) { - parentFolder.mkdirs(); - } workTreeUpdater.updateFileWithContent(rawMerged::openInputStream, - eol, tw.getSmudgeCommand(attributes), of.getPath(), of); + eol, tw.getSmudgeCommand(attributes), gitPath, of); return of; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java index da698d6bf..04300a976 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022, Google Inc. and others + * Copyright (C) 2023, 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 @@ -52,6 +52,7 @@ import org.eclipse.jgit.dircache.DirCacheCheckout.StreamSupplier; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.dircache.DirCacheIterator; +import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.IndexWriteException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.Config; @@ -59,6 +60,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.CoreConfig.EolStreamType; import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.FileModeCache; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectLoader; @@ -81,6 +83,7 @@ import org.eclipse.jgit.util.LfsFactory.LfsInputStream; import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.StringUtils; +import org.eclipse.jgit.util.SystemReader; import org.eclipse.jgit.util.TemporaryBuffer; import org.eclipse.jgit.util.TemporaryBuffer.LocalFile; import org.eclipse.jgit.util.io.BinaryDeltaInputStream; @@ -258,6 +261,7 @@ public Result applyPatch(Patch p) throws IOException { DirCache dirCache = inCore() ? DirCache.read(reader, beforeTree) : repo.lockDirCache(); + FileModeCache directoryCache = new FileModeCache(repo); DirCacheBuilder dirCacheBuilder = dirCache.builder(); Set modifiedPaths = new HashSet<>(); for (FileHeader fh : p.getFiles()) { @@ -270,7 +274,8 @@ public Result applyPatch(Patch p) throws IOException { switch (type) { case ADD: { if (dest != null) { - FileUtils.mkdirs(dest.getParentFile(), true); + directoryCache.safeCreateParentDirectory(fh.getNewPath(), + dest.getParentFile(), false); FileUtils.createNewFile(dest); } apply(fh.getNewPath(), dirCache, dirCacheBuilder, dest, fh, result); @@ -295,7 +300,8 @@ public Result applyPatch(Patch p) throws IOException { * apply() will write a fresh stream anyway, which will * overwrite if there were hunks in the patch. */ - FileUtils.mkdirs(dest.getParentFile(), true); + directoryCache.safeCreateParentDirectory(fh.getNewPath(), + dest.getParentFile(), false); FileUtils.rename(src, dest, StandardCopyOption.ATOMIC_MOVE); } @@ -306,7 +312,8 @@ public Result applyPatch(Patch p) throws IOException { } case COPY: { if (!inCore()) { - FileUtils.mkdirs(dest.getParentFile(), true); + directoryCache.safeCreateParentDirectory(fh.getNewPath(), + dest.getParentFile(), false); Files.copy(src.toPath(), dest.toPath()); } apply(fh.getOldPath(), dirCache, dirCacheBuilder, dest, fh, result); @@ -401,9 +408,27 @@ private boolean verifyExistence(FileHeader fh, File src, File dest, fh.getPatchType()), fh.getNewPath(), null); isValid = false; } + if (srcShouldExist && !validGitPath(fh.getOldPath())) { + result.addError(JGitText.get().applyPatchSourceInvalid, + fh.getOldPath(), null); + isValid = false; + } + if (destShouldNotExist && !validGitPath(fh.getNewPath())) { + result.addError(JGitText.get().applyPatchDestInvalid, + fh.getNewPath(), null); + isValid = false; + } return isValid; } + private boolean validGitPath(String path) { + try { + SystemReader.getInstance().checkPath(path); + return true; + } catch (CorruptObjectException e) { + return false; + } + } private static final int FILE_TREE_INDEX = 1; /** From ff08cbfe0751ee65fe1a77ba74c1a87c0f5e253e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 3 Sep 2023 00:50:37 +0200 Subject: [PATCH 2/3] JGit v6.6.1.202309021850-r Signed-off-by: Matthias Sohn Change-Id: I4f173dc9d634e0c9f31305961400b6b35a0a332f --- .../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 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/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 +- 91 files changed, 125 insertions(+), 125 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index e6c0b6db3..cb3d09fe6 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 0975233f5..f5d748f6d 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 b4cd0b8aa..8c0613e9d 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 863799520..53da63579 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index dccbcb914..7b28ca6fe 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 63b0958be..badb94b45 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index e5defc84c..c1dea0cbf 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 7b64948c7..01b75f489 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e743a2a36..f8008c4e3 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 7a8f56caf..f1cca7a71 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.ant - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.archive - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.http.apache - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.http.server - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.lfs - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.pgm - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.ui - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.test - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.ant.test - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.http.test - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 805b6fb69..f7424d266 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index c4d38187a..75fc67ef7 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 94ca55735..2dff9ca78 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="[6.6.1,6.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.69.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 e6f3a4d41..78fee9b73 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f6339f8ca..369d49c7a 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 37028f828..2be6526fb 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index d2336b3ad..a8d004b41 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 2c96b01ea..d1b5a6240 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 170e91ff0..998da0a6a 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="6.6.1", 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 ff4e2345c..fe6c21a73 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 27127b174..2180205b6 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 5fbbac0f5..dea6d3a37 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 985acd257..5faae4c31 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 ffb35aeb8..1c077b271 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 825f4ba54..a3f966f0a 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 839669ba4..b4c39c235 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 b5567a640..978c607ba 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 336fa5a2c..0cbd8ce47 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 9b03d3dcb..1666b9e2e 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 8a2233450..c2ed57195 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 7ba902c58..312335b32 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 3237f3adb..3b9a688f6 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 8e9f3b822..de1b37e6f 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 51b3bced7..921258524 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 dc645115e..4fd6d9f6f 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="6.6.1"; 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 3293f109c..74dd70e2a 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 3937ffdad..7ea09e127 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 27b919a5c..eda3c8bea 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 73e12c270..87b6ba59f 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 855235ed2..44d2b0936 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="6.6.1", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 54ca76a12..923deed8a 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 880f024ef..51b5def72 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 e3136653b..f807ffdb8 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 4377855e7..e415b9fd6 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 89eacfdda..382c665cf 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 a8c8305b7..6a75d8bbb 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 d8d80c705..06161ee5f 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 055fefa50..a01e63e96 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 ee6d3423a..7962c2297 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 e45b95ded..e50e05744 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 2bc55599a..12b1d1cea 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 ba0996526..3572388f5 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 d95fb9d17..475746115 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 2ac0a4aed..237b9a9c3 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 76d666fd2..69ce05c36 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 8199d5e2f..ef4ff2007 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 3ebdc25ad..7a4797402 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 c7435ff84..3e45bbbc2 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 b0754a434..0e30082b0 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 fce5f1ee0..d53fd58c1 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 0dd15a48e..4a4c77c1f 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 9ff1b165e..a18ee5f1e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index b2260d24b..c9f7f351d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index f31071147..b9d10f7f7 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 84268a2e0..161c612a6 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-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 1cc82aeb1..ae30a596a 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 bcb3b4a23..19255fc70 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 6c292ddab..52b26bdd8 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 368fc6873..15e1765be 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 e617ab746..dcec00890 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.6.1,6.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 10749146b..93952725f 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,5 +3,5 @@ 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: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 46cd612a5..c3f5d73a2 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 bc871d2e5..cf43667b1 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 31ad1cc1a..c6c3d4a76 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 4575c9709..80cf880a6 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.6.1";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index b4eaa8cf8..ba871ea46 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 2963449d3..673af5ac2 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 e3a88fdcd..964f68268 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index b246b2b95..17e45b019 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 537d42ce6..94fb5bba2 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="[6.6.1,6.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.6.1" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.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 d313a034d..3db803e94 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 75e95ba52..34bf351d7 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 9a807ae52..a53d0b10f 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d4f339dd1..09ae9107e 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-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 a96211a66..ad97eca60 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.awtui;version="6.6.1" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index f59738010..feaee6865 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a90975189..5254f6074 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 - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index cd3b59a62..cd291de6e 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: 6.6.1.qualifier +Bundle-Version: 6.6.1.202309021850-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index ac3df7214..0f908f01e 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="6.6.1.qualifier";roots="." +Bundle-Version: 6.6.1.202309021850-r +Eclipse-SourceBundle: org.eclipse.jgit;version="6.6.1.202309021850-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 93d2a9aca..4aeecce14 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 41f843989..839abf1b6 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.6.1-SNAPSHOT + 6.6.1.202309021850-r JGit - Parent ${jgit-url} From 43d6bc5ef1add70315b411969aac2ad84bf0f492 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 3 Sep 2023 01:57:43 +0200 Subject: [PATCH 3/3] Prepare 6.6.2-SNAPSHOT builds Change-Id: Id4e2fbefc49115c7e3de26a34cfbe01ba6de25b2 --- .../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 | 14 +-- .../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 | 40 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++--- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 32 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 ++--- 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 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/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 | 86 ++++++------- .../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 | 22 ++-- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 16 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 118 +++++++++--------- 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 | 110 ++++++++-------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 91 files changed, 533 insertions(+), 533 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index cb3d09fe6..9659eb273 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.ant.tasks;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.hamcrest.core;version="[1.1.0,3.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 f5d748f6d..bd0c93c79 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 - 6.6.1.202309021850-r + 6.6.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 8c0613e9d..93fdd8d05 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)" + org.eclipse.jgit.storage.file;version="[6.6.2,6.7.0)" Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="6.6.1", - org.eclipse.jgit.ant.tasks;version="6.6.1"; +Export-Package: org.eclipse.jgit.ant;version="6.6.2", + org.eclipse.jgit.ant.tasks;version="6.6.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 53da63579..b4e80a343 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7b28ca6fe..5d9d889e6 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 - 6.6.1.202309021850-r + 6.6.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 badb94b45..7f72ee2e7 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="6.6.1"; +Export-Package: org.eclipse.jgit.archive;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="6.6.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="6.6.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 c1dea0cbf..2ab44a740 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 01b75f489..06e9559b4 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 - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index f8008c4e3..47402385b 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index f1cca7a71..868802cc6 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 - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.6.1.202309021850-r + 6.6.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 f7424d266..f70a9459a 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -12,9 +12,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.sha1;version="[6.6.1,6.7.0)", + org.eclipse.jgit.gpg.bc.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.sha1;version="[6.6.2,6.7.0)", org.hamcrest;version="[1.1.0,3.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 75fc67ef7..2e6d7c8ad 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 - 6.6.1.202309021850-r + 6.6.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 2dff9ca78..1df6959ec 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="[6.6.1,6.7.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[6.6.2,6.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)", @@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", - org.eclipse.jgit.annotations;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", + org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="6.6.1", - org.eclipse.jgit.gpg.bc.internal;version="6.6.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="6.6.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="6.6.2", + org.eclipse.jgit.gpg.bc.internal;version="6.6.2";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="6.6.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 78fee9b73..5d97eb983 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 369d49c7a..b44db9f06 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 - 6.6.1.202309021850-r + 6.6.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 2be6526fb..d28b70068 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor @@ -25,11 +25,11 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="6.6.1"; + org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="6.6.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 a8d004b41..20b3c6458 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index d1b5a6240..ef7bf9922 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 - 6.6.1.202309021850-r + 6.6.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 998da0a6a..43c28793c 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="6.6.1", - org.eclipse.jgit.http.server.glue;version="6.6.1"; +Export-Package: org.eclipse.jgit.http.server;version="6.6.2", + org.eclipse.jgit.http.server.glue;version="6.6.2"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="6.6.1"; + org.eclipse.jgit.http.server.resolver;version="6.6.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,14 +18,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.servlet;version="[2.5.0,5.0.0)", javax.servlet.http;version="[2.5.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.6.1,6.7.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.transport.parser;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.resolver;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)" + org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.transport.parser;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.resolver;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.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 fe6c21a73..4c3d78338 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2180205b6..648575b22 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 - 6.6.1.202309021850-r + 6.6.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 dea6d3a37..c589d8eb9 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -26,26 +26,26 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.http.server;version="[6.6.1,6.7.0)", - org.eclipse.jgit.http.server.glue;version="[6.6.1,6.7.0)", - org.eclipse.jgit.http.server.resolver;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http.apache;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.resolver;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.http.server;version="[6.6.2,6.7.0)", + org.eclipse.jgit.http.server.glue;version="[6.6.2,6.7.0)", + org.eclipse.jgit.http.server.resolver;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http.apache;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.resolver;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.hamcrest;version="[1.1.0,3.0.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 5faae4c31..a5e677b9e 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 - 6.6.1.202309021850-r + 6.6.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 1c077b271..98533a447 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -21,17 +21,17 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.ssl;version="[10.0.0,11.0.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.http.server;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.resolver;version="[6.6.1,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.http.server;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.resolver;version="[6.6.2,6.7.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="6.6.1"; +Export-Package: org.eclipse.jgit.junit.http;version="6.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index a3f966f0a..d2a069096 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index b4c39c235..6618b63e9 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 - 6.6.1.202309021850-r + 6.6.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 978c607ba..872967592 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.10.0,2.11.0)", org.apache.sshd.server.subsystem;version="[2.10.0,2.11.0)", org.apache.sshd.sftp;version="[2.10.0,2.11.0)", org.apache.sshd.sftp.server;version="[2.10.0,2.11.0)", - org.eclipse.jgit.annotations;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.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,2.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="6.6.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="6.6.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 0cbd8ce47..1bb45a1e1 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 1666b9e2e..1d01ec3e2 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 - 6.6.1.202309021850-r + 6.6.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 c2ed57195..f19515643 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.annotations;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.dircache;version="[6.6.1,6.7.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.merge;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="6.6.1", - org.eclipse.jgit.treewalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk.filter;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.io;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.time;version="[6.6.1,6.7.0)", +Import-Package: org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.dircache;version="[6.6.2,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.merge;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="6.6.2", + org.eclipse.jgit.treewalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk.filter;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.io;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.time;version="[6.6.2,6.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,2.0.0)" -Export-Package: org.eclipse.jgit.junit;version="6.6.1"; +Export-Package: org.eclipse.jgit.junit;version="6.6.2"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -44,4 +44,4 @@ Export-Package: org.eclipse.jgit.junit;version="6.6.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="6.6.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="6.6.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 312335b32..a420be641 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 3b9a688f6..a86842ba7 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 - 6.6.1.202309021850-r + 6.6.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 de1b37e6f..432a9f8f9 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -26,24 +26,24 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.server;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.test;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk.filter;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.server;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.server.fs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.test;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk.filter;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.hamcrest.core;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.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 921258524..53d2e0e2d 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 - 6.6.1.202309021850-r + 6.6.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 4fd6d9f6f..247fcfe23 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="6.6.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="6.6.2"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="6.6.1"; + org.eclipse.jgit.lfs.server.fs;version="6.6.2"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="6.6.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="6.6.1"; + org.eclipse.jgit.lfs.server.internal;version="6.6.2";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="6.6.2"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.annotation;version="[3.1.0,5.0.0)", javax.servlet.http;version="[3.1.0,5.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http.apache;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http.apache;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 74dd70e2a..1214dafa8 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 7ea09e127..623ec95c8 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 - 6.6.1.202309021850-r + 6.6.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 eda3c8bea..86839773f 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,27 +3,27 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.attributes;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk.filter;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", +Import-Package: org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.attributes;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk.filter;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.hamcrest.core;version="[1.1.0,3.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="6.6.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="6.6.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 87b6ba59f..092d2c038 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 - 6.6.1.202309021850-r + 6.6.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 44d2b0936..9f24a8188 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="6.6.1", - org.eclipse.jgit.lfs.errors;version="6.6.1", - org.eclipse.jgit.lfs.internal;version="6.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="6.6.1" +Export-Package: org.eclipse.jgit.lfs;version="6.6.2", + org.eclipse.jgit.lfs.errors;version="6.6.2", + org.eclipse.jgit.lfs.internal;version="6.6.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="6.6.2" Bundle-RequiredExecutionEnvironment: JavaSE-11 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="[6.6.1,6.7.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.attributes;version="[6.6.1,6.7.0)", - org.eclipse.jgit.diff;version="[6.6.1,6.7.0)", - org.eclipse.jgit.dircache;version="[6.6.1,6.7.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.hooks;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.pack;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk.filter;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.io;version="[6.6.1,6.7.0)" + org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.attributes;version="[6.6.2,6.7.0)", + org.eclipse.jgit.diff;version="[6.6.2,6.7.0)", + org.eclipse.jgit.dircache;version="[6.6.2,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.hooks;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.pack;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk.filter;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.io;version="[6.6.2,6.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 923deed8a..decae5413 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 51b5def72..178990fe9 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 - 6.6.1.202309021850-r + 6.6.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 f807ffdb8..d5db5b2a8 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 e415b9fd6..9c9eb31e1 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 - 6.6.1.202309021850-r + 6.6.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 382c665cf..b38d00282 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 - 6.6.1.202309021850-r + 6.6.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 06161ee5f..384add81d 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 - 6.6.1.202309021850-r + 6.6.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 7962c2297..7b95d3bc3 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 - 6.6.1.202309021850-r + 6.6.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 12b1d1cea..0c1cbd025 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 - 6.6.1.202309021850-r + 6.6.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 475746115..c3be1494d 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 - 6.6.1.202309021850-r + 6.6.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 69ce05c36..ae31d3ad8 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 - 6.6.1.202309021850-r + 6.6.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 ef4ff2007..2989aa80f 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 - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.6.1.202309021850-r + 6.6.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 3e45bbbc2..e838d1f81 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 - 6.6.1.202309021850-r + 6.6.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 d53fd58c1..126c5ba92 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 - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index a18ee5f1e..7c4a732d9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index c9f7f351d..86d2cbb9a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index b9d10f7f7..1e4d0520d 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 - 6.6.1.202309021850-r + 6.6.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 161c612a6..598aa02f9 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.diff;version="[6.6.1,6.7.0)", - org.eclipse.jgit.dircache;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="6.6.1", - org.eclipse.jgit.internal.storage.file;version="6.6.1", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.merge;version="[6.6.1,6.7.0)", - org.eclipse.jgit.pgm;version="[6.6.1,6.7.0)", - org.eclipse.jgit.pgm.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.pgm.opt;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.io;version="[6.6.1,6.7.0)", +Import-Package: org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.diff;version="[6.6.2,6.7.0)", + org.eclipse.jgit.dircache;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.diffmergetool;version="6.6.2", + org.eclipse.jgit.internal.storage.file;version="6.6.2", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.merge;version="[6.6.2,6.7.0)", + org.eclipse.jgit.pgm;version="[6.6.2,6.7.0)", + org.eclipse.jgit.pgm.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.pgm.opt;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.io;version="[6.6.2,6.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 ae30a596a..84887faa5 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 - 6.6.1.202309021850-r + 6.6.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 19255fc70..250acbb73 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -14,49 +14,49 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)", org.eclipse.jetty.util;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.archive;version="[6.6.1,6.7.0)", - org.eclipse.jgit.awtui;version="[6.6.1,6.7.0)", - org.eclipse.jgit.blame;version="[6.6.1,6.7.0)", - org.eclipse.jgit.diff;version="[6.6.1,6.7.0)", - org.eclipse.jgit.dircache;version="[6.6.1,6.7.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.gitrepo;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.io;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.server;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs.server.s3;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.merge;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.notes;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revplot;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk.filter;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.pack;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http.apache;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.resolver;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.sshd;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk.filter;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.io;version="[6.6.1,6.7.0)", + org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.archive;version="[6.6.2,6.7.0)", + org.eclipse.jgit.awtui;version="[6.6.2,6.7.0)", + org.eclipse.jgit.blame;version="[6.6.2,6.7.0)", + org.eclipse.jgit.diff;version="[6.6.2,6.7.0)", + org.eclipse.jgit.dircache;version="[6.6.2,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.gitrepo;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.io;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.server;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.server.fs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs.server.s3;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.merge;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.notes;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revplot;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk.filter;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.pack;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http.apache;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.resolver;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.sshd;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk.filter;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.io;version="[6.6.2,6.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="6.6.1"; +Export-Package: org.eclipse.jgit.console;version="6.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="6.6.1"; + org.eclipse.jgit.pgm;version="6.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="6.6.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="6.6.1"; + org.eclipse.jgit.pgm.debug;version="6.6.2"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="6.6.1"; + org.eclipse.jgit.pgm.internal;version="6.6.2"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="6.6.1"; + org.eclipse.jgit.pgm.opt;version="6.6.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 52b26bdd8..3a3b108d0 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 15e1765be..06975ff1f 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 - 6.6.1.202309021850-r + 6.6.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 dcec00890..84d97e27e 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.6.1,6.7.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.6.2,6.7.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.transport.sshd;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.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="6.6.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.6.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 93952725f..f0c3ec286 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,5 +3,5 @@ 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: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index c3f5d73a2..5b1ea044e 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 - 6.6.1.202309021850-r + 6.6.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 cf43667b1..cf7edd2ce 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -21,16 +21,16 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.10.0,2.11.0)", org.apache.sshd.core;version="[2.10.0,2.11.0)", org.apache.sshd.server;version="[2.10.0,2.11.0)", org.apache.sshd.server.forward;version="[2.10.0,2.11.0)", - org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit.ssh;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.sshd;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit.ssh;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.sshd;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.sshd.agent;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.hamcrest;version="[1.1.0,3.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 c6c3d4a76..9e19ec466 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 - 6.6.1.202309021850-r + 6.6.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 80cf880a6..22f07ad9c 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.6.1";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.6.2";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,17 +23,17 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.6.1";x-inter org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="6.6.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="6.6.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="6.6.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="6.6.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="6.6.2";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="6.6.2";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="6.6.2";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="6.6.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="6.6.1" + org.eclipse.jgit.transport.sshd.agent;version="6.6.2" Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.10.0,2.11.0)", org.apache.sshd.client;version="[2.10.0,2.11.0)", @@ -86,12 +86,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.10.0,2.11.0)", org.apache.sshd.sftp.client;version="[2.10.0,2.11.0)", org.apache.sshd.sftp.common;version="[2.10.0,2.11.0)", - org.eclipse.jgit.annotations;version="[6.6.1,6.7.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.fnmatch;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.fnmatch;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index ba871ea46..c51e94b70 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 673af5ac2..47bda2e22 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 - 6.6.1.202309021850-r + 6.6.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 964f68268..095dbb195 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,18 +3,18 @@ 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit.ssh;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit.ssh;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", org.hamcrest;version="[1.1.0,3.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 17e45b019..34fb8e7f3 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 - 6.6.1.202309021850-r + 6.6.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 94fb5bba2..056af3420 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ 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="[6.6.1,6.7.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[6.6.2,6.7.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.6.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.6.2" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.io;version="[6.6.1,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.io;version="[6.6.2,6.7.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 3db803e94..81557f598 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 34bf351d7..6be4eaa79 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 - 6.6.1.202309021850-r + 6.6.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 a53d0b10f..06be2aecd 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: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -16,64 +16,64 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api;version="[6.6.1,6.7.0)", - org.eclipse.jgit.api.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.archive;version="[6.6.1,6.7.0)", - org.eclipse.jgit.attributes;version="[6.6.1,6.7.0)", - org.eclipse.jgit.awtui;version="[6.6.1,6.7.0)", - org.eclipse.jgit.blame;version="[6.6.1,6.7.0)", - org.eclipse.jgit.diff;version="[6.6.1,6.7.0)", - org.eclipse.jgit.dircache;version="[6.6.1,6.7.0)", - org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.events;version="[6.6.1,6.7.0)", - org.eclipse.jgit.fnmatch;version="[6.6.1,6.7.0)", - org.eclipse.jgit.gitrepo;version="[6.6.1,6.7.0)", - org.eclipse.jgit.hooks;version="[6.6.1,6.7.0)", - org.eclipse.jgit.ignore;version="[6.6.1,6.7.0)", - org.eclipse.jgit.ignore.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.diff;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.diffmergetool;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.fsck;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="6.6.1", - org.eclipse.jgit.internal.storage.dfs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.io;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.memory;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.transport.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.transport.parser;version="[6.6.1,6.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit;version="[6.6.1,6.7.0)", - org.eclipse.jgit.junit.time;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lfs;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.logging;version="[6.6.1,6.7.0)", - org.eclipse.jgit.merge;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.notes;version="[6.6.1,6.7.0)", - org.eclipse.jgit.patch;version="[6.6.1,6.7.0)", - org.eclipse.jgit.pgm;version="[6.6.1,6.7.0)", - org.eclipse.jgit.pgm.internal;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revplot;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk.filter;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.file;version="[6.6.1,6.7.0)", - org.eclipse.jgit.storage.pack;version="[6.6.1,6.7.0)", - org.eclipse.jgit.submodule;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.http;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport.resolver;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.treewalk.filter;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.io;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util.sha1;version="[6.6.1,6.7.0)", + org.eclipse.jgit.annotations;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api;version="[6.6.2,6.7.0)", + org.eclipse.jgit.api.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.archive;version="[6.6.2,6.7.0)", + org.eclipse.jgit.attributes;version="[6.6.2,6.7.0)", + org.eclipse.jgit.awtui;version="[6.6.2,6.7.0)", + org.eclipse.jgit.blame;version="[6.6.2,6.7.0)", + org.eclipse.jgit.diff;version="[6.6.2,6.7.0)", + org.eclipse.jgit.dircache;version="[6.6.2,6.7.0)", + org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.events;version="[6.6.2,6.7.0)", + org.eclipse.jgit.fnmatch;version="[6.6.2,6.7.0)", + org.eclipse.jgit.gitrepo;version="[6.6.2,6.7.0)", + org.eclipse.jgit.hooks;version="[6.6.2,6.7.0)", + org.eclipse.jgit.ignore;version="[6.6.2,6.7.0)", + org.eclipse.jgit.ignore.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.diff;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.fsck;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="6.6.2", + org.eclipse.jgit.internal.storage.dfs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.io;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.memory;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.transport.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.transport.parser;version="[6.6.2,6.7.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit;version="[6.6.2,6.7.0)", + org.eclipse.jgit.junit.time;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lfs;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.logging;version="[6.6.2,6.7.0)", + org.eclipse.jgit.merge;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.notes;version="[6.6.2,6.7.0)", + org.eclipse.jgit.patch;version="[6.6.2,6.7.0)", + org.eclipse.jgit.pgm;version="[6.6.2,6.7.0)", + org.eclipse.jgit.pgm.internal;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revplot;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk.filter;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.file;version="[6.6.2,6.7.0)", + org.eclipse.jgit.storage.pack;version="[6.6.2,6.7.0)", + org.eclipse.jgit.submodule;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.http;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport.resolver;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.treewalk.filter;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.io;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util.sha1;version="[6.6.2,6.7.0)", org.hamcrest;version="[1.1.0,3.0.0)", org.hamcrest.collection;version="[1.1.0,3.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 09ae9107e..2e64ccc85 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 - 6.6.1.202309021850-r + 6.6.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 ad97eca60..fd679f96d 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.awtui;version="6.6.1" -Import-Package: org.eclipse.jgit.errors;version="[6.6.1,6.7.0)", - org.eclipse.jgit.lib;version="[6.6.1,6.7.0)", - org.eclipse.jgit.nls;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revplot;version="[6.6.1,6.7.0)", - org.eclipse.jgit.revwalk;version="[6.6.1,6.7.0)", - org.eclipse.jgit.transport;version="[6.6.1,6.7.0)", - org.eclipse.jgit.util;version="[6.6.1,6.7.0)" +Export-Package: org.eclipse.jgit.awtui;version="6.6.2" +Import-Package: org.eclipse.jgit.errors;version="[6.6.2,6.7.0)", + org.eclipse.jgit.lib;version="[6.6.2,6.7.0)", + org.eclipse.jgit.nls;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revplot;version="[6.6.2,6.7.0)", + org.eclipse.jgit.revwalk;version="[6.6.2,6.7.0)", + org.eclipse.jgit.transport;version="[6.6.2,6.7.0)", + org.eclipse.jgit.util;version="[6.6.2,6.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 feaee6865..be9bb5d89 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5254f6074..cdb6f84f3 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 - 6.6.1.202309021850-r + 6.6.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 cd291de6e..bf40cfd7c 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.6.1.202309021850-r +Bundle-Version: 6.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="6.6.1", - org.eclipse.jgit.api;version="6.6.1"; +Export-Package: org.eclipse.jgit.annotations;version="6.6.2", + org.eclipse.jgit.api;version="6.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.annotations;version="6.6.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="6.6.1"; + org.eclipse.jgit.api.errors;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="6.6.1"; + org.eclipse.jgit.attributes;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="6.6.1"; + org.eclipse.jgit.blame;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="6.6.1"; + org.eclipse.jgit.diff;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -42,53 +42,53 @@ Export-Package: org.eclipse.jgit.annotations;version="6.6.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="6.6.1"; + org.eclipse.jgit.dircache;version="6.6.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="6.6.1"; + org.eclipse.jgit.errors;version="6.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="6.6.1"; + org.eclipse.jgit.events;version="6.6.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="6.6.1", - org.eclipse.jgit.gitrepo;version="6.6.1"; + org.eclipse.jgit.fnmatch;version="6.6.2", + org.eclipse.jgit.gitrepo;version="6.6.2"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="6.6.1";x-internal:=true, - org.eclipse.jgit.hooks;version="6.6.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="6.6.1", - org.eclipse.jgit.ignore.internal;version="6.6.1"; + org.eclipse.jgit.gitrepo.internal;version="6.6.2";x-internal:=true, + org.eclipse.jgit.hooks;version="6.6.2";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="6.6.2", + org.eclipse.jgit.ignore.internal;version="6.6.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="6.6.1"; + org.eclipse.jgit.internal;version="6.6.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="6.6.1"; + org.eclipse.jgit.internal.diff;version="6.6.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="6.6.1"; + org.eclipse.jgit.internal.diffmergetool;version="6.6.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="6.6.1"; + org.eclipse.jgit.internal.fsck;version="6.6.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="6.6.1"; + org.eclipse.jgit.internal.revwalk;version="6.6.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="6.6.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="6.6.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="6.6.1"; + org.eclipse.jgit.internal.storage.dfs;version="6.6.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="6.6.1"; + org.eclipse.jgit.internal.storage.file;version="6.6.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -97,34 +97,34 @@ Export-Package: org.eclipse.jgit.annotations;version="6.6.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="6.6.1"; + org.eclipse.jgit.internal.storage.io;version="6.6.2"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="6.6.1"; + org.eclipse.jgit.internal.storage.memory;version="6.6.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="6.6.1"; + org.eclipse.jgit.internal.storage.pack;version="6.6.2"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="6.6.1"; + org.eclipse.jgit.internal.storage.reftable;version="6.6.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="6.6.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="6.6.1"; + org.eclipse.jgit.internal.submodule;version="6.6.2";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="6.6.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="6.6.1"; + org.eclipse.jgit.internal.transport.http;version="6.6.2"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="6.6.1"; + org.eclipse.jgit.internal.transport.parser;version="6.6.2"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="6.6.1"; + org.eclipse.jgit.internal.transport.ssh;version="6.6.2"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.lib;version="6.6.1"; + org.eclipse.jgit.lib;version="6.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -138,12 +138,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.6.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="6.6.1"; + org.eclipse.jgit.lib.internal;version="6.6.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="6.6.1", - org.eclipse.jgit.merge;version="6.6.1"; + org.eclipse.jgit.logging;version="6.6.2", + org.eclipse.jgit.merge;version="6.6.2"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -152,40 +152,40 @@ Export-Package: org.eclipse.jgit.annotations;version="6.6.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="6.6.1", - org.eclipse.jgit.notes;version="6.6.1"; + org.eclipse.jgit.nls;version="6.6.2", + org.eclipse.jgit.notes;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="6.6.1"; + org.eclipse.jgit.patch;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="6.6.1"; + org.eclipse.jgit.revplot;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="6.6.1"; + org.eclipse.jgit.revwalk;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="6.6.1"; + org.eclipse.jgit.revwalk.filter;version="6.6.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="6.6.1"; + org.eclipse.jgit.storage.file;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="6.6.1"; + org.eclipse.jgit.storage.pack;version="6.6.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="6.6.1"; + org.eclipse.jgit.submodule;version="6.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="6.6.1"; + org.eclipse.jgit.transport;version="6.6.2"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -198,21 +198,21 @@ Export-Package: org.eclipse.jgit.annotations;version="6.6.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="6.6.1"; + org.eclipse.jgit.transport.http;version="6.6.2"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="6.6.1"; + org.eclipse.jgit.transport.resolver;version="6.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="6.6.1"; + org.eclipse.jgit.treewalk;version="6.6.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="6.6.1"; + org.eclipse.jgit.treewalk.filter;version="6.6.2"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="6.6.1"; + org.eclipse.jgit.util;version="6.6.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -225,12 +225,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.6.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="6.6.1"; + org.eclipse.jgit.util.io;version="6.6.2"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="6.6.1", - org.eclipse.jgit.util.time;version="6.6.1" + org.eclipse.jgit.util.sha1;version="6.6.2", + org.eclipse.jgit.util.time;version="6.6.2" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 0f908f01e..152ab2a8d 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.6.1.202309021850-r -Eclipse-SourceBundle: org.eclipse.jgit;version="6.6.1.202309021850-r";roots="." +Bundle-Version: 6.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="6.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 4aeecce14..4d7336d74 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 839abf1b6..873958ccf 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.6.1.202309021850-r + 6.6.2-SNAPSHOT JGit - Parent ${jgit-url}