From 386d75bd85b8b56a8385206de5c646d8d703612e Mon Sep 17 00:00:00 2001 From: Matt Coleman Date: Mon, 30 Nov 2015 14:27:09 -0800 Subject: [PATCH 01/29] Allow inaccessible GIT env vars --- .../jgit/lib/BaseRepositoryBuilder.java | 60 ++++++++++++------- .../src/org/eclipse/jgit/lib/UserConfig.java | 16 ++++- 2 files changed, 53 insertions(+), 23 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java index e51995f93da..8cc954950ff 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; +import java.security.AccessControlException; import java.text.MessageFormat; import java.util.Collection; import java.util.LinkedList; @@ -377,45 +378,62 @@ public B readEnvironment() { */ public B readEnvironment(SystemReader sr) { if (getGitDir() == null) { - String val = sr.getenv(GIT_DIR_KEY); - if (val != null) - setGitDir(new File(val)); + try { + String val = sr.getenv(GIT_DIR_KEY); + if (val != null) + setGitDir(new File(val)); + } catch (AccessControlException ignored) { + } } if (getObjectDirectory() == null) { - String val = sr.getenv(GIT_OBJECT_DIRECTORY_KEY); - if (val != null) - setObjectDirectory(new File(val)); + try { + String val = sr.getenv(GIT_OBJECT_DIRECTORY_KEY); + if (val != null) + setObjectDirectory(new File(val)); + } catch (AccessControlException ignored) { + } } if (getAlternateObjectDirectories() == null) { - String val = sr.getenv(GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY); - if (val != null) { - for (String path : val.split(File.pathSeparator)) - addAlternateObjectDirectory(new File(path)); + try { + String val = sr.getenv(GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY); + if (val != null) { + for (String path : val.split(File.pathSeparator)) + addAlternateObjectDirectory(new File(path)); + } + } catch (AccessControlException ignored) { } } if (getWorkTree() == null) { - String val = sr.getenv(GIT_WORK_TREE_KEY); - if (val != null) - setWorkTree(new File(val)); + try { + String val = sr.getenv(GIT_WORK_TREE_KEY); + if (val != null) + setWorkTree(new File(val)); + } catch (AccessControlException ignored) { + } } if (getIndexFile() == null) { - String val = sr.getenv(GIT_INDEX_FILE_KEY); - if (val != null) - setIndexFile(new File(val)); + try { + String val = sr.getenv(GIT_INDEX_FILE_KEY); + if (val != null) + setIndexFile(new File(val)); + } catch (AccessControlException ignored) { + } } if (ceilingDirectories == null) { - String val = sr.getenv(GIT_CEILING_DIRECTORIES_KEY); - if (val != null) { - for (String path : val.split(File.pathSeparator)) - addCeilingDirectory(new File(path)); + try { + String val = sr.getenv(GIT_CEILING_DIRECTORIES_KEY); + if (val != null) { + for (String path : val.split(File.pathSeparator)) + addCeilingDirectory(new File(path)); + } + } catch (AccessControlException ignored) { } } - return self(); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java index b4a8cfa478e..179fed2ddaf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java @@ -12,6 +12,8 @@ package org.eclipse.jgit.lib; +import java.security.AccessControlException; + import org.eclipse.jgit.lib.Config.SectionParser; import org.eclipse.jgit.util.SystemReader; @@ -157,7 +159,12 @@ public boolean isCommitterEmailImplicit() { private static String getNameInternal(Config rc, String envKey) { // try to get the user name for the system property GIT_XXX_NAME - String username = system().getenv(envKey); + String username; + try { + username = system().getenv(envKey); + } catch (AccessControlException e) { + username = null; + } if (username == null) { // try to get the user name from the local and global @@ -182,7 +189,12 @@ private static String getDefaultUserName() { private static String getEmailInternal(Config rc, String envKey) { // try to get the email for the system property GIT_XXX_EMAIL - String email = system().getenv(envKey); + String email; + try { + email = system().getenv(envKey); + } catch (AccessControlException e) { + email = null; + } if (email == null) { // try to get the email from the local and global configurations. From 935ea830d32cc50aa568aa130174b3c00b75a4d1 Mon Sep 17 00:00:00 2001 From: Matt Coleman Date: Mon, 11 Jan 2016 16:09:25 -0800 Subject: [PATCH 02/29] Allow tag names to end with '@', but '@' cannot be the only character --- .../org/eclipse/jgit/api/PushCommandTest.java | 38 +++++++++++++++++++ .../src/org/eclipse/jgit/lib/Repository.java | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java index 5ddc16aaaa4..05eaedf06cd 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java @@ -405,4 +405,42 @@ public void testPushWithLease() throws JGitInternalException, IOException, } } } + + @Test + public void testPushTagEndingWithAtSymbol() throws JGitInternalException, IOException, + GitAPIException, URISyntaxException { + + // create other repository + Repository db2 = createWorkRepository(); + + // setup the first repository + final StoredConfig config = db.getConfig(); + RemoteConfig remoteConfig = new RemoteConfig(config, "test"); + URIish uri = new URIish(db2.getDirectory().toURI().toURL()); + remoteConfig.addURI(uri); + remoteConfig.update(config); + config.save(); + + Git git1 = new Git(db); + // create some refs via commits and a tag ending in an '@' symbol + RevCommit commit = git1.commit().setMessage("initial commit").call(); + Ref tagRef = git1.tag().setName("tag@").call(); + + try { + db2.resolve(commit.getId().getName() + "^{commit}"); + fail("id shouldn't exist yet"); + } catch (MissingObjectException e) { + // we should get here + } + + RefSpec spec = new RefSpec("refs/heads/master:refs/heads/x"); + git1.push().setRemote("test").setRefSpecs(spec) + .setPushTags() + .call(); + + assertEquals(commit.getId(), + db2.resolve(commit.getId().getName() + "^{commit}")); + assertEquals(tagRef.getObjectId(), + db2.resolve(tagRef.getObjectId().getName())); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index a7a832c1aae..99681289b30 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -673,7 +673,7 @@ private Object resolve(RevWalk rw, String revstr) case '@': if (rev != null) throw new RevisionSyntaxException(revstr); - if (i + 1 == revChars.length) + if (i == revChars.length - 1 && i != 0) continue; if (i + 1 < revChars.length && revChars[i + 1] != '{') continue; From ce48a542075c18f0ab6d295726050689ea4d8c87 Mon Sep 17 00:00:00 2001 From: "matt.wilkofsky" Date: Fri, 11 Oct 2019 13:24:50 -0400 Subject: [PATCH 03/29] Disable all hooks from executing --- org.eclipse.jgit/src/org/eclipse/jgit/hooks/GitHook.java | 9 ++++++++- org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/hooks/GitHook.java b/org.eclipse.jgit/src/org/eclipse/jgit/hooks/GitHook.java index 4059b16b397..dc1cff9fd0e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/hooks/GitHook.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/hooks/GitHook.java @@ -158,6 +158,9 @@ protected PrintStream getErrorStream() { * If the underlying hook script exited with non-zero. */ protected void doRun() throws AbortedByHookException { + if (!hooksEnabled()) + return; + final ByteArrayOutputStream errorByteArray = new ByteArrayOutputStream(); final TeeOutputStream stderrStream = new TeeOutputStream(errorByteArray, getErrorStream()); @@ -198,4 +201,8 @@ public boolean isNativeHookPresent() { return fs.findHook(getRepository(), getHookName()) != null; } -} + private boolean hooksEnabled() { + //DISABLE ALL HOOKS + return false; + } +} \ No newline at end of file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index bf7b753693e..820948a2c17 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -1907,6 +1907,10 @@ protected ProcessResult internalRunHookIfPresent(Repository repository, final String hookName, String[] args, PrintStream outRedirect, PrintStream errRedirect, String stdinArgs) throws JGitInternalException { + + if (!hooksEnabled()) + return new ProcessResult(Status.NOT_SUPPORTED); + File hookFile = findHook(repository, hookName); if (hookFile == null || hookName == null) { return new ProcessResult(Status.NOT_PRESENT); @@ -2483,4 +2487,9 @@ void copy() throws IOException { } } } + + private boolean hooksEnabled() { + //DISABLE HOOKS + return false; + } } From 56c531e1e2ac11e744caddc22d8decd4cb1a679d Mon Sep 17 00:00:00 2001 From: "matt.wilkofsky" Date: Fri, 11 Oct 2019 13:25:10 -0400 Subject: [PATCH 04/29] Update tests to account for all hooks being disabled --- .../org/eclipse/jgit/api/PushCommandTest.java | 6 ++-- .../tst/org/eclipse/jgit/util/HookTest.java | 30 ++++++++++++------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java index 05eaedf06cd..2a102f0eb3b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java @@ -113,9 +113,11 @@ public void testPrePushHook() throws JGitInternalException, IOException, RefSpec spec = new RefSpec("refs/heads/master:refs/heads/x"); git1.push().setRemote("test").setRefSpecs(spec).call(); - assertEquals("1:test, 2:" + uri + ", 3:\n" + "refs/heads/master " + //HOOKS ARE DISABLED + assertEquals("HookOutput should not exist since hooks are disabled", false, hookOutput.exists()); + /*assertEquals("1:test, 2:" + uri + ", 3:\n" + "refs/heads/master " + commit.getName() + " refs/heads/x " - + ObjectId.zeroId().name() + "\n", read(hookOutput)); + + ObjectId.zeroId().name() + "\n", read(hookOutput));*/ } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java index 33ed360efd2..dbfdd7192c2 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java @@ -69,9 +69,11 @@ public void testFailedCommitMsgHookBlocksCommit() throws Exception { git.add().addFilepattern(path).call(); ByteArrayOutputStream out = new ByteArrayOutputStream(); try { - git.commit().setMessage("commit") + RevCommit revCommit = git.commit().setMessage("commit") .setHookOutputStream(new PrintStream(out)).call(); - fail("expected commit-msg hook to abort commit"); + //HOOKS ARE DISABLED + //fail("expected commit-msg hook to abort commit"); + assertEquals("commit", revCommit.getFullMessage()); } catch (AbortedByHookException e) { assertEquals("unexpected error message from commit-msg hook", "Rejected by \"commit-msg\" hook.\nstderr\n", @@ -94,8 +96,10 @@ public void testCommitMsgHookReceivesCorrectParameter() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); git.commit().setMessage("commit") .setHookOutputStream(new PrintStream(out)).call(); - assertEquals(".git/COMMIT_EDITMSG\n", - out.toString("UTF-8")); + //assertEquals(".git/COMMIT_EDITMSG\n", + //out.toString("UTF-8")); + //HOOKS ARE DISABLED + assertEquals("", out.toString("UTF-8")); } @Test @@ -111,7 +115,9 @@ public void testCommitMsgHookCanModifyCommitMessage() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); RevCommit revCommit = git.commit().setMessage("commit") .setHookOutputStream(new PrintStream(out)).call(); - assertEquals("new message\n", revCommit.getFullMessage()); + //assertEquals("new message\n", revCommit.getFullMessage()); + // HOOKS ARE DISABLED + assertEquals("commit", revCommit.getFullMessage()); } @Test @@ -178,14 +184,14 @@ public void testRunHook() throws Exception { "arg1", "arg2" }, new PrintStream(out), new PrintStream(err), "stdin"); - assertEquals("unexpected hook output", + /*assertEquals("unexpected hook output", "test arg1 arg2\nstdin\n" + db.getDirectory().getAbsolutePath() + '\n' + db.getWorkTree().getAbsolutePath() + '\n', out.toString("UTF-8")); assertEquals("unexpected output on stderr stream", "stderr\n", - err.toString("UTF-8")); - assertEquals("unexpected exit code", 0, res.getExitCode()); - assertEquals("unexpected process status", ProcessResult.Status.OK, + err.toString("UTF-8"));*/ + assertEquals("unexpected exit code", -1, res.getExitCode()); + assertEquals("unexpected process status", ProcessResult.Status.NOT_SUPPORTED, res.getStatus()); } @@ -302,9 +308,11 @@ public void testFailedPreCommitHookBlockCommit() throws Exception { git.add().addFilepattern(path).call(); ByteArrayOutputStream out = new ByteArrayOutputStream(); try { - git.commit().setMessage("commit") + RevCommit revCommit = git.commit().setMessage("commit") .setHookOutputStream(new PrintStream(out)).call(); - fail("expected pre-commit hook to abort commit"); + //fail("expected pre-commit hook to abort commit"); + // HOOKS ARE DISABLED + assertEquals("commit", revCommit.getFullMessage()); } catch (AbortedByHookException e) { assertEquals("unexpected error message from pre-commit hook", "Rejected by \"pre-commit\" hook.\nstderr\n", From 9eca465c80b0c54c1b105b3d5775107f850170ce Mon Sep 17 00:00:00 2001 From: Krishna Chaitanya Akkineni Date: Thu, 12 Dec 2019 10:10:27 -0600 Subject: [PATCH 05/29] STRY50557163 : [Delta-Loading]Find the delta of changes between currently loaded application files and new changes applied while Import from SC (#4) [Delta-Loading]Find the delta of changes between currently loaded application files and new changes applied while Import from SC This is a customization in the JGIT to filter out the noise and reduce the source control app install on the service now instance. The customization ONLY includes changes to DiffCommand and DiffFormatter and we exposed a new method and the purpose is to not break existing JGIT in any way. --- .../org/eclipse/jgit/api/DiffCommandTest.java | 24 +++ .../eclipse/jgit/diff/DiffFormatterTest.java | 182 ++++++++++++++++++ .../src/org/eclipse/jgit/api/DiffCommand.java | 25 ++- .../org/eclipse/jgit/diff/DiffFormatter.java | 35 ++++ 4 files changed, 265 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DiffCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DiffCommandTest.java index b1aca59f6a2..d564e65ac2d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DiffCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DiffCommandTest.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.List; +import java.util.regex.Pattern; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffEntry.ChangeType; @@ -212,6 +213,29 @@ public void testNoOutputStreamSet() throws Exception { } } + @Test + /** + * Setting a delta filter Pattern (applies to any file) with regex that matches the + * change: diff skipped. + */ + public void testDiffModified_anyDeltaFilter() throws Exception { + write(new File(db.getWorkTree(), "test.txt"), "test"); + File folder = new File(db.getWorkTree(), "folder"); + folder.mkdir(); + write(new File(folder, "folder.txt"), "folder"); + Git git = new Git(db); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); + + OutputStream out = new ByteArrayOutputStream(); + Pattern deltaFilterPattern = Pattern.compile("change"); + List entries = git.diff().setDeltaFilterPattern(deltaFilterPattern).setOutputStream(out).call(); + assertEquals(0, entries.size()); + + assertEquals("", out.toString()); + } + private AbstractTreeIterator getTreeIterator(String name) throws IOException { final ObjectId id = db.resolve(name); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java index 62824d3aecb..b7a9f4044de 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java @@ -18,6 +18,7 @@ import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.File; +import java.util.regex.Pattern; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Status; @@ -390,6 +391,187 @@ public void testDiff() throws Exception { } } + @Test + public void testDiffDeltaFilter_emptyFilter() throws Exception { + write(new File(db.getDirectory().getParent(), "test.txt"), "test"); + File folder = new File(db.getDirectory().getParent(), "folder"); + FileUtils.mkdir(folder); + write(new File(folder, "folder.txt"), "folder"); + Git git = new Git(db); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folder change"); + + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing an empty delta filter + Pattern deltaFilterPattern = Pattern.compile(""); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + String actual = os.toString("UTF-8"); + String expected = + "diff --git a/folder/folder.txt b/folder/folder.txt\n" + + "index 0119635..95c4c65 100644\n" + + "--- a/folder/folder.txt\n" + "+++ b/folder/folder.txt\n" + + "@@ -1 +1 @@\n" + "-folder\n" + + "\\ No newline at end of file\n" + "+folder change\n" + + "\\ No newline at end of file\n"; + + assertEquals(expected, actual); + } + + @Test + /** + * This is an ADD file, the file content matches the filter: diff unchanged. + */ + public void testDiffDeltaFilter_addFile() throws Exception { + write(new File(db.getDirectory().getParent(), "test.txt"), "test"); + File folder = new File(db.getDirectory().getParent(), "folder"); + FileUtils.mkdir(folder); + Git git = new Git(db); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "change"); + + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex + Pattern deltaFilterPattern = Pattern.compile("change"); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + String actual = os.toString("UTF-8"); + String expected = + "diff --git a/folder/folder.txt b/folder/folder.txt\n" + + "new file mode 100644\n" + + "index 0000000..8013df8\n" + + "--- /dev/null\n" + + "+++ b/folder/folder.txt\n" + + "@@ -0,0 +1 @@\n" + + "+change\n" + + "\\ No newline at end of file\n"; + + assertEquals(expected, actual); + } + + @Test + /** + * This is an DELETE file, the file content matches the filter: diff unchanged. + */ + public void testDiffDeltaFilter_deleteFile() throws Exception { + write(new File(db.getDirectory().getParent(), "test.txt"), "test"); + File folder = new File(db.getDirectory().getParent(), "folder"); + FileUtils.mkdir(folder); + write(new File(folder, "folder.txt"), "change"); + Git git = new Git(db); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + new File(folder, "folder.txt").delete(); + + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex + Pattern deltaFilterPattern = Pattern.compile("change"); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + String actual = os.toString("UTF-8"); + String expected = + "diff --git a/folder/folder.txt b/folder/folder.txt\n" + + "deleted file mode 100644\n" + + "index 8013df8..0000000\n" + + "--- a/folder/folder.txt\n" + + "+++ /dev/null\n" + + "@@ -1 +0,0 @@\n" + + "-change\n" + + "\\ No newline at end of file\n"; + + assertEquals(expected, actual); + } + + @Test + /** + * Filter for any file matches the content of the changed file: diff skipped. + */ + public void testDiffDeltaFilter_filteredModifiedFile() throws Exception { + write(new File(db.getDirectory().getParent(), "test.txt"), "test"); + File folder = new File(db.getDirectory().getParent(), "folder"); + FileUtils.mkdir(folder); + write(new File(folder, "folder.txt"), "folder"); + Git git = new Git(db); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); + + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex (ANY) + Pattern deltaFilterPattern = Pattern.compile("change"); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + assertEquals("", os.toString("UTF-8")); + } + + @Test + /** + * The filter doesn't match any change: diff unchanged. + */ + public void testDiffDeltaFilter_filterNoMatch() throws Exception { + write(new File(db.getDirectory().getParent(), "test.txt"), "test"); + File folder = new File(db.getDirectory().getParent(), "folder"); + FileUtils.mkdir(folder); + write(new File(folder, "folder.txt"), "folder"); + Git git = new Git(db); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); + + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex (ANY) + Pattern deltaFilterPattern = Pattern.compile("xxxx"); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + String actual = os.toString("UTF-8"); + String expected = + "diff --git a/folder/folder.txt b/folder/folder.txt\n" + + "index 0119635..0b099ef 100644\n" + + "--- a/folder/folder.txt\n" + "+++ b/folder/folder.txt\n" + + "@@ -1 +1 @@\n" + "-folder\n" + + "\\ No newline at end of file\n" + "+folderchange\n" + + "\\ No newline at end of file\n"; + + assertEquals(expected, actual); + } + @Test public void testDiffRootNullToTree() throws Exception { write(new File(db.getDirectory().getParent(), "test.txt"), "test"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java index a925a08e334..dd69e0e48b7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java @@ -15,6 +15,8 @@ import java.io.IOException; import java.io.OutputStream; import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; @@ -61,6 +63,8 @@ public class DiffCommand extends GitCommand> { private ProgressMonitor monitor = NullProgressMonitor.INSTANCE; + private Pattern deltaFilterPattern = null; + /** * Constructor for DiffCommand * @@ -84,6 +88,9 @@ private DiffFormatter getDiffFormatter() { * collected by the setter methods (e.g. {@link #setCached(boolean)} of this * class. Each instance of this class should only be used for one invocation * of the command. Don't call this method twice on an instance. + * + * Team-Devatscale SC customization to filter some files based on a regex pattern. + * This filter will not be applied if showNameAndStatusOnly is set to true */ @Override public List call() throws GitAPIException { @@ -126,7 +133,7 @@ public List call() throws GitAPIException { if (sourcePrefix != null) { diffFmt.setOldPrefix(sourcePrefix); } - diffFmt.format(result); + diffFmt.format(result, this.getDeltaFilterPattern()); diffFmt.flush(); return result; } catch (IOException e) { @@ -258,4 +265,20 @@ public DiffCommand setProgressMonitor(ProgressMonitor monitor) { this.monitor = monitor; return this; } + + public Pattern getDeltaFilterPattern() { + return deltaFilterPattern; + } + + /** + * Set the given delta filter regex pattern. Used only for Source Control. + * + * @param deltaFilterPattern + * the filter pattern + * @return this instance + */ + public DiffCommand setDeltaFilterPattern(Pattern deltaFilterPattern) { + this.deltaFilterPattern = deltaFilterPattern; + return this; + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index ec21954aa2e..ecf90680353 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -27,7 +27,9 @@ import java.io.OutputStream; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; import java.util.List; +import java.util.regex.Pattern; import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; import org.eclipse.jgit.diff.DiffEntry.ChangeType; @@ -112,6 +114,7 @@ public class DiffFormatter implements AutoCloseable { private Repository repository; + private static final String EMPTY_STRING = ""; private Boolean quotePaths; /** @@ -691,6 +694,38 @@ public void format(List entries) throws IOException { format(ent); } + /** + * Format the diff entries by filtering out the noise from the given delta filter pattern + * The filter acts only for files that have MODIFY change Type. + * If there are no changes detected, we will remove the diff entry. + * @param entries + * @param deltaFilterPattern + * @throws IOException + */ + + public void format(List entries, Pattern deltaFilterPattern) throws IOException { + if (deltaFilterPattern == null) { + format(entries); + return; + } + Iterator diIterator = entries.iterator(); + while (diIterator.hasNext()) { + DiffEntry diffEntry = diIterator.next(); + if (MODIFY.equals(diffEntry.changeType)) { + FormatResult res = createFormatResult(diffEntry); + String aContent = new String(res.a.content); + String bContent = new String(res.b.content); + aContent = deltaFilterPattern.matcher(aContent).replaceAll(EMPTY_STRING); + bContent = deltaFilterPattern.matcher(bContent).replaceAll(EMPTY_STRING); + if (!aContent.equals(bContent)) + format(res.header, res.a, res.b); + else + diIterator.remove(); + } else format(diffEntry); + } + } + + /** * Format a patch script for one file entry. * From 4e84bc2ca6c0718e0ea458e23ad3c142f712e39a Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Tue, 26 May 2020 13:48:28 -0500 Subject: [PATCH 06/29] STRY50515803: fixed Test cases when hook is disabled fixed compilation issues for delat loading --- .../tst/org/eclipse/jgit/api/PushCommandTest.java | 3 +-- .../tst/org/eclipse/jgit/diff/DiffFormatterTest.java | 10 +++++----- .../tst/org/eclipse/jgit/util/HookTest.java | 10 +++++++--- .../src/org/eclipse/jgit/api/DiffCommand.java | 5 ++++- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java index 2a102f0eb3b..6ff5eb25d91 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java @@ -26,7 +26,6 @@ import org.eclipse.jgit.hooks.PrePushHook; import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.RepositoryTestCase; -import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; @@ -109,7 +108,7 @@ public void testPrePushHook() throws JGitInternalException, IOException, try (Git git1 = new Git(db)) { // create some refs via commits and tag - RevCommit commit = git1.commit().setMessage("initial commit").call(); + git1.commit().setMessage("initial commit").call(); RefSpec spec = new RefSpec("refs/heads/master:refs/heads/x"); git1.push().setRemote("test").setRefSpecs(spec).call(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java index b7a9f4044de..abe860ebd5a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java @@ -403,7 +403,7 @@ public void testDiffDeltaFilter_emptyFilter() throws Exception { write(new File(folder, "folder.txt"), "folder change"); ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); dfmt.setRepository(db); dfmt.setPathFilter(PathFilter.create("folder")); DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); @@ -440,7 +440,7 @@ public void testDiffDeltaFilter_addFile() throws Exception { write(new File(folder, "folder.txt"), "change"); ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); dfmt.setRepository(db); dfmt.setPathFilter(PathFilter.create("folder")); DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); @@ -480,7 +480,7 @@ public void testDiffDeltaFilter_deleteFile() throws Exception { new File(folder, "folder.txt").delete(); ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); dfmt.setRepository(db); dfmt.setPathFilter(PathFilter.create("folder")); DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); @@ -520,7 +520,7 @@ public void testDiffDeltaFilter_filteredModifiedFile() throws Exception { write(new File(folder, "folder.txt"), "folderchange"); ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); dfmt.setRepository(db); dfmt.setPathFilter(PathFilter.create("folder")); DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); @@ -549,7 +549,7 @@ public void testDiffDeltaFilter_filterNoMatch() throws Exception { write(new File(folder, "folder.txt"), "folderchange"); ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new SafeBufferedOutputStream(os)); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); dfmt.setRepository(db); dfmt.setPathFilter(PathFilter.create("folder")); DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java index dbfdd7192c2..d39022c19cb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java @@ -134,12 +134,15 @@ public void testPostCommitRunHook() throws Exception { "arg1", "arg2" }, new PrintStream(out), new PrintStream(err), "stdin"); - assertEquals("unexpected hook output", "test arg1 arg2\nstdin\n", + /*assertEquals("unexpected hook output", "test arg1 arg2\nstdin\n", out.toString("UTF-8")); assertEquals("unexpected output on stderr stream", "stderr\n", err.toString("UTF-8")); assertEquals("unexpected exit code", 0, res.getExitCode()); assertEquals("unexpected process status", ProcessResult.Status.OK, + res.getStatus());*/ + assertEquals("unexpected exit code", -1, res.getExitCode()); + assertEquals("unexpected process status", ProcessResult.Status.NOT_SUPPORTED, res.getStatus()); } @@ -164,9 +167,10 @@ public void testAllCommitHooks() throws Exception { } catch (AbortedByHookException e) { fail("unexpected hook failure"); } - assertEquals("unexpected hook output", + /*assertEquals("unexpected hook output", "test pre-commit\ntest commit-msg .git/COMMIT_EDITMSG\ntest post-commit\n", - out.toString("UTF-8")); + out.toString("UTF-8"));*/ + assertEquals("", out.toString("UTF-8")); } @Test diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java index dd69e0e48b7..e6c3befacbb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java @@ -15,7 +15,6 @@ import java.io.IOException; import java.io.OutputStream; import java.util.List; -import java.util.Map; import java.util.regex.Pattern; import org.eclipse.jgit.api.errors.GitAPIException; @@ -266,6 +265,10 @@ public DiffCommand setProgressMonitor(ProgressMonitor monitor) { return this; } + /** + * Get deltaFilterPattern + * @return deltaFilterPattern + */ public Pattern getDeltaFilterPattern() { return deltaFilterPattern; } From d02d848b9046a4670bbb6ccf511c85769d582f02 Mon Sep 17 00:00:00 2001 From: "krishnachaitanya.akkineni" Date: Fri, 31 Jan 2020 16:09:06 -0600 Subject: [PATCH 07/29] STRY50374949: Support SSH for Basic authentication (without MID server) Support SSH for Basic authentication (without MID server) + On the instance we do not want to grant access to GIT_SSH environment variable. Adding a try/catch to not make it fail. --- .../org/eclipse/jgit/transport/TransportGitSsh.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java index b9cb2484d80..2a8e86ff5bb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java @@ -16,6 +16,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.security.AccessControlException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; @@ -192,8 +193,16 @@ NoRemoteRepositoryException cleanNotFound(NoRemoteRepositoryException nf, return new NoRemoteRepositoryException(uri, why); } + /** + * Added a try/catch to return false if cannot access the environment variable. + * @return + */ private static boolean useExtSession() { - return SystemReader.getInstance().getenv("GIT_SSH") != null; //$NON-NLS-1$ + try { + return SystemReader.getInstance().getenv("GIT_SSH") != null; //$NON-NLS-1$ + } catch (AccessControlException e){ + return false; + } } private class ExtSession implements RemoteSession { From 6499bde76ca07a12d1a29821715e30a9349f22ce Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Tue, 26 May 2020 22:27:59 -0500 Subject: [PATCH 08/29] STRY50515803: Port the following changes: 1. commit c81ea59e5b8d255b5e4c4680a2a7935bc30217c6 Author: Matt Coleman Date: Mon Nov 30 14:03:10 2015 -0800 java.policy modifications to JGit - GIT_CONFIG_NOSYSTEM no longer needed - permission to create symlinks no longer needed - permission to read user's home directory no longer needed 2. commit 56837c8b625bc54192ce9ecc23ef107127b822c8 Author: anjanakr Date: Thu Feb 13 08:52:49 2020 -0800 DEF0087691: Set FS to POSIX if OS is not Windows Update FS to FS_POSIX only if the detected OS is not Windows 3. fixed compilation and test case issues --- .../eclipse/jgit/junit/MockSystemReader.java | 2 +- .../eclipse/jgit/util/SystemReaderTest.java | 10 ++-- .../internal/storage/file/FileRepository.java | 2 +- .../jgit/transport/TransportGitSsh.java | 2 +- .../src/org/eclipse/jgit/util/FS.java | 7 ++- .../org/eclipse/jgit/util/SystemReader.java | 53 +++++++++++++++---- 6 files changed, 57 insertions(+), 19 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index 664615e456d..38bbbd8f1d3 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -162,7 +162,7 @@ public String getProperty(String key) { /** {@inheritDoc} */ @Override public FileBasedConfig openUserConfig(Config parent, FS fs) { - assert parent == null || parent == systemGitConfig; + assert parent == null || parent == systemGitConfig || parent instanceof FileBasedConfig; return userGitConfig; } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/SystemReaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/SystemReaderTest.java index c652f696a82..79d566337a1 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/SystemReaderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/SystemReaderTest.java @@ -19,6 +19,7 @@ import org.eclipse.jgit.storage.file.FileBasedConfig; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -28,7 +29,7 @@ public class SystemReaderTest { private Path trash; - private Path mockSystemConfig; + //private Path mockSystemConfig; private Path mockUserConfig; @@ -38,13 +39,13 @@ public class SystemReaderTest { @Before public void setup() throws Exception { trash = Files.createTempDirectory("jgit_test"); - mockSystemConfig = trash.resolve("systemgitconfig"); + /*mockSystemConfig = trash.resolve("systemgitconfig"); Files.write(mockSystemConfig, "[core]\n trustFolderStat = false\n" - .getBytes(StandardCharsets.UTF_8)); + .getBytes(StandardCharsets.UTF_8));*/ mockUserConfig = trash.resolve(".gitconfig"); Files.write(mockUserConfig, "[core]\n bare = false\n".getBytes(StandardCharsets.UTF_8)); - when(fs.getGitSystemConfig()).thenReturn(mockSystemConfig.toFile()); + //when(fs.getGitSystemConfig()).thenReturn(mockSystemConfig.toFile()); when(fs.userHome()).thenReturn(trash.toFile()); SystemReader.setInstance(null); } @@ -55,6 +56,7 @@ public void teardown() throws Exception { } @Test + @Ignore public void openSystemConfigReturnsDifferentInstances() throws Exception { FileBasedConfig system1 = SystemReader.getInstance() .openSystemConfig(null, fs); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index fd052cec280..5c74542017e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -159,7 +159,7 @@ public FileRepository(BaseRepositoryBuilder options) throws IOException { super(options); StoredConfig userConfig = null; try { - userConfig = SystemReader.getInstance().getUserConfig(); + userConfig = SystemReader.getInstance().getUserConfig(getFS()); } catch (ConfigInvalidException e) { LOG.error(e.getMessage(), e); throw new IOException(e.getMessage(), e); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java index 2a8e86ff5bb..98e3f6db699 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java @@ -195,7 +195,7 @@ NoRemoteRepositoryException cleanNotFound(NoRemoteRepositoryException nf, /** * Added a try/catch to return false if cannot access the environment variable. - * @return + * @return ture if environment variable GIT_SSH exists; false otherwise */ private static boolean useExtSession() { try { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index 820948a2c17..9f935f11a14 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -96,7 +96,7 @@ public abstract class FS { */ protected static final Entry[] NO_ENTRIES = {}; - private volatile Boolean supportSymlinks; + //private volatile Boolean supportSymlinks; /** * This class creates FS instances. It will be overridden by a Java7 variant @@ -968,6 +968,9 @@ public boolean supportsAtomicCreateNewFile() { * @since 3.0 */ public boolean supportsSymlinks() { + return false; + } + /*public boolean supportsSymlinks() { if (supportSymlinks == null) { detectSymlinkSupport(); } @@ -994,7 +997,7 @@ private void detectSymlinkSupport() { } } } - } + }*/ /** * Is this file system case sensitive diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 447f417e7e6..e379ebcb790 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -17,9 +17,10 @@ import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; -import java.nio.file.InvalidPathException; +//import java.nio.file.InvalidPathException; import java.nio.file.Path; -import java.nio.file.Paths; +//import java.nio.file.Paths; +import java.security.AccessControlException; import java.security.AccessController; import java.security.PrivilegedAction; import java.text.DateFormat; @@ -71,7 +72,14 @@ private static class Default extends SystemReader { @Override public String getenv(String variable) { - return System.getenv(variable); + String envValue = null; + try { + envValue = System.getenv(variable); + } catch (AccessControlException ex) { + // do nothing + } + + return envValue; } @Override @@ -81,13 +89,13 @@ public String getProperty(String key) { @Override public FileBasedConfig openSystemConfig(Config parent, FS fs) { - if (StringUtils + /*if (StringUtils .isEmptyOrNull(getenv(Constants.GIT_CONFIG_NOSYSTEM_KEY))) { File configFile = fs.getGitSystemConfig(); if (configFile != null) { return new FileBasedConfig(parent, configFile, fs); } - } + }*/ return new FileBasedConfig(parent, null, fs) { @Override public void load() { @@ -109,7 +117,7 @@ public FileBasedConfig openUserConfig(Config parent, FS fs) { } private Path getXDGConfigHome(FS fs) { - String configHomePath = getenv(Constants.XDG_CONFIG_HOME); + /*String configHomePath = getenv(Constants.XDG_CONFIG_HOME); if (StringUtils.isEmptyOrNull(configHomePath)) { configHomePath = new File(fs.userHome(), ".config") //$NON-NLS-1$ .getAbsolutePath(); @@ -119,7 +127,7 @@ private Path getXDGConfigHome(FS fs) { } catch (InvalidPathException e) { LOG.error(JGitText.get().logXDGConfigHomeInvalid, configHomePath, e); - } + }*/ return null; } @@ -305,10 +313,25 @@ protected final void setPlatformChecker() { */ public StoredConfig getUserConfig() throws ConfigInvalidException, IOException { + return getUserConfig(FS.DETECTED); + } + + /** + * Get the git configuration found in the user home. + * @param fs the file system abstraction which will be necessary to perform + * certain file system operations. + * @return the git configuration found in the user home + * @throws ConfigInvalidException + * if configuration is invalid + * @throws IOException + * if something went wrong when reading files + */ + public StoredConfig getUserConfig(FS fs) + throws ConfigInvalidException, IOException { FileBasedConfig c = userConfig.get(); if (c == null) { userConfig.compareAndSet(null, - openUserConfig(getSystemConfig(), FS.DETECTED)); + openUserConfig(getSystemConfig(), fs)); c = userConfig.get(); } // on the very first call this will check a second time if the system @@ -332,10 +355,15 @@ public StoredConfig getUserConfig() */ public StoredConfig getJGitConfig() throws ConfigInvalidException, IOException { + return getJGitConfig(FS.DETECTED); + } + + private StoredConfig getJGitConfig(FS fs) + throws ConfigInvalidException, IOException { FileBasedConfig c = jgitConfig.get(); if (c == null) { jgitConfig.compareAndSet(null, - openJGitConfig(null, FS.DETECTED)); + openJGitConfig(null, fs)); c = jgitConfig.get(); } updateAll(c); @@ -357,10 +385,15 @@ public StoredConfig getJGitConfig() */ public StoredConfig getSystemConfig() throws ConfigInvalidException, IOException { + return getSystemConfig(FS.DETECTED); + } + + private StoredConfig getSystemConfig(FS fs) + throws ConfigInvalidException, IOException { FileBasedConfig c = systemConfig.get(); if (c == null) { systemConfig.compareAndSet(null, - openSystemConfig(getJGitConfig(), FS.DETECTED)); + openSystemConfig(getJGitConfig(), fs)); c = systemConfig.get(); } updateAll(c); From 1495677ae9af42cc081bbb3bc62c85a70ec505ea Mon Sep 17 00:00:00 2001 From: junnacui <53009835+junnacui@users.noreply.github.com> Date: Thu, 16 Jul 2020 16:44:28 -0500 Subject: [PATCH 09/29] STRY50515803: Fixed NullPointerException when saving .jgitconfig file (#17) Co-authored-by: junna.cui --- .../src/org/eclipse/jgit/util/SystemReader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index e379ebcb790..1d470cf1af4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -17,9 +17,9 @@ import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; -//import java.nio.file.InvalidPathException; +import java.nio.file.InvalidPathException; import java.nio.file.Path; -//import java.nio.file.Paths; +import java.nio.file.Paths; import java.security.AccessControlException; import java.security.AccessController; import java.security.PrivilegedAction; @@ -117,7 +117,7 @@ public FileBasedConfig openUserConfig(Config parent, FS fs) { } private Path getXDGConfigHome(FS fs) { - /*String configHomePath = getenv(Constants.XDG_CONFIG_HOME); + String configHomePath = getenv(Constants.XDG_CONFIG_HOME); if (StringUtils.isEmptyOrNull(configHomePath)) { configHomePath = new File(fs.userHome(), ".config") //$NON-NLS-1$ .getAbsolutePath(); @@ -127,7 +127,7 @@ private Path getXDGConfigHome(FS fs) { } catch (InvalidPathException e) { LOG.error(JGitText.get().logXDGConfigHomeInvalid, configHomePath, e); - }*/ + } return null; } From 9d6e657aaa2e512f6cc036820c43659761c734c7 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Mon, 1 Jun 2020 23:17:31 -0500 Subject: [PATCH 10/29] STRY50515803: fixed IT failure in Jenkins build (at org.eclipse.jgit.lib.ConfigTest.testReadUserConfigWithInvalidCharactersStripped(ConfigTest.java:280)) --- .../tst/org/eclipse/jgit/lib/ConfigTest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java index 327b554b48a..8a4731c459d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java @@ -36,6 +36,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.security.AccessControlException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; @@ -57,6 +58,7 @@ import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.SystemReader; import org.junit.After; +import org.junit.Assume; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -233,13 +235,22 @@ public void test007_readUserConfig() { @Test public void testReadUserConfigWithInvalidCharactersStripped() { + String authorName = null; + try { + authorName = SystemReader.getInstance().getenv(Constants.GIT_AUTHOR_NAME_KEY); + } catch (AccessControlException e) { + // do nothing; + } + + Assume.assumeTrue(authorName == null); + final MockSystemReader mockSystemReader = new MockSystemReader(); final Config localConfig = new Config(mockSystemReader.openUserConfig( null, FS.DETECTED)); localConfig.setString("user", null, "name", "foo\nqux@example.com"); - + UserConfig userConfig = localConfig.get(UserConfig.KEY); assertEquals("foobar", userConfig.getAuthorName()); assertEquals("bazqux@example.com", userConfig.getAuthorEmail()); From ba53dc89050e7205db8d9a90570ceacd0b1d917a Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Mon, 2 Nov 2020 22:15:14 -0600 Subject: [PATCH 11/29] Fixed test failures --- .../tst/org/eclipse/jgit/util/HookTest.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java index d39022c19cb..648447eba9c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/HookTest.java @@ -220,15 +220,15 @@ public void testRunHookHooksPathRelative() throws Exception { PreCommitHook.NAME, new String[] { "arg1", "arg2" }, new PrintStream(out), new PrintStream(err), "stdin"); - assertEquals("unexpected hook output", + /*assertEquals("unexpected hook output", "test arg1 arg2\nstdin\n" + db.getDirectory().getAbsolutePath() + '\n' + db.getWorkTree().getAbsolutePath() + '\n', out.toString("UTF-8")); assertEquals("unexpected output on stderr stream", "stderr\n", - err.toString("UTF-8")); - assertEquals("unexpected exit code", 0, res.getExitCode()); - assertEquals("unexpected process status", ProcessResult.Status.OK, + err.toString("UTF-8"));*/ + assertEquals("unexpected exit code", -1, res.getExitCode()); + assertEquals("unexpected process status", ProcessResult.Status.NOT_SUPPORTED, res.getStatus()); } } @@ -255,15 +255,15 @@ public void testRunHookHooksPathAbsolute() throws Exception { PreCommitHook.NAME, new String[] { "arg1", "arg2" }, new PrintStream(out), new PrintStream(err), "stdin"); - assertEquals("unexpected hook output", + /*assertEquals("unexpected hook output", "test arg1 arg2\nstdin\n" + db.getDirectory().getAbsolutePath() + '\n' + db.getWorkTree().getAbsolutePath() + '\n', out.toString("UTF-8")); assertEquals("unexpected output on stderr stream", "stderr\n", - err.toString("UTF-8")); - assertEquals("unexpected exit code", 0, res.getExitCode()); - assertEquals("unexpected process status", ProcessResult.Status.OK, + err.toString("UTF-8"));*/ + assertEquals("unexpected exit code", -1, res.getExitCode()); + assertEquals("unexpected process status", ProcessResult.Status.NOT_SUPPORTED, res.getStatus()); } } @@ -287,15 +287,15 @@ public void testHookPathWithBlank() throws Exception { PreCommitHook.NAME, new String[] { "arg1", "arg2" }, new PrintStream(out), new PrintStream(err), "stdin"); - assertEquals("unexpected hook output", + /*assertEquals("unexpected hook output", "test arg1 arg2\nstdin\n" + db.getDirectory().getAbsolutePath() + '\n' + db.getWorkTree().getAbsolutePath() + '\n', out.toString("UTF-8")); assertEquals("unexpected output on stderr stream", "stderr\n", - err.toString("UTF-8")); - assertEquals("unexpected exit code", 0, res.getExitCode()); - assertEquals("unexpected process status", ProcessResult.Status.OK, + err.toString("UTF-8"));*/ + assertEquals("unexpected exit code", -1, res.getExitCode()); + assertEquals("unexpected process status", ProcessResult.Status.NOT_SUPPORTED, res.getStatus()); } } From a4f15d6f0fe76b3b2820c2c437caa155b662f3c9 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Mon, 2 Nov 2020 22:12:21 -0600 Subject: [PATCH 12/29] update jgit version --- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++---------- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 39 files changed, 57 insertions(+), 57 deletions(-) diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index d2dd5a19223..e3f92db5145 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 342e84dd0ac..7f43920b530 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 1277f452f21..a10013cf500 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e4d8703e084..2d2574cf85c 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 14a22f553ee..36082a5dd1e 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 780a2731935..51f7cac292e 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 9b09db5507a..bb82fb3b822 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 26d0eae4b24..f1639d6e5fb 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 572fd4b9e89..80d28614634 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 6c259e69bcf..a526dce438c 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index e7193e6b6f1..36e0ddeb8ed 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index a1e635b558d..86ebbed7575 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c6c7c4fd381..fff72478a46 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index a4f7bd1f568..878a53261fa 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index abb28912460..7e725e1ab29 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 22fd3a7a608..49e84e555a2 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 2ee2f343cd5..5687e2d7eea 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.lfs 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 3959f9e1142..74bd238b1a0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 0e48821bced..3862d4b66b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 277e1f539a4..b03026427b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 21bb3c84437..79d9080b820 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 a104305112f..006dfaa9e5a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 804057ebd03..ba2a8a65690 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 7cb65b358fb..7c04fe0299b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.repository 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 4f63e6a170d..c1ac1406a8a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT 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 0d1e81a3e8d..23559013660 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 3b2a45dab0b..9eb532ac40f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 020580d44f5..bd971d44f8d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 935d9c57865..84edc911f42 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index db4e93e1753..f3f767a0c32 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 0c265056d02..ba6175b5b2b 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index df319ad83d7..b79c6262c46 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e9952003cb2..fb08eda2c34 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 24e1109be5c..f1cd41aee46 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 5916157907b..c456f0a9ce6 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d9c9a3da6a2..b1d54c4c093 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 3c5c1371f50..a71dec7578a 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index c899dfd293b..bfd3e0df173 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index a9d5a132354..025760fee6a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.9.1-SNAPSHOT + 5.9.0-snc-1-SNAPSHOT JGit - Parent ${jgit-url} From 6b41babe4d6404f1d1c70650be4657dfcf270baa Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Mon, 16 Nov 2020 17:53:15 -0600 Subject: [PATCH 13/29] STRY51637620: Undo customization in jGit that was done to support null GitSystemConfig. No need to customize jGit to support null GitSystemConfig. FS.DETECTED's gitSystemConfig.value is set to null by calling setFs() api in initRepo() or cloneGitFromRemoteRepo() in AGitRepository. --- .../eclipse/jgit/util/SystemReaderTest.java | 10 ++--- .../internal/storage/file/FileRepository.java | 2 +- .../org/eclipse/jgit/util/SystemReader.java | 39 +++---------------- 3 files changed, 11 insertions(+), 40 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/SystemReaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/SystemReaderTest.java index 79d566337a1..c652f696a82 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/SystemReaderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/SystemReaderTest.java @@ -19,7 +19,6 @@ import org.eclipse.jgit.storage.file.FileBasedConfig; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -29,7 +28,7 @@ public class SystemReaderTest { private Path trash; - //private Path mockSystemConfig; + private Path mockSystemConfig; private Path mockUserConfig; @@ -39,13 +38,13 @@ public class SystemReaderTest { @Before public void setup() throws Exception { trash = Files.createTempDirectory("jgit_test"); - /*mockSystemConfig = trash.resolve("systemgitconfig"); + mockSystemConfig = trash.resolve("systemgitconfig"); Files.write(mockSystemConfig, "[core]\n trustFolderStat = false\n" - .getBytes(StandardCharsets.UTF_8));*/ + .getBytes(StandardCharsets.UTF_8)); mockUserConfig = trash.resolve(".gitconfig"); Files.write(mockUserConfig, "[core]\n bare = false\n".getBytes(StandardCharsets.UTF_8)); - //when(fs.getGitSystemConfig()).thenReturn(mockSystemConfig.toFile()); + when(fs.getGitSystemConfig()).thenReturn(mockSystemConfig.toFile()); when(fs.userHome()).thenReturn(trash.toFile()); SystemReader.setInstance(null); } @@ -56,7 +55,6 @@ public void teardown() throws Exception { } @Test - @Ignore public void openSystemConfigReturnsDifferentInstances() throws Exception { FileBasedConfig system1 = SystemReader.getInstance() .openSystemConfig(null, fs); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index 5c74542017e..fd052cec280 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -159,7 +159,7 @@ public FileRepository(BaseRepositoryBuilder options) throws IOException { super(options); StoredConfig userConfig = null; try { - userConfig = SystemReader.getInstance().getUserConfig(getFS()); + userConfig = SystemReader.getInstance().getUserConfig(); } catch (ConfigInvalidException e) { LOG.error(e.getMessage(), e); throw new IOException(e.getMessage(), e); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 1d470cf1af4..2da7bf3d3de 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -89,13 +89,11 @@ public String getProperty(String key) { @Override public FileBasedConfig openSystemConfig(Config parent, FS fs) { - /*if (StringUtils + File configFile = fs.getGitSystemConfig(); + if (configFile != null && StringUtils .isEmptyOrNull(getenv(Constants.GIT_CONFIG_NOSYSTEM_KEY))) { - File configFile = fs.getGitSystemConfig(); - if (configFile != null) { return new FileBasedConfig(parent, configFile, fs); - } - }*/ + } return new FileBasedConfig(parent, null, fs) { @Override public void load() { @@ -313,25 +311,10 @@ protected final void setPlatformChecker() { */ public StoredConfig getUserConfig() throws ConfigInvalidException, IOException { - return getUserConfig(FS.DETECTED); - } - - /** - * Get the git configuration found in the user home. - * @param fs the file system abstraction which will be necessary to perform - * certain file system operations. - * @return the git configuration found in the user home - * @throws ConfigInvalidException - * if configuration is invalid - * @throws IOException - * if something went wrong when reading files - */ - public StoredConfig getUserConfig(FS fs) - throws ConfigInvalidException, IOException { FileBasedConfig c = userConfig.get(); if (c == null) { userConfig.compareAndSet(null, - openUserConfig(getSystemConfig(), fs)); + openUserConfig(getSystemConfig(), FS.DETECTED)); c = userConfig.get(); } // on the very first call this will check a second time if the system @@ -355,15 +338,10 @@ public StoredConfig getUserConfig(FS fs) */ public StoredConfig getJGitConfig() throws ConfigInvalidException, IOException { - return getJGitConfig(FS.DETECTED); - } - - private StoredConfig getJGitConfig(FS fs) - throws ConfigInvalidException, IOException { FileBasedConfig c = jgitConfig.get(); if (c == null) { jgitConfig.compareAndSet(null, - openJGitConfig(null, fs)); + openJGitConfig(null, FS.DETECTED)); c = jgitConfig.get(); } updateAll(c); @@ -385,15 +363,10 @@ private StoredConfig getJGitConfig(FS fs) */ public StoredConfig getSystemConfig() throws ConfigInvalidException, IOException { - return getSystemConfig(FS.DETECTED); - } - - private StoredConfig getSystemConfig(FS fs) - throws ConfigInvalidException, IOException { FileBasedConfig c = systemConfig.get(); if (c == null) { systemConfig.compareAndSet(null, - openSystemConfig(getJGitConfig(), fs)); + openSystemConfig(getJGitConfig(), FS.DETECTED)); c = systemConfig.get(); } updateAll(c); From 958a453c81fdce9e4760452251753fc64986767f Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Mon, 16 Nov 2020 17:55:50 -0600 Subject: [PATCH 14/29] STRY51637620: Bumped jGit version to 5.9.0-snc-1 --- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++---------- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 39 files changed, 57 insertions(+), 57 deletions(-) diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index e3f92db5145..ab9b60ac1de 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7f43920b530..d534fb6b3dd 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a10013cf500..36bbae95289 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 2d2574cf85c..583a8bc28cc 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 36082a5dd1e..c693eeea88e 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ant - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.archive - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.http.apache - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.http.server - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.lfs - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.pgm - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ui - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ant.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.http.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 51f7cac292e..04a97698ebd 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index bb82fb3b822..d4a3aced05e 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index f1639d6e5fb..6906ae33e9c 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 80d28614634..dcb227786d7 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index a526dce438c..d707e4f879b 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 36e0ddeb8ed..73c529b7e47 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 86ebbed7575..d92e85cae19 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index fff72478a46..9fc0d23996d 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 878a53261fa..21f17c52d2a 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 7e725e1ab29..c63ebecf6d1 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 49e84e555a2..30e1bb6a663 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 5687e2d7eea..e0f6e527e0b 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.lfs 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 74bd238b1a0..ad4c6b09a06 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 3862d4b66b0..bf306f49ed3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 b03026427b7..534b37ca16e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 79d9080b820..55eda54f97a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 006dfaa9e5a..398f2beb106 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 ba2a8a65690..9f63366a1fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 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 7c04fe0299b..12caf715d68 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.repository 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 c1ac1406a8a..9f69561c1b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 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 23559013660..2f6ef3f2654 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 9eb532ac40f..36ba9bd96fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 bd971d44f8d..851990b8031 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 84edc911f42..53f4d1686ae 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f3f767a0c32..2b34b02d4d1 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index ba6175b5b2b..46f26aa007f 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index b79c6262c46..b4bca7db379 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index fb08eda2c34..f27f3731c42 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index f1cd41aee46..0e610695ff7 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index c456f0a9ce6..640d9a8cdd4 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b1d54c4c093..d155beeb7ce 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a71dec7578a..1ceae6acf89 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index bfd3e0df173..0213c3020a7 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 025760fee6a..2ee231aa8ee 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 JGit - Parent ${jgit-url} From f767064f2913fd39580f8d43dfea3291ec0f9302 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Tue, 17 Nov 2020 15:23:36 -0600 Subject: [PATCH 15/29] Revert "STRY51637620: Bumped jGit version to 5.9.0-snc-1" This reverts commit 37e36e93ac811f4fe61f79c081d1941a04d7629d. --- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++---------- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 39 files changed, 57 insertions(+), 57 deletions(-) diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index ab9b60ac1de..e3f92db5145 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index d534fb6b3dd..7f43920b530 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 36bbae95289..a10013cf500 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 583a8bc28cc..2d2574cf85c 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index c693eeea88e..36082a5dd1e 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 04a97698ebd..51f7cac292e 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index d4a3aced05e..bb82fb3b822 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 6906ae33e9c..f1639d6e5fb 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index dcb227786d7..80d28614634 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index d707e4f879b..a526dce438c 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 73c529b7e47..36e0ddeb8ed 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d92e85cae19..86ebbed7575 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9fc0d23996d..fff72478a46 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 21f17c52d2a..878a53261fa 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index c63ebecf6d1..7e725e1ab29 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 30e1bb6a663..49e84e555a2 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index e0f6e527e0b..5687e2d7eea 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.lfs 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 ad4c6b09a06..74bd238b1a0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 bf306f49ed3..3862d4b66b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 534b37ca16e..b03026427b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 55eda54f97a..79d9080b820 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 398f2beb106..006dfaa9e5a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 9f63366a1fe..ba2a8a65690 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 12caf715d68..7c04fe0299b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.repository 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 9f69561c1b7..c1ac1406a8a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT 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 2f6ef3f2654..23559013660 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 36ba9bd96fe..9eb532ac40f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.feature 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 851990b8031..bd971d44f8d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 53f4d1686ae..84edc911f42 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 2b34b02d4d1..f3f767a0c32 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 46f26aa007f..ba6175b5b2b 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index b4bca7db379..b79c6262c46 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index f27f3731c42..fb08eda2c34 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 0e610695ff7..f1cd41aee46 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 640d9a8cdd4..c456f0a9ce6 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d155beeb7ce..b1d54c4c093 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 1ceae6acf89..a71dec7578a 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 0213c3020a7..bfd3e0df173 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 2ee231aa8ee..025760fee6a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.9.0-snc-1 + 5.9.0-snc-1-SNAPSHOT JGit - Parent ${jgit-url} From 4337c95c1c3341b08e6a39106c518bcf6a20b870 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Wed, 18 Nov 2020 14:15:47 -0600 Subject: [PATCH 16/29] MAINT: Prevent org.eclipse.jgit.gpg.bc and org.eclipse.jgit.pgm from being released --- org.eclipse.jgit.gpg.bc/pom.xml | 1 + org.eclipse.jgit.pgm/pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index bb82fb3b822..426df79402c 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -30,6 +30,7 @@ ${project.build.directory}/META-INF/SOURCE-MANIFEST.MF + true diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index ba6175b5b2b..03d39b11881 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -30,6 +30,7 @@ ${project.build.directory}/META-INF/SOURCE-MANIFEST.MF + true From 153e2eb3b2f5009159a4b30dc1cf6bbc774d28b2 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Wed, 18 Nov 2020 17:11:16 -0600 Subject: [PATCH 17/29] Revert "Revert "STRY51637620: Bumped jGit version to 5.9.0-snc-1"" This reverts commit f767064f2913fd39580f8d43dfea3291ec0f9302. --- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++---------- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 39 files changed, 57 insertions(+), 57 deletions(-) diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index e3f92db5145..ab9b60ac1de 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7f43920b530..d534fb6b3dd 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a10013cf500..36bbae95289 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 2d2574cf85c..583a8bc28cc 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 36082a5dd1e..c693eeea88e 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ant - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.archive - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.http.apache - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.http.server - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.lfs - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.pgm - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ui - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ant.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.http.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 51f7cac292e..04a97698ebd 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 426df79402c..4172a416ff7 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index f1639d6e5fb..6906ae33e9c 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 80d28614634..dcb227786d7 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index a526dce438c..d707e4f879b 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 36e0ddeb8ed..73c529b7e47 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 86ebbed7575..d92e85cae19 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index fff72478a46..9fc0d23996d 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 878a53261fa..21f17c52d2a 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 7e725e1ab29..c63ebecf6d1 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 49e84e555a2..30e1bb6a663 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 5687e2d7eea..e0f6e527e0b 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.lfs 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 74bd238b1a0..ad4c6b09a06 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 3862d4b66b0..bf306f49ed3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 b03026427b7..534b37ca16e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 79d9080b820..55eda54f97a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 006dfaa9e5a..398f2beb106 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 ba2a8a65690..9f63366a1fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 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 7c04fe0299b..12caf715d68 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.repository 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 c1ac1406a8a..9f69561c1b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 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 23559013660..2f6ef3f2654 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 9eb532ac40f..36ba9bd96fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.feature 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 bd971d44f8d..851990b8031 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 84edc911f42..53f4d1686ae 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f3f767a0c32..2b34b02d4d1 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 03d39b11881..d0dfb51108e 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index b79c6262c46..b4bca7db379 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index fb08eda2c34..f27f3731c42 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index f1cd41aee46..0e610695ff7 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index c456f0a9ce6..640d9a8cdd4 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b1d54c4c093..d155beeb7ce 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a71dec7578a..1ceae6acf89 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index bfd3e0df173..0213c3020a7 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 025760fee6a..2ee231aa8ee 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.9.0-snc-1-SNAPSHOT + 5.9.0-snc-1 JGit - Parent ${jgit-url} From 9ab90b1f9b3544e0917d6367e4bc12c0da5ff82d Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Fri, 20 Nov 2020 13:54:27 -0600 Subject: [PATCH 18/29] MAINT: Downgrade maven-deploy-plugin to 2.7 to fix the deployment issue --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 53f4d1686ae..1f9459fa648 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -308,7 +308,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 2.7 org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 2ee231aa8ee..e00f973308e 100644 --- a/pom.xml +++ b/pom.xml @@ -369,7 +369,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 2.7 org.apache.maven.plugins From 6718c0e708d36f85df76d5319f23c9e97e4d0f62 Mon Sep 17 00:00:00 2001 From: "matthew.clase" Date: Fri, 8 Jan 2021 15:31:34 -0600 Subject: [PATCH 19/29] Create method to filter modify files while ignoring add/deletes --- .../src/org/eclipse/jgit/api/DiffCommand.java | 2 +- .../org/eclipse/jgit/diff/DiffFormatter.java | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java index e6c3befacbb..12e2a80c074 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java @@ -132,7 +132,7 @@ public List call() throws GitAPIException { if (sourcePrefix != null) { diffFmt.setOldPrefix(sourcePrefix); } - diffFmt.format(result, this.getDeltaFilterPattern()); + diffFmt.filterHiddenFiles(result, this.getDeltaFilterPattern()); diffFmt.flush(); return result; } catch (IOException e) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index ecf90680353..daeb554003f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -725,6 +725,34 @@ public void format(List entries, Pattern deltaFilterPattern } } + /** + * Format the diff entries by filtering out the noise from the given delta filter pattern + * The filter acts only for files that have MODIFY change Type. + * If there are no changes detected, we will remove the diff entry. + * @param entries + * @param deltaFilterPattern + * @throws IOException + */ + + public void filterHiddenFiles(List entries, Pattern deltaFilterPattern) throws IOException { + if (deltaFilterPattern == null) + return; + + Iterator diIterator = entries.iterator(); + while (diIterator.hasNext()) { + DiffEntry diffEntry = diIterator.next(); + if (MODIFY.equals(diffEntry.changeType)) { + FormatResult res = createFormatResult(diffEntry); + String aContent = new String(res.a.content); + String bContent = new String(res.b.content); + aContent = deltaFilterPattern.matcher(aContent).replaceAll(EMPTY_STRING); + bContent = deltaFilterPattern.matcher(bContent).replaceAll(EMPTY_STRING); + if (aContent.equals(bContent)) + diIterator.remove(); + } + } + } + /** * Format a patch script for one file entry. From 31838ca17b2325e521d980d537539dfdde7924e1 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Sun, 13 Dec 2020 15:34:00 -0600 Subject: [PATCH 20/29] Specify a dummy terminal type PtyChannelConfiguration and pass it through createExecChannel api to avoid reading TERM from env --- .../src/org/eclipse/jgit/transport/sshd/SshdSession.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java index dfd7cca1b42..37f2020a298 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java @@ -17,6 +17,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.EnumSet; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -32,6 +33,7 @@ import org.apache.sshd.client.subsystem.sftp.SftpClient.CloseableHandle; import org.apache.sshd.client.subsystem.sftp.SftpClient.CopyMode; import org.apache.sshd.client.subsystem.sftp.SftpClientFactory; +import org.apache.sshd.common.channel.PtyChannelConfiguration; import org.apache.sshd.common.session.Session; import org.apache.sshd.common.session.SessionListener; import org.apache.sshd.common.subsystem.sftp.SftpException; @@ -132,7 +134,9 @@ private void notifyCloseListeners() { @Override public Process exec(String commandName, int timeout) throws IOException { @SuppressWarnings("resource") - ChannelExec exec = session.createExecChannel(commandName); + PtyChannelConfiguration config = new PtyChannelConfiguration(); + config.setPtyType("dummy"); + ChannelExec exec = session.createExecChannel(commandName, config, Collections.emptyMap()); if (timeout <= 0) { try { exec.open().verify(); From d247a8a4dc1d14fa7d1f8a6ee51de589c08fb357 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Sun, 13 Dec 2020 15:36:49 -0600 Subject: [PATCH 21/29] Update version to 5.9.0-snc-2-SNAPSHOT --- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++---------- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 39 files changed, 57 insertions(+), 57 deletions(-) diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index ab9b60ac1de..6faf319cad4 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index d534fb6b3dd..4a05f3e9629 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 36bbae95289..143a8efaf84 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 583a8bc28cc..7143ad8b62e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index c693eeea88e..28ebaf63303 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 04a97698ebd..84906e7b637 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 4172a416ff7..3941d808f80 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 6906ae33e9c..2023941a68d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index dcb227786d7..37512d6fccf 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index d707e4f879b..f9a644b5df9 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 73c529b7e47..78c9799e373 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d92e85cae19..f5bc895e4a0 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9fc0d23996d..21b7b73e331 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 21f17c52d2a..7570ae4da67 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index c63ebecf6d1..374ae4efe97 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 30e1bb6a663..9a228fced4d 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index e0f6e527e0b..b530503247d 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.lfs 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 ad4c6b09a06..ffd4855dc0a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.feature 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 bf306f49ed3..b33241859d2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.feature 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 534b37ca16e..9f2671f6442 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.feature 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 55eda54f97a..1b4b13e5216 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.feature 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 398f2beb106..57678a4a658 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.feature 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 9f63366a1fe..a4733ea3ede 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-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 12caf715d68..30028daca98 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.repository 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 9f69561c1b7..80e969bf7d8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT 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 2f6ef3f2654..3d170afd13f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.feature 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 36ba9bd96fe..66a3dacfabb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.feature 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 851990b8031..f94161502bb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 1f9459fa648..da264b20849 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 2b34b02d4d1..6bf38c802a2 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index d0dfb51108e..6eefda6b0c6 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index b4bca7db379..dfa42d27e3e 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index f27f3731c42..d58553a3a49 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 0e610695ff7..85e753da6cc 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 640d9a8cdd4..9471a4cd261 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d155beeb7ce..06e5cffdd48 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 1ceae6acf89..c81c731903b 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 0213c3020a7..dd8a032fef5 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index e00f973308e..30a28536fe1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.9.0-snc-1 + 5.9.0-snc-2-SNAPSHOT JGit - Parent ${jgit-url} From 29002b2f8a287793456c4356372597815a3425f4 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Sun, 13 Dec 2020 18:33:30 -0600 Subject: [PATCH 22/29] Fixed test failure in GcPruneNonReferencedTest.nonReferencedObjects_onlyExpiredPruned --- .../jgit/internal/storage/file/GcPruneNonReferencedTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java index 796df3db064..fdc9d657b65 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java @@ -10,6 +10,7 @@ package org.eclipse.jgit.internal.storage.file; +import static java.lang.Thread.sleep; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -59,7 +60,8 @@ public void nonReferencedObjects_onlyExpiredPruned() throws Exception { RevBlob a = tr.blob("a"); gc.setExpire(new Date(lastModified(a) + 1)); - fsTick(); + //fsTick(); + sleep(1000); RevBlob b = tr.blob("b"); gc.prune(Collections. emptySet()); From 67a95ddaa9ee2e056bf7fb9b5bbc259bed4e8a66 Mon Sep 17 00:00:00 2001 From: "matthew.clase" Date: Mon, 11 Jan 2021 10:36:06 -0600 Subject: [PATCH 23/29] Refactor method name, allow for original funcationality to be preserved --- .../src/org/eclipse/jgit/api/DiffCommand.java | 18 +++++++++++++----- .../org/eclipse/jgit/diff/DiffFormatter.java | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java index 12e2a80c074..9d721b08579 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java @@ -89,7 +89,9 @@ private DiffFormatter getDiffFormatter() { * of the command. Don't call this method twice on an instance. * * Team-Devatscale SC customization to filter some files based on a regex pattern. - * This filter will not be applied if showNameAndStatusOnly is set to true + * This filter will not be applied if showNameAndStatusOnly is set to true and no + * regex pattern is passed. Formatting is applied to all files returned by + * DiffFormatter.scan() if showNameAndStatusOnly is false. */ @Override public List call() throws GitAPIException { @@ -120,9 +122,6 @@ public List call() throws GitAPIException { diffFmt.setPathFilter(pathFilter); List result = diffFmt.scan(oldTree, newTree); - if (showNameAndStatusOnly) { - return result; - } if (contextLines >= 0) { diffFmt.setContext(contextLines); } @@ -132,7 +131,16 @@ public List call() throws GitAPIException { if (sourcePrefix != null) { diffFmt.setOldPrefix(sourcePrefix); } - diffFmt.filterHiddenFiles(result, this.getDeltaFilterPattern()); + + if (showNameAndStatusOnly) { + if (this.getDeltaFilterPattern() != null) { + diffFmt.filterModifiedFiles(result, this.getDeltaFilterPattern()); + diffFmt.flush(); + } + return result; + } + + diffFmt.format(result, this.getDeltaFilterPattern()); diffFmt.flush(); return result; } catch (IOException e) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index daeb554003f..4d9c55ff2a4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -734,7 +734,7 @@ public void format(List entries, Pattern deltaFilterPattern * @throws IOException */ - public void filterHiddenFiles(List entries, Pattern deltaFilterPattern) throws IOException { + public void filterModifiedFiles(List entries, Pattern deltaFilterPattern) throws IOException { if (deltaFilterPattern == null) return; From 852cae80c0d17c670420bcc30a16561dd586e7ef Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Thu, 7 Jan 2021 17:06:57 -0600 Subject: [PATCH 24/29] STRY51679658: Remove dependency on net.i2p.crypto --- org.eclipse.jgit.ssh.apache.test/pom.xml | 7 +++++++ org.eclipse.jgit.ssh.apache/pom.xml | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index dfa42d27e3e..6cf042fec27 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -29,6 +29,7 @@ true + 0.3.0 @@ -61,6 +62,12 @@ ${project.version} + + net.i2p.crypto + eddsa + ${eddsa-version} + + org.eclipse.jgit org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index d58553a3a49..0b584cece6b 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -30,7 +30,6 @@ ${project.build.directory}/META-INF/SOURCE-MANIFEST.MF - 0.3.0 @@ -52,12 +51,6 @@ ${apache-sshd-version} - - net.i2p.crypto - eddsa - ${eddsa-version} - - org.slf4j slf4j-api From 48f0c18b1d259ae8fa8994039b121fc0f4ac7b64 Mon Sep 17 00:00:00 2001 From: "matthew.clase" Date: Mon, 11 Jan 2021 14:29:43 -0600 Subject: [PATCH 25/29] Added tests for new filterModify method --- .../eclipse/jgit/diff/DiffFormatterTest.java | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java index abe860ebd5a..0462903dc2a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java @@ -18,6 +18,7 @@ import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.File; +import java.util.List; import java.util.regex.Pattern; import org.eclipse.jgit.api.Git; @@ -534,6 +535,37 @@ public void testDiffDeltaFilter_filteredModifiedFile() throws Exception { assertEquals("", os.toString("UTF-8")); } + @Test + /** + * Filter for any file matches the content of the changed file without writing format changes: diff skipped. + */ + public void testDiffDeltaFilterModifyOnly_filteredModifiedFile() throws Exception { + write(new File(db.getDirectory().getParent(), "test.txt"), "test"); + File folder = new File(db.getDirectory().getParent(), "folder"); + FileUtils.mkdir(folder); + write(new File(folder, "folder.txt"), "folder"); + Git git = new Git(db); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); + + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex (ANY) + Pattern deltaFilterPattern = Pattern.compile("change"); + + List result = dfmt.scan(oldTree, newTree); + dfmt.filterModifiedFiles(result, deltaFilterPattern); + dfmt.flush(); + + assertEquals(0, result.size()); + } + @Test /** * The filter doesn't match any change: diff unchanged. @@ -572,6 +604,37 @@ public void testDiffDeltaFilter_filterNoMatch() throws Exception { assertEquals(expected, actual); } + @Test + /** + * The filter doesn't match any change without writing format changes: diff unchanged. + */ + public void testDiffDeltaFilterModifyOnly_filterNoMatch() throws Exception { + write(new File(db.getDirectory().getParent(), "test.txt"), "test"); + File folder = new File(db.getDirectory().getParent(), "folder"); + FileUtils.mkdir(folder); + write(new File(folder, "folder.txt"), "folder"); + Git git = new Git(db); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); + + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex (ANY) + Pattern deltaFilterPattern = Pattern.compile("xxxx"); + + List result = dfmt.scan(oldTree, newTree); + dfmt.filterModifiedFiles(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + assertEquals(1, result.size()); + } + @Test public void testDiffRootNullToTree() throws Exception { write(new File(db.getDirectory().getParent(), "test.txt"), "test"); From 58e9d00b6358bc4cde3f82e8831144d662141e08 Mon Sep 17 00:00:00 2001 From: "junna.cui" Date: Wed, 20 Jan 2021 10:21:59 -0600 Subject: [PATCH 26/29] MAINT: bump jgit version to 5.9.0-snc-2 --- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++---------- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 39 files changed, 57 insertions(+), 57 deletions(-) diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 6faf319cad4..43be259f0a8 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 4a05f3e9629..652423e1f5a 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 143a8efaf84..9d13c0537fb 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 7143ad8b62e..44961ed18bc 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 28ebaf63303..74c7eb6ea00 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.ant - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.archive - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.http.apache - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.http.server - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.lfs - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.pgm - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.ui - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.test - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.ant.test - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.http.test - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 84906e7b637..205d2edd53e 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 3941d808f80..c01d0b00341 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 2023941a68d..d4869b6a2e2 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 37512d6fccf..f1e0fcc162d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index f9a644b5df9..ebba7c0ddc5 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 78c9799e373..bbefe7cf6bf 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index f5bc895e4a0..3c09f2ef230 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 21b7b73e331..ba4a1dd506f 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 7570ae4da67..4a62588527f 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 374ae4efe97..67a31af06bd 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 9a228fced4d..e9babd11dbb 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index b530503247d..dff3d2cf5c7 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.lfs 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 ffd4855dc0a..faea578c66e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.feature 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 b33241859d2..eaacfa1c18b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.feature 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 9f2671f6442..67cd1914267 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.feature 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 1b4b13e5216..703d350ca35 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.feature 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 57678a4a658..3606a7b82b2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.feature 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 a4733ea3ede..4947d3c0f02 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 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 30028daca98..b967056f210 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.repository 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 80e969bf7d8..f8fbadda984 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 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 3d170afd13f..1e1d44b692f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.feature 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 66a3dacfabb..55b4b5dc570 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.feature 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 f94161502bb..0a534c9c364 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index da264b20849..bfb27fc4370 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 6bf38c802a2..30646aedc52 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 6eefda6b0c6..4d2999c06a7 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 6cf042fec27..974878426ea 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 0b584cece6b..891b58a73a2 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 85e753da6cc..c7d5217be75 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 9471a4cd261..876cf9ab236 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 06e5cffdd48..eaf8913390d 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index c81c731903b..24709300f67 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index dd8a032fef5..1c6815b8dd3 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 30a28536fe1..26771edc2eb 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.9.0-snc-2-SNAPSHOT + 5.9.0-snc-2 JGit - Parent ${jgit-url} From 145101803b7829ffe0c3dd909f713ff89c4eff1d Mon Sep 17 00:00:00 2001 From: "david.hodgson" Date: Tue, 26 Apr 2022 14:40:09 -0400 Subject: [PATCH 27/29] STRY51637620: merge our 5.9 changes into 6.1 STRY51637620: merge our 5.9 changes into 6.1 --- org.eclipse.jgit.ant.test/.classpath | 30 +++++++- org.eclipse.jgit.ant.test/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.ant.test/pom.xml | 4 -- org.eclipse.jgit.ant/.classpath | 38 ++++++++-- org.eclipse.jgit.ant/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.ant/pom.xml | 4 -- org.eclipse.jgit.archive/.classpath | 32 ++++++++- org.eclipse.jgit.archive/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.archive/pom.xml | 4 -- org.eclipse.jgit.benchmarks/.classpath | 2 +- org.eclipse.jgit.benchmarks/.project | 11 +++ org.eclipse.jgit.benchmarks/pom.xml | 4 -- org.eclipse.jgit.coverage/.project | 11 +++ org.eclipse.jgit.coverage/pom.xml | 72 ------------------- org.eclipse.jgit.gpg.bc.test/.classpath | 39 ++++++++-- org.eclipse.jgit.gpg.bc.test/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.gpg.bc.test/pom.xml | 4 -- org.eclipse.jgit.gpg.bc/.classpath | 38 ++++++++-- org.eclipse.jgit.gpg.bc/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.gpg.bc/pom.xml | 4 -- org.eclipse.jgit.http.apache/.classpath | 38 ++++++++-- org.eclipse.jgit.http.apache/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.http.apache/pom.xml | 4 -- org.eclipse.jgit.http.server/.classpath | 38 ++++++++-- org.eclipse.jgit.http.server/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.http.server/pom.xml | 4 -- org.eclipse.jgit.http.test/.classpath | 33 +++++++-- org.eclipse.jgit.http.test/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + .../org.eclipse.jgit.http--All-Tests.launch | 34 ++++----- org.eclipse.jgit.http.test/pom.xml | 4 -- org.eclipse.jgit.junit.http/.classpath | 30 ++++++-- org.eclipse.jgit.junit.http/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.junit.http/pom.xml | 4 -- org.eclipse.jgit.junit.ssh/.classpath | 38 ++++++++-- org.eclipse.jgit.junit.ssh/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.junit.ssh/pom.xml | 4 -- org.eclipse.jgit.junit/.classpath | 32 ++++++++- org.eclipse.jgit.junit/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.junit/pom.xml | 4 -- org.eclipse.jgit.lfs.server.test/.classpath | 36 +++++++++- org.eclipse.jgit.lfs.server.test/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.lfs.server.test/pom.xml | 4 -- org.eclipse.jgit.lfs.server/.classpath | 38 ++++++++-- org.eclipse.jgit.lfs.server/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.lfs.server/pom.xml | 4 -- org.eclipse.jgit.lfs.test/.classpath | 33 +++++++-- org.eclipse.jgit.lfs.test/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.lfs.test/pom.xml | 4 -- org.eclipse.jgit.lfs/.classpath | 38 ++++++++-- org.eclipse.jgit.lfs/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.lfs/pom.xml | 4 -- .../org.eclipse.jgit.feature/pom.xml | 4 -- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 4 -- .../pom.xml | 4 -- .../org.eclipse.jgit.junit.feature/pom.xml | 4 -- .../org.eclipse.jgit.lfs.feature/pom.xml | 4 -- .../org.eclipse.jgit.pgm.feature/pom.xml | 4 -- .../org.eclipse.jgit.repository/pom.xml | 4 -- .../org.eclipse.jgit.source.feature/pom.xml | 8 --- .../pom.xml | 4 -- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 4 -- .../org.eclipse.jgit.target/pom.xml | 4 -- org.eclipse.jgit.packaging/pom.xml | 4 -- org.eclipse.jgit.pgm.test/.classpath | 35 +++++++-- org.eclipse.jgit.pgm.test/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + ...e.jgit.pgm--All-Tests (Java11) (de).launch | 56 ++++++++------- ...clipse.jgit.pgm--All-Tests (Java11).launch | 50 ++++++------- .../org.eclipse.jgit.pgm--All-Tests.launch | 36 +++++----- org.eclipse.jgit.pgm.test/pom.xml | 4 -- org.eclipse.jgit.pgm/.classpath | 39 ++++++++-- org.eclipse.jgit.pgm/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.pgm/pom.xml | 4 -- org.eclipse.jgit.ssh.apache.agent/.classpath | 42 +++++++++-- org.eclipse.jgit.ssh.apache.agent/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.ssh.apache.test/.classpath | 36 +++++++++- org.eclipse.jgit.ssh.apache.test/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.ssh.apache.test/pom.xml | 4 -- org.eclipse.jgit.ssh.apache/.classpath | 38 ++++++++-- org.eclipse.jgit.ssh.apache/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.ssh.apache/pom.xml | 4 -- org.eclipse.jgit.ssh.jsch.test/.classpath | 36 +++++++++- org.eclipse.jgit.ssh.jsch.test/.project | 17 +++++ org.eclipse.jgit.ssh.jsch.test/pom.xml | 4 -- org.eclipse.jgit.ssh.jsch/.classpath | 38 ++++++++-- org.eclipse.jgit.ssh.jsch/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.ssh.jsch/pom.xml | 4 -- org.eclipse.jgit.test/.classpath | 40 +++++++++-- org.eclipse.jgit.test/.project | 19 +++++ .../org.eclipse.core.resources.prefs | 8 +-- .../.settings/org.eclipse.jdt.core.prefs | 1 + ...jgit.core--All-Tests (Java 11) (de).launch | 58 +++++++-------- ...ipse.jgit.core--All-Tests (Java 11).launch | 52 +++++++------- .../org.eclipse.jgit.core--All-Tests.launch | 36 +++++----- org.eclipse.jgit.test/pom.xml | 4 -- org.eclipse.jgit.ui/.classpath | 38 ++++++++-- org.eclipse.jgit.ui/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit.ui/pom.xml | 4 -- org.eclipse.jgit/.classpath | 38 ++++++++-- org.eclipse.jgit/.project | 17 +++++ .../org.eclipse.core.resources.prefs | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + org.eclipse.jgit/pom.xml | 4 -- 146 files changed, 1499 insertions(+), 497 deletions(-) diff --git a/org.eclipse.jgit.ant.test/.classpath b/org.eclipse.jgit.ant.test/.classpath index 73d6894a615..16466e92aa3 100644 --- a/org.eclipse.jgit.ant.test/.classpath +++ b/org.eclipse.jgit.ant.test/.classpath @@ -2,14 +2,38 @@ - + - + + + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.ant.test/.project b/org.eclipse.jgit.ant.test/.project index 02d617dffd0..8fcbaeadef9 100644 --- a/org.eclipse.jgit.ant.test/.project +++ b/org.eclipse.jgit.ant.test/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855718 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.ant.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.ant.test/.settings/org.eclipse.core.resources.prefs index f77db3b7230..7a531392842 100644 --- a/org.eclipse.jgit.ant.test/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.ant.test/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Sat Dec 20 21:21:24 CET 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs index 69e9221102b..363011e880f 100644 --- a/org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 7c481cf5838..ba473eff293 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/.classpath b/org.eclipse.jgit.ant/.classpath index 1fde318a04c..6ac071ba9e7 100644 --- a/org.eclipse.jgit.ant/.classpath +++ b/org.eclipse.jgit.ant/.classpath @@ -2,11 +2,41 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.ant/.project b/org.eclipse.jgit.ant/.project index 630653dd64b..a3d838e52f0 100644 --- a/org.eclipse.jgit.ant/.project +++ b/org.eclipse.jgit.ant/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855697 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.ant/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.ant/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..b33191047b5 100644 --- a/org.eclipse.jgit.ant/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.ant/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs index f79df5b9dd9..ed5fdfc0f1d 100644 --- a/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index eabf6a4a614..a7f258be53c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,11 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/.classpath b/org.eclipse.jgit.archive/.classpath index f0d0c735ff8..7052102a413 100644 --- a/org.eclipse.jgit.archive/.classpath +++ b/org.eclipse.jgit.archive/.classpath @@ -1,11 +1,37 @@ - + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.archive/.project b/org.eclipse.jgit.archive/.project index 4c7f39466af..5668835e9bc 100644 --- a/org.eclipse.jgit.archive/.project +++ b/org.eclipse.jgit.archive/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855722 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.archive/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.archive/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..7a531392842 100644 --- a/org.eclipse.jgit.archive/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.archive/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.archive/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.archive/.settings/org.eclipse.jdt.core.prefs index 2abe9529d32..bcbbab9b646 100644 --- a/org.eclipse.jgit.archive/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.archive/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 721c7ab49bb..12f3e685d87 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/.classpath b/org.eclipse.jgit.benchmarks/.classpath index 8dcf94ed9ca..6d30c34d70b 100644 --- a/org.eclipse.jgit.benchmarks/.classpath +++ b/org.eclipse.jgit.benchmarks/.classpath @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/org.eclipse.jgit.benchmarks/.project b/org.eclipse.jgit.benchmarks/.project index 59be0016d34..54580f7b528 100644 --- a/org.eclipse.jgit.benchmarks/.project +++ b/org.eclipse.jgit.benchmarks/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1650997855727 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 1fe01e9af25..0f72f64ff6d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,11 +14,7 @@ 4.0.0 org.eclipse.jgit -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/.project b/org.eclipse.jgit.coverage/.project index 6306b5ce061..94afcc8531f 100644 --- a/org.eclipse.jgit.coverage/.project +++ b/org.eclipse.jgit.coverage/.project @@ -14,4 +14,15 @@ org.eclipse.m2e.core.maven2Nature + + + 1650997855731 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 810d2c2abde..abc37ec69f9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,11 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 4.0.0 @@ -31,156 +27,88 @@ org.eclipse.jgit org.eclipse.jgit -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.ant -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.archive -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.http.apache -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.http.server -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.lfs -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.lfs.server -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.pgm -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.ui -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.ssh.apache -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.test -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.ant.test -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.http.test -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.pgm.test -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.lfs.test -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.lfs.server.test -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 diff --git a/org.eclipse.jgit.gpg.bc.test/.classpath b/org.eclipse.jgit.gpg.bc.test/.classpath index 2a1645a58bb..b8eb2c41035 100644 --- a/org.eclipse.jgit.gpg.bc.test/.classpath +++ b/org.eclipse.jgit.gpg.bc.test/.classpath @@ -2,19 +2,50 @@ - + - + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.gpg.bc.test/.project b/org.eclipse.jgit.gpg.bc.test/.project index 9aac4a256df..c608d1343cd 100644 --- a/org.eclipse.jgit.gpg.bc.test/.project +++ b/org.eclipse.jgit.gpg.bc.test/.project @@ -20,9 +20,26 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + + + 1650997855742 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.gpg.bc.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.gpg.bc.test/.settings/org.eclipse.core.resources.prefs index 99f26c0203a..487949c55b3 100644 --- a/org.eclipse.jgit.gpg.bc.test/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.gpg.bc.test/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/tst=UTF-8 +encoding/tst-rsrc=UTF-8 diff --git a/org.eclipse.jgit.gpg.bc.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.gpg.bc.test/.settings/org.eclipse.jdt.core.prefs index 76f48d86d5a..b012856c92f 100644 --- a/org.eclipse.jgit.gpg.bc.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.gpg.bc.test/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index ccbf0e6d7f5..9568c6884d0 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/.classpath b/org.eclipse.jgit.gpg.bc/.classpath index 1fde318a04c..6ac071ba9e7 100644 --- a/org.eclipse.jgit.gpg.bc/.classpath +++ b/org.eclipse.jgit.gpg.bc/.classpath @@ -2,11 +2,41 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.gpg.bc/.project b/org.eclipse.jgit.gpg.bc/.project index 86910cf3ad1..ebd7b6121c6 100644 --- a/org.eclipse.jgit.gpg.bc/.project +++ b/org.eclipse.jgit.gpg.bc/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855736 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.gpg.bc/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.gpg.bc/.settings/org.eclipse.core.resources.prefs index 99f26c0203a..b33191047b5 100644 --- a/org.eclipse.jgit.gpg.bc/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.gpg.bc/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.gpg.bc/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.gpg.bc/.settings/org.eclipse.jdt.core.prefs index d1f54bbe65c..3b56e780ddd 100644 --- a/org.eclipse.jgit.gpg.bc/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.gpg.bc/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index fd9c23d09d8..1305a9ad730 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/.classpath b/org.eclipse.jgit.http.apache/.classpath index 1fde318a04c..6ac071ba9e7 100644 --- a/org.eclipse.jgit.http.apache/.classpath +++ b/org.eclipse.jgit.http.apache/.classpath @@ -2,11 +2,41 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.http.apache/.project b/org.eclipse.jgit.http.apache/.project index f75f86bec24..dd2b8a1b727 100644 --- a/org.eclipse.jgit.http.apache/.project +++ b/org.eclipse.jgit.http.apache/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855748 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.http.apache/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.http.apache/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..b33191047b5 100644 --- a/org.eclipse.jgit.http.apache/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.http.apache/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.http.apache/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.http.apache/.settings/org.eclipse.jdt.core.prefs index f79df5b9dd9..ed5fdfc0f1d 100644 --- a/org.eclipse.jgit.http.apache/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.http.apache/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 6678ff8400c..bd35589f540 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,11 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/.classpath b/org.eclipse.jgit.http.server/.classpath index 139a059adc9..f46b706d30f 100644 --- a/org.eclipse.jgit.http.server/.classpath +++ b/org.eclipse.jgit.http.server/.classpath @@ -1,12 +1,42 @@ - - + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.http.server/.project b/org.eclipse.jgit.http.server/.project index 4a369a62f75..42c4d85346b 100644 --- a/org.eclipse.jgit.http.server/.project +++ b/org.eclipse.jgit.http.server/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855768 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.http.server/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.http.server/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..b33191047b5 100644 --- a/org.eclipse.jgit.http.server/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.http.server/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.http.server/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.http.server/.settings/org.eclipse.jdt.core.prefs index f79df5b9dd9..ed5fdfc0f1d 100644 --- a/org.eclipse.jgit.http.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.http.server/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index b7f3adf62c8..6a788e23235 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,11 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/.classpath b/org.eclipse.jgit.http.test/.classpath index e736f8e3063..46e10e94b37 100644 --- a/org.eclipse.jgit.http.test/.classpath +++ b/org.eclipse.jgit.http.test/.classpath @@ -2,19 +2,44 @@ - + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/org.eclipse.jgit.http.test/.project b/org.eclipse.jgit.http.test/.project index a70c3649617..e10a377d8bd 100644 --- a/org.eclipse.jgit.http.test/.project +++ b/org.eclipse.jgit.http.test/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855775 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.http.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.http.test/.settings/org.eclipse.core.resources.prefs index ceaec8217f4..0044a1277c2 100644 --- a/org.eclipse.jgit.http.test/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.http.test/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Fri Jun 18 23:33:29 CEST 2010 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 +encoding/tst=UTF-8 diff --git a/org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs index 69e9221102b..363011e880f 100644 --- a/org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.http.test/org.eclipse.jgit.http--All-Tests.launch b/org.eclipse.jgit.http.test/org.eclipse.jgit.http--All-Tests.launch index 146c0b52073..286d9270565 100644 --- a/org.eclipse.jgit.http.test/org.eclipse.jgit.http--All-Tests.launch +++ b/org.eclipse.jgit.http.test/org.eclipse.jgit.http--All-Tests.launch @@ -1,19 +1,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index de4cec4355c..336f43bfff6 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,11 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/.classpath b/org.eclipse.jgit.junit.http/.classpath index 73d6894a615..ee4d09e1a09 100644 --- a/org.eclipse.jgit.junit.http/.classpath +++ b/org.eclipse.jgit.junit.http/.classpath @@ -2,14 +2,36 @@ - + - + - + + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.junit.http/.project b/org.eclipse.jgit.junit.http/.project index 2de2238389c..149d06e8fde 100644 --- a/org.eclipse.jgit.junit.http/.project +++ b/org.eclipse.jgit.junit.http/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855786 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.junit.http/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.junit.http/.settings/org.eclipse.core.resources.prefs index f77db3b7230..7a531392842 100644 --- a/org.eclipse.jgit.junit.http/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.junit.http/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Sat Dec 20 21:21:24 CET 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.junit.http/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.junit.http/.settings/org.eclipse.jdt.core.prefs index e9a5a41226c..3fa961ed4e9 100644 --- a/org.eclipse.jgit.junit.http/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.junit.http/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index e5f16e50ef7..d883e03879f 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/.classpath b/org.eclipse.jgit.junit.ssh/.classpath index 1fde318a04c..6ac071ba9e7 100644 --- a/org.eclipse.jgit.junit.ssh/.classpath +++ b/org.eclipse.jgit.junit.ssh/.classpath @@ -2,11 +2,41 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.junit.ssh/.project b/org.eclipse.jgit.junit.ssh/.project index 3a0c494155f..7839ba0db8e 100644 --- a/org.eclipse.jgit.junit.ssh/.project +++ b/org.eclipse.jgit.junit.ssh/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855790 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.core.resources.prefs index f77db3b7230..b33191047b5 100644 --- a/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Sat Dec 20 21:21:24 CET 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.jdt.core.prefs index e9a5a41226c..3fa961ed4e9 100644 --- a/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index b19bcef544a..07d0218bf40 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/.classpath b/org.eclipse.jgit.junit/.classpath index 4a00becd81d..ee4d09e1a09 100644 --- a/org.eclipse.jgit.junit/.classpath +++ b/org.eclipse.jgit.junit/.classpath @@ -2,10 +2,36 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.junit/.project b/org.eclipse.jgit.junit/.project index c8d749b29f1..008eba7f2ca 100644 --- a/org.eclipse.jgit.junit/.project +++ b/org.eclipse.jgit.junit/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855780 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.junit/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.junit/.settings/org.eclipse.core.resources.prefs index f77db3b7230..7a531392842 100644 --- a/org.eclipse.jgit.junit/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.junit/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Sat Dec 20 21:21:24 CET 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs index bdfba71f547..1177745ff9e 100644 --- a/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs @@ -125,6 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 4b5f11de925..2c260e24752 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,11 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/.classpath b/org.eclipse.jgit.lfs.server.test/.classpath index 5899a4e74e4..04a638a8816 100644 --- a/org.eclipse.jgit.lfs.server.test/.classpath +++ b/org.eclipse.jgit.lfs.server.test/.classpath @@ -2,14 +2,44 @@ - + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.lfs.server.test/.project b/org.eclipse.jgit.lfs.server.test/.project index e3a4748e918..6810f60648d 100644 --- a/org.eclipse.jgit.lfs.server.test/.project +++ b/org.eclipse.jgit.lfs.server.test/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855823 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.core.resources.prefs index 4824b802631..60eebb24273 100644 --- a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/tst=UTF-8 diff --git a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs index 9c8bfdb117a..183a7a6c244 100644 --- a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 86703951a6e..1bab6208814 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/.classpath b/org.eclipse.jgit.lfs.server/.classpath index 139a059adc9..f46b706d30f 100644 --- a/org.eclipse.jgit.lfs.server/.classpath +++ b/org.eclipse.jgit.lfs.server/.classpath @@ -1,12 +1,42 @@ - - + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.lfs.server/.project b/org.eclipse.jgit.lfs.server/.project index 8379fea6770..c12b4376658 100644 --- a/org.eclipse.jgit.lfs.server/.project +++ b/org.eclipse.jgit.lfs.server/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855817 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.core.resources.prefs index 99f26c0203a..b33191047b5 100644 --- a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs index 0857bc15f29..b4a3fbbf55a 100644 --- a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 433927b8e3a..ae27153d71a 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/.classpath b/org.eclipse.jgit.lfs.test/.classpath index 722f3027a02..345388f4e4c 100644 --- a/org.eclipse.jgit.lfs.test/.classpath +++ b/org.eclipse.jgit.lfs.test/.classpath @@ -2,19 +2,44 @@ - + - + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + diff --git a/org.eclipse.jgit.lfs.test/.project b/org.eclipse.jgit.lfs.test/.project index c5dddb0e949..6ef287f467d 100644 --- a/org.eclipse.jgit.lfs.test/.project +++ b/org.eclipse.jgit.lfs.test/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855827 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.lfs.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.lfs.test/.settings/org.eclipse.core.resources.prefs index 4824b802631..0044a1277c2 100644 --- a/org.eclipse.jgit.lfs.test/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.lfs.test/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 +encoding/tst=UTF-8 diff --git a/org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs index 69e9221102b..363011e880f 100644 --- a/org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 9fd1084448c..1d782e6fd31 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/.classpath b/org.eclipse.jgit.lfs/.classpath index 139a059adc9..f46b706d30f 100644 --- a/org.eclipse.jgit.lfs/.classpath +++ b/org.eclipse.jgit.lfs/.classpath @@ -1,12 +1,42 @@ - - + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.lfs/.project b/org.eclipse.jgit.lfs/.project index d9beec1979c..aac9e9280e8 100644 --- a/org.eclipse.jgit.lfs/.project +++ b/org.eclipse.jgit.lfs/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855797 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.lfs/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.lfs/.settings/org.eclipse.core.resources.prefs index 99f26c0203a..b33191047b5 100644 --- a/org.eclipse.jgit.lfs/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.lfs/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs index 0857bc15f29..b4a3fbbf55a 100644 --- a/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index b4394676688..949c568217c 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.lfs 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 9f45897b60f..54feb9d384c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.feature 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 58ddcc8f222..760903e7e0e 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,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.feature 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 13d72856536..b725dff2162 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,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.feature 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 117102859fb..3566dbb4a07 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,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.feature 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 05293cf3a60..50338a60c5e 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,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.feature 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 4724ae327dc..4b0e26aa942 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,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 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 59a332d64d1..9ccf39eafa2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.repository 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 81c5076335c..d8b5de2436a 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,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.feature @@ -34,11 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 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 b4f410d8d6a..591b4480169 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,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.feature 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 5fcc921cd3b..e461bff45af 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,11 +17,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.feature 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 d1498220c30..2a95042eed9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,11 +16,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 6530a82b8dc..2d92e9313bd 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,11 +16,7 @@ org.eclipse.jgit jgit.tycho.parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/.classpath b/org.eclipse.jgit.pgm.test/.classpath index 855f717cace..15a143e1575 100644 --- a/org.eclipse.jgit.pgm.test/.classpath +++ b/org.eclipse.jgit.pgm.test/.classpath @@ -1,20 +1,45 @@ - + + + - + - + + - + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.pgm.test/.project b/org.eclipse.jgit.pgm.test/.project index cf0a9ed27c4..99a827709d5 100644 --- a/org.eclipse.jgit.pgm.test/.project +++ b/org.eclipse.jgit.pgm.test/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855836 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.core.resources.prefs index f77db3b7230..d8fc92ce99a 100644 --- a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Sat Dec 20 21:21:24 CET 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/src=UTF-8 +encoding/tst=UTF-8 diff --git a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs index 69e9221102b..363011e880f 100644 --- a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests (Java11) (de).launch b/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests (Java11) (de).launch index b860abbf63c..0f9455009db 100644 --- a/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests (Java11) (de).launch +++ b/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests (Java11) (de).launch @@ -1,30 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests (Java11).launch b/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests (Java11).launch index 02a4dab02e7..2b9cf029eca 100644 --- a/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests (Java11).launch +++ b/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests (Java11).launch @@ -1,27 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests.launch b/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests.launch index 77c04663db5..60527163f44 100644 --- a/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests.launch +++ b/org.eclipse.jgit.pgm.test/org.eclipse.jgit.pgm--All-Tests.launch @@ -1,20 +1,22 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 3f340cedc03..c824788255b 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/.classpath b/org.eclipse.jgit.pgm/.classpath index e8b509e018c..f46b706d30f 100644 --- a/org.eclipse.jgit.pgm/.classpath +++ b/org.eclipse.jgit.pgm/.classpath @@ -1,13 +1,42 @@ - - - + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.pgm/.project b/org.eclipse.jgit.pgm/.project index 78a63ccfb8f..60cf7b247e8 100644 --- a/org.eclipse.jgit.pgm/.project +++ b/org.eclipse.jgit.pgm/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855832 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.pgm/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.pgm/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..b33191047b5 100644 --- a/org.eclipse.jgit.pgm/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.pgm/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.pgm/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.pgm/.settings/org.eclipse.jdt.core.prefs index 2abe9529d32..bcbbab9b646 100644 --- a/org.eclipse.jgit.pgm/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.pgm/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 7c53d4f5ef0..f31190667bc 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/.classpath b/org.eclipse.jgit.ssh.apache.agent/.classpath index df1b324f7f4..6ac071ba9e7 100644 --- a/org.eclipse.jgit.ssh.apache.agent/.classpath +++ b/org.eclipse.jgit.ssh.apache.agent/.classpath @@ -1,8 +1,42 @@ - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.ssh.apache.agent/.project b/org.eclipse.jgit.ssh.apache.agent/.project index 73358f4a6b6..fca7f1ed619 100644 --- a/org.eclipse.jgit.ssh.apache.agent/.project +++ b/org.eclipse.jgit.ssh.apache.agent/.project @@ -20,9 +20,26 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + + + 1650997855848 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.ssh.apache.agent/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.ssh.apache.agent/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..b33191047b5 100644 --- a/org.eclipse.jgit.ssh.apache.agent/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.ssh.apache.agent/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.ssh.apache.agent/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ssh.apache.agent/.settings/org.eclipse.jdt.core.prefs index d1f54bbe65c..3b56e780ddd 100644 --- a/org.eclipse.jgit.ssh.apache.agent/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ssh.apache.agent/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.ssh.apache.test/.classpath b/org.eclipse.jgit.ssh.apache.test/.classpath index 5899a4e74e4..46e10e94b37 100644 --- a/org.eclipse.jgit.ssh.apache.test/.classpath +++ b/org.eclipse.jgit.ssh.apache.test/.classpath @@ -2,14 +2,44 @@ - + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.ssh.apache.test/.project b/org.eclipse.jgit.ssh.apache.test/.project index 0aafb730fb1..5d3fa3d64a8 100644 --- a/org.eclipse.jgit.ssh.apache.test/.project +++ b/org.eclipse.jgit.ssh.apache.test/.project @@ -20,9 +20,26 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + + + 1650997855867 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.core.resources.prefs index f77db3b7230..689aec86684 100644 --- a/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Sat Dec 20 21:21:24 CET 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/tst=UTF-8 diff --git a/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.jdt.core.prefs index 76f48d86d5a..b012856c92f 100644 --- a/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 5364c0876c4..3807895ae5e 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/.classpath b/org.eclipse.jgit.ssh.apache/.classpath index 1fde318a04c..6ac071ba9e7 100644 --- a/org.eclipse.jgit.ssh.apache/.classpath +++ b/org.eclipse.jgit.ssh.apache/.classpath @@ -2,11 +2,41 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.ssh.apache/.project b/org.eclipse.jgit.ssh.apache/.project index a7bbd6bafd4..bb3f65ddc6b 100644 --- a/org.eclipse.jgit.ssh.apache/.project +++ b/org.eclipse.jgit.ssh.apache/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855842 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..b33191047b5 100644 --- a/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.jdt.core.prefs index d1f54bbe65c..3b56e780ddd 100644 --- a/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e47c8edaff5..63b903b835f 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/.classpath b/org.eclipse.jgit.ssh.jsch.test/.classpath index 5899a4e74e4..46e10e94b37 100644 --- a/org.eclipse.jgit.ssh.jsch.test/.classpath +++ b/org.eclipse.jgit.ssh.jsch.test/.classpath @@ -2,14 +2,44 @@ - + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.ssh.jsch.test/.project b/org.eclipse.jgit.ssh.jsch.test/.project index ad4fefec1b4..5404db5601f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/.project +++ b/org.eclipse.jgit.ssh.jsch.test/.project @@ -20,9 +20,26 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + + + 1650997855874 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 55d9271a1ab..ca1e7423446 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/.classpath b/org.eclipse.jgit.ssh.jsch/.classpath index 1fde318a04c..6ac071ba9e7 100644 --- a/org.eclipse.jgit.ssh.jsch/.classpath +++ b/org.eclipse.jgit.ssh.jsch/.classpath @@ -2,11 +2,41 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.ssh.jsch/.project b/org.eclipse.jgit.ssh.jsch/.project index c29a38cb54a..1ae5ed2c35a 100644 --- a/org.eclipse.jgit.ssh.jsch/.project +++ b/org.eclipse.jgit.ssh.jsch/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855870 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.ssh.jsch/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.ssh.jsch/.settings/org.eclipse.core.resources.prefs index 99f26c0203a..b33191047b5 100644 --- a/org.eclipse.jgit.ssh.jsch/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.ssh.jsch/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.ssh.jsch/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ssh.jsch/.settings/org.eclipse.jdt.core.prefs index d1f54bbe65c..3b56e780ddd 100644 --- a/org.eclipse.jgit.ssh.jsch/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ssh.jsch/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index aad6de91504..3b6d66c68c6 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,11 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/.classpath b/org.eclipse.jgit.test/.classpath index 363ffa34c5d..aa417e31151 100644 --- a/org.eclipse.jgit.test/.classpath +++ b/org.eclipse.jgit.test/.classpath @@ -1,14 +1,22 @@ - + + + - - + + + + + + + + @@ -18,9 +26,31 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.test/.project b/org.eclipse.jgit.test/.project index 80bb7dab4fa..d3ed333c13d 100644 --- a/org.eclipse.jgit.test/.project +++ b/org.eclipse.jgit.test/.project @@ -2,6 +2,8 @@ org.eclipse.jgit.test + + org.eclipse.jdt.core.javabuilder @@ -23,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855881 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.test/.settings/org.eclipse.core.resources.prefs index cddb99d1d5c..123be213e5c 100644 --- a/org.eclipse.jgit.test/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.test/.settings/org.eclipse.core.resources.prefs @@ -1,7 +1,5 @@ eclipse.preferences.version=1 -encoding//tst-rsrc/org/eclipse/jgit/diff/umlaut.patch=ISO-8859-1 -encoding//tst-rsrc/org/eclipse/jgit/diff/umlaut_PostImage=ISO-8859-1 -encoding//tst-rsrc/org/eclipse/jgit/patch/testGetText_BothISO88591.patch=ISO-8859-1 -encoding//tst-rsrc/org/eclipse/jgit/patch/testGetText_Convert.patch=ISO-8859-1 -encoding//tst-rsrc/org/eclipse/jgit/patch/testGetText_DiffCc.patch=ISO-8859-1 encoding/=UTF-8 +encoding/src=UTF-8 +encoding/tst=UTF-8 +encoding/tst-rsrc=UTF-8 diff --git a/org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs index 69e9221102b..363011e880f 100644 --- a/org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 11) (de).launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 11) (de).launch index fdfdce834ee..b15385f8e2e 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 11) (de).launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 11) (de).launch @@ -1,31 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 11).launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 11).launch index 89c23c3234f..b213de932af 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 11).launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 11).launch @@ -1,28 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch index 12669a9237f..f64cfdbbeff 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch @@ -1,20 +1,22 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index c5993cd1351..6b66919894c 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,11 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/.classpath b/org.eclipse.jgit.ui/.classpath index 1fde318a04c..6ac071ba9e7 100644 --- a/org.eclipse.jgit.ui/.classpath +++ b/org.eclipse.jgit.ui/.classpath @@ -2,11 +2,41 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit.ui/.project b/org.eclipse.jgit.ui/.project index 59e2e097b6b..6de0adf115a 100644 --- a/org.eclipse.jgit.ui/.project +++ b/org.eclipse.jgit.ui/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855886 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.ui/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..b33191047b5 100644 --- a/org.eclipse.jgit.ui/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit.ui/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ui/.settings/org.eclipse.jdt.core.prefs index 0857bc15f29..b4a3fbbf55a 100644 --- a/org.eclipse.jgit.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ui/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index cf580b95744..125e120b455 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,11 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/.classpath b/org.eclipse.jgit/.classpath index 139a059adc9..f46b706d30f 100644 --- a/org.eclipse.jgit/.classpath +++ b/org.eclipse.jgit/.classpath @@ -1,12 +1,42 @@ - - + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit/.project b/org.eclipse.jgit/.project index d785b658014..ae1054f0037 100644 --- a/org.eclipse.jgit/.project +++ b/org.eclipse.jgit/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + 1650997855687 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.eclipse.jgit/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit/.settings/org.eclipse.core.resources.prefs index 66ac15c47ce..b33191047b5 100644 --- a/org.eclipse.jgit/.settings/org.eclipse.core.resources.prefs +++ b/org.eclipse.jgit/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,4 @@ -#Mon Aug 11 16:46:12 PDT 2008 eclipse.preferences.version=1 encoding/=UTF-8 +encoding/resources=UTF-8 +encoding/src=UTF-8 diff --git a/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs index 2abe9529d32..bcbbab9b646 100644 --- a/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs @@ -114,6 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error +org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index b09613684dc..f0e92b3894d 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,11 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent -<<<<<<< HEAD 6.1.1-SNAPSHOT -======= - 5.9.0-snc-2 ->>>>>>> stable-5.9 org.eclipse.jgit From d5d4a6e9d09db176ab9a7233dce45ab78cd09eba Mon Sep 17 00:00:00 2001 From: "venkateswar.kaluva" Date: Tue, 26 Apr 2022 14:56:48 -0500 Subject: [PATCH 28/29] fix compilation errors --- .../src/org/eclipse/jgit/transport/sshd/SshdSession.java | 7 ------- .../tst/org/eclipse/jgit/api/PushCommandTest.java | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java index 5dbb2db2da7..f3a16140c1d 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java @@ -49,14 +49,7 @@ import org.apache.sshd.sftp.client.SftpClient.CopyMode; import org.apache.sshd.sftp.client.SftpClientFactory; import org.apache.sshd.sftp.common.SftpException; -import org.apache.sshd.client.subsystem.sftp.SftpClient; -import org.apache.sshd.client.subsystem.sftp.SftpClient.CloseableHandle; -import org.apache.sshd.client.subsystem.sftp.SftpClient.CopyMode; -import org.apache.sshd.client.subsystem.sftp.SftpClientFactory; import org.apache.sshd.common.channel.PtyChannelConfiguration; -import org.apache.sshd.common.session.Session; -import org.apache.sshd.common.session.SessionListener; -import org.apache.sshd.common.subsystem.sftp.SftpException; import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.internal.transport.ssh.OpenSshConfigFile; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java index 217eea14fd2..3155c770e8d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java @@ -31,6 +31,7 @@ import org.eclipse.jgit.hooks.PrePushHook; import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; From 6f150771d6537fe28d5d0acf8129af13984828f5 Mon Sep 17 00:00:00 2001 From: "venkateswar.kaluva" Date: Tue, 26 Apr 2022 15:59:11 -0500 Subject: [PATCH 29/29] fix Git resource leak warnings --- .../eclipse/jgit/diff/DiffFormatterTest.java | 331 +++++++++--------- 1 file changed, 169 insertions(+), 162 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java index e55b8e246ad..2ca74ed165e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java @@ -403,33 +403,34 @@ public void testDiffDeltaFilter_emptyFilter() throws Exception { File folder = new File(db.getDirectory().getParent(), "folder"); FileUtils.mkdir(folder); write(new File(folder, "folder.txt"), "folder"); - Git git = new Git(db); - git.add().addFilepattern(".").call(); - git.commit().setMessage("Initial commit").call(); - write(new File(folder, "folder.txt"), "folder change"); - - ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); - dfmt.setRepository(db); - dfmt.setPathFilter(PathFilter.create("folder")); - DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); - FileTreeIterator newTree = new FileTreeIterator(db); - - //testing an empty delta filter - Pattern deltaFilterPattern = Pattern.compile(""); - dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); - dfmt.flush(); - - String actual = os.toString("UTF-8"); - String expected = - "diff --git a/folder/folder.txt b/folder/folder.txt\n" - + "index 0119635..95c4c65 100644\n" - + "--- a/folder/folder.txt\n" + "+++ b/folder/folder.txt\n" - + "@@ -1 +1 @@\n" + "-folder\n" - + "\\ No newline at end of file\n" + "+folder change\n" - + "\\ No newline at end of file\n"; - - assertEquals(expected, actual); + try (Git git = new Git(db); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os))) { + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folder change"); + + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing an empty delta filter + Pattern deltaFilterPattern = Pattern.compile(""); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + String actual = os.toString("UTF-8"); + String expected = + "diff --git a/folder/folder.txt b/folder/folder.txt\n" + + "index 0119635..95c4c65 100644\n" + + "--- a/folder/folder.txt\n" + "+++ b/folder/folder.txt\n" + + "@@ -1 +1 @@\n" + "-folder\n" + + "\\ No newline at end of file\n" + "+folder change\n" + + "\\ No newline at end of file\n"; + + assertEquals(expected, actual); + } } @Test @@ -440,35 +441,36 @@ public void testDiffDeltaFilter_addFile() throws Exception { write(new File(db.getDirectory().getParent(), "test.txt"), "test"); File folder = new File(db.getDirectory().getParent(), "folder"); FileUtils.mkdir(folder); - Git git = new Git(db); - git.add().addFilepattern(".").call(); - git.commit().setMessage("Initial commit").call(); - write(new File(folder, "folder.txt"), "change"); + try (Git git = new Git(db); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os))) { + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "change"); - ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); - dfmt.setRepository(db); - dfmt.setPathFilter(PathFilter.create("folder")); - DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); - FileTreeIterator newTree = new FileTreeIterator(db); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); - //testing a delta filter with one regex - Pattern deltaFilterPattern = Pattern.compile("change"); - dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); - dfmt.flush(); + //testing a delta filter with one regex + Pattern deltaFilterPattern = Pattern.compile("change"); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); - String actual = os.toString("UTF-8"); - String expected = - "diff --git a/folder/folder.txt b/folder/folder.txt\n" - + "new file mode 100644\n" - + "index 0000000..8013df8\n" - + "--- /dev/null\n" - + "+++ b/folder/folder.txt\n" - + "@@ -0,0 +1 @@\n" - + "+change\n" - + "\\ No newline at end of file\n"; + String actual = os.toString("UTF-8"); + String expected = + "diff --git a/folder/folder.txt b/folder/folder.txt\n" + + "new file mode 100644\n" + + "index 0000000..8013df8\n" + + "--- /dev/null\n" + + "+++ b/folder/folder.txt\n" + + "@@ -0,0 +1 @@\n" + + "+change\n" + + "\\ No newline at end of file\n"; - assertEquals(expected, actual); + assertEquals(expected, actual); + } } @Test @@ -480,35 +482,36 @@ public void testDiffDeltaFilter_deleteFile() throws Exception { File folder = new File(db.getDirectory().getParent(), "folder"); FileUtils.mkdir(folder); write(new File(folder, "folder.txt"), "change"); - Git git = new Git(db); - git.add().addFilepattern(".").call(); - git.commit().setMessage("Initial commit").call(); - new File(folder, "folder.txt").delete(); - - ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); - dfmt.setRepository(db); - dfmt.setPathFilter(PathFilter.create("folder")); - DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); - FileTreeIterator newTree = new FileTreeIterator(db); - - //testing a delta filter with one regex - Pattern deltaFilterPattern = Pattern.compile("change"); - dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); - dfmt.flush(); - - String actual = os.toString("UTF-8"); - String expected = - "diff --git a/folder/folder.txt b/folder/folder.txt\n" - + "deleted file mode 100644\n" - + "index 8013df8..0000000\n" - + "--- a/folder/folder.txt\n" - + "+++ /dev/null\n" - + "@@ -1 +0,0 @@\n" - + "-change\n" - + "\\ No newline at end of file\n"; - - assertEquals(expected, actual); + try (Git git = new Git(db); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os))) { + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + new File(folder, "folder.txt").delete(); + + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex + Pattern deltaFilterPattern = Pattern.compile("change"); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + String actual = os.toString("UTF-8"); + String expected = + "diff --git a/folder/folder.txt b/folder/folder.txt\n" + + "deleted file mode 100644\n" + + "index 8013df8..0000000\n" + + "--- a/folder/folder.txt\n" + + "+++ /dev/null\n" + + "@@ -1 +0,0 @@\n" + + "-change\n" + + "\\ No newline at end of file\n"; + + assertEquals(expected, actual); + } } @Test @@ -520,24 +523,25 @@ public void testDiffDeltaFilter_filteredModifiedFile() throws Exception { File folder = new File(db.getDirectory().getParent(), "folder"); FileUtils.mkdir(folder); write(new File(folder, "folder.txt"), "folder"); - Git git = new Git(db); - git.add().addFilepattern(".").call(); - git.commit().setMessage("Initial commit").call(); - write(new File(folder, "folder.txt"), "folderchange"); - - ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); - dfmt.setRepository(db); - dfmt.setPathFilter(PathFilter.create("folder")); - DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); - FileTreeIterator newTree = new FileTreeIterator(db); - - //testing a delta filter with one regex (ANY) - Pattern deltaFilterPattern = Pattern.compile("change"); - dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); - dfmt.flush(); - - assertEquals("", os.toString("UTF-8")); + try (Git git = new Git(db); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os))) { + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); + + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex (ANY) + Pattern deltaFilterPattern = Pattern.compile("change"); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + assertEquals("", os.toString("UTF-8")); + } } @Test @@ -549,26 +553,27 @@ public void testDiffDeltaFilterModifyOnly_filteredModifiedFile() throws Exceptio File folder = new File(db.getDirectory().getParent(), "folder"); FileUtils.mkdir(folder); write(new File(folder, "folder.txt"), "folder"); - Git git = new Git(db); - git.add().addFilepattern(".").call(); - git.commit().setMessage("Initial commit").call(); - write(new File(folder, "folder.txt"), "folderchange"); + try (Git git = new Git(db); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os))) { + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); - ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); - dfmt.setRepository(db); - dfmt.setPathFilter(PathFilter.create("folder")); - DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); - FileTreeIterator newTree = new FileTreeIterator(db); + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); - //testing a delta filter with one regex (ANY) - Pattern deltaFilterPattern = Pattern.compile("change"); + //testing a delta filter with one regex (ANY) + Pattern deltaFilterPattern = Pattern.compile("change"); - List result = dfmt.scan(oldTree, newTree); - dfmt.filterModifiedFiles(result, deltaFilterPattern); - dfmt.flush(); + List result = dfmt.scan(oldTree, newTree); + dfmt.filterModifiedFiles(result, deltaFilterPattern); + dfmt.flush(); - assertEquals(0, result.size()); + assertEquals(0, result.size()); + } } @Test @@ -580,33 +585,34 @@ public void testDiffDeltaFilter_filterNoMatch() throws Exception { File folder = new File(db.getDirectory().getParent(), "folder"); FileUtils.mkdir(folder); write(new File(folder, "folder.txt"), "folder"); - Git git = new Git(db); - git.add().addFilepattern(".").call(); - git.commit().setMessage("Initial commit").call(); - write(new File(folder, "folder.txt"), "folderchange"); - - ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); - dfmt.setRepository(db); - dfmt.setPathFilter(PathFilter.create("folder")); - DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); - FileTreeIterator newTree = new FileTreeIterator(db); - - //testing a delta filter with one regex (ANY) - Pattern deltaFilterPattern = Pattern.compile("xxxx"); - dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); - dfmt.flush(); - - String actual = os.toString("UTF-8"); - String expected = - "diff --git a/folder/folder.txt b/folder/folder.txt\n" - + "index 0119635..0b099ef 100644\n" - + "--- a/folder/folder.txt\n" + "+++ b/folder/folder.txt\n" - + "@@ -1 +1 @@\n" + "-folder\n" - + "\\ No newline at end of file\n" + "+folderchange\n" - + "\\ No newline at end of file\n"; - - assertEquals(expected, actual); + try (Git git = new Git(db); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os))) { + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); + + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex (ANY) + Pattern deltaFilterPattern = Pattern.compile("xxxx"); + dfmt.format(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + String actual = os.toString("UTF-8"); + String expected = + "diff --git a/folder/folder.txt b/folder/folder.txt\n" + + "index 0119635..0b099ef 100644\n" + + "--- a/folder/folder.txt\n" + "+++ b/folder/folder.txt\n" + + "@@ -1 +1 @@\n" + "-folder\n" + + "\\ No newline at end of file\n" + "+folderchange\n" + + "\\ No newline at end of file\n"; + + assertEquals(expected, actual); + } } @Test @@ -618,26 +624,27 @@ public void testDiffDeltaFilterModifyOnly_filterNoMatch() throws Exception { File folder = new File(db.getDirectory().getParent(), "folder"); FileUtils.mkdir(folder); write(new File(folder, "folder.txt"), "folder"); - Git git = new Git(db); - git.add().addFilepattern(".").call(); - git.commit().setMessage("Initial commit").call(); - write(new File(folder, "folder.txt"), "folderchange"); - - ByteArrayOutputStream os = new ByteArrayOutputStream(); - DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os)); - dfmt.setRepository(db); - dfmt.setPathFilter(PathFilter.create("folder")); - DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); - FileTreeIterator newTree = new FileTreeIterator(db); - - //testing a delta filter with one regex (ANY) - Pattern deltaFilterPattern = Pattern.compile("xxxx"); - - List result = dfmt.scan(oldTree, newTree); - dfmt.filterModifiedFiles(dfmt.scan(oldTree, newTree), deltaFilterPattern); - dfmt.flush(); - - assertEquals(1, result.size()); + try (Git git = new Git(db); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter dfmt = new DiffFormatter(new BufferedOutputStream(os))) { + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + write(new File(folder, "folder.txt"), "folderchange"); + + dfmt.setRepository(db); + dfmt.setPathFilter(PathFilter.create("folder")); + DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache()); + FileTreeIterator newTree = new FileTreeIterator(db); + + //testing a delta filter with one regex (ANY) + Pattern deltaFilterPattern = Pattern.compile("xxxx"); + + List result = dfmt.scan(oldTree, newTree); + dfmt.filterModifiedFiles(dfmt.scan(oldTree, newTree), deltaFilterPattern); + dfmt.flush(); + + assertEquals(1, result.size()); + } } @Test