From c221bd6c15887ad97e4c32bf213a6de69ecaaf53 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Wed, 20 Jan 2016 22:08:23 -0800 Subject: [PATCH 01/12] Fix unused throws CorruptObjectException from addTree 2262a794b48ea removed throws CorruptObjectException, but was not compiled under Eclipse and did not see errors generated by Eclipse. Maven build silently ignored the unnecessary code. Change-Id: I6e9014adcc604588e10e5963d13d0c6ef0e1c617 --- .../jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java | 3 +-- .../tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java index 6ad19a249..4215ba23e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java @@ -56,7 +56,6 @@ import java.util.Collections; import java.util.List; import org.eclipse.jgit.attributes.Attribute.State; -import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.FileMode; @@ -253,7 +252,7 @@ public class AttributesNodeWorkingTreeIteratorTest extends RepositoryTestCase { writeTrashFile(name, data.toString()); } - private TreeWalk beginWalk() throws CorruptObjectException { + private TreeWalk beginWalk() { TreeWalk newWalk = new TreeWalk(db); newWalk.addTree(new FileTreeIterator(db)); return newWalk; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java index 5893d8c40..c026efcde 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java @@ -55,7 +55,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.ignore.IgnoreNode.MatchResult; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.FileMode; @@ -509,7 +508,7 @@ public class IgnoreNodeTest extends RepositoryTestCase { .toString()); } - private void beginWalk() throws CorruptObjectException { + private void beginWalk() { walk = new TreeWalk(db); walk.addTree(new FileTreeIterator(db)); } From 82f47ace3d8f2141059cbe76ca51d4916a3e5d02 Mon Sep 17 00:00:00 2001 From: Chris Gavin Date: Wed, 6 Jan 2016 15:53:22 +0000 Subject: [PATCH 02/12] Fix TransportException when reading bundle When reading a bundle file, commit messages who's oneline format is longer than 982 characters caused JGit to treat subsequent text in the commit as a SHA, then throw a TransportException because it's not a valid SHA. Now the readLine method will read all the way to the end of the line, not just the first 1024 characters of it. Change-Id: If15b491aa9a1e4fd9b8bbed2dd9e6be47a64ccb7 Signed-off-by: Chris Gavin --- .../jgit/transport/BundleFetchConnection.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java index e53c04b53..8038fa4d3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java @@ -161,16 +161,23 @@ class BundleFetchConnection extends BaseFetchConnection { } private String readLine(final byte[] hdrbuf) throws IOException { - bin.mark(hdrbuf.length); - final int cnt = bin.read(hdrbuf); - int lf = 0; - while (lf < cnt && hdrbuf[lf] != '\n') - lf++; - bin.reset(); - IO.skipFully(bin, lf); - if (lf < cnt && hdrbuf[lf] == '\n') - IO.skipFully(bin, 1); - return RawParseUtils.decode(Constants.CHARSET, hdrbuf, 0, lf); + StringBuilder line = new StringBuilder(); + boolean done = false; + while (!done) { + bin.mark(hdrbuf.length); + final int cnt = bin.read(hdrbuf); + int lf = 0; + while (lf < cnt && hdrbuf[lf] != '\n') + lf++; + bin.reset(); + IO.skipFully(bin, lf); + if (lf < cnt && hdrbuf[lf] == '\n') { + IO.skipFully(bin, 1); + done = true; + } + line.append(RawParseUtils.decode(Constants.CHARSET, hdrbuf, 0, lf)); + } + return line.toString(); } public boolean didFetchTestConnectivity() { From 44097515163f0be59775221b7fad6120452801c5 Mon Sep 17 00:00:00 2001 From: Laurent Delaigue Date: Wed, 13 Jan 2016 16:56:00 +0100 Subject: [PATCH 03/12] Add progress monitor to Merger Monitoring progress of merges can be useful for users for large repositories or complex merge processes that take some time. This enables setting a monitor. Existing merge implementations in jgit do not yet report progress if a monitor is set. This will be added in a later change. Change-Id: I17b978b3fc91750dd88649638b90a46820a0877c Signed-off-by: Laurent Delaigue Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/api/MergeCommand.java | 25 ++++++++++++++++++ .../src/org/eclipse/jgit/api/PullCommand.java | 2 ++ .../org/eclipse/jgit/api/RebaseCommand.java | 2 ++ .../jgit/api/SubmoduleUpdateCommand.java | 3 +++ .../src/org/eclipse/jgit/merge/Merger.java | 26 +++++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java index d2075a70f..bfe90a3a4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2010, Christian Halstrick * Copyright (C) 2010-2014, Stefan Lay + * Copyright (C) 2016, Laurent Delaigue * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -65,8 +66,10 @@ import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Config.ConfigEnum; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef; +import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Ref.Storage; import org.eclipse.jgit.lib.RefUpdate; @@ -106,6 +109,8 @@ public class MergeCommand extends GitCommand { private String message; + private ProgressMonitor monitor = NullProgressMonitor.INSTANCE; + /** * The modes available for fast forward merges corresponding to the * --ff, --no-ff and --ff-only @@ -330,6 +335,7 @@ public class MergeCommand extends GitCommand { repo.writeSquashCommitMsg(squashMessage); } Merger merger = mergeStrategy.newMerger(repo); + merger.setProgressMonitor(monitor); boolean noProblems; Map> lowLevelResults = null; Map failingPaths = null; @@ -586,4 +592,23 @@ public class MergeCommand extends GitCommand { this.message = message; return this; } + + /** + * The progress monitor associated with the diff operation. By default, this + * is set to NullProgressMonitor + * + * @see NullProgressMonitor + * + * @param monitor + * A progress monitor + * @return this instance + * @since 4.2 + */ + public MergeCommand setProgressMonitor(ProgressMonitor monitor) { + if (monitor == null) { + monitor = NullProgressMonitor.INSTANCE; + } + this.monitor = monitor; + return this; + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java index 2783edd5d..549ef6cf1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2010, Christian Halstrick * Copyright (C) 2010, Mathias Kinzler + * Copyright (C) 2016, Laurent Delaigue * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -326,6 +327,7 @@ public class PullCommand extends TransportCommand { MergeCommand merge = new MergeCommand(repo); merge.include(upstreamName, commitToMerge); merge.setStrategy(strategy); + merge.setProgressMonitor(monitor); MergeResult mergeRes = merge.call(); monitor.update(1); result = new PullResult(fetchRes, remote, mergeRes); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index e3e76c95f..643ec7a51 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2010, 2013 Mathias Kinzler + * Copyright (C) 2016, Laurent Delaigue * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -611,6 +612,7 @@ public class RebaseCommand extends GitCommand { // their non-first parents rewritten MergeCommand merge = git.merge() .setFastForward(MergeCommand.FastForwardMode.NO_FF) + .setProgressMonitor(monitor) .setCommit(false); for (int i = 1; i < commitToPick.getParentCount(); i++) merge.include(newParents.get(i)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java index e288d7755..342d7f42f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2011, GitHub Inc. + * Copyright (C) 2016, Laurent Delaigue * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -178,11 +179,13 @@ public class SubmoduleUpdateCommand extends if (ConfigConstants.CONFIG_KEY_MERGE.equals(update)) { MergeCommand merge = new MergeCommand(submoduleRepo); merge.include(commit); + merge.setProgressMonitor(monitor); merge.setStrategy(strategy); merge.call(); } else if (ConfigConstants.CONFIG_KEY_REBASE.equals(update)) { RebaseCommand rebase = new RebaseCommand(submoduleRepo); rebase.setUpstream(commit); + rebase.setProgressMonitor(monitor); rebase.setStrategy(strategy); rebase.call(); } else { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java index 983bf5c91..bee2d0352 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2008-2013, Google Inc. + * Copyright (C) 2016, Laurent Delaigue * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -51,9 +52,11 @@ import org.eclipse.jgit.errors.NoMergeBaseException; import org.eclipse.jgit.errors.NoMergeBaseException.MergeBaseFailureReason; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectReader; +import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevObject; @@ -87,6 +90,13 @@ public abstract class Merger { /** The trees matching every entry in {@link #sourceObjects}. */ protected RevTree[] sourceTrees; + /** + * A progress monitor. + * + * @since 4.2 + */ + protected ProgressMonitor monitor = NullProgressMonitor.INSTANCE; + /** * Create a new merge instance for a repository. * @@ -290,4 +300,20 @@ public abstract class Merger { * @return resulting tree, if {@link #merge(AnyObjectId[])} returned true. */ public abstract ObjectId getResultTreeId(); + + /** + * Set a progress monitor. + * + * @param monitor + * Monitor to use, can be null to indicate no progress reporting + * is desired. + * @since 4.2 + */ + public void setProgressMonitor(ProgressMonitor monitor) { + if (monitor == null) { + this.monitor = NullProgressMonitor.INSTANCE; + } else { + this.monitor = monitor; + } + } } From 20c2079f70c0150dcda105a6952a73b57c2c4f6a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 21 Jan 2016 23:47:12 +0100 Subject: [PATCH 04/12] JGit v4.2.0.201601211800-r Change-Id: I89f33b0da81ff499315baa5311f95f31724fa510 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 46 files changed, 49 insertions(+), 49 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index c3b9a3790..32d231f68 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index f8bf0838b..c0205d2c1 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 0cdf8bac2..043c389b9 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 1a445ea87..d7f4839dc 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 2bd016422..7bd23f638 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 8d7846b6a..7e8661d9f 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.2.0.qualifier";roots="." +Bundle-Version: 4.2.0.201601211800-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.2.0.201601211800-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index c93da4bf4..45158458a 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 8058f309f..b31351593 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 68d3c2269..84a07177b 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 78c41c487..e228b519d 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.http.server;version="4.2.0", diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 9859a1d12..b7b91d7f5 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index f8bd4915f..a80f210fa 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 0af30f659..4bd1fe3d7 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 32bca1bda..c0d59b97d 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index a61e6801a..7953d8ce6 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 7449004ba..f380b5be4 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index bf281e62b..84e7a3139 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 99e153edc..911adf008 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index e0bdd3871..689bcc133 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index ac37d0771..296b71a5e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index b1f8302fd..0ee2e7432 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 00f368cd7..28af5092a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 2bef9a6d3..da2fb723c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 254852f2c..5f811cbb9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 91e00170b..d0d87eab2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index f7766ea3a..1446fe906 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index cc3b18279..e1bccc0d8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index b6e6869fe..c9d492f2b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 967d6c23d..070b4529d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 8fd1da658..6de1ce2d6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 572ac376e..9196587dd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 869968864..01ff97714 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index dd329b4b0..563b5479e 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 2514fdff7..299699677 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 955674a06..04453bf2b 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 9dc6aea16..ec306d83b 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index a3fef2e29..3ae1b878f 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.2.0.qualifier";roots="." +Bundle-Version: 4.2.0.201601211800-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.2.0.201601211800-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 264249132..d3fdf3ff2 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index f78fe5b24..9c0d76095 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 539caff14..6065b5c2d 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 4e2db1bfc..54a6eabae 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.eclipse.jgit.awtui;version="4.2.0" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 6a56f8cf3..8a846971e 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 25d0be6ec..796ebf484 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.2.0.201601211800-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index a03d7df6c..10b5cab41 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="4.2.0.qualifier";roots="." +Bundle-Version: 4.2.0.201601211800-r +Eclipse-SourceBundle: org.eclipse.jgit;version="4.2.0.201601211800-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 4f98323e5..965fbe8c0 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 6b4170835..a65622dd9 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.2.0-SNAPSHOT + 4.2.0.201601211800-r JGit - Parent ${jgit-url} From fc4d117511858c0546e85b20dfc319759ce9d9bb Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 22 Jan 2016 01:48:52 +0100 Subject: [PATCH 05/12] Prepare 4.2.1-SNAPSHOT builds Change-Id: Ic9eac53b10ac97b2038b334d388ae3d21393f993 Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 26 +++--- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++--- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 32 ++++---- org.eclipse.jgit.junit/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 4 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 ++++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 68 +++++++-------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 82 +++++++++---------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 78 +++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 46 files changed, 255 insertions(+), 255 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 32d231f68..cfaefcde0 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.junit;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)", + org.eclipse.jgit.ant.tasks;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.junit;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c0205d2c1..f1e7e36b8 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 043c389b9..74720fe03 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)" + org.eclipse.jgit.storage.file;version="[4.2.1,4.3.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="4.2.0"; +Export-Package: org.eclipse.jgit.ant.tasks;version="4.2.1"; uses:="org.apache.tools.ant.types,org.apache.tools.ant" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index d7f4839dc..0e694574f 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 7bd23f638..4f3a61f39 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -12,14 +12,14 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.nls;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.nls;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="4.2.0"; +Export-Package: org.eclipse.jgit.archive;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 7e8661d9f..61fbb7e65 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.2.0.201601211800-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.2.0.201601211800-r";roots="." +Bundle-Version: 4.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 45158458a..b9c509fe4 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index b31351593..b77554965 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -20,10 +20,10 @@ Import-Package: org.apache.commons.logging;version="[1.1.1,2.0.0)", org.apache.http.impl.client;version="[4.1.0,5.0.0)", org.apache.http.impl.client.cache;version="[4.1.0,5.0.0)", org.apache.http.params;version="[4.1.0,5.0.0)", - org.eclipse.jgit.nls;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.http;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="4.2.0"; + org.eclipse.jgit.nls;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.http;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="4.2.1"; uses:="org.eclipse.jgit.transport.http, javax.net.ssl, org.apache.http.client, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 84a07177b..e2df65b63 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index e228b519d..9f87aab94 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="4.2.0", - org.eclipse.jgit.http.server.glue;version="4.2.0"; +Export-Package: org.eclipse.jgit.http.server;version="4.2.1", + org.eclipse.jgit.http.server.glue;version="4.2.1"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="4.2.0"; + org.eclipse.jgit.http.server.resolver;version="4.2.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -17,12 +17,12 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.nls;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.resolver;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)" + org.eclipse.jgit.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.nls;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.resolver;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index b7b91d7f5..e13e9fa3a 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index a80f210fa..05e4f8131 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -22,23 +22,23 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)", - org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.http.server;version="[4.2.0,4.3.0)", - org.eclipse.jgit.http.server.glue;version="[4.2.0,4.3.0)", - org.eclipse.jgit.http.server.resolver;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.junit;version="[4.2.0,4.3.0)", - org.eclipse.jgit.junit.http;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.nls;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.http;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.http.apache;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.resolver;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.http.server;version="[4.2.1,4.3.0)", + org.eclipse.jgit.http.server.glue;version="[4.2.1,4.3.0)", + org.eclipse.jgit.http.server.resolver;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.junit;version="[4.2.1,4.3.0)", + org.eclipse.jgit.junit.http;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.nls;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.http;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.http.apache;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.resolver;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 4bd1fe3d7..44f7a38a8 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index c0d59b97d..bec4178db 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,16 +20,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", - org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.http.server;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.junit;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.resolver;version="[4.2.0,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.http.server;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.junit;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.resolver;version="[4.2.1,4.3.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="4.2.0"; +Export-Package: org.eclipse.jgit.junit.http;version="4.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 7953d8ce6..47be76bda 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index f380b5be4..794e3d32e 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,27 +2,27 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[4.2.0,4.3.0)", - org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.dircache;version="[4.2.0,4.3.0)", - org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.merge;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.treewalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.treewalk.filter;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util.io;version="[4.2.0,4.3.0)", +Import-Package: org.eclipse.jgit.api;version="[4.2.1,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.dircache;version="[4.2.1,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.merge;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.treewalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.treewalk.filter;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util.io;version="[4.2.1,4.3.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="4.2.0"; +Export-Package: org.eclipse.jgit.junit;version="4.2.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 84e7a3139..4c7a85b1d 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 911adf008..c22b3bc8f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 689bcc133..cbfa6b69a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 296b71a5e..73b6eb6f4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 0ee2e7432..82dfb1f0d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 28af5092a..186b2631c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index da2fb723c..4cee17ed5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 5f811cbb9..67ff3cfad 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -27,7 +27,7 @@ version="0.0.0"/> - + org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 1446fe906..d53df3145 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index e1bccc0d8..8dd726d10 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.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 c9d492f2b..bf8c7cb09 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 070b4529d..38db4f6ad 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 6de1ce2d6..ef6de2b33 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 9196587dd..09e7c944f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 01ff97714..a4fcefaaf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 563b5479e..7231c9ca7 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 299699677..b64f5f07f 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,28 +2,28 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[4.2.0,4.3.0)", - org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.diff;version="[4.2.0,4.3.0)", - org.eclipse.jgit.dircache;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.file;version="4.2.0", - org.eclipse.jgit.junit;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.merge;version="[4.2.0,4.3.0)", - org.eclipse.jgit.pgm;version="[4.2.0,4.3.0)", - org.eclipse.jgit.pgm.internal;version="[4.2.0,4.3.0)", - org.eclipse.jgit.pgm.opt;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", - org.eclipse.jgit.treewalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util.io;version="[4.2.0,4.3.0)", +Import-Package: org.eclipse.jgit.api;version="[4.2.1,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.diff;version="[4.2.1,4.3.0)", + org.eclipse.jgit.dircache;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="4.2.1", + org.eclipse.jgit.junit;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.merge;version="[4.2.1,4.3.0)", + org.eclipse.jgit.pgm;version="[4.2.1,4.3.0)", + org.eclipse.jgit.pgm.internal;version="[4.2.1,4.3.0)", + org.eclipse.jgit.pgm.opt;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.1,4.3.0)", + org.eclipse.jgit.treewalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util.io;version="[4.2.1,4.3.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)" diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 04453bf2b..135bf6592 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index ec306d83b..5c6a16b4e 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -10,40 +10,40 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", org.apache.commons.compress.archivers.tar;version="[1.3,2.0)", org.apache.commons.compress.archivers.zip;version="[1.3,2.0)", - org.eclipse.jgit.api;version="[4.2.0,4.3.0)", - org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.archive;version="[4.2.0,4.3.0)", - org.eclipse.jgit.awtui;version="[4.2.0,4.3.0)", - org.eclipse.jgit.blame;version="[4.2.0,4.3.0)", - org.eclipse.jgit.diff;version="[4.2.0,4.3.0)", - org.eclipse.jgit.dircache;version="[4.2.0,4.3.0)", - org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.gitrepo;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.merge;version="4.2.0", - org.eclipse.jgit.nls;version="[4.2.0,4.3.0)", - org.eclipse.jgit.notes;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revplot;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk.filter;version="[4.2.0,4.3.0)", - org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.storage.pack;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.http.apache;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.resolver;version="[4.2.0,4.3.0)", - org.eclipse.jgit.treewalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.treewalk.filter;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util.io;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api;version="[4.2.1,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.archive;version="[4.2.1,4.3.0)", + org.eclipse.jgit.awtui;version="[4.2.1,4.3.0)", + org.eclipse.jgit.blame;version="[4.2.1,4.3.0)", + org.eclipse.jgit.diff;version="[4.2.1,4.3.0)", + org.eclipse.jgit.dircache;version="[4.2.1,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.gitrepo;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.merge;version="4.2.1", + org.eclipse.jgit.nls;version="[4.2.1,4.3.0)", + org.eclipse.jgit.notes;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revplot;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk.filter;version="[4.2.1,4.3.0)", + org.eclipse.jgit.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.storage.pack;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.http.apache;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.resolver;version="[4.2.1,4.3.0)", + org.eclipse.jgit.treewalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.treewalk.filter;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util.io;version="[4.2.1,4.3.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)" -Export-Package: org.eclipse.jgit.console;version="4.2.0"; +Export-Package: org.eclipse.jgit.console;version="4.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="4.2.0"; + org.eclipse.jgit.pgm;version="4.2.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -54,11 +54,11 @@ Export-Package: org.eclipse.jgit.console;version="4.2.0"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="4.2.0"; + org.eclipse.jgit.pgm.debug;version="4.2.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="4.2.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="4.2.0"; + org.eclipse.jgit.pgm.internal;version="4.2.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.kohsuke.args4j.spi, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 3ae1b878f..5df8f53d8 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.2.0.201601211800-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.2.0.201601211800-r";roots="." +Bundle-Version: 4.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index d3fdf3ff2..b9ad70607 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 9c0d76095..abb86e828 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,52 +2,52 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", - org.eclipse.jgit.api;version="[4.2.0,4.3.0)", - org.eclipse.jgit.api.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.attributes;version="[4.2.0,4.3.0)", - org.eclipse.jgit.awtui;version="[4.2.0,4.3.0)", - org.eclipse.jgit.blame;version="[4.2.0,4.3.0)", - org.eclipse.jgit.diff;version="[4.2.0,4.3.0)", - org.eclipse.jgit.dircache;version="[4.2.0,4.3.0)", - org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.events;version="[4.2.0,4.3.0)", - org.eclipse.jgit.fnmatch;version="[4.2.0,4.3.0)", - org.eclipse.jgit.gitrepo;version="[4.2.0,4.3.0)", - org.eclipse.jgit.hooks;version="[4.2.0,4.3.0)", - org.eclipse.jgit.ignore;version="[4.2.0,4.3.0)", - org.eclipse.jgit.ignore.internal;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.2.0,4.3.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.2.0,4.3.0)", - org.eclipse.jgit.junit;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.merge;version="[4.2.0,4.3.0)", - org.eclipse.jgit.nls;version="[4.2.0,4.3.0)", - org.eclipse.jgit.notes;version="[4.2.0,4.3.0)", - org.eclipse.jgit.patch;version="[4.2.0,4.3.0)", - org.eclipse.jgit.pgm;version="[4.2.0,4.3.0)", - org.eclipse.jgit.pgm.internal;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revplot;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk.filter;version="[4.2.0,4.3.0)", - org.eclipse.jgit.storage.file;version="[4.2.0,4.3.0)", - org.eclipse.jgit.storage.pack;version="[4.2.0,4.3.0)", - org.eclipse.jgit.submodule;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.http;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport.resolver;version="[4.2.0,4.3.0)", - org.eclipse.jgit.treewalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.treewalk.filter;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util.io;version="[4.2.0,4.3.0)", + org.eclipse.jgit.api;version="[4.2.1,4.3.0)", + org.eclipse.jgit.api.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.attributes;version="[4.2.1,4.3.0)", + org.eclipse.jgit.awtui;version="[4.2.1,4.3.0)", + org.eclipse.jgit.blame;version="[4.2.1,4.3.0)", + org.eclipse.jgit.diff;version="[4.2.1,4.3.0)", + org.eclipse.jgit.dircache;version="[4.2.1,4.3.0)", + org.eclipse.jgit.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.events;version="[4.2.1,4.3.0)", + org.eclipse.jgit.fnmatch;version="[4.2.1,4.3.0)", + org.eclipse.jgit.gitrepo;version="[4.2.1,4.3.0)", + org.eclipse.jgit.hooks;version="[4.2.1,4.3.0)", + org.eclipse.jgit.ignore;version="[4.2.1,4.3.0)", + org.eclipse.jgit.ignore.internal;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.2.1,4.3.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.2.1,4.3.0)", + org.eclipse.jgit.junit;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.merge;version="[4.2.1,4.3.0)", + org.eclipse.jgit.nls;version="[4.2.1,4.3.0)", + org.eclipse.jgit.notes;version="[4.2.1,4.3.0)", + org.eclipse.jgit.patch;version="[4.2.1,4.3.0)", + org.eclipse.jgit.pgm;version="[4.2.1,4.3.0)", + org.eclipse.jgit.pgm.internal;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revplot;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk.filter;version="[4.2.1,4.3.0)", + org.eclipse.jgit.storage.file;version="[4.2.1,4.3.0)", + org.eclipse.jgit.storage.pack;version="[4.2.1,4.3.0)", + org.eclipse.jgit.submodule;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.http;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport.resolver;version="[4.2.1,4.3.0)", + org.eclipse.jgit.treewalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.treewalk.filter;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util.io;version="[4.2.1,4.3.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.junit.experimental.theories;version="[4.4.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 6065b5c2d..0985c3df0 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 54a6eabae..f9e1a3990 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.jgit.awtui;version="4.2.0" -Import-Package: org.eclipse.jgit.errors;version="[4.2.0,4.3.0)", - org.eclipse.jgit.lib;version="[4.2.0,4.3.0)", - org.eclipse.jgit.nls;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revplot;version="[4.2.0,4.3.0)", - org.eclipse.jgit.revwalk;version="[4.2.0,4.3.0)", - org.eclipse.jgit.transport;version="[4.2.0,4.3.0)", - org.eclipse.jgit.util;version="[4.2.0,4.3.0)" +Export-Package: org.eclipse.jgit.awtui;version="4.2.1" +Import-Package: org.eclipse.jgit.errors;version="[4.2.1,4.3.0)", + org.eclipse.jgit.lib;version="[4.2.1,4.3.0)", + org.eclipse.jgit.nls;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revplot;version="[4.2.1,4.3.0)", + org.eclipse.jgit.revwalk;version="[4.2.1,4.3.0)", + org.eclipse.jgit.transport;version="[4.2.1,4.3.0)", + org.eclipse.jgit.util;version="[4.2.1,4.3.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 8a846971e..c80f31ff4 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 796ebf484..d0f03ff3c 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.2.0.201601211800-r +Bundle-Version: 4.2.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.annotations;version="4.2.0", - org.eclipse.jgit.api;version="4.2.0"; +Export-Package: org.eclipse.jgit.annotations;version="4.2.1", + org.eclipse.jgit.api;version="4.2.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -21,55 +21,55 @@ Export-Package: org.eclipse.jgit.annotations;version="4.2.0", org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="4.2.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="4.2.0", - org.eclipse.jgit.blame;version="4.2.0"; + org.eclipse.jgit.api.errors;version="4.2.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", + org.eclipse.jgit.attributes;version="4.2.1", + org.eclipse.jgit.blame;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="4.2.0"; + org.eclipse.jgit.diff;version="4.2.1"; uses:="org.eclipse.jgit.patch, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="4.2.0"; + org.eclipse.jgit.dircache;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events, org.eclipse.jgit.attributes", - org.eclipse.jgit.errors;version="4.2.0"; + org.eclipse.jgit.errors;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="4.2.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="4.2.0", - org.eclipse.jgit.gitrepo;version="4.2.0"; + org.eclipse.jgit.events;version="4.2.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.fnmatch;version="4.2.1", + org.eclipse.jgit.gitrepo;version="4.2.1"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax.helpers, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="4.2.0";x-internal:=true, - org.eclipse.jgit.hooks;version="4.2.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="4.2.0", - org.eclipse.jgit.ignore.internal;version="4.2.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="4.2.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.dfs;version="4.2.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.server", - org.eclipse.jgit.internal.storage.file;version="4.2.0"; + org.eclipse.jgit.gitrepo.internal;version="4.2.1";x-internal:=true, + org.eclipse.jgit.hooks;version="4.2.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="4.2.1", + org.eclipse.jgit.ignore.internal;version="4.2.1";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="4.2.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.dfs;version="4.2.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.server", + org.eclipse.jgit.internal.storage.file;version="4.2.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.http.server, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="4.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftree;version="4.2.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="4.2.0"; + org.eclipse.jgit.internal.storage.pack;version="4.2.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.reftree;version="4.2.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="4.2.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -79,32 +79,32 @@ Export-Package: org.eclipse.jgit.annotations;version="4.2.0", org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.merge;version="4.2.0"; + org.eclipse.jgit.merge;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache, org.eclipse.jgit.api", - org.eclipse.jgit.nls;version="4.2.0", - org.eclipse.jgit.notes;version="4.2.0"; + org.eclipse.jgit.nls;version="4.2.1", + org.eclipse.jgit.notes;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="4.2.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="4.2.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="4.2.0"; + org.eclipse.jgit.patch;version="4.2.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", + org.eclipse.jgit.revplot;version="4.2.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", + org.eclipse.jgit.revwalk;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.revwalk.filter", - org.eclipse.jgit.revwalk.filter;version="4.2.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="4.2.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="4.2.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="4.2.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="4.2.0"; + org.eclipse.jgit.revwalk.filter;version="4.2.1";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.file;version="4.2.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.pack;version="4.2.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.submodule;version="4.2.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", + org.eclipse.jgit.transport;version="4.2.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -116,22 +116,22 @@ Export-Package: org.eclipse.jgit.annotations;version="4.2.0", org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="4.2.0";uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="4.2.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="4.2.0"; + org.eclipse.jgit.transport.http;version="4.2.1";uses:="javax.net.ssl", + org.eclipse.jgit.transport.resolver;version="4.2.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", + org.eclipse.jgit.treewalk;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="4.2.0";uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="4.2.0"; + org.eclipse.jgit.treewalk.filter;version="4.2.1";uses:="org.eclipse.jgit.treewalk", + org.eclipse.jgit.util;version="4.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="4.2.0" + org.eclipse.jgit.util.io;version="4.2.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 10b5cab41..98ede3176 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.2.0.201601211800-r -Eclipse-SourceBundle: org.eclipse.jgit;version="4.2.0.201601211800-r";roots="." +Bundle-Version: 4.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="4.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 965fbe8c0..e931990a7 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index a65622dd9..38060d0a4 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.2.0.201601211800-r + 4.2.1-SNAPSHOT JGit - Parent ${jgit-url} From 5da5eb4b6975a4c9867e038a07827fca4538fb14 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 22 Jan 2016 01:49:22 +0100 Subject: [PATCH 06/12] Remove java7 bundle from Maven central scripts The bundle org.eclipse.jgit.java7 was deleted in 4.0 Change-Id: I57dbc0b18eaf164c8f53cc2b776ecb80481a993d Signed-off-by: Matthias Sohn --- tools/maven-central/deploy.rb | 1 - tools/maven-central/download.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/tools/maven-central/deploy.rb b/tools/maven-central/deploy.rb index d620a88e1..8e7adc893 100755 --- a/tools/maven-central/deploy.rb +++ b/tools/maven-central/deploy.rb @@ -53,7 +53,6 @@ artifacts = [group, group + '.archive', group + '.http.apache', group + '.http.server', - group + '.java7', group + '.junit', group + '.junit.http', group + '.pgm', diff --git a/tools/maven-central/download.rb b/tools/maven-central/download.rb index de4ecd426..b7ea2150b 100755 --- a/tools/maven-central/download.rb +++ b/tools/maven-central/download.rb @@ -13,7 +13,6 @@ artifacts = [group, group + '.archive', group + '.http.apache', group + '.http.server', - group + '.java7', group + '.junit', group + '.junit.http', group + '.pgm', From ddcbd22cd376754fed73ae1824b924ff5403380d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 22 Jan 2016 14:21:15 +0900 Subject: [PATCH 07/12] RepositorySetupWorkDirTest: Fix "resource leak" warnings Use FileRepositoryBuilder to create the Repository, except in cases where the creation was already in a try-block. Convert those to use a try-with-resource. Change-Id: I7d7adeee81bda6e80d91a119c7d690de3d00dc2b Signed-off-by: David Pursehouse --- .../file/RepositorySetupWorkDirTest.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RepositorySetupWorkDirTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RepositorySetupWorkDirTest.java index 295ef45a7..84c2543c1 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RepositorySetupWorkDirTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RepositorySetupWorkDirTest.java @@ -73,13 +73,14 @@ public class RepositorySetupWorkDirTest extends LocalDiskRepositoryTestCase { public void testIsBare_CreateRepositoryFromArbitraryGitDir() throws Exception { File gitDir = getFile("workdir"); - assertTrue(new FileRepository(gitDir).isBare()); + Repository repo = new FileRepositoryBuilder().setGitDir(gitDir).build(); + assertTrue(repo.isBare()); } @Test public void testNotBare_CreateRepositoryFromDotGitGitDir() throws Exception { File gitDir = getFile("workdir", Constants.DOT_GIT); - Repository repo = new FileRepository(gitDir); + Repository repo = new FileRepositoryBuilder().setGitDir(gitDir).build(); assertFalse(repo.isBare()); assertWorkdirPath(repo, "workdir"); assertGitdirPath(repo, "workdir", Constants.DOT_GIT); @@ -89,7 +90,7 @@ public class RepositorySetupWorkDirTest extends LocalDiskRepositoryTestCase { public void testWorkdirIsParentDir_CreateRepositoryFromDotGitGitDir() throws Exception { File gitDir = getFile("workdir", Constants.DOT_GIT); - Repository repo = new FileRepository(gitDir); + Repository repo = new FileRepositoryBuilder().setGitDir(gitDir).build(); String workdir = repo.getWorkTree().getName(); assertEquals(workdir, "workdir"); } @@ -157,8 +158,8 @@ public class RepositorySetupWorkDirTest extends LocalDiskRepositoryTestCase { @Test public void testExceptionThrown_BareRepoGetWorkDir() throws Exception { File gitDir = getFile("workdir"); - try { - new FileRepository(gitDir).getWorkTree(); + try (Repository repo = new FileRepository(gitDir)) { + repo.getWorkTree(); fail("Expected NoWorkTreeException missing"); } catch (NoWorkTreeException e) { // expected @@ -168,8 +169,8 @@ public class RepositorySetupWorkDirTest extends LocalDiskRepositoryTestCase { @Test public void testExceptionThrown_BareRepoGetIndex() throws Exception { File gitDir = getFile("workdir"); - try { - new FileRepository(gitDir).readDirCache(); + try (Repository repo = new FileRepository(gitDir)) { + repo.readDirCache(); fail("Expected NoWorkTreeException missing"); } catch (NoWorkTreeException e) { // expected @@ -179,8 +180,8 @@ public class RepositorySetupWorkDirTest extends LocalDiskRepositoryTestCase { @Test public void testExceptionThrown_BareRepoGetIndexFile() throws Exception { File gitDir = getFile("workdir"); - try { - new FileRepository(gitDir).getIndexFile(); + try (Repository repo = new FileRepository(gitDir)) { + repo.getIndexFile(); fail("Expected NoWorkTreeException missing"); } catch (NoWorkTreeException e) { // expected From 3ee9e2ac076733298906b92965a27a532c1cd5f5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 22 Jan 2016 14:30:57 +0900 Subject: [PATCH 08/12] FileRepositoryBuilderTest: Use try-with-resource for auto-closeables Use try-with-resource to create instances of FileRepository and FileWriter. "resource" and "unused" warnings no longer occur, so remove the suppression annotations. Change-Id: I3ad58d4cc2d4c019cd8edda7cb401e9d9f3fb790 Signed-off-by: David Pursehouse --- .../file/FileRepositoryBuilderTest.java | 94 +++++++++---------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderTest.java index dca356434..deffa04b5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileRepositoryBuilderTest.java @@ -72,7 +72,6 @@ public class FileRepositoryBuilderTest extends LocalDiskRepositoryTestCase { .findGitDir(d).getGitDir()); } - @SuppressWarnings("unused") @Test public void emptyRepositoryFormatVersion() throws Exception { Repository r = createWorkRepository(); @@ -81,10 +80,11 @@ public class FileRepositoryBuilderTest extends LocalDiskRepositoryTestCase { ConfigConstants.CONFIG_KEY_REPO_FORMAT_VERSION, ""); config.save(); - new FileRepository(r.getDirectory()); + try (FileRepository repo = new FileRepository(r.getDirectory())) { + // Unused + } } - @SuppressWarnings("unused") @Test public void invalidRepositoryFormatVersion() throws Exception { Repository r = createWorkRepository(); @@ -93,15 +93,13 @@ public class FileRepositoryBuilderTest extends LocalDiskRepositoryTestCase { ConfigConstants.CONFIG_KEY_REPO_FORMAT_VERSION, "notanumber"); config.save(); - try { - new FileRepository(r.getDirectory()); + try (FileRepository repo = new FileRepository(r.getDirectory())) { fail("IllegalArgumentException not thrown"); } catch (IllegalArgumentException e) { assertNotNull(e.getMessage()); } } - @SuppressWarnings("unused") @Test public void unknownRepositoryFormatVersion() throws Exception { Repository r = createWorkRepository(); @@ -110,75 +108,75 @@ public class FileRepositoryBuilderTest extends LocalDiskRepositoryTestCase { ConfigConstants.CONFIG_KEY_REPO_FORMAT_VERSION, 999999); config.save(); - try { - new FileRepository(r.getDirectory()); + try (FileRepository repo = new FileRepository(r.getDirectory())) { fail("IOException not thrown"); } catch (IOException e) { assertNotNull(e.getMessage()); } } - @SuppressWarnings("resource" /* java 7 */) @Test public void absoluteGitDirRef() throws Exception { Repository repo1 = createWorkRepository(); File dir = createTempDirectory("dir"); File dotGit = new File(dir, Constants.DOT_GIT); - new FileWriter(dotGit).append( - "gitdir: " + repo1.getDirectory().getAbsolutePath()).close(); - FileRepositoryBuilder builder = new FileRepositoryBuilder(); + try (FileWriter writer = new FileWriter(dotGit)) { + writer.append("gitdir: " + repo1.getDirectory().getAbsolutePath()).close(); + FileRepositoryBuilder builder = new FileRepositoryBuilder(); - builder.setWorkTree(dir); - builder.setMustExist(true); - Repository repo2 = builder.build(); + builder.setWorkTree(dir); + builder.setMustExist(true); + Repository repo2 = builder.build(); - assertEquals(repo1.getDirectory().getAbsolutePath(), repo2 - .getDirectory().getAbsolutePath()); - assertEquals(dir, repo2.getWorkTree()); + assertEquals(repo1.getDirectory().getAbsolutePath(), repo2 + .getDirectory().getAbsolutePath()); + assertEquals(dir, repo2.getWorkTree()); + } } - @SuppressWarnings("resource" /* java 7 */) @Test public void relativeGitDirRef() throws Exception { Repository repo1 = createWorkRepository(); File dir = new File(repo1.getWorkTree(), "dir"); assertTrue(dir.mkdir()); File dotGit = new File(dir, Constants.DOT_GIT); - new FileWriter(dotGit).append("gitdir: ../" + Constants.DOT_GIT) - .close(); - - FileRepositoryBuilder builder = new FileRepositoryBuilder(); - builder.setWorkTree(dir); - builder.setMustExist(true); - Repository repo2 = builder.build(); - - // The tmp directory may be a symlink so the actual path - // may not - assertEquals(repo1.getDirectory().getCanonicalPath(), repo2 - .getDirectory().getCanonicalPath()); - assertEquals(dir, repo2.getWorkTree()); + try (FileWriter writer = new FileWriter(dotGit)) { + writer.append("gitdir: ../" + Constants.DOT_GIT).close(); + + FileRepositoryBuilder builder = new FileRepositoryBuilder(); + builder.setWorkTree(dir); + builder.setMustExist(true); + Repository repo2 = builder.build(); + + // The tmp directory may be a symlink so the actual path + // may not + assertEquals(repo1.getDirectory().getCanonicalPath(), repo2 + .getDirectory().getCanonicalPath()); + assertEquals(dir, repo2.getWorkTree()); + } } - @SuppressWarnings("resource" /* java 7 */) @Test public void scanWithGitDirRef() throws Exception { Repository repo1 = createWorkRepository(); File dir = createTempDirectory("dir"); File dotGit = new File(dir, Constants.DOT_GIT); - new FileWriter(dotGit).append( - "gitdir: " + repo1.getDirectory().getAbsolutePath()).close(); - FileRepositoryBuilder builder = new FileRepositoryBuilder(); - - builder.setWorkTree(dir); - builder.findGitDir(dir); - assertEquals(repo1.getDirectory().getAbsolutePath(), builder - .getGitDir().getAbsolutePath()); - builder.setMustExist(true); - Repository repo2 = builder.build(); - - // The tmp directory may be a symlink - assertEquals(repo1.getDirectory().getCanonicalPath(), repo2 - .getDirectory().getCanonicalPath()); - assertEquals(dir, repo2.getWorkTree()); + try (FileWriter writer = new FileWriter(dotGit)) { + writer.append( + "gitdir: " + repo1.getDirectory().getAbsolutePath()).close(); + FileRepositoryBuilder builder = new FileRepositoryBuilder(); + + builder.setWorkTree(dir); + builder.findGitDir(dir); + assertEquals(repo1.getDirectory().getAbsolutePath(), builder + .getGitDir().getAbsolutePath()); + builder.setMustExist(true); + Repository repo2 = builder.build(); + + // The tmp directory may be a symlink + assertEquals(repo1.getDirectory().getCanonicalPath(), repo2 + .getDirectory().getCanonicalPath()); + assertEquals(dir, repo2.getWorkTree()); + } } } From 84ac3cc3792ec164e304acf89d739bf724b619cc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 22 Jan 2016 14:51:52 +0900 Subject: [PATCH 09/12] UnpackedObjectTest: Create ObjectInserter.Formatter in try-with-resource The ObjectInserter.Formatter instance is only used to call idFor. Factor out a utility method to do that. Change-Id: I4ef823110c2152ac7905681df3217eb8001f5bd9 Signed-off-by: David Pursehouse --- .../storage/file/UnpackedObjectTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/UnpackedObjectTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/UnpackedObjectTest.java index 8c8c6c6d0..c6653bfdb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/UnpackedObjectTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/UnpackedObjectTest.java @@ -143,7 +143,7 @@ public class UnpackedObjectTest extends LocalDiskRepositoryTestCase { public void testStandardFormat_LargeObject() throws Exception { final int type = Constants.OBJ_BLOB; byte[] data = getRng().nextBytes(streamThreshold + 5); - ObjectId id = new ObjectInserter.Formatter().idFor(type, data); + ObjectId id = getId(type, data); write(id, compressStandardFormat(type, data)); ObjectLoader ol; @@ -306,7 +306,7 @@ public class UnpackedObjectTest extends LocalDiskRepositoryTestCase { throws Exception { final int type = Constants.OBJ_BLOB; byte[] data = getRng().nextBytes(streamThreshold + 5); - ObjectId id = new ObjectInserter.Formatter().idFor(type, data); + ObjectId id = getId(type, data); byte[] gz = compressStandardFormat(type, data); gz[gz.length - 1] = 0; gz[gz.length - 2] = 0; @@ -344,7 +344,7 @@ public class UnpackedObjectTest extends LocalDiskRepositoryTestCase { throws Exception { final int type = Constants.OBJ_BLOB; byte[] data = getRng().nextBytes(streamThreshold + 5); - ObjectId id = new ObjectInserter.Formatter().idFor(type, data); + ObjectId id = getId(type, data); byte[] gz = compressStandardFormat(type, data); byte[] tr = new byte[gz.length - 1]; System.arraycopy(gz, 0, tr, 0, tr.length); @@ -379,7 +379,7 @@ public class UnpackedObjectTest extends LocalDiskRepositoryTestCase { throws Exception { final int type = Constants.OBJ_BLOB; byte[] data = getRng().nextBytes(streamThreshold + 5); - ObjectId id = new ObjectInserter.Formatter().idFor(type, data); + ObjectId id = getId(type, data); byte[] gz = compressStandardFormat(type, data); byte[] tr = new byte[gz.length + 1]; System.arraycopy(gz, 0, tr, 0, gz.length); @@ -438,7 +438,7 @@ public class UnpackedObjectTest extends LocalDiskRepositoryTestCase { public void testPackFormat_LargeObject() throws Exception { final int type = Constants.OBJ_BLOB; byte[] data = getRng().nextBytes(streamThreshold + 5); - ObjectId id = new ObjectInserter.Formatter().idFor(type, data); + ObjectId id = getId(type, data); write(id, compressPackFormat(type, data)); ObjectLoader ol; @@ -578,4 +578,10 @@ public class UnpackedObjectTest extends LocalDiskRepositoryTestCase { out.close(); } } + + private ObjectId getId(int type, byte[] data) { + try (ObjectInserter.Formatter formatter = new ObjectInserter.Formatter()) { + return formatter.idFor(type, data); + } + } } From 625a21f5f47c5fd4fa4453934843f2dee0c5cc78 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 22 Jan 2016 14:57:21 +0900 Subject: [PATCH 10/12] CommitOnlyTest: Open RevWalk in try-with-resource Change-Id: Ia3db8696f66f8d294e1d443fb54e716d26d517b1 Signed-off-by: David Pursehouse --- .../tst/org/eclipse/jgit/api/CommitOnlyTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitOnlyTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitOnlyTest.java index 336a33566..5f7434b41 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitOnlyTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitOnlyTest.java @@ -1294,10 +1294,12 @@ public class CommitOnlyTest extends RepositoryTestCase { try { final Repository repo = git.getRepository(); final ObjectId headId = repo.resolve(Constants.HEAD + "^{commit}"); - final TreeWalk tw = TreeWalk.forPath(repo, path, - new RevWalk(repo).parseTree(headId)); - return new String(tw.getObjectReader().open(tw.getObjectId(0)) - .getBytes()); + try (RevWalk rw = new RevWalk(repo)) { + final TreeWalk tw = TreeWalk.forPath(repo, path, + rw.parseTree(headId)); + return new String(tw.getObjectReader().open(tw.getObjectId(0)) + .getBytes()); + } } catch (Exception e) { return ""; } From 8bbd9077e476444589798f84a4a103c2e769d9a2 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 22 Jan 2016 14:59:54 +0900 Subject: [PATCH 11/12] ConcurrentRepackTest: Open RevWalk in try-with-resource Change-Id: Idc7b7bbdc1df05372b873cbe4c495474f3ffd64b Signed-off-by: David Pursehouse --- .../jgit/internal/storage/file/ConcurrentRepackTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java index 514e00f35..1b973ea81 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java @@ -211,7 +211,9 @@ public class ConcurrentRepackTest extends RepositoryTestCase { private RevObject parse(final AnyObjectId id) throws MissingObjectException, IOException { - return new RevWalk(db).parseAny(id); + try (RevWalk rw = new RevWalk(db)) { + return rw.parseAny(id); + } } private File[] pack(final Repository src, final RevObject... list) @@ -280,7 +282,6 @@ public class ConcurrentRepackTest extends RepositoryTestCase { private RevObject writeBlob(final Repository repo, final String data) throws IOException { - final RevWalk revWalk = new RevWalk(repo); final byte[] bytes = Constants.encode(data); final ObjectId id; try (ObjectInserter inserter = repo.newObjectInserter()) { @@ -293,6 +294,8 @@ public class ConcurrentRepackTest extends RepositoryTestCase { } catch (MissingObjectException e) { // Ok } - return revWalk.lookupBlob(id); + try (RevWalk revWalk = new RevWalk(repo)) { + return revWalk.lookupBlob(id); + } } } From 43190868926aec80bfcbc6d7deb82fc67515a005 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 22 Jan 2016 15:03:33 +0900 Subject: [PATCH 12/12] ConcurrentRepackTest: Don't use deprecated WindowCache.reconfigure Replace with calls to WindowCacheConfig.install() as mentioned in WindowCache.reconfigure's deprecation notice. Change-Id: Ifdb33501a2209239029c815b1e4e844ea5b56075 Signed-off-by: David Pursehouse --- .../jgit/internal/storage/file/ConcurrentRepackTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java index 1b973ea81..9d7a4822a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ConcurrentRepackTest.java @@ -81,15 +81,14 @@ public class ConcurrentRepackTest extends RepositoryTestCase { public void setUp() throws Exception { WindowCacheConfig windowCacheConfig = new WindowCacheConfig(); windowCacheConfig.setPackedGitOpenFiles(1); - WindowCache.reconfigure(windowCacheConfig); + windowCacheConfig.install(); super.setUp(); } @After public void tearDown() throws Exception { super.tearDown(); - WindowCacheConfig windowCacheConfig = new WindowCacheConfig(); - WindowCache.reconfigure(windowCacheConfig); + new WindowCacheConfig().install(); } @Test @@ -206,7 +205,7 @@ public class ConcurrentRepackTest extends RepositoryTestCase { private static void whackCache() { final WindowCacheConfig config = new WindowCacheConfig(); config.setPackedGitOpenFiles(1); - WindowCache.reconfigure(config); + config.install(); } private RevObject parse(final AnyObjectId id)