From 0da46186e596fe4397f3fe710afbc7afb979de81 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sat, 26 May 2012 10:07:18 +0200 Subject: [PATCH 01/14] Relax RevisionSyntaxException to an IllegalArgumentException Change-Id: Ide46eeb6cddcf3111f7c237ba8425a0854a90bfd --- .../src/org/eclipse/jgit/errors/RevisionSyntaxException.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevisionSyntaxException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevisionSyntaxException.java index 6b7f12d4b..386d4c9e0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevisionSyntaxException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/RevisionSyntaxException.java @@ -45,13 +45,12 @@ package org.eclipse.jgit.errors; -import java.io.IOException; /** * This signals a revision or object reference was not * properly formatted. */ -public class RevisionSyntaxException extends IOException { +public class RevisionSyntaxException extends IllegalArgumentException { private static final long serialVersionUID = 1L; private final String revstr; From 2a18bb304caea46f9fb6fd5e1d37a13f53dc19e4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 10 May 2012 13:32:16 -0700 Subject: [PATCH 02/14] Support gitdir: refs in BaseRepositoryBuilder.findGitDir This allows findGitDir to be used for repositories containing a .git file with a gitdir: ref to the repository's directory such as submodule repositories that point to a folder under the parent repository's .git/modules folder Change-Id: I2f1ec7215a2208aa90511c065cadc7e816522f62 Signed-off-by: Chris Aniszczyk --- .../file/FileRepositoryBuilderTest.java | 57 +++++++++++++++++++ .../jgit/lib/BaseRepositoryBuilder.java | 57 +++++++++++-------- 2 files changed, 89 insertions(+), 25 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileRepositoryBuilderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileRepositoryBuilderTest.java index aed48aa5f..b6377482d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileRepositoryBuilderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileRepositoryBuilderTest.java @@ -45,13 +45,16 @@ package org.eclipse.jgit.storage.file; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; +import java.io.FileWriter; import java.io.IOException; import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.util.FileUtils; import org.junit.Test; @@ -108,4 +111,58 @@ public class FileRepositoryBuilderTest extends LocalDiskRepositoryTestCase { assertNotNull(e.getMessage()); } } + + @Test + public void absoluteGitDirRef() throws Exception { + FileRepository 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.setMustExist(true); + FileRepository repo2 = builder.build(); + + assertEquals(repo1.getDirectory(), repo2.getDirectory()); + assertEquals(dir, repo2.getWorkTree()); + } + + @Test + public void relativeGitDirRef() throws Exception { + FileRepository 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); + FileRepository repo2 = builder.build(); + + assertEquals(repo1.getDirectory(), repo2.getDirectory()); + assertEquals(dir, repo2.getWorkTree()); + } + + @Test + public void scanWithGitDirRef() throws Exception { + FileRepository 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(), builder.getGitDir()); + builder.setMustExist(true); + FileRepository repo2 = builder.build(); + + assertEquals(repo1.getDirectory(), repo2.getDirectory()); + assertEquals(dir, repo2.getWorkTree()); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java index 17e06039b..f80c80360 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java @@ -100,6 +100,29 @@ public class BaseRepositoryBuilder Date: Wed, 22 Feb 2012 14:50:25 -0800 Subject: [PATCH 03/14] Configure maven-source-plugin execution in parent POM This ensures all modules will have source jars built Change-Id: I11a762f54cc8b059eff3bd99138a7efa9723b19f Signed-off-by: Matthias Sohn --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index cf744197d..09deec6ae 100644 --- a/pom.xml +++ b/pom.xml @@ -377,6 +377,20 @@ + + org.apache.maven.plugins + maven-source-plugin + true + + + attach-sources + process-classes + + jar + + + + From 108e2bc6e43b1ddf4d7545edffc75dcc9e106cd7 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 5 Jun 2012 02:17:30 +0200 Subject: [PATCH 04/14] Throw formal CheckoutConflictException on hard reset This will allow calling classes to have access to the conflicts that occurred during the attempted checkout. Even though setFailOnConflict(false) is called on the DirCacheCheckout a CheckoutConflictException can still be thrown if cleanup fails. Change-Id: Iea7ad3176a1b0e8606a643de8945e276718eb3ce Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/api/ResetCommand.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java index a6d425ea3..24984803f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java @@ -47,6 +47,7 @@ import java.text.MessageFormat; import java.util.Collection; import java.util.LinkedList; +import org.eclipse.jgit.api.errors.CheckoutConflictException; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.dircache.DirCache; @@ -136,7 +137,7 @@ public class ResetCommand extends GitCommand { * * @return the Ref after reset */ - public Ref call() throws GitAPIException { + public Ref call() throws GitAPIException, CheckoutConflictException { checkCallable(); Ref r; @@ -366,13 +367,19 @@ public class ResetCommand extends GitCommand { } } - private void checkoutIndex(RevCommit commit) throws IOException { + private void checkoutIndex(RevCommit commit) throws IOException, + GitAPIException { DirCache dc = repo.lockDirCache(); try { DirCacheCheckout checkout = new DirCacheCheckout(repo, dc, commit.getTree()); checkout.setFailOnConflict(false); - checkout.checkout(); + try { + checkout.checkout(); + } catch (org.eclipse.jgit.errors.CheckoutConflictException cce) { + throw new CheckoutConflictException(checkout.getConflicts(), + cce); + } } finally { dc.unlock(); } From 1c0ac7cd10750e3c82eff61201cfc3ba91b203da Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 5 Jun 2012 15:45:29 +0200 Subject: [PATCH 05/14] Update build to use Tycho 0.15.0 Also use packaging type eclipse-repository to create the p2 repository since Tycho fixed bug 368596 which we worked around using packaging type eclipse-update-site. Change-Id: Id4ee884027d55cd2d43e8a6ef58a67f74ab488e4 Signed-off-by: Matthias Sohn --- .../org.eclipse.jgit.repository/assembly.xml | 14 ---------- .../{site.xml => category.xml} | 0 .../org.eclipse.jgit.repository/pom.xml | 28 +------------------ org.eclipse.jgit.packaging/pom.xml | 2 +- 4 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml rename org.eclipse.jgit.packaging/org.eclipse.jgit.repository/{site.xml => category.xml} (100%) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml deleted file mode 100644 index 5bcf74602..000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - site - - zip - - false - - - ${project.build.directory}/site - / - - - \ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml similarity index 100% rename from org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml rename to org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml 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 e87f4498d..05f35f071 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -54,9 +54,7 @@ org.eclipse.jgit.repository - - eclipse-update-site + eclipse-repository JGit P2 Repository @@ -82,28 +80,4 @@ ${project.version} - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - assembly.xml - - - - - make-assembly - package - - single - - - - - - diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index d3a956307..c23dd96db 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -59,7 +59,7 @@ JGit Tycho Parent - 0.14.1 + 0.15.0 7.6.0.v20120127 http://download.eclipse.org/releases/indigo From b61d35e848e637ef85fde4ebe95d60ced171e963 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Tue, 5 Jun 2012 16:52:49 +0200 Subject: [PATCH 06/14] Further cleanup of exceptions in Git API - Translate internal exceptions to corresponding API exception - Do not catch GitAPI exceptions internally to an internal exception. Just pass them to caller - Mention thrown exceptions in javadoc Change-Id: I9044cf86d2b0bcc8b63b7cc016e1bf0055a62053 Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/api/ApplyCommand.java | 6 +- .../eclipse/jgit/api/CherryPickCommand.java | 14 ++++- .../org/eclipse/jgit/api/CleanCommand.java | 5 +- .../org/eclipse/jgit/api/CloneCommand.java | 15 +++-- .../org/eclipse/jgit/api/FetchCommand.java | 3 +- .../org/eclipse/jgit/api/LsRemoteCommand.java | 5 +- .../src/org/eclipse/jgit/api/PullCommand.java | 61 +++++++------------ .../src/org/eclipse/jgit/api/PushCommand.java | 14 +++-- .../org/eclipse/jgit/api/RebaseCommand.java | 6 +- .../org/eclipse/jgit/api/ReflogCommand.java | 9 ++- .../org/eclipse/jgit/api/ResetCommand.java | 1 + .../org/eclipse/jgit/api/RevertCommand.java | 13 +++- .../eclipse/jgit/api/StashApplyCommand.java | 5 +- .../eclipse/jgit/api/StashCreateCommand.java | 1 + .../eclipse/jgit/api/StashDropCommand.java | 1 + .../eclipse/jgit/api/StashListCommand.java | 3 +- .../jgit/api/SubmoduleUpdateCommand.java | 32 ++++++++-- 17 files changed, 129 insertions(+), 65 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java index 8658b0709..32abf86ed 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java @@ -102,8 +102,12 @@ public class ApplyCommand extends GitCommand { * method twice on an instance. * * @return an {@link ApplyResult} object representing the command result + * @throws GitAPIException + * @throws PatchFormatException + * @throws PatchApplyException */ - public ApplyResult call() throws GitAPIException { + public ApplyResult call() throws GitAPIException, PatchFormatException, + PatchApplyException { checkCallable(); ApplyResult r = new ApplyResult(); try { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java index 41265e832..b5bf11908 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java @@ -47,10 +47,14 @@ import java.text.MessageFormat; import java.util.LinkedList; import java.util.List; +import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.MultipleParentsNotAllowedException; import org.eclipse.jgit.api.errors.NoHeadException; +import org.eclipse.jgit.api.errors.NoMessageException; +import org.eclipse.jgit.api.errors.UnmergedPathsException; +import org.eclipse.jgit.api.errors.WrongRepositoryStateException; import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.AnyObjectId; @@ -94,8 +98,16 @@ public class CherryPickCommand extends GitCommand { * invocation of the command. Don't call this method twice on an instance. * * @return the result of the cherry-pick + * @throws GitAPIException + * @throws WrongRepositoryStateException + * @throws ConcurrentRefUpdateException + * @throws UnmergedPathsException + * @throws NoMessageException + * @throws NoHeadException */ - public CherryPickResult call() throws GitAPIException { + public CherryPickResult call() throws GitAPIException, NoMessageException, + UnmergedPathsException, ConcurrentRefUpdateException, + WrongRepositoryStateException, NoHeadException { RevCommit newHead = null; List cherryPickedRefs = new LinkedList(); checkCallable(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CleanCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CleanCommand.java index 341be91da..1c19e9373 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CleanCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CleanCommand.java @@ -51,6 +51,7 @@ import java.util.TreeSet; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.errors.NoWorkTreeException; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.util.FileUtils; @@ -81,8 +82,10 @@ public class CleanCommand extends GitCommand> { * call to {@link #call()}) * * @return a set of strings representing each file cleaned. + * @throws GitAPIException + * @throws NoWorkTreeException */ - public Set call() throws GitAPIException { + public Set call() throws NoWorkTreeException, GitAPIException { Set files = new TreeSet(); try { StatusCommand command = new StatusCommand(repo); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java index 23bbc2aa9..067e92a96 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java @@ -113,8 +113,12 @@ public class CloneCommand extends TransportCommand { * Executes the {@code Clone} command. * * @return the newly created {@code Git} object with associated repository + * @throws InvalidRemoteException + * @throws org.eclipse.jgit.api.errors.TransportException + * @throws GitAPIException */ - public Git call() throws GitAPIException { + public Git call() throws GitAPIException, InvalidRemoteException, + org.eclipse.jgit.api.errors.TransportException { try { URIish u = new URIish(uri); Repository repository = init(u); @@ -124,10 +128,9 @@ public class CloneCommand extends TransportCommand { return new Git(repository); } catch (IOException ioe) { throw new JGitInternalException(ioe.getMessage(), ioe); - } catch (InvalidRemoteException e) { - throw new JGitInternalException(e.getMessage(), e); } catch (URISyntaxException e) { - throw new JGitInternalException(e.getMessage(), e); + throw new InvalidRemoteException(MessageFormat.format( + JGitText.get().invalidRemote, remote)); } } @@ -144,7 +147,9 @@ public class CloneCommand extends TransportCommand { } private FetchResult fetch(Repository clonedRepo, URIish u) - throws URISyntaxException, IOException, GitAPIException { + throws URISyntaxException, + org.eclipse.jgit.api.errors.TransportException, IOException, + GitAPIException { // create the remote config and save it RemoteConfig config = new RemoteConfig(clonedRepo.getConfig(), remote); config.addURI(u); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java index 6df244bcc..69c492372 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java @@ -135,8 +135,7 @@ public class FetchCommand extends TransportCommand { JGitText.get().invalidRemote, remote), e); } catch (TransportException e) { throw new org.eclipse.jgit.api.errors.TransportException( - JGitText.get().exceptionCaughtDuringExecutionOfFetchCommand, - e); + e.getMessage(), e); } catch (URISyntaxException e) { throw new InvalidRemoteException(MessageFormat.format( JGitText.get().invalidRemote, remote)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/LsRemoteCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/LsRemoteCommand.java index b041f33c4..c450ea962 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/LsRemoteCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/LsRemoteCommand.java @@ -148,6 +148,7 @@ public class LsRemoteCommand extends * for errors that occurs during transport */ public Collection call() throws GitAPIException, + InvalidRemoteException, org.eclipse.jgit.api.errors.TransportException { checkCallable(); @@ -186,8 +187,8 @@ public class LsRemoteCommand extends JGitText.get().exceptionCaughtDuringExecutionOfLsRemoteCommand, e); } catch (TransportException e) { - throw new org.eclipse.jgit.api.errors.TransportException( - JGitText.get().exceptionCaughtDuringExecutionOfLsRemoteCommand, + throw new org.eclipse.jgit.api.errors.TransportException( + e.getMessage(), e); } finally { if (fc != null) 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 86d38fb36..fa425d37f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java @@ -48,16 +48,12 @@ import java.text.MessageFormat; import org.eclipse.jgit.api.RebaseCommand.Operation; import org.eclipse.jgit.api.errors.CanceledException; -import org.eclipse.jgit.api.errors.CheckoutConflictException; -import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; import org.eclipse.jgit.api.errors.DetachedHeadException; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.InvalidConfigurationException; -import org.eclipse.jgit.api.errors.InvalidMergeHeadsException; import org.eclipse.jgit.api.errors.InvalidRemoteException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.NoHeadException; -import org.eclipse.jgit.api.errors.NoMessageException; import org.eclipse.jgit.api.errors.RefNotFoundException; import org.eclipse.jgit.api.errors.WrongRepositoryStateException; import org.eclipse.jgit.internal.JGitText; @@ -109,11 +105,21 @@ public class PullCommand extends TransportCommand { * command. Don't call this method twice on an instance. * * @return the result of the pull + * @throws WrongRepositoryStateException + * @throws InvalidConfigurationException + * @throws DetachedHeadException + * @throws InvalidRemoteException + * @throws CanceledException + * @throws RefNotFoundException + * @throws NoHeadException + * @throws org.eclipse.jgit.api.errors.TransportException + * @throws GitAPIException */ - public PullResult call() throws GitAPIException, WrongRepositoryStateException, - InvalidConfigurationException, DetachedHeadException, - InvalidRemoteException, CanceledException, RefNotFoundException, - NoHeadException { + public PullResult call() throws GitAPIException, + WrongRepositoryStateException, InvalidConfigurationException, + DetachedHeadException, InvalidRemoteException, CanceledException, + RefNotFoundException, NoHeadException, + org.eclipse.jgit.api.errors.TransportException { checkCallable(); monitor.beginTask(JGitText.get().pullTaskName, 2); @@ -239,44 +245,19 @@ public class PullCommand extends TransportCommand { PullResult result; if (doRebase) { RebaseCommand rebase = new RebaseCommand(repo); - try { - RebaseResult rebaseRes = rebase.setUpstream(commitToMerge) - .setProgressMonitor(monitor).setOperation( - Operation.BEGIN).call(); - result = new PullResult(fetchRes, remote, rebaseRes); - } catch (NoHeadException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (RefNotFoundException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (JGitInternalException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (GitAPIException e) { - throw new JGitInternalException(e.getMessage(), e); - } + RebaseResult rebaseRes = rebase.setUpstream(commitToMerge) + .setProgressMonitor(monitor).setOperation(Operation.BEGIN) + .call(); + result = new PullResult(fetchRes, remote, rebaseRes); } else { MergeCommand merge = new MergeCommand(repo); String name = "branch \'" + Repository.shortenRefName(remoteBranchName) + "\' of " + remoteUri; merge.include(name, commitToMerge); - MergeResult mergeRes; - try { - mergeRes = merge.call(); - monitor.update(1); - result = new PullResult(fetchRes, remote, mergeRes); - } catch (NoHeadException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (ConcurrentRefUpdateException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (CheckoutConflictException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (InvalidMergeHeadsException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (WrongRepositoryStateException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (NoMessageException e) { - throw new JGitInternalException(e.getMessage(), e); - } + MergeResult mergeRes = merge.call(); + monitor.update(1); + result = new PullResult(fetchRes, remote, mergeRes); } monitor.endTask(); return result; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PushCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PushCommand.java index edfb2f7b7..1a4058e12 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PushCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PushCommand.java @@ -109,9 +109,13 @@ public class PushCommand extends * @return an iteration over {@link PushResult} objects * @throws InvalidRemoteException * when called with an invalid remote uri + * @throws org.eclipse.jgit.api.errors.TransportException + * when an error occurs with the transport + * @throws GitAPIException */ public Iterable call() throws GitAPIException, - InvalidRemoteException { + InvalidRemoteException, + org.eclipse.jgit.api.errors.TransportException { checkCallable(); ArrayList pushResults = new ArrayList(3); @@ -150,9 +154,8 @@ public class PushCommand extends pushResults.add(result); } catch (TransportException e) { - throw new JGitInternalException( - JGitText.get().exceptionCaughtDuringExecutionOfPushCommand, - e); + throw new org.eclipse.jgit.api.errors.TransportException( + e.getMessage(), e); } finally { transport.close(); } @@ -161,6 +164,9 @@ public class PushCommand extends } catch (URISyntaxException e) { throw new InvalidRemoteException(MessageFormat.format( JGitText.get().invalidRemote, remote)); + } catch (TransportException e) { + throw new org.eclipse.jgit.api.errors.TransportException( + e.getMessage(), e); } catch (NotSupportedException e) { throw new JGitInternalException( JGitText.get().exceptionCaughtDuringExecutionOfPushCommand, 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 ecf85932e..645c9ff1f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -189,9 +189,13 @@ public class RebaseCommand extends GitCommand { * this method twice on an instance. * * @return an object describing the result of this command + * @throws GitAPIException + * @throws WrongRepositoryStateException + * @throws NoHeadException + * @throws RefNotFoundException */ public RebaseResult call() throws GitAPIException, NoHeadException, - RefNotFoundException { + RefNotFoundException, WrongRepositoryStateException { RevCommit newHead = null; boolean lastStepWasForward = false; checkCallable(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java index c4d112a31..ef344b5c3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java @@ -85,7 +85,14 @@ public class ReflogCommand extends GitCommand> { return this; } - public Collection call() throws GitAPIException { + /** + * Run the reflog command + * + * @throws GitAPIException + * @throws InvalidRefNameException + */ + public Collection call() throws GitAPIException, + InvalidRefNameException { checkCallable(); try { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java index 24984803f..b34b902ce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java @@ -136,6 +136,7 @@ public class ResetCommand extends GitCommand { * twice on an instance. * * @return the Ref after reset + * @throws GitAPIException */ public Ref call() throws GitAPIException, CheckoutConflictException { checkCallable(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java index 416677c40..fde6b94d2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java @@ -49,10 +49,14 @@ import java.util.List; import java.util.Map; import org.eclipse.jgit.api.MergeResult.MergeStatus; +import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.MultipleParentsNotAllowedException; import org.eclipse.jgit.api.errors.NoHeadException; +import org.eclipse.jgit.api.errors.NoMessageException; +import org.eclipse.jgit.api.errors.UnmergedPathsException; +import org.eclipse.jgit.api.errors.WrongRepositoryStateException; import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.AnyObjectId; @@ -105,8 +109,15 @@ public class RevertCommand extends GitCommand { * returned. If a failure occurred during revert null * is returned. The list of successfully reverted {@link Ref}'s can * be obtained by calling {@link #getRevertedRefs()} + * @throws GitAPIException + * @throws WrongRepositoryStateException + * @throws ConcurrentRefUpdateException + * @throws UnmergedPathsException + * @throws NoMessageException */ - public RevCommit call() throws GitAPIException { + public RevCommit call() throws NoMessageException, UnmergedPathsException, + ConcurrentRefUpdateException, WrongRepositoryStateException, + GitAPIException { RevCommit newHead = null; checkCallable(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java index 4992d3ccd..c26a48525 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java @@ -296,8 +296,11 @@ public class StashApplyCommand extends GitCommand { * Apply the changes in a stashed commit to the working directory and index * * @return id of stashed commit that was applied + * @throws GitAPIException + * @throws WrongRepositoryStateException */ - public ObjectId call() throws GitAPIException { + public ObjectId call() throws GitAPIException, + WrongRepositoryStateException { checkCallable(); if (repo.getRepositoryState() != RepositoryState.SAFE) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java index 4056894c9..4c7ae6ade 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java @@ -211,6 +211,7 @@ public class StashCreateCommand extends GitCommand { * and reset to the current HEAD commit. * * @return stashed commit or null if no changes to stash + * @throws GitAPIException */ public RevCommit call() throws GitAPIException { checkCallable(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashDropCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashDropCommand.java index eb61298e2..dde736bb5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashDropCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashDropCommand.java @@ -167,6 +167,7 @@ public class StashDropCommand extends GitCommand { * stash reference after the drop occurs * * @return commit id of stash reference or null if no more stashed changes + * @throws GitAPIException */ public ObjectId call() throws GitAPIException { checkCallable(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashListCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashListCommand.java index 407b5ab1e..697790596 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashListCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashListCommand.java @@ -76,7 +76,8 @@ public class StashListCommand extends GitCommand> { super(repo); } - public Collection call() throws GitAPIException { + public Collection call() throws GitAPIException, + InvalidRefNameException { checkCallable(); try { 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 be705ee6d..caf2cedc4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java @@ -47,8 +47,16 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.eclipse.jgit.api.errors.CheckoutConflictException; +import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.api.errors.InvalidConfigurationException; +import org.eclipse.jgit.api.errors.InvalidMergeHeadsException; import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.api.errors.NoHeadException; +import org.eclipse.jgit.api.errors.NoMessageException; +import org.eclipse.jgit.api.errors.RefNotFoundException; +import org.eclipse.jgit.api.errors.WrongRepositoryStateException; import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lib.ConfigConstants; @@ -109,7 +117,25 @@ public class SubmoduleUpdateCommand extends return this; } - public Collection call() throws GitAPIException { + /** + * Execute the SubmoduleUpdateCommand command. + * + * @return a collection of updated submodule paths + * @throws ConcurrentRefUpdateException + * @throws CheckoutConflictException + * @throws InvalidMergeHeadsException + * @throws InvalidConfigurationException + * @throws NoHeadException + * @throws NoMessageException + * @throws RefNotFoundException + * @throws WrongRepositoryStateException + * @throws GitAPIException + */ + public Collection call() throws InvalidConfigurationException, + NoHeadException, ConcurrentRefUpdateException, + CheckoutConflictException, InvalidMergeHeadsException, + WrongRepositoryStateException, NoMessageException, NoHeadException, + RefNotFoundException, GitAPIException { checkCallable(); try { @@ -168,9 +194,7 @@ public class SubmoduleUpdateCommand extends } catch (IOException e) { throw new JGitInternalException(e.getMessage(), e); } catch (ConfigInvalidException e) { - throw new JGitInternalException(e.getMessage(), e); - } catch (GitAPIException e) { - throw new JGitInternalException(e.getMessage(), e); + throw new InvalidConfigurationException(e.getMessage(), e); } } } From 59a98b49d2bf1e4514967dfa0acbceea6b37dbd4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 5 Jun 2012 08:23:04 -0700 Subject: [PATCH 07/14] Use working tree iterator to compare file modes Add isModeDifferent method to WorkingTreeIterator that compares mode with consideration of the core.filemode setting in the config. Bug: 379004 Change-Id: I07335300d787a69c3d1608242238991d5b5214ac Signed-off-by: Christian Halstrick --- .../jgit/api/CherryPickCommandTest.java | 40 ++++++++++++++++ .../org/eclipse/jgit/merge/ResolveMerger.java | 19 +++++--- .../jgit/treewalk/WorkingTreeIterator.java | 46 ++++++++++++------- 3 files changed, 81 insertions(+), 24 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java index 9f92c045c..469739c57 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java @@ -44,6 +44,7 @@ package org.eclipse.jgit.api; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; @@ -54,7 +55,10 @@ import org.eclipse.jgit.api.CherryPickResult.CherryPickStatus; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.dircache.DirCache; +import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.RepositoryState; import org.eclipse.jgit.lib.RepositoryTestCase; import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; @@ -183,6 +187,42 @@ public class CherryPickCommandTest extends RepositoryTestCase { .exists()); } + @Test + public void testCherryPickOverExecutableChangeOnNonExectuableFileSystem() + throws Exception { + Git git = new Git(db); + File file = writeTrashFile("test.txt", "a"); + assertNotNull(git.add().addFilepattern("test.txt").call()); + assertNotNull(git.commit().setMessage("commit1").call()); + + assertNotNull(git.checkout().setCreateBranch(true).setName("a").call()); + + writeTrashFile("test.txt", "b"); + assertNotNull(git.add().addFilepattern("test.txt").call()); + RevCommit commit2 = git.commit().setMessage("commit2").call(); + assertNotNull(commit2); + + assertNotNull(git.checkout().setName(Constants.MASTER).call()); + + DirCache cache = db.lockDirCache(); + cache.getEntry("test.txt").setFileMode(FileMode.EXECUTABLE_FILE); + cache.write(); + assertTrue(cache.commit()); + cache.unlock(); + + assertNotNull(git.commit().setMessage("commit3").call()); + + db.getFS().setExecute(file, false); + git.getRepository() + .getConfig() + .setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_FILEMODE, false); + + CherryPickResult result = git.cherryPick().include(commit2).call(); + assertNotNull(result); + assertEquals(CherryPickStatus.OK, result.getStatus()); + } + private RevCommit prepareCherryPick(final Git git) throws Exception { // create, add and commit file a writeTrashFile("a", "a"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 261aa9f0a..2c1aa6fbf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -399,7 +399,7 @@ public class ResolveMerger extends ThreeWayMerger { else { // the preferred version THEIRS has a different mode // than ours. Check it out! - if (isWorktreeDirty()) + if (isWorktreeDirty(work)) return false; DirCacheEntry e = add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_0); @@ -434,7 +434,7 @@ public class ResolveMerger extends ThreeWayMerger { // THEIRS. THEIRS is chosen. // Check worktree before checking out THEIRS - if (isWorktreeDirty()) + if (isWorktreeDirty(work)) return false; if (nonTree(modeT)) { DirCacheEntry e = add(tw.getRawPath(), theirs, @@ -485,7 +485,7 @@ public class ResolveMerger extends ThreeWayMerger { if (nonTree(modeO) && nonTree(modeT)) { // Check worktree before modifying files - if (isWorktreeDirty()) + if (isWorktreeDirty(work)) return false; MergeResult result = contentMerge(base, ours, theirs); @@ -507,7 +507,7 @@ public class ResolveMerger extends ThreeWayMerger { // OURS was deleted checkout THEIRS if (modeO == 0) { // Check worktree before checking out THEIRS - if (isWorktreeDirty()) + if (isWorktreeDirty(work)) return false; if (nonTree(modeT)) { if (e != null) @@ -563,7 +563,7 @@ public class ResolveMerger extends ThreeWayMerger { return isDirty; } - private boolean isWorktreeDirty() { + private boolean isWorktreeDirty(WorkingTreeIterator work) { if (inCore) return false; @@ -571,8 +571,13 @@ public class ResolveMerger extends ThreeWayMerger { final int modeO = tw.getRawMode(T_OURS); // Worktree entry has to match ours to be considered clean - final boolean isDirty = nonTree(modeF) - && !(modeO == modeF && tw.idEqual(T_FILE, T_OURS)); + final boolean isDirty; + if (nonTree(modeF)) + isDirty = work.isModeDifferent(modeO) + || !tw.idEqual(T_FILE, T_OURS); + else + isDirty = false; + if (isDirty) failingPaths.put(tw.getPathString(), MergeFailureReason.DIRTY_WORKTREE); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index 759613ba2..ebe9f73fb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -695,6 +695,33 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { DIFFER_BY_TIMESTAMP } + /** + * Is the file mode of the current entry different than the given raw mode? + * + * @param rawMode + * @return true if different, false otherwise + */ + public boolean isModeDifferent(final int rawMode) { + // Determine difference in mode-bits of file and index-entry. In the + // bitwise presentation of modeDiff we'll have a '1' when the two modes + // differ at this position. + int modeDiff = getEntryRawMode() ^ rawMode; + + if (modeDiff == 0) + return false; + + // Do not rely on filemode differences in case of symbolic links + if (FileMode.SYMLINK.equals(rawMode)) + return false; + + // Ignore the executable file bits if WorkingTreeOptions tell me to + // do so. Ignoring is done by setting the bits representing a + // EXECUTABLE_FILE to '0' in modeDiff + if (!state.options.isFileMode()) + modeDiff &= ~FileMode.EXECUTABLE_FILE.getBits(); + return modeDiff != 0; + } + /** * Compare the metadata (mode, length, modification-timestamp) of the * current entry and a {@link DirCacheEntry} @@ -714,23 +741,8 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { if (!entry.isSmudged() && entry.getLength() != (int) getEntryLength()) return MetadataDiff.DIFFER_BY_METADATA; - // Determine difference in mode-bits of file and index-entry. In the - // bitwise presentation of modeDiff we'll have a '1' when the two modes - // differ at this position. - int modeDiff = getEntryRawMode() ^ entry.getRawMode(); - - // Do not rely on filemode differences in case of symbolic links - if (modeDiff != 0 && !FileMode.SYMLINK.equals(entry.getRawMode())) { - // Ignore the executable file bits if WorkingTreeOptions tell me to - // do so. Ignoring is done by setting the bits representing a - // EXECUTABLE_FILE to '0' in modeDiff - if (!state.options.isFileMode()) - modeDiff &= ~FileMode.EXECUTABLE_FILE.getBits(); - if (modeDiff != 0) - // Report a modification if the modes still (after potentially - // ignoring EXECUTABLE_FILE bits) differ - return MetadataDiff.DIFFER_BY_METADATA; - } + if (isModeDifferent(entry.getRawMode())) + return MetadataDiff.DIFFER_BY_METADATA; // Git under windows only stores seconds so we round the timestamp // Java gives us if it looks like the timestamp in index is seconds From 20c33e6b0c4d5282f68b0e96b2e1a42cf5e9bb20 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sun, 20 May 2012 10:45:03 +0200 Subject: [PATCH 08/14] Make FS OS X detection work for OpenJDK OpenJDK sets the os.name system.property to "Darwin", while Apple's version says "Mac OS X". Change-Id: If08f8e7b8ef94ec00023a3f78bbf502ebd9699fb --- .../src/org/eclipse/jgit/dircache/DirCacheCheckout.java | 7 +++---- org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index 22a855832..4c2988634 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -1015,10 +1015,9 @@ public class DirCacheCheckout { } private static boolean isValidPathSegment(CanonicalTreeParser t) { - boolean isWindows = "Windows".equals(SystemReader.getInstance() - .getProperty("os.name")); - boolean isOSX = "Mac OS X".equals(SystemReader.getInstance() - .getProperty("os.name")); + String osName = SystemReader.getInstance().getProperty("os.name"); + boolean isWindows = "Windows".equals(osName); + boolean isOSX = "Darwin".equals(osName) || "Mac OS X".equals(osName); boolean ignCase = isOSX || isWindows; int ptr = t.getNameOffset(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java index c181a7a74..f04bb6fe0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java @@ -105,6 +105,6 @@ abstract class FS_POSIX extends FS { return System.getProperty("os.name"); } }); - return "Mac OS X".equals(osDotName); + return "Mac OS X".equals(osDotName) || "Darwin".equals(osDotName); } } From 4321f9353f8d8ce6549c1b4190c8bc20fbfe0541 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Wed, 6 Jun 2012 01:43:44 +0200 Subject: [PATCH 09/14] cleanup: Remove unused declarations Change-Id: I3b54cb9f73cb433c71a441a11ddc74cfecdaa1dc --- .../src/org/eclipse/jgit/ant/tasks/GitInitTask.java | 1 - .../src/org/eclipse/jgit/junit/http/RecordingLogger.java | 1 - .../src/org/eclipse/jgit/storage/dht/ChunkIndex.java | 1 - .../src/org/eclipse/jgit/storage/dfs/DfsInserter.java | 1 - 4 files changed, 4 deletions(-) diff --git a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java index efdab42aa..91e57c0d6 100644 --- a/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java +++ b/org.eclipse.jgit.ant/src/org/eclipse/jgit/ant/tasks/GitInitTask.java @@ -48,7 +48,6 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.InitCommand; -import org.eclipse.jgit.api.errors.JGitInternalException; /** * Create an empty git repository. diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java index ba7ee9782..0accfc8b6 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/RecordingLogger.java @@ -184,7 +184,6 @@ public class RecordingLogger implements Logger { // Ignore (not relevant to test failures) } - @SuppressWarnings("unused") public void ignore(Throwable arg0) { // Ignore (not relevant to test failures) } diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/ChunkIndex.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/ChunkIndex.java index 91a2d0efc..89029c0cc 100644 --- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/ChunkIndex.java +++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/ChunkIndex.java @@ -204,7 +204,6 @@ public abstract class ChunkIndex { return fmt; } - @SuppressWarnings("unchecked") private static void sortObjectList(List list) { Collections.sort(list); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsInserter.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsInserter.java index 335e284e2..0e02e00bc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsInserter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/dfs/DfsInserter.java @@ -231,7 +231,6 @@ public class DfsInserter extends ObjectInserter { packOut.write(buf, 0, 12); } - @SuppressWarnings("unchecked") private void sortObjectsById() { Collections.sort(objectList); } From 4e5944fbf8579fddc8b81ae11484b392cc6fc527 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Wed, 6 Jun 2012 02:26:53 +0200 Subject: [PATCH 10/14] Removed unused parameters from private methods Change-Id: I60bc03b9550ccd2350918e6328276ec9839748d5 Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/diff/DiffFormatter.java | 4 ++-- .../src/org/eclipse/jgit/transport/URIish.java | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index ceb4cb0c0..4258f7409 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -963,7 +963,7 @@ public class DiffFormatter { if (entry.getMode(side).getObjectType() != Constants.OBJ_BLOB) return EMPTY; - if (isBinary(entry.getPath(side))) + if (isBinary()) return BINARY; AbbreviatedObjectId id = entry.getId(side); @@ -1004,7 +1004,7 @@ public class DiffFormatter { } } - private boolean isBinary(String path) { + private boolean isBinary() { return false; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java index 9b061329f..f2d3c8c23 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java @@ -591,15 +591,14 @@ public class URIish implements Serializable { * @return the URI, including its password field, if any. */ public String toPrivateString() { - return format(true, false, false); + return format(true, false); } public String toString() { - return format(false, false, false); + return format(false, false); } - private String format(final boolean includePassword, boolean escape, - boolean escapeNonAscii) { + private String format(final boolean includePassword, boolean escapeNonAscii) { final StringBuilder r = new StringBuilder(); if (getScheme() != null) { r.append(getScheme()); @@ -646,7 +645,7 @@ public class URIish implements Serializable { * @return the URI as an ASCII string. Password is not included. */ public String toASCIIString() { - return format(false, true, true); + return format(false, true); } /** @@ -654,7 +653,7 @@ public class URIish implements Serializable { * such that it will be valid for use over the network. */ public String toPrivateASCIIString() { - return format(true, true, true); + return format(true, true); } /** From e2513558970ae47234298fdae892dc60cadb17e6 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Wed, 6 Jun 2012 02:28:06 +0200 Subject: [PATCH 11/14] Get rid of warnings about empty statments In HtttpAuthMethod there were comments, but not in a style that Eclipse recognizes. Change-Id: I64f55b27143f8badcefbb419d3951f2a26b87d5f Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/junit/TestRepository.java | 6 ++++++ .../src/org/eclipse/jgit/lib/RefDatabase.java | 1 + .../org/eclipse/jgit/transport/HttpAuthMethod.java | 12 +++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index f4a3a6289..1afc6d808 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -459,9 +459,13 @@ public class TestRepository { */ public T update(String ref, T obj) throws Exception { if (Constants.HEAD.equals(ref)) { + // nothing } else if ("FETCH_HEAD".equals(ref)) { + // nothing } else if ("MERGE_HEAD".equals(ref)) { + // nothing } else if (ref.startsWith(Constants.R_REFS)) { + // nothing } else ref = Constants.R_HEADS + ref; @@ -537,7 +541,9 @@ public class TestRepository { */ public BranchBuilder branch(String ref) { if (Constants.HEAD.equals(ref)) { + // nothing } else if (ref.startsWith(Constants.R_REFS)) { + // nothing } else ref = Constants.R_HEADS + ref; return new BranchBuilder(ref); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index 33c362305..727315047 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -219,5 +219,6 @@ public abstract class RefDatabase { * Implementors should overwrite this method if they use any kind of caches. */ public void refresh() { + // nothing } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpAuthMethod.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpAuthMethod.java index d9673f74e..bcf0a8ba2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpAuthMethod.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpAuthMethod.java @@ -277,12 +277,14 @@ abstract class HttpAuthMethod { r.append("://"); r.append(u.getHost()); if (0 < u.getPort()) { - if (u.getPort() == 80 && "http".equals(u.getProtocol())) - /* nothing */; - else if (u.getPort() == 443 && "https".equals(u.getProtocol())) - /* nothing */; - else + if (u.getPort() == 80 && "http".equals(u.getProtocol())) { + /* nothing */ + } else if (u.getPort() == 443 + && "https".equals(u.getProtocol())) { + /* nothing */ + } else { r.append(':').append(u.getPort()); + } } r.append(u.getPath()); if (u.getQuery() != null) From 794f42f0acf70293d9a872a02c6337fde2af6e3a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 6 Jun 2012 10:29:00 +0200 Subject: [PATCH 12/14] Remove Jetty p2 repository from Maven build This reference is not required and would force all JGit consumers to switch to Maven 3 and Tycho which isn't desirable. Bug: http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg01687.html Change-Id: Iecf7c5aad46bb05fce0455cc8127aee2f679848c Signed-off-by: Matthias Sohn --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 09deec6ae..ad17122ff 100644 --- a/pom.xml +++ b/pom.xml @@ -183,11 +183,6 @@ jgit-repository http://download.eclipse.org/jgit/maven - - jetty - p2 - http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/${jetty-version}/ - From 1cb135ebfb3af9f5ec9ab682b40404bb8f2401bf Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 6 Jun 2012 13:27:54 +0200 Subject: [PATCH 13/14] JGit v2.0.0.201206060730-rc3 Change-Id: I12f8800b74228e71c77f0fb82c250c154d06369f 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.console/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.console/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.generated.storage.dht.proto/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.iplog/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.iplog/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.feature/pom.xml | 4 ++-- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 8 ++++---- .../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.packaging/pom.xml | 4 ++-- 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/pom.xml | 2 +- org.eclipse.jgit.storage.dht.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.storage.dht.test/pom.xml | 2 +- org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.storage.dht/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 | 2 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 42 files changed, 47 insertions(+), 47 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 6c476e33d..cd7437217 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 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 0ccc8b345..84b504913 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 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 c5dfc34b2..01df77d10 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant Bundle-Localization: plugin diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 752c9157f..92ddbbc97 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index c443c9d92..11d170eca 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.console -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.jgit.console;version="2.0.0" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index 79cbb79c2..8f9ba9beb 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.console diff --git a/org.eclipse.jgit.generated.storage.dht.proto/META-INF/MANIFEST.MF b/org.eclipse.jgit.generated.storage.dht.proto/META-INF/MANIFEST.MF index 57123a5b7..af14049c9 100644 --- a/org.eclipse.jgit.generated.storage.dht.proto/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.generated.storage.dht.proto/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.generated.storage.dht.proto -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.generated.storage.dht.proto/pom.xml b/org.eclipse.jgit.generated.storage.dht.proto/pom.xml index 48850d8bf..21558191a 100644 --- a/org.eclipse.jgit.generated.storage.dht.proto/pom.xml +++ b/org.eclipse.jgit.generated.storage.dht.proto/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.generated.storage.dht.proto diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 6c53e5944..50b469361 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index ec2bfc271..1ebb56826 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 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 18b9d869d..1821eb92b 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 1b99fdffd..5856c9b2a 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF index 58b46e5fd..94798c84a 100644 --- a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.iplog -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.iplog/pom.xml b/org.eclipse.jgit.iplog/pom.xml index df3baac46..170fddd48 100644 --- a/org.eclipse.jgit.iplog/pom.xml +++ b/org.eclipse.jgit.iplog/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.iplog diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 5413590f4..a0f7e08d2 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 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 c4959af7d..8a22024d3 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 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 93e92c5e1..d9af8e215 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 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 510091e31..5d0e3917f 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 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 d54701d7e..c0b63478d 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 326f68dc8..1f634b6aa 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.feature @@ -63,7 +63,7 @@ org.eclipse.jgit org.eclipse.jgit - ${project.version} + 2.0.0.201206060730-rc3 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 61de085fa..603006882 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 4c1aea78c..03d878ff2 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.feature @@ -63,17 +63,17 @@ org.eclipse.jgit org.eclipse.jgit.junit - ${project.version} + 2.0.0.201206060730-rc3 org.eclipse.jgit org.eclipse.jgit.junit.http - ${project.version} + 2.0.0.201206060730-rc3 org.eclipse.jgit org.eclipse.jgit.http.server - ${project.version} + 2.0.0.201206060730-rc3 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 05f35f071..3886b196e 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 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 7a73e4401..9d25a6e6a 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 0fb43c7d5..1dca45914 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index c23dd96db..2b32541f6 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 pom JGit Tycho Parent @@ -89,7 +89,7 @@ org.eclipse.jgit org.eclipse.jgit - ${project.version} + 2.0.0.201206060730-rc3 sources diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 717ffc158..911d298c2 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 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 05d452ddf..552740117 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 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 3310ccc36..c4f52bb43 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 67b5d3016..6c3de2e7b 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.storage.dht.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.storage.dht.test/META-INF/MANIFEST.MF index 545afcf51..70005ea47 100644 --- a/org.eclipse.jgit.storage.dht.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.storage.dht.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.storage.dht.test -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.storage.dht.test/pom.xml b/org.eclipse.jgit.storage.dht.test/pom.xml index 800aab292..c7d77a8f9 100644 --- a/org.eclipse.jgit.storage.dht.test/pom.xml +++ b/org.eclipse.jgit.storage.dht.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.storage.dht.test diff --git a/org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF b/org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF index 34d0311bc..4c84a789e 100644 --- a/org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.storage.dht -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.storage.dht;version="2.0.0", diff --git a/org.eclipse.jgit.storage.dht/pom.xml b/org.eclipse.jgit.storage.dht/pom.xml index 87eccec43..f65b86ace 100644 --- a/org.eclipse.jgit.storage.dht/pom.xml +++ b/org.eclipse.jgit.storage.dht/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.storage.dht diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index a7a3e1161..93859cc9a 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 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 7eee851b3..f690e94fe 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 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 061a7a684..5731626dc 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.jgit.awtui;version="2.0.0" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index b91405b50..5fdcd2481 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 - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 17b6813f1..26cd92e1b 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: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.api;version="2.0.0", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index d366b7d61..50bcfbc85 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source;singleton:=true Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0.201206060730-rc3 Eclipse-SourceBundle: org.eclipse.jgit;version="2.0.0";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index ae2fe59b5..2d7c121da 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index ad17122ff..3edc2b19e 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 2.0.0-SNAPSHOT + 2.0.0.201206060730-rc3 JGit - Parent ${jgit-url} From f2d9a5ed31380470aa2b708afc5d1711aa086ca7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 6 Jun 2012 13:57:32 +0200 Subject: [PATCH 14/14] Prepare next 2.0.0-SNAPSHOT builds Change-Id: I0d55b390502b3da139ab0d15a6cf3d05774d8ad9 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.console/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.console/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.generated.storage.dht.proto/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.iplog/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.iplog/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.feature/pom.xml | 4 ++-- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 8 ++++---- .../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.packaging/pom.xml | 4 ++-- 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/pom.xml | 2 +- org.eclipse.jgit.storage.dht.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.storage.dht.test/pom.xml | 2 +- org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.storage.dht/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 | 2 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 42 files changed, 47 insertions(+), 47 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index cd7437217..6c476e33d 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 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 84b504913..0ccc8b345 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 01df77d10..c5dfc34b2 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant Bundle-Localization: plugin diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 92ddbbc97..752c9157f 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index 11d170eca..c443c9d92 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.console -Bundle-Version: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.jgit.console;version="2.0.0" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index 8f9ba9beb..79cbb79c2 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.console diff --git a/org.eclipse.jgit.generated.storage.dht.proto/META-INF/MANIFEST.MF b/org.eclipse.jgit.generated.storage.dht.proto/META-INF/MANIFEST.MF index af14049c9..57123a5b7 100644 --- a/org.eclipse.jgit.generated.storage.dht.proto/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.generated.storage.dht.proto/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.generated.storage.dht.proto -Bundle-Version: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.generated.storage.dht.proto/pom.xml b/org.eclipse.jgit.generated.storage.dht.proto/pom.xml index 21558191a..48850d8bf 100644 --- a/org.eclipse.jgit.generated.storage.dht.proto/pom.xml +++ b/org.eclipse.jgit.generated.storage.dht.proto/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.generated.storage.dht.proto diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 50b469361..6c53e5944 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 1ebb56826..ec2bfc271 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 1821eb92b..18b9d869d 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 5856c9b2a..1b99fdffd 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF index 94798c84a..58b46e5fd 100644 --- a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.iplog -Bundle-Version: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.iplog/pom.xml b/org.eclipse.jgit.iplog/pom.xml index 170fddd48..df3baac46 100644 --- a/org.eclipse.jgit.iplog/pom.xml +++ b/org.eclipse.jgit.iplog/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.iplog diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index a0f7e08d2..5413590f4 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier 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 8a22024d3..c4959af7d 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 - 2.0.0.201206060730-rc3 + 2.0.0-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 d9af8e215..93e92c5e1 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier 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 5d0e3917f..510091e31 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 - 2.0.0.201206060730-rc3 + 2.0.0-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 c0b63478d..d54701d7e 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 1f634b6aa..326f68dc8 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.feature @@ -63,7 +63,7 @@ org.eclipse.jgit org.eclipse.jgit - 2.0.0.201206060730-rc3 + ${project.version} 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 603006882..61de085fa 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 03d878ff2..4c1aea78c 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.feature @@ -63,17 +63,17 @@ org.eclipse.jgit org.eclipse.jgit.junit - 2.0.0.201206060730-rc3 + ${project.version} org.eclipse.jgit org.eclipse.jgit.junit.http - 2.0.0.201206060730-rc3 + ${project.version} org.eclipse.jgit org.eclipse.jgit.http.server - 2.0.0.201206060730-rc3 + ${project.version} 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 3886b196e..05f35f071 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 9d25a6e6a..7a73e4401 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 1dca45914..0fb43c7d5 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2b32541f6..c23dd96db 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT pom JGit Tycho Parent @@ -89,7 +89,7 @@ org.eclipse.jgit org.eclipse.jgit - 2.0.0.201206060730-rc3 + ${project.version} sources diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 911d298c2..717ffc158 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier 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 552740117..05d452ddf 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index c4f52bb43..3310ccc36 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 6c3de2e7b..67b5d3016 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.storage.dht.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.storage.dht.test/META-INF/MANIFEST.MF index 70005ea47..545afcf51 100644 --- a/org.eclipse.jgit.storage.dht.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.storage.dht.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.storage.dht.test -Bundle-Version: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.storage.dht.test/pom.xml b/org.eclipse.jgit.storage.dht.test/pom.xml index c7d77a8f9..800aab292 100644 --- a/org.eclipse.jgit.storage.dht.test/pom.xml +++ b/org.eclipse.jgit.storage.dht.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.storage.dht.test diff --git a/org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF b/org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF index 4c84a789e..34d0311bc 100644 --- a/org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.storage.dht/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.storage.dht -Bundle-Version: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.storage.dht;version="2.0.0", diff --git a/org.eclipse.jgit.storage.dht/pom.xml b/org.eclipse.jgit.storage.dht/pom.xml index f65b86ace..87eccec43 100644 --- a/org.eclipse.jgit.storage.dht/pom.xml +++ b/org.eclipse.jgit.storage.dht/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.storage.dht diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 93859cc9a..a7a3e1161 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier 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 f690e94fe..7eee851b3 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 5731626dc..061a7a684 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.jgit.awtui;version="2.0.0" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5fdcd2481..b91405b50 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 - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 26cd92e1b..17b6813f1 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: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.api;version="2.0.0", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 50bcfbc85..d366b7d61 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source;singleton:=true Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 2.0.0.201206060730-rc3 +Bundle-Version: 2.0.0.qualifier Eclipse-SourceBundle: org.eclipse.jgit;version="2.0.0";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 2d7c121da..ae2fe59b5 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 3edc2b19e..ad17122ff 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 2.0.0.201206060730-rc3 + 2.0.0-SNAPSHOT JGit - Parent ${jgit-url}