From 80fa5f39f9d3b742e34b4baad019d917ff19f318 Mon Sep 17 00:00:00 2001
From: Jon Schneider <jkschneider@gmail.com>
Date: Fri, 15 Apr 2016 14:37:32 -0700
Subject: Fix ApplyCommand when result of patch is an empty file
Such hunks are identifiable by a zero value for "new start line". Prior
to the fix, JGit throws and ArrayIndexOutOfBoundsException on such
patches.
Change-Id: I4f3deb5e5f41a08af965fcc178d678c77270cddb
Signed-off-by: Jonathan Schneider <jkschneider@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
.../tst-rsrc/org/eclipse/jgit/diff/W.patch | 7 +++++++
.../tst-rsrc/org/eclipse/jgit/diff/W_PostImage | 0
.../tst-rsrc/org/eclipse/jgit/diff/W_PreImage | 1 +
.../tst/org/eclipse/jgit/api/ApplyCommandTest.java | 10 ++++++++++
.../src/org/eclipse/jgit/api/ApplyCommand.java | 18 ++++++++++++------
5 files changed, 30 insertions(+), 6 deletions(-)
create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W.patch
create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W_PostImage
create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W_PreImage
diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W.patch
new file mode 100644
index 0000000000..cfecb8c5c4
--- /dev/null
+++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W.patch
@@ -0,0 +1,7 @@
+diff --git a/W b/W
+index a3648a1..2d44096 100644
+--- a/W
++++ b/W
+@@ -1 +0,0 @@
+-a
+\ No newline at end of file
\ No newline at end of file
diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W_PostImage
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W_PreImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W_PreImage
new file mode 100644
index 0000000000..2e65efe2a1
--- /dev/null
+++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/W_PreImage
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
index 239c844c33..f2b5b3ba95 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
@@ -146,6 +146,16 @@ public class ApplyCommandTest extends RepositoryTestCase {
b.getString(0, b.size(), false));
}
+ @Test
+ public void testModifyW() throws Exception {
+ ApplyResult result = init("W");
+ assertEquals(1, result.getUpdatedFiles().size());
+ assertEquals(new File(db.getWorkTree(), "W"),
+ result.getUpdatedFiles().get(0));
+ checkFile(new File(db.getWorkTree(), "W"),
+ b.getString(0, b.size(), false));
+ }
+
@Test
public void testModifyX() throws Exception {
ApplyResult result = init("X");
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 bde450f99d..8fbf83954c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java
@@ -223,12 +223,16 @@ public class ApplyCommand extends GitCommand<ApplyResult> {
pos++;
break;
case '-':
- if (!newLines.get(hh.getNewStartLine() - 1 + pos).equals(
- hunkLine.substring(1))) {
- throw new PatchApplyException(MessageFormat.format(
- JGitText.get().patchApplyException, hh));
+ if (hh.getNewStartLine() == 0) {
+ newLines.clear();
+ } else {
+ if (!newLines.get(hh.getNewStartLine() - 1 + pos)
+ .equals(hunkLine.substring(1))) {
+ throw new PatchApplyException(MessageFormat.format(
+ JGitText.get().patchApplyException, hh));
+ }
+ newLines.remove(hh.getNewStartLine() - 1 + pos);
}
- newLines.remove(hh.getNewStartLine() - 1 + pos);
break;
case '+':
newLines.add(hh.getNewStartLine() - 1 + pos,
@@ -250,7 +254,9 @@ public class ApplyCommand extends GitCommand<ApplyResult> {
// still there!
sb.append(l).append('\n');
}
- sb.deleteCharAt(sb.length() - 1);
+ if (sb.length() > 0) {
+ sb.deleteCharAt(sb.length() - 1);
+ }
FileWriter fw = new FileWriter(f);
fw.write(sb.toString());
fw.close();
--
cgit v1.2.3
From 22d7ec2971edf8d375c4fc9ef9d92526bad73626 Mon Sep 17 00:00:00 2001
From: Christian Halstrick <christian.halstrick@sap.com>
Date: Tue, 12 Apr 2016 14:38:37 +0200
Subject: Fix calling of clean/smudge filters from Checkout,MergeCommands
When CheckoutCommand or MergeCommand is called then not in all situation
the treewalks have been prepared to support clean/smudge filters. Fix
this
Bug: 491505
Change-Id: Iab5608049221c46d06812552ab97299e44d59e64
---
.../org/eclipse/jgit/api/CheckoutCommandTest.java | 37 ++++++++++++----------
.../eclipse/jgit/dircache/DirCacheCheckout.java | 12 ++++---
.../src/org/eclipse/jgit/merge/ResolveMerger.java | 5 +--
.../jgit/merge/StrategySimpleTwoWayInCore.java | 2 +-
4 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
index 8162ac4575..0bb6610a24 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
@@ -88,7 +88,6 @@ import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.util.FileUtils;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
public class CheckoutCommandTest extends RepositoryTestCase {
@@ -740,11 +739,9 @@ public class CheckoutCommandTest extends RepositoryTestCase {
}
@Test
- @Ignore
- public void testSmudgeAndClean() throws IOException, GitAPIException {
- // @TODO: fix this test
- File clean_filter = writeTempFile("sed s/V1/@version/g -");
- File smudge_filter = writeTempFile("sed s/@version/V1/g -");
+ public void testSmudgeAndClean() throws Exception {
+ File clean_filter = writeTempFile("sed s/V1/@version/g");
+ File smudge_filter = writeTempFile("sed s/@version/V1/g");
try (Git git2 = new Git(db)) {
StoredConfig config = git.getRepository().getConfig();
@@ -753,33 +750,39 @@ public class CheckoutCommandTest extends RepositoryTestCase {
config.setString("filter", "tstFilter", "clean",
"sh " + slashify(clean_filter.getPath()));
config.save();
- writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
+ writeTrashFile(".gitattributes", "filterTest.txt filter=tstFilter");
git2.add().addFilepattern(".gitattributes").call();
git2.commit().setMessage("add attributes").call();
- writeTrashFile("filterTest.txt", "hello world, V1");
+ fsTick(writeTrashFile("filterTest.txt", "hello world, V1\n"));
git2.add().addFilepattern("filterTest.txt").call();
- git2.commit().setMessage("add filterText.txt").call();
+ RevCommit one = git2.commit().setMessage("add filterText.txt").call();
assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:hello world, @version]",
+ "[.gitattributes, mode:100644, content:filterTest.txt filter=tstFilter][Test.txt, mode:100644, content:Some change][filterTest.txt, mode:100644, content:hello world, @version\n]",
indexState(CONTENT));
- git2.checkout().setCreateBranch(true).setName("test2").call();
- writeTrashFile("filterTest.txt", "bon giorno world, V1");
+ fsTick(writeTrashFile("filterTest.txt", "bon giorno world, V1\n"));
git2.add().addFilepattern("filterTest.txt").call();
- git2.commit().setMessage("modified filterText.txt").call();
+ RevCommit two = git2.commit().setMessage("modified filterTest.txt").call();
assertTrue(git2.status().call().isClean());
assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:bon giorno world, @version]",
+ "[.gitattributes, mode:100644, content:filterTest.txt filter=tstFilter][Test.txt, mode:100644, content:Some change][filterTest.txt, mode:100644, content:bon giorno world, @version\n]",
indexState(CONTENT));
- git2.checkout().setName("refs/heads/test").call();
+ git2.checkout().setName(one.getName()).call();
assertTrue(git2.status().call().isClean());
assertEquals(
- "[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some other change][filterTest.txt, mode:100644, content:hello world, @version]",
+ "[.gitattributes, mode:100644, content:filterTest.txt filter=tstFilter][Test.txt, mode:100644, content:Some change][filterTest.txt, mode:100644, content:hello world, @version\n]",
indexState(CONTENT));
- assertEquals("hello world, V1", read("filterTest.txt"));
+ assertEquals("hello world, V1\n", read("filterTest.txt"));
+
+ git2.checkout().setName(two.getName()).call();
+ assertTrue(git2.status().call().isClean());
+ assertEquals(
+ "[.gitattributes, mode:100644, content:filterTest.txt filter=tstFilter][Test.txt, mode:100644, content:Some change][filterTest.txt, mode:100644, content:bon giorno world, @version\n]",
+ indexState(CONTENT));
+ assertEquals("bon giorno world, V1\n", read("filterTest.txt"));
}
}
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 3fcaa38395..fc4cc90937 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
@@ -280,8 +280,9 @@ public class DirCacheCheckout {
addTree(walk, headCommitTree);
addTree(walk, mergeCommitTree);
- walk.addTree(new DirCacheBuildIterator(builder));
+ int dciPos = walk.addTree(new DirCacheBuildIterator(builder));
walk.addTree(workingTree);
+ workingTree.setDirCacheIterator(walk, dciPos);
while (walk.next()) {
processEntry(walk.getTree(0, CanonicalTreeParser.class),
@@ -320,8 +321,9 @@ public class DirCacheCheckout {
walk = new NameConflictTreeWalk(repo);
addTree(walk, mergeCommitTree);
- walk.addTree(new DirCacheBuildIterator(builder));
+ int dciPos = walk.addTree(new DirCacheBuildIterator(builder));
walk.addTree(workingTree);
+ workingTree.setDirCacheIterator(walk, dciPos);
while (walk.next()) {
processEntry(walk.getTree(0, CanonicalTreeParser.class),
@@ -1093,8 +1095,10 @@ public class DirCacheCheckout {
private boolean isModifiedSubtree_IndexWorkingtree(String path)
throws CorruptObjectException, IOException {
try (NameConflictTreeWalk tw = new NameConflictTreeWalk(repo)) {
- tw.addTree(new DirCacheIterator(dc));
- tw.addTree(new FileTreeIterator(repo));
+ int dciPos = tw.addTree(new DirCacheIterator(dc));
+ FileTreeIterator fti = new FileTreeIterator(repo);
+ tw.addTree(fti);
+ fti.setDirCacheIterator(tw, dciPos);
tw.setRecursive(true);
tw.setFilter(PathFilter.create(path));
DirCacheIterator dcIt;
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 de08e4b6a0..e224d71d4b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -1005,13 +1005,14 @@ public class ResolveMerger extends ThreeWayMerger {
builder = dircache.builder();
DirCacheBuildIterator buildIt = new DirCacheBuildIterator(builder);
- tw = new NameConflictTreeWalk(reader);
+ tw = new NameConflictTreeWalk(db, reader);
tw.addTree(baseTree);
tw.addTree(headTree);
tw.addTree(mergeTree);
- tw.addTree(buildIt);
+ int dciPos = tw.addTree(buildIt);
if (workingTreeIterator != null) {
tw.addTree(workingTreeIterator);
+ workingTreeIterator.setDirCacheIterator(tw, dciPos);
} else {
tw.setFilter(TreeFilter.ANY_DIFF);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java
index f18a522131..ec903c139d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java
@@ -106,7 +106,7 @@ public class StrategySimpleTwoWayInCore extends ThreeWayMergeStrategy {
InCoreMerger(final Repository local) {
super(local);
- tw = new NameConflictTreeWalk(reader);
+ tw = new NameConflictTreeWalk(local, reader);
cache = DirCache.newInCore();
}
--
cgit v1.2.3
From ddc0e9e84abf88701c32c1947fe536050a0b1043 Mon Sep 17 00:00:00 2001
From: Christian Halstrick <christian.halstrick@sap.com>
Date: Wed, 27 Apr 2016 09:47:28 +0200
Subject: Fix possible NPEs when reporting transport errors
There was a bug in JGit which caused NPEs being thrown when Transport
errors should be reported. Avoid the NPE to let the original error show
up.
Change-Id: I9e1e2b0195bd61b7e531a09d0fc7bce109bd6515
---
org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java
index 6a43c0f963..7cb2bf6c87 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java
@@ -189,7 +189,8 @@ public class HttpSupport {
try {
return c.getResponseCode();
} catch (ConnectException ce) {
- final String host = c.getURL().getHost();
+ final URL url = c.getURL();
+ final String host = (url == null) ? "<null>" : url.getHost();
// The standard J2SE error message is not very useful.
//
if ("Connection timed out: connect".equals(ce.getMessage())) //$NON-NLS-1$
@@ -216,7 +217,8 @@ public class HttpSupport {
try {
return c.getResponseCode();
} catch (ConnectException ce) {
- final String host = c.getURL().getHost();
+ final URL url = c.getURL();
+ final String host = (url == null) ? "<null>" : url.getHost();
// The standard J2SE error message is not very useful.
//
if ("Connection timed out: connect".equals(ce.getMessage())) //$NON-NLS-1$
--
cgit v1.2.3
From 05fd01656ee295e4a8d3c1efff0ca3a6f48c1f4c Mon Sep 17 00:00:00 2001
From: Marco Miller <marco.miller@ericsson.com>
Date: Wed, 20 Apr 2016 17:42:34 -0400
Subject: Scan loose ref before packed in case gc about to remove the loose
Before this change, jgit used to read packed-refs before scanning
loose refs. That was not a problem if gc didn't run concurrently. When
gc did run concurrently with such refs reading, that order sometimes
broke the latter. This lead to reading an older version of a ref's
tip, which meant "losing" the real tip or commit. The specific
read-Vs-gc concurrency scenario which broke reading that way follows:
1. let ref R be in packed-refs and R' be in loose
2. jgit starts reading packed-refs
3. gc also starts its business around that very time
4. jgit still has the time to read R from packed-refs
5. as gc is not done yet updating packed-refs with R'
6. jgit then starts scanning loose refs (or is about to)
7. gc quickly ends up being done moving loose R' to packed-refs
8. so gc (quickly) removes loose refs
9. -while jgit is scanning loose refs, now gone
10. so jgit assumes no loose to consider => packed-refs winning
11. so jgit wrongfully returns R (from 4.) as the tip, instead of R'.
This fix switches the order so loose refs are scanned (secured) before
taking the time to read packed-refs. This way, knowledge of the
likelier tip is guaranteed for ref reading to return the true tip
- despite concurrent gc. If there is no loose ref to scan, jgit reads
packed-refs and lands on R' (or S), which it then returns, as
expected. The gerrit issue [1] should be solved by this fix.
[1] https://code.google.com/p/gerrit/issues/detail?id=2302
Change-Id: Ibd120120a361a3a6ed565f3836afc1db706fbcdd
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
.../src/org/eclipse/jgit/internal/storage/file/RefDirectory.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
index 6f3166a680..4bb2982b48 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
@@ -312,11 +312,10 @@ public class RefDirectory extends RefDatabase {
@Override
public Map<String, Ref> getRefs(String prefix) throws IOException {
- final RefList<Ref> packed = getPackedRefs();
final RefList<LooseRef> oldLoose = looseRefs.get();
-
LooseScanner scan = new LooseScanner(oldLoose);
scan.scan(prefix);
+ final RefList<Ref> packed = getPackedRefs();
RefList<LooseRef> loose;
if (scan.newLoose != null) {
--
cgit v1.2.3
From 41b194c718d50763a79951029787cca70a5804a5 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Thu, 5 May 2016 23:08:18 +0200
Subject: JGit v4.3.1.201605051710-r
Change-Id: I25fb72cc17d7a27b0b69746d907dac9ccd4d7997
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.ant.test/pom.xml | 2 +-
org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.ant/pom.xml | 2 +-
org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 ++--
org.eclipse.jgit.archive/pom.xml | 2 +-
org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.http.apache/pom.xml | 2 +-
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.http.server/pom.xml | 2 +-
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.http.test/pom.xml | 2 +-
org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.junit.http/pom.xml | 2 +-
org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.junit/pom.xml | 2 +-
org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.lfs.server.test/pom.xml | 2 +-
org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.lfs.server/pom.xml | 2 +-
org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.lfs.test/pom.xml | 2 +-
org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.lfs/pom.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml | 2 +-
.../org.eclipse.jgit.http.apache.feature/feature.xml | 2 +-
.../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml | 2 +-
.../org.eclipse.jgit.pgm.source.feature/feature.xml | 2 +-
.../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml | 2 +-
.../org.eclipse.jgit.source.feature/feature.xml | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml | 2 +-
.../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 +-
org.eclipse.jgit.packaging/pom.xml | 2 +-
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.pgm.test/pom.xml | 2 +-
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 ++--
org.eclipse.jgit.pgm/pom.xml | 2 +-
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.test/pom.xml | 2 +-
org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit.ui/pom.xml | 2 +-
org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +-
org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 ++--
org.eclipse.jgit/pom.xml | 2 +-
pom.xml | 2 +-
56 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 1d5aa68c1f..5ecc5c49ba 100644
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.ant.test
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.tools.ant,
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index a95ccc9e92..5882248099 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index da723e4976..d06c6037dd 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.tools.ant,
org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)"
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index b057ae0f66..0ceceaf82b 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -48,7 +48,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.ant</artifactId>
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index 548e879a06..74fe72a337 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.archive
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
index bb1ac47971..77664d5901 100644
--- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit.archive - Sources
Bundle-SymbolicName: org.eclipse.jgit.archive.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 4.3.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.3.1.qualifier";roots="."
+Bundle-Version: 4.3.1.201605051710-r
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.3.1.201605051710-r";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index ad506efa3f..1965a01cde 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index b435350ce7..db0478a16a 100644
--- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jgit.http.apache
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: plugin
Bundle-Vendor: %Provider-Name
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index 74634c7c91..74f1f6e7db 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -48,7 +48,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 3c7ca442b0..ca9dc55511 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package: org.eclipse.jgit.http.server;version="4.3.1",
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 589cffa6d7..73bf0c6730 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.http.server</artifactId>
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 006a86a500..751184fa55 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index 653463f42a..6f3ede6d60 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -51,7 +51,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.http.test</artifactId>
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 1ac2563d7b..7530335300 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index 3cb71a4ef9..ee872190b0 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.junit.http</artifactId>
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 19059bb5da..65e6ee682d 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 89e4960999..8e5eebbd17 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index d67c9198e1..60131192ab 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.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.lfs.server.test
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index db2b5eefb3..6e3a710dc9 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index cdd9159c12..72962190a1 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.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.lfs.server
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package: org.eclipse.jgit.lfs.server;version="4.3.1";
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index b20ae27304..10d1aed1da 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index bad6a41667..bf0fddb6c6 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.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.lfs.test
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml
index 71bf1edf86..64be3ea824 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index 8db6fa7722..97883006a1 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package: org.eclipse.jgit.lfs.errors;version="4.3.1",
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index 136d5b98d7..5f60386d00 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.lfs</artifactId>
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 85c96d0284..f3e00ce370 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 @@
<feature
id="org.eclipse.jgit"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.1.201605051710-r"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
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 fa7b631450..2c4271ae27 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
index f6103672a3..99d423a3cf 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.http.apache"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.1.201605051710-r"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
index 795ea21c00..0d2f93ebd6 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 abfc74b271..0279e0d89a 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 @@
<feature
id="org.eclipse.jgit.junit"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.1.201605051710-r"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
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 7b5b428909..f3489af757 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
index 40b30e4b51..48cefbe15e 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.lfs"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.1.201605051710-r"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
index 3ce017bd85..8d47cbeac4 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index 50f33d12ef..c0de3cc052 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.pgm"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.1.201605051710-r"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
index b6fe15ddfe..0fdd826d50 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
index 18b274659d..9837ee1b78 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.pgm.source"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.1.201605051710-r"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
index 4aced9aa0a..c92774a66e 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 ddac5d3a6d..9a681b3341 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.repository</artifactId>
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 7c824c273f..b564c38e85 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 @@
<feature
id="org.eclipse.jgit.source"
label="%featureName"
- version="4.3.1.qualifier"
+ version="4.3.1.201605051710-r"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
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 52a47b4045..153c0dcba0 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
index 242c3f6630..396f4216f6 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JGit Target Platform Bundle
Bundle-SymbolicName: org.eclipse.jgit.target
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
index 1305d7bccb..079ae4195e 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -49,7 +49,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.target</artifactId>
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 7ae1c3b5eb..c569600551 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -53,7 +53,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
<packaging>pom</packaging>
<name>JGit Tycho Parent</name>
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index 83ab2fccff..45adcf0fbf 100644
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index 78fcefc9f6..e2b876d6b0 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index b428515dd1..f626ed4778 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index e658e22795..b47b7eba3a 100644
--- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit.pgm - Sources
Bundle-SymbolicName: org.eclipse.jgit.pgm.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 4.3.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.3.1.qualifier";roots="."
+Bundle-Version: 4.3.1.201605051710-r
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.3.1.201605051710-r";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 2a06ca1102..d8cfed2275 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.pgm</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index f066bbdb28..5f7561286b 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index ec292ad363..85a7945a80 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 0049e1b11a..0b31a83b70 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.ui
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.jgit.awtui;version="4.3.1"
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index 5f024134a0..eddd8744c9 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 1832ed3a37..5d74590e86 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 4.3.1.qualifier
+Bundle-Version: 4.3.1.201605051710-r
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index b95d013113..8fce97b5e1 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit - Sources
Bundle-SymbolicName: org.eclipse.jgit.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 4.3.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="4.3.1.qualifier";roots="."
+Bundle-Version: 4.3.1.201605051710-r
+Eclipse-SourceBundle: org.eclipse.jgit;version="4.3.1.201605051710-r";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index eac3738ab6..9dcd01301f 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -53,7 +53,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/pom.xml b/pom.xml
index 3c3382bd4e..e29980a0b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<packaging>pom</packaging>
- <version>4.3.1-SNAPSHOT</version>
+ <version>4.3.1.201605051710-r</version>
<name>JGit - Parent</name>
<url>${jgit-url}</url>
--
cgit v1.2.3
From 4641c43a98dd291403fa776cf7ff6d5e5f5b2031 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Thu, 19 May 2016 10:17:39 +0200
Subject: Prepare 4.3.2-SNAPSHOT builds
Change-Id: I71997a8be83841765111cb7b55506bd8edd8adad
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 12 ++--
org.eclipse.jgit.ant.test/pom.xml | 2 +-
org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +-
org.eclipse.jgit.ant/pom.xml | 2 +-
org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 12 ++--
.../META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.archive/pom.xml | 2 +-
org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 10 +--
org.eclipse.jgit.http.apache/pom.xml | 2 +-
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 26 +++----
org.eclipse.jgit.http.server/pom.xml | 2 +-
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 36 +++++-----
org.eclipse.jgit.http.test/pom.xml | 2 +-
org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 +++---
org.eclipse.jgit.junit.http/pom.xml | 2 +-
org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 32 ++++-----
org.eclipse.jgit.junit/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 12 ++--
org.eclipse.jgit.lfs.server.test/pom.xml | 2 +-
org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 28 ++++----
org.eclipse.jgit.lfs.server/pom.xml | 2 +-
org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 14 ++--
org.eclipse.jgit.lfs.test/pom.xml | 2 +-
org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 16 ++---
org.eclipse.jgit.lfs/pom.xml | 2 +-
.../org.eclipse.jgit.feature/feature.xml | 2 +-
.../org.eclipse.jgit.feature/pom.xml | 2 +-
.../feature.xml | 2 +-
.../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +-
.../org.eclipse.jgit.junit.feature/feature.xml | 2 +-
.../org.eclipse.jgit.junit.feature/pom.xml | 2 +-
.../org.eclipse.jgit.lfs.feature/feature.xml | 2 +-
.../org.eclipse.jgit.lfs.feature/pom.xml | 2 +-
.../org.eclipse.jgit.pgm.feature/feature.xml | 2 +-
.../org.eclipse.jgit.pgm.feature/pom.xml | 2 +-
.../feature.xml | 2 +-
.../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +-
.../org.eclipse.jgit.repository/pom.xml | 2 +-
.../org.eclipse.jgit.source.feature/feature.xml | 2 +-
.../org.eclipse.jgit.source.feature/pom.xml | 2 +-
.../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.jgit.target/pom.xml | 2 +-
org.eclipse.jgit.packaging/pom.xml | 2 +-
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 36 +++++-----
org.eclipse.jgit.pgm.test/pom.xml | 2 +-
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 78 ++++++++++----------
org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.pgm/pom.xml | 2 +-
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 82 +++++++++++-----------
org.eclipse.jgit.test/pom.xml | 2 +-
org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++---
org.eclipse.jgit.ui/pom.xml | 2 +-
org.eclipse.jgit/META-INF/MANIFEST.MF | 80 ++++++++++-----------
org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit/pom.xml | 2 +-
pom.xml | 2 +-
56 files changed, 301 insertions(+), 301 deletions(-)
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 5ecc5c49ba..afa0f5c24b 100644
--- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.ant.test
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
+ org.eclipse.jgit.ant.tasks;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.junit;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
org.hamcrest;version="[1.1.0,2.0.0)",
org.junit;version="[4.0.0,5.0.0)"
diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml
index 5882248099..fc1257d644 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index d06c6037dd..98da2c0525 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)"
+ org.eclipse.jgit.storage.file;version="[4.3.2,4.4.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Provider-Name
-Export-Package: org.eclipse.jgit.ant.tasks;version="4.3.1";
+Export-Package: org.eclipse.jgit.ant.tasks;version="4.3.2";
uses:="org.apache.tools.ant.types,org.apache.tools.ant"
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 0ceceaf82b..6fc806f132 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -48,7 +48,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant</artifactId>
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index 74fe72a337..a185d1f782 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.archive
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -12,14 +12,14 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)",
org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)",
org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)",
org.apache.commons.compress.compressors.xz;version="[1.4,2.0)",
- org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
+ org.eclipse.jgit.api;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.jgit.archive.FormatActivator
-Export-Package: org.eclipse.jgit.archive;version="4.3.1";
+Export-Package: org.eclipse.jgit.archive;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.api,
org.apache.commons.compress.archivers,
diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
index 77664d5901..cf164a9c29 100644
--- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit.archive - Sources
Bundle-SymbolicName: org.eclipse.jgit.archive.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 4.3.1.201605051710-r
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.3.1.201605051710-r";roots="."
+Bundle-Version: 4.3.2.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.3.2.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index 1965a01cde..7b9c6ac893 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index db0478a16a..0872d4983a 100644
--- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jgit.http.apache
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: plugin
Bundle-Vendor: %Provider-Name
@@ -19,10 +19,10 @@ Import-Package: org.apache.http;version="[4.1.0,5.0.0)",
org.apache.http.impl.client;version="[4.1.0,5.0.0)",
org.apache.http.impl.client.cache;version="[4.1.0,5.0.0)",
org.apache.http.params;version="[4.1.0,5.0.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.http;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="4.3.1";
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.http;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="4.3.2";
uses:="org.eclipse.jgit.transport.http,
javax.net.ssl,
org.apache.http.client,
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index 74f1f6e7db..2b0b58d5f9 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -48,7 +48,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index ca9dc55511..848b55e427 100644
--- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.http.server;version="4.3.1",
- org.eclipse.jgit.http.server.glue;version="4.3.1";
+Export-Package: org.eclipse.jgit.http.server;version="4.3.2",
+ org.eclipse.jgit.http.server.glue;version="4.3.2";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="4.3.1";
+ org.eclipse.jgit.http.server.resolver;version="4.3.2";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.lib,
org.eclipse.jgit.transport,
@@ -17,12 +17,12 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
- org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)"
+ org.eclipse.jgit.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)"
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 73bf0c6730..c6de937212 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.server</artifactId>
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 751184fa55..fefdb66db3 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -22,23 +22,23 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
- org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.http.server;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.http.server.glue;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.http.server.resolver;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.junit.http;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.http;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.http.apache;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
+ org.eclipse.jgit.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.http.server;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.http.server.glue;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.http.server.resolver;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.junit;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.junit.http;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.http;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.http.apache;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.0.0,5.0.0)",
org.junit.runner;version="[4.0.0,5.0.0)",
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index 6f3ede6d60..8fc34f7417 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -51,7 +51,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.test</artifactId>
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 7530335300..bd26ac098d 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
@@ -20,16 +20,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
- org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.http.server;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
+ org.eclipse.jgit.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.http.server;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.junit;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.3.2,4.4.0)",
org.junit;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="4.3.1";
+Export-Package: org.eclipse.jgit.junit.http;version="4.3.2";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.junit,
javax.servlet.http,
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index ee872190b0..43fdb8ac07 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.http</artifactId>
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 65e6ee682d..89171bcc8a 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.api.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.dircache;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.pack;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.merge;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.treewalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util.io;version="[4.3.1,4.4.0)",
+Import-Package: org.eclipse.jgit.api;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.api.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.dircache;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.merge;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.treewalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util.io;version="[4.3.2,4.4.0)",
org.junit;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="4.3.1";
+Export-Package: org.eclipse.jgit.junit;version="4.3.2";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 8e5eebbd17..bb2b6771b5 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
index 60131192ab..53d74cfdbe 100644
--- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server.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.lfs.server.test
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -27,11 +27,11 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
- org.eclipse.jgit.junit.http;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.server.fs;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.test;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
+ org.eclipse.jgit.junit.http;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.test;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.0.0,5.0.0)",
org.junit.runner;version="[4.0.0,5.0.0)",
diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml
index 6e3a710dc9..05ee6f2eff 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index 72962190a1..d15690056a 100644
--- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.lfs.server
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.lfs.server;version="4.3.1";
+Export-Package: org.eclipse.jgit.lfs.server;version="4.3.2";
uses:="javax.servlet.http,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="4.3.1";
+ org.eclipse.jgit.lfs.server.fs;version="4.3.2";
uses:="javax.servlet,
javax.servlet.http,
org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.internal;version="4.3.1";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="4.3.1";
+ org.eclipse.jgit.lfs.server.internal;version="4.3.2";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="4.3.2";
uses:="org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -24,12 +24,12 @@ Import-Package: com.google.gson;version="[2.2.4,3.0.0)",
javax.servlet.http;version="[3.1.0,4.0.0)",
org.apache.http;version="[4.3.0,5.0.0)",
org.apache.http.client;version="[4.3.0,5.0.0)",
- org.eclipse.jgit.annotations;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.http;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.http.apache;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)"
+ org.eclipse.jgit.annotations;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.http;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.http.apache;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)"
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index 10d1aed1da..0a81e33c88 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index bf0fddb6c6..173b0eb998 100644
--- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.lfs.test
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
+Import-Package: org.eclipse.jgit.junit;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.0.0,5.0.0)",
org.junit.runner;version="[4.0.0,5.0.0)",
org.junit.runners;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.lfs.test;version="4.3.1";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="4.3.2";x-friends:="org.eclipse.jgit.lfs.server.test"
diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml
index 64be3ea824..8e5d28b5d8 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index 97883006a1..30baf05fac 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.lfs.errors;version="4.3.1",
- org.eclipse.jgit.lfs.internal;version="4.3.1";x-friends:="org.eclipse.jgit.lfs.test",
- org.eclipse.jgit.lfs.lib;version="4.3.1"
+Export-Package: org.eclipse.jgit.lfs.errors;version="4.3.2",
+ org.eclipse.jgit.lfs.internal;version="4.3.2";x-friends:="org.eclipse.jgit.lfs.test",
+ org.eclipse.jgit.lfs.lib;version="4.3.2"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)"
+Import-Package: org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)"
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index 5f60386d00..b0f543d9b1 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs</artifactId>
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 f3e00ce370..3d13c7139e 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 @@
<feature
id="org.eclipse.jgit"
label="%featureName"
- version="4.3.1.201605051710-r"
+ version="4.3.2.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
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 2c4271ae27..81a8c3b455 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
index 99d423a3cf..f2597a46cc 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.http.apache"
label="%featureName"
- version="4.3.1.201605051710-r"
+ version="4.3.2.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
index 0d2f93ebd6..ca0fdca5bf 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 0279e0d89a..829ef0a506 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 @@
<feature
id="org.eclipse.jgit.junit"
label="%featureName"
- version="4.3.1.201605051710-r"
+ version="4.3.2.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
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 f3489af757..6b900d433c 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
index 48cefbe15e..829c05623a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.lfs"
label="%featureName"
- version="4.3.1.201605051710-r"
+ version="4.3.2.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
index 8d47cbeac4..bf96616a5f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index c0de3cc052..73a9a13823 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.pgm"
label="%featureName"
- version="4.3.1.201605051710-r"
+ version="4.3.2.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
index 0fdd826d50..262872166b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
index 9837ee1b78..4cb5cb7b3b 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.pgm.source"
label="%featureName"
- version="4.3.1.201605051710-r"
+ version="4.3.2.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
index c92774a66e..c5015c6b6c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 9a681b3341..1410d68e88 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.repository</artifactId>
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 b564c38e85..4d49aae0a0 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 @@
<feature
id="org.eclipse.jgit.source"
label="%featureName"
- version="4.3.1.201605051710-r"
+ version="4.3.2.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
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 153c0dcba0..204026b63d 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
index 396f4216f6..4e1f66f7ae 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JGit Target Platform Bundle
Bundle-SymbolicName: org.eclipse.jgit.target
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
index 079ae4195e..4696b82719 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -49,7 +49,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.target</artifactId>
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index c569600551..39b4be9043 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -53,7 +53,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JGit Tycho Parent</name>
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index 45adcf0fbf..097319d8c8 100644
--- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.api.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.diff;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.dircache;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="4.3.1",
- org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.merge;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.pgm;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.pgm.internal;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.pgm.opt;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.treewalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util.io;version="[4.3.1,4.4.0)",
+Import-Package: org.eclipse.jgit.api;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.api.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.diff;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.dircache;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="4.3.2",
+ org.eclipse.jgit.junit;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.merge;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.pgm;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.pgm.internal;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.pgm.opt;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.treewalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util.io;version="[4.3.2,4.4.0)",
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
org.junit;version="[4.4.0,5.0.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)"
diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml
index e2b876d6b0..422532371e 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index f626ed4778..ab0c11bd0f 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
@@ -26,45 +26,45 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
- org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.api.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.archive;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.awtui;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.blame;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.diff;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.dircache;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.gitrepo;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.ketch;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.pack;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.server;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.server.fs;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lfs.server.s3;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.merge;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.notes;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revplot;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk.filter;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.storage.pack;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.http.apache;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.treewalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util.io;version="[4.3.1,4.4.0)",
+ org.eclipse.jgit.api;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.api.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.archive;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.awtui;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.blame;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.diff;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.dircache;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.gitrepo;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.ketch;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.server;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.merge;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.notes;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revplot;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk.filter;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.storage.pack;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.http.apache;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.treewalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util.io;version="[4.3.2,4.4.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)",
org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)"
-Export-Package: org.eclipse.jgit.console;version="4.3.1";
+Export-Package: org.eclipse.jgit.console;version="4.3.2";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="4.3.1";
+ org.eclipse.jgit.pgm;version="4.3.2";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.pgm.opt,
@@ -75,11 +75,11 @@ Export-Package: org.eclipse.jgit.console;version="4.3.1";
org.eclipse.jgit.treewalk,
javax.swing,
org.eclipse.jgit.transport",
- org.eclipse.jgit.pgm.debug;version="4.3.1";
+ org.eclipse.jgit.pgm.debug;version="4.3.2";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.pgm.internal;version="4.3.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="4.3.1";
+ org.eclipse.jgit.pgm.internal;version="4.3.2";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
+ org.eclipse.jgit.pgm.opt;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.kohsuke.args4j.spi,
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index b47b7eba3a..3bbff12e19 100644
--- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit.pgm - Sources
Bundle-SymbolicName: org.eclipse.jgit.pgm.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 4.3.1.201605051710-r
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.3.1.201605051710-r";roots="."
+Bundle-Version: 4.3.2.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.3.2.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index d8cfed2275..8edb94a4ce 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 5f7561286b..4c47ce5b58 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -2,52 +2,52 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)",
- org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.api.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.attributes;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.awtui;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.blame;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.diff;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.dircache;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.events;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.fnmatch;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.gitrepo;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.hooks;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.ignore;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.ignore.internal;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.pack;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.internal.storage.reftree;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.merge;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.notes;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.patch;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.pgm;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.pgm.internal;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revplot;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk.filter;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.storage.pack;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.submodule;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.http;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.treewalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.treewalk.filter;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util.io;version="[4.3.1,4.4.0)",
+ org.eclipse.jgit.api;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.api.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.attributes;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.awtui;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.blame;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.diff;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.dircache;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.events;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.fnmatch;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.gitrepo;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.hooks;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.ignore;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.ignore.internal;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.internal.storage.reftree;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.junit;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.merge;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.notes;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.patch;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.pgm;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.pgm.internal;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revplot;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk.filter;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.storage.file;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.storage.pack;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.submodule;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.http;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.treewalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.treewalk.filter;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util.io;version="[4.3.2,4.4.0)",
org.hamcrest;version="[1.1.0,2.0.0)",
org.junit;version="[4.4.0,5.0.0)",
org.junit.experimental.theories;version="[4.4.0,5.0.0)",
diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml
index 85a7945a80..a52ac4c075 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index 0b31a83b70..db339e073c 100644
--- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.ui
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.jgit.awtui;version="4.3.1"
-Import-Package: org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revplot;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
- org.eclipse.jgit.util;version="[4.3.1,4.4.0)"
+Export-Package: org.eclipse.jgit.awtui;version="4.3.2"
+Import-Package: org.eclipse.jgit.errors;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.lib;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.nls;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revplot;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.revwalk;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.transport;version="[4.3.2,4.4.0)",
+ org.eclipse.jgit.util;version="[4.3.2,4.4.0)"
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index eddd8744c9..fdd6dad2df 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 5d74590e86..f94c22c0f5 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 4.3.1.201605051710-r
+Bundle-Version: 4.3.2.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jgit.annotations;version="4.3.1",
- org.eclipse.jgit.api;version="4.3.1";
+Export-Package: org.eclipse.jgit.annotations;version="4.3.2",
+ org.eclipse.jgit.api;version="4.3.2";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
@@ -21,47 +21,47 @@ Export-Package: org.eclipse.jgit.annotations;version="4.3.1",
org.eclipse.jgit.submodule,
org.eclipse.jgit.transport,
org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="4.3.1",
- org.eclipse.jgit.blame;version="4.3.1";
+ org.eclipse.jgit.api.errors;version="4.3.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
+ org.eclipse.jgit.attributes;version="4.3.2",
+ org.eclipse.jgit.blame;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="4.3.1";
+ org.eclipse.jgit.diff;version="4.3.2";
uses:="org.eclipse.jgit.patch,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="4.3.1";
+ org.eclipse.jgit.dircache;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util,
org.eclipse.jgit.events,
org.eclipse.jgit.attributes",
- org.eclipse.jgit.errors;version="4.3.1";
+ org.eclipse.jgit.errors;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack,
org.eclipse.jgit.transport,
org.eclipse.jgit.dircache",
- org.eclipse.jgit.events;version="4.3.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="4.3.1",
- org.eclipse.jgit.gitrepo;version="4.3.1";
+ org.eclipse.jgit.events;version="4.3.2";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.fnmatch;version="4.3.2",
+ org.eclipse.jgit.gitrepo;version="4.3.2";
uses:="org.eclipse.jgit.api,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.xml.sax.helpers,
org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="4.3.1";x-internal:=true,
- org.eclipse.jgit.hooks;version="4.3.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="4.3.1",
- org.eclipse.jgit.ignore.internal;version="4.3.1";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="4.3.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.ketch;version="4.3.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.dfs;version="4.3.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.server",
- org.eclipse.jgit.internal.storage.file;version="4.3.1";
+ org.eclipse.jgit.gitrepo.internal;version="4.3.2";x-internal:=true,
+ org.eclipse.jgit.hooks;version="4.3.2";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="4.3.2",
+ org.eclipse.jgit.ignore.internal;version="4.3.2";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal;version="4.3.2";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
+ org.eclipse.jgit.internal.ketch;version="4.3.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.storage.dfs;version="4.3.2";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.server",
+ org.eclipse.jgit.internal.storage.file;version="4.3.2";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.http,
@@ -69,9 +69,9 @@ Export-Package: org.eclipse.jgit.annotations;version="4.3.1",
org.eclipse.jgit.lfs.server,
org.eclipse.jgit.pgm,
org.eclipse.jgit.pgm.test",
- org.eclipse.jgit.internal.storage.pack;version="4.3.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftree;version="4.3.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.lib;version="4.3.1";
+ org.eclipse.jgit.internal.storage.pack;version="4.3.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.internal.storage.reftree;version="4.3.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.lib;version="4.3.2";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
@@ -81,32 +81,32 @@ Export-Package: org.eclipse.jgit.annotations;version="4.3.1",
org.eclipse.jgit.treewalk,
org.eclipse.jgit.transport,
org.eclipse.jgit.submodule",
- org.eclipse.jgit.merge;version="4.3.1";
+ org.eclipse.jgit.merge;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.diff,
org.eclipse.jgit.dircache,
org.eclipse.jgit.api",
- org.eclipse.jgit.nls;version="4.3.1",
- org.eclipse.jgit.notes;version="4.3.1";
+ org.eclipse.jgit.nls;version="4.3.2",
+ org.eclipse.jgit.notes;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="4.3.1";
+ org.eclipse.jgit.patch;version="4.3.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
+ org.eclipse.jgit.revplot;version="4.3.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
+ org.eclipse.jgit.revwalk;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
org.eclipse.jgit.revwalk.filter",
- org.eclipse.jgit.revwalk.filter;version="4.3.1";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="4.3.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
- org.eclipse.jgit.transport;version="4.3.1";
+ org.eclipse.jgit.revwalk.filter;version="4.3.2";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
+ org.eclipse.jgit.storage.file;version="4.3.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
+ org.eclipse.jgit.storage.pack;version="4.3.2";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.submodule;version="4.3.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
+ org.eclipse.jgit.transport;version="4.3.2";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.internal.storage.pack,
@@ -118,22 +118,22 @@ Export-Package: org.eclipse.jgit.annotations;version="4.3.1",
org.eclipse.jgit.transport.http,
org.eclipse.jgit.errors,
org.eclipse.jgit.storage.pack",
- org.eclipse.jgit.transport.http;version="4.3.1";uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
- org.eclipse.jgit.treewalk;version="4.3.1";
+ org.eclipse.jgit.transport.http;version="4.3.2";uses:="javax.net.ssl",
+ org.eclipse.jgit.transport.resolver;version="4.3.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
+ org.eclipse.jgit.treewalk;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.attributes,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
org.eclipse.jgit.dircache",
- org.eclipse.jgit.treewalk.filter;version="4.3.1";uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="4.3.1";
+ org.eclipse.jgit.treewalk.filter;version="4.3.2";uses:="org.eclipse.jgit.treewalk",
+ org.eclipse.jgit.util;version="4.3.2";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.transport.http,
org.eclipse.jgit.storage.file,
org.ietf.jgss",
- org.eclipse.jgit.util.io;version="4.3.1"
+ org.eclipse.jgit.util.io;version="4.3.2"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)",
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 8fce97b5e1..3bf02b7772 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit - Sources
Bundle-SymbolicName: org.eclipse.jgit.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 4.3.1.201605051710-r
-Eclipse-SourceBundle: org.eclipse.jgit;version="4.3.1.201605051710-r";roots="."
+Bundle-Version: 4.3.2.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="4.3.2.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index 9dcd01301f..40d15c87bb 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -53,7 +53,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/pom.xml b/pom.xml
index e29980a0b8..1ff91cd169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<packaging>pom</packaging>
- <version>4.3.1.201605051710-r</version>
+ <version>4.3.2-SNAPSHOT</version>
<name>JGit - Parent</name>
<url>${jgit-url}</url>
--
cgit v1.2.3
From ffa237e7dbd56df2f28d45113fe0ea03337900f1 Mon Sep 17 00:00:00 2001
From: Christian Halstrick <christian.halstrick@sap.com>
Date: Wed, 18 May 2016 15:03:51 +0200
Subject: Fix computation of id in WorkingTreeIterator with autocrlf and
smudging
JGit failed to do checkouts when the index contained smudged entries and
autocrlf was on. In such cases the WorkingTreeIterator calculated the
SHA1 sometimes on content which was not correctly filtered. The SHA1 was
computed on content which two times went through a lf->crlf conversion.
We used to tell the treewalk whether it is a checkin or checkout
operation and always use the related filters when reading any content.
If on windows and autocrlf is true and we do a checkout operation then
we always used a lf->crlf conversion on any text content. That's not
correct. Even during a checkout we sometimes need the crlf->lf
conversion. E.g. when calculating the content-id for working-tree
content we need to use crlf->lf filtering although the overall operation
type is checkout.
Often this bug does not have effects because we seldom compute the
content-id of filesystem content during a checkout. But we do need to
know whether a file is dirty or not before we overwrite it during a
checkout. And if the index entries are smudged we don't trust the index
and compute filesystem-content-sha1's explicitly.
This caused EGit not to be able to switch branches anymore on Windows
when autocrlf was true. EGit denied the checkout because it thought
workingtree files are dirty because content-sha1 are computed on wrongly
filtered content.
Bug: 493360
Change-Id: I1072a57b4c529ba3aaa50b7b02d2b816bb64a9b8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
.../org/eclipse/jgit/api/EolRepositoryTest.java | 56 ++++++++++++++++++---
.../src/org/eclipse/jgit/treewalk/TreeWalk.java | 20 ++++++--
.../eclipse/jgit/treewalk/WorkingTreeIterator.java | 57 +++++++++++++++++-----
3 files changed, 112 insertions(+), 21 deletions(-)
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolRepositoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolRepositoryTest.java
index 5dd8da57c2..5f10131750 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolRepositoryTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolRepositoryTest.java
@@ -51,6 +51,7 @@ import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.NoFilepatternException;
import org.eclipse.jgit.attributes.Attribute;
import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.dircache.DirCacheEditor;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.dircache.DirCacheIterator;
import org.eclipse.jgit.errors.RevisionSyntaxException;
@@ -61,9 +62,11 @@ import org.eclipse.jgit.lib.CoreConfig.AutoCRLF;
import org.eclipse.jgit.lib.CoreConfig.EOL;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectLoader;
+import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.treewalk.FileTreeIterator;
import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.IO;
import org.junit.Assert;
import org.junit.Test;
@@ -82,6 +85,14 @@ public class EolRepositoryTest extends RepositoryTestCase {
private static final FileMode F = FileMode.REGULAR_FILE;
+ @DataPoint
+ public static boolean doSmudgeEntries = true;
+
+ @DataPoint
+ public static boolean dontSmudgeEntries = false;
+
+ private boolean smudge;
+
@DataPoint
public static String smallContents[] = {
generateTestData(3, 1, true, false),
@@ -117,10 +128,11 @@ public class EolRepositoryTest extends RepositoryTestCase {
return sb.toString();
}
- public EolRepositoryTest(String[] testContent) {
+ public EolRepositoryTest(String[] testContent, boolean smudgeEntries) {
CONTENT_CRLF = testContent[0];
CONTENT_LF = testContent[1];
CONTENT_MIXED = testContent[2];
+ this.smudge = smudgeEntries;
}
protected String CONTENT_CRLF;
@@ -160,7 +172,7 @@ public class EolRepositoryTest extends RepositoryTestCase {
private ActualEntry entryMixed = new ActualEntry();
- private DirCache dc;
+ private DirCache dirCache;
@Test
public void testDefaultSetup() throws Exception {
@@ -177,7 +189,9 @@ public class EolRepositoryTest extends RepositoryTestCase {
String indexContent) {
assertEquals(fileContent, entry.file);
assertEquals(indexContent, entry.index);
- assertEquals(fileContent.length(), entry.indexContentLength);
+ if (entry.indexContentLength != 0) {
+ assertEquals(fileContent.length(), entry.indexContentLength);
+ }
}
@Test
@@ -584,6 +598,14 @@ public class EolRepositoryTest extends RepositoryTestCase {
dotGitattributes = null;
}
+ fileCRLF = createAndAddFile(git, "file1.txt", "a");
+
+ fileLF = createAndAddFile(git, "file2.txt", "a");
+
+ fileMixed = createAndAddFile(git, "file3.txt", "a");
+
+ RevCommit c = gitCommit(git, "create files");
+
fileCRLF = createAndAddFile(git, "file1.txt", CONTENT_CRLF);
fileLF = createAndAddFile(git, "file2.txt", CONTENT_LF);
@@ -593,6 +615,26 @@ public class EolRepositoryTest extends RepositoryTestCase {
gitCommit(git, "addFiles");
recreateWorktree(git);
+
+ if (smudge) {
+ DirCache dc = DirCache.lock(git.getRepository().getIndexFile(),
+ FS.detect());
+ DirCacheEditor editor = dc.editor();
+ for (int i = 0; i < dc.getEntryCount(); i++) {
+ editor.add(new DirCacheEditor.PathEdit(
+ dc.getEntry(i).getPathString()) {
+ public void apply(DirCacheEntry ent) {
+ ent.smudgeRacilyClean();
+ }
+ });
+ }
+ editor.commit();
+ }
+
+ // @TODO: find out why the following assertion would break the tests
+ // assertTrue(git.status().call().isClean());
+ git.checkout().setName(c.getName()).call();
+ git.checkout().setName("master").call();
}
private void recreateWorktree(Git git)
@@ -610,8 +652,8 @@ public class EolRepositoryTest extends RepositoryTestCase {
gitAdd(git, ".");
}
- protected void gitCommit(Git git, String msg) throws GitAPIException {
- git.commit().setMessage(msg).call();
+ protected RevCommit gitCommit(Git git, String msg) throws GitAPIException {
+ return git.commit().setMessage(msg).call();
}
protected void gitAdd(Git git, String path) throws GitAPIException {
@@ -644,7 +686,7 @@ public class EolRepositoryTest extends RepositoryTestCase {
}
private void collectRepositoryState() throws Exception {
- dc = db.readDirCache();
+ dirCache = db.readDirCache();
walk = beginWalk();
if (dotGitattributes != null)
collectEntryContentAndAttributes(F, ".gitattributes", null);
@@ -680,7 +722,7 @@ public class EolRepositoryTest extends RepositoryTestCase {
e.attrs = e.attrs.trim();
e.file = new String(
IO.readFully(new File(db.getWorkTree(), pathName)));
- DirCacheEntry dce = dc.getEntry(pathName);
+ DirCacheEntry dce = dirCache.getEntry(pathName);
ObjectLoader open = walk.getObjectReader().open(dce.getObjectId());
e.index = new String(open.getBytes());
e.indexContentLength = dce.getLength();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
index 501d676735..7dac50a89a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
@@ -580,18 +580,32 @@ public class TreeWalk implements AutoCloseable, AttributesProvider {
}
/**
+ * @param opType
+ * the operationtype (checkin/checkout) which should be used
* @return the EOL stream type of the current entry using the config and
* {@link #getAttributes()} Note that this method may return null if
* the {@link TreeWalk} is not based on a working tree
- * @since 4.3
*/
- public @Nullable EolStreamType getEolStreamType() {
+ // TODO(msohn) make this method public in 4.4
+ @Nullable
+ EolStreamType getEolStreamType(OperationType opType) {
if (attributesNodeProvider == null || config == null)
return null;
- return EolStreamTypeUtil.detectStreamType(operationType,
+ return EolStreamTypeUtil.detectStreamType(opType,
config.get(WorkingTreeOptions.KEY), getAttributes());
}
+ /**
+ * @return the EOL stream type of the current entry using the config and
+ * {@link #getAttributes()} Note that this method may return null if
+ * the {@link TreeWalk} is not based on a working tree
+ * @since 4.3
+ */
+ // TODO(msohn) deprecate this method in 4.4
+ public @Nullable EolStreamType getEolStreamType() {
+ return (getEolStreamType(operationType));
+ }
+
/** Reset this walker so new tree iterators can be added to it. */
public void reset() {
attrs = null;
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 39176c621e..c8de3de83c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
@@ -86,6 +86,7 @@ import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.submodule.SubmoduleWalk;
+import org.eclipse.jgit.treewalk.TreeWalk.OperationType;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FS.ExecutionResult;
import org.eclipse.jgit.util.Holder;
@@ -361,7 +362,8 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
state.initializeDigestAndReadBuffer();
final long len = e.getLength();
- InputStream filteredIs = possiblyFilteredInputStream(e, is, len);
+ InputStream filteredIs = possiblyFilteredInputStream(e, is, len,
+ OperationType.CHECKIN_OP);
return computeHash(filteredIs, canonLen);
} finally {
safeClose(is);
@@ -374,8 +376,15 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
private InputStream possiblyFilteredInputStream(final Entry e,
final InputStream is, final long len) throws IOException {
+ return possiblyFilteredInputStream(e, is, len, null);
+
+ }
+
+ private InputStream possiblyFilteredInputStream(final Entry e,
+ final InputStream is, final long len, OperationType opType)
+ throws IOException {
if (getCleanFilterCommand() == null
- && getEolStreamType() == EolStreamType.DIRECT) {
+ && getEolStreamType(opType) == EolStreamType.DIRECT) {
canonLen = len;
return is;
}
@@ -385,7 +394,7 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
byte[] raw = rawbuf.array();
int n = rawbuf.limit();
if (!isBinary(raw, n)) {
- rawbuf = filterClean(raw, n);
+ rawbuf = filterClean(raw, n, opType);
raw = rawbuf.array();
n = rawbuf.limit();
}
@@ -398,13 +407,14 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
return is;
}
- final InputStream lenIs = filterClean(e.openInputStream());
+ final InputStream lenIs = filterClean(e.openInputStream(),
+ opType);
try {
canonLen = computeLength(lenIs);
} finally {
safeClose(lenIs);
}
- return filterClean(is);
+ return filterClean(is, opType);
}
private static void safeClose(final InputStream in) {
@@ -430,17 +440,23 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
}
}
- private ByteBuffer filterClean(byte[] src, int n) throws IOException {
+ private ByteBuffer filterClean(byte[] src, int n, OperationType opType)
+ throws IOException {
InputStream in = new ByteArrayInputStream(src);
try {
- return IO.readWholeStream(filterClean(in), n);
+ return IO.readWholeStream(filterClean(in, opType), n);
} finally {
safeClose(in);
}
}
private InputStream filterClean(InputStream in) throws IOException {
- in = handleAutoCRLF(in);
+ return filterClean(in, null);
+ }
+
+ private InputStream filterClean(InputStream in, OperationType opType)
+ throws IOException {
+ in = handleAutoCRLF(in, opType);
String filterCommand = getCleanFilterCommand();
if (filterCommand != null) {
FS fs = repository.getFS();
@@ -469,8 +485,9 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
return in;
}
- private InputStream handleAutoCRLF(InputStream in) throws IOException {
- return EolStreamTypeUtil.wrapInputStream(in, getEolStreamType());
+ private InputStream handleAutoCRLF(InputStream in, OperationType opType)
+ throws IOException {
+ return EolStreamTypeUtil.wrapInputStream(in, getEolStreamType(opType));
}
/**
@@ -1332,10 +1349,28 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
* @since 4.3
*/
public EolStreamType getEolStreamType() throws IOException {
+ return getEolStreamType(null);
+ }
+
+ /**
+ * @param opType
+ * The operationtype (checkin/checkout) which should be used
+ * @return the eol stream type for the current entry or <code>null</code> if
+ * it cannot be determined. When state or state.walk is null or the
+ * {@link TreeWalk} is not based on a {@link Repository} then null
+ * is returned.
+ * @throws IOException
+ */
+ private EolStreamType getEolStreamType(OperationType opType)
+ throws IOException {
if (eolStreamTypeHolder == null) {
EolStreamType type=null;
if (state.walk != null) {
- type=state.walk.getEolStreamType();
+ if (opType != null) {
+ type = state.walk.getEolStreamType(opType);
+ } else {
+ type=state.walk.getEolStreamType();
+ }
} else {
switch (getOptions().getAutoCRLF()) {
case FALSE:
--
cgit v1.2.3