From c053900c5bc89d2b55c563e04bc1edab53cdc143 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Sun, 14 Dec 2014 18:07:59 +0100 Subject: [PATCH 1/5] PathMatcher should respect "assumeDirectory" flag The path matcher should not fail if the rule ends with trailing slash, target pattern does not ends with the slash and the "assumeDirectory" flag is set. E.g. */bin/ should also match a/bin if this pattern is threated as directory by WorkingTreeIterator (FileMode.TREE). The old code/tests have never tested directory rules with patterns *without* trailing slashes but with the "assumeDirectory" flag set. Unfortunately this is exactly what WorkingTreeIterator does... The tests are changed to test *both* cases now (with trailing slash and without) if the target pattern has trailing slash (represents directory). Bug: 454672 Change-Id: I621c1644d9e94df3eb9f6f09c6de0fe51f0950a4 Also-by: Markus Duft Signed-off-by: Andrey Loskutov --- .../ignore/IgnoreMatcherParametrizedTest.java | 115 +++++++++++++++--- .../jgit/ignore/internal/PathMatcher.java | 3 +- 2 files changed, 103 insertions(+), 15 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreMatcherParametrizedTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreMatcherParametrizedTest.java index cbfe6f279..699542c57 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreMatcherParametrizedTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreMatcherParametrizedTest.java @@ -44,9 +44,12 @@ package org.eclipse.jgit.ignore; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; import java.util.Arrays; +import org.eclipse.jgit.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -236,16 +239,62 @@ public class IgnoreMatcherParametrizedTest { } @Test - public void testTrailingSlash() { + public void testDirModeAndNoRegex() { String pattern = "/src/"; assertMatched(pattern, "/src/"); assertMatched(pattern, "/src/new"); assertMatched(pattern, "/src/new/a.c"); assertMatched(pattern, "/src/a.c"); + // no match as a "file" pattern, because rule is for directories only assertNotMatched(pattern, "/src"); assertNotMatched(pattern, "/srcA/"); } + @Test + public void testDirModeAndRegex1() { + // IgnoreRule was buggy for some cases below, therefore using "Assume" + Boolean assume = useOldRule; + + String pattern = "a/*/src/"; + assertMatched(pattern, "a/b/src/"); + assertMatched(pattern, "a/b/src/new"); + assertMatched(pattern, "a/b/src/new/a.c"); + assertMatched(pattern, "a/b/src/a.c"); + // no match as a "file" pattern, because rule is for directories only + assertNotMatched(pattern, "a/b/src", assume); + assertNotMatched(pattern, "a/b/srcA/"); + } + + @Test + public void testDirModeAndRegex2() { + // IgnoreRule was buggy for some cases below, therefore using "Assume" + Boolean assume = useOldRule; + + String pattern = "a/[a-b]/src/"; + assertMatched(pattern, "a/b/src/"); + assertMatched(pattern, "a/b/src/new"); + assertMatched(pattern, "a/b/src/new/a.c"); + assertMatched(pattern, "a/b/src/a.c"); + // no match as a "file" pattern, because rule is for directories only + assertNotMatched(pattern, "a/b/src", assume); + assertNotMatched(pattern, "a/b/srcA/"); + } + + @Test + public void testDirModeAndRegex3() { + // IgnoreRule was buggy for some cases below, therefore using "Assume" + Boolean assume = useOldRule; + + String pattern = "**/src/"; + assertMatched(pattern, "a/b/src/", assume); + assertMatched(pattern, "a/b/src/new", assume); + assertMatched(pattern, "a/b/src/new/a.c", assume); + assertMatched(pattern, "a/b/src/a.c", assume); + // no match as a "file" pattern, because rule is for directories only + assertNotMatched(pattern, "a/b/src", assume); + assertNotMatched(pattern, "a/b/srcA/", assume); + } + @Test public void testNameOnlyMatches() { /* @@ -321,11 +370,16 @@ public class IgnoreMatcherParametrizedTest { * Pattern as it would appear in a .gitignore file * @param target * Target file path relative to repository's GIT_DIR + * @param assume */ - public void assertMatched(String pattern, String target) { + public void assertMatched(String pattern, String target, Boolean... assume) { boolean value = match(pattern, target); - assertTrue("Expected a match for: " + pattern + " with: " + target, - value); + if (assume.length == 0 || !assume[0].booleanValue()) + assertTrue("Expected a match for: " + pattern + " with: " + target, + value); + else + assumeTrue("Expected a match for: " + pattern + " with: " + target, + value); } /** @@ -336,11 +390,17 @@ public class IgnoreMatcherParametrizedTest { * Pattern as it would appear in a .gitignore file * @param target * Target file path relative to repository's GIT_DIR + * @param assume */ - public void assertNotMatched(String pattern, String target) { + public void assertNotMatched(String pattern, String target, + Boolean... assume) { boolean value = match(pattern, target); - assertFalse("Expected no match for: " + pattern + " with: " + target, - value); + if (assume.length == 0 || !assume[0].booleanValue()) + assertFalse("Expected no match for: " + pattern + " with: " + + target, value); + else + assumeFalse("Expected no match for: " + pattern + " with: " + + target, value); } /** @@ -355,16 +415,43 @@ public class IgnoreMatcherParametrizedTest { */ private boolean match(String pattern, String target) { boolean isDirectory = target.endsWith("/"); + boolean match; + if (useOldRule.booleanValue()) { + IgnoreRule r = new IgnoreRule(pattern); + match = r.isMatch(target, isDirectory); + } else { + FastIgnoreRule r = new FastIgnoreRule(pattern); + match = r.isMatch(target, isDirectory); + } + + if (isDirectory) { + boolean noTrailingSlash = matchAsDir(pattern, + target.substring(0, target.length() - 1)); + if (match != noTrailingSlash) { + String message = "Difference in result for directory pattern: " + + pattern + " with: " + target + + " if target is given without trailing slash"; + Assert.assertEquals(message, match, noTrailingSlash); + } + } + return match; + } + + /** + * + * @param target + * must not ends with a slash! + * @param pattern + * same as {@link #match(String, String)} + * @return same as {@link #match(String, String)} + */ + private boolean matchAsDir(String pattern, String target) { + assertFalse(target.endsWith("/")); if (useOldRule.booleanValue()) { IgnoreRule r = new IgnoreRule(pattern); - // If speed of this test is ever an issue, we can use a presetRule - // field - // to avoid recompiling a pattern each time. - return r.isMatch(target, isDirectory); + return r.isMatch(target, true); } FastIgnoreRule r = new FastIgnoreRule(pattern); - // If speed of this test is ever an issue, we can use a presetRule field - // to avoid recompiling a pattern each time. - return r.isMatch(target, isDirectory); + return r.isMatch(target, true); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/PathMatcher.java b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/PathMatcher.java index dcecf303c..d3e5f6a05 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/PathMatcher.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/PathMatcher.java @@ -217,7 +217,8 @@ public class PathMatcher extends AbstractMatcher { matcher++; match = matches(matcher, path, left, endExcl, assumeDirectory); - } else if (dirOnly) + } else if (dirOnly && !assumeDirectory) + // Directory expectations not met return false; } return match && matcher + 1 == matchers.size(); From 1cb566844116fc280969e4a89be8fa1c6e3a7d72 Mon Sep 17 00:00:00 2001 From: Marc Strapetz Date: Thu, 30 Oct 2014 19:36:49 +0100 Subject: [PATCH 2/5] Rename detection should canonicalize line endings Native Git canonicalizes line endings when detecting renames, more specifically it replaces CRLF by LF. See: hash_chars in diffcore-delta.c Bug: 449545 Change-Id: Iec2aab12ae9e67074cccb7fbd4d9defe176a0130 Signed-off-by: Marc Strapetz Signed-off-by: Matthias Sohn --- .../jgit/diff/SimilarityIndexTest.java | 62 ++++++++++++------ .../eclipse/jgit/diff/SimilarityIndex.java | 64 ++++++++++++------- 2 files changed, 86 insertions(+), 40 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/SimilarityIndexTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/SimilarityIndexTest.java index 95423609a..4724677bb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/SimilarityIndexTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/SimilarityIndexTest.java @@ -83,7 +83,7 @@ public class SimilarityIndexTest { + "B\n" // + "B\n").getBytes("UTF-8"); SimilarityIndex si = new SimilarityIndex(); - si.hash(new ByteArrayInputStream(in), in.length); + si.hash(new ByteArrayInputStream(in), in.length, false); assertEquals(2, si.size()); } @@ -103,6 +103,48 @@ public class SimilarityIndexTest { assertEquals(100, dst.score(src, 100)); } + @Test + public void testCommonScore_SameFiles_CR_canonicalization() + throws TableFullException { + String text = "" // + + "A\r\n" // + + "B\r\n" // + + "D\r\n" // + + "B\r\n"; + SimilarityIndex src = hash(text); + SimilarityIndex dst = hash(text.replace("\r", "")); + assertEquals(8, src.common(dst)); + assertEquals(8, dst.common(src)); + + assertEquals(100, src.score(dst, 100)); + assertEquals(100, dst.score(src, 100)); + } + + @Test + public void testCommonScoreLargeObject_SameFiles_CR_canonicalization() + throws TableFullException, IOException { + String text = "" // + + "A\r\n" // + + "B\r\n" // + + "D\r\n" // + + "B\r\n"; + SimilarityIndex src = new SimilarityIndex(); + byte[] bytes1 = text.getBytes("UTF-8"); + src.hash(new ByteArrayInputStream(bytes1), bytes1.length, true); + src.sort(); + + SimilarityIndex dst = new SimilarityIndex(); + byte[] bytes2 = text.replace("\r", "").getBytes("UTF-8"); + dst.hash(new ByteArrayInputStream(bytes2), bytes2.length, true); + dst.sort(); + + assertEquals(8, src.common(dst)); + assertEquals(8, dst.common(src)); + + assertEquals(100, src.score(dst, 100)); + assertEquals(100, dst.score(src, 100)); + } + @Test public void testCommonScore_EmptyFiles() throws TableFullException { SimilarityIndex src = hash(""); @@ -132,24 +174,8 @@ public class SimilarityIndexTest { } private static SimilarityIndex hash(String text) throws TableFullException { - SimilarityIndex src = new SimilarityIndex() { - @Override - void hash(byte[] raw, int ptr, final int end) - throws TableFullException { - while (ptr < end) { - int hash = raw[ptr] & 0xff; - int start = ptr; - do { - int c = raw[ptr++] & 0xff; - if (c == '\n') - break; - } while (ptr < end && ptr - start < 64); - add(hash, ptr - start); - } - } - }; + SimilarityIndex src = new SimilarityIndex(); byte[] raw = Constants.encode(text); - src.setFileSize(raw.length); src.hash(raw, 0, raw.length); src.sort(); return src; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java index 17ccb9726..f376b8e36 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java @@ -79,8 +79,11 @@ class SimilarityIndex { /** Maximum value of the count field, also mask to extract the count. */ private static final long MAX_COUNT = (1L << KEY_SHIFT) - 1; - /** Total size of the file we hashed into the structure. */ - private long fileSize; + /** + * Total amount of bytes hashed into the structure, including \n. This is + * usually the size of the file minus number of CRLF encounters. + */ + private long hashedCnt; /** Number of non-zero entries in {@link #idHash}. */ private int idSize; @@ -108,48 +111,59 @@ class SimilarityIndex { idGrowAt = growAt(idHashBits); } - long getFileSize() { - return fileSize; - } - - void setFileSize(long size) { - fileSize = size; - } - void hash(ObjectLoader obj) throws MissingObjectException, IOException, TableFullException { if (obj.isLarge()) { - ObjectStream in = obj.openStream(); - try { - setFileSize(in.getSize()); - hash(in, fileSize); - } finally { - in.close(); - } + hashLargeObject(obj); } else { byte[] raw = obj.getCachedBytes(); - setFileSize(raw.length); hash(raw, 0, raw.length); } } + private void hashLargeObject(ObjectLoader obj) throws IOException, + TableFullException { + ObjectStream in1 = obj.openStream(); + boolean text; + try { + text = !RawText.isBinary(in1); + } finally { + in1.close(); + } + + ObjectStream in2 = obj.openStream(); + try { + hash(in2, in2.getSize(), text); + } finally { + in2.close(); + } + } + void hash(byte[] raw, int ptr, final int end) throws TableFullException { + final boolean text = !RawText.isBinary(raw); + hashedCnt = 0; while (ptr < end) { int hash = 5381; + int blockHashedCnt = 0; int start = ptr; // Hash one line, or one block, whichever occurs first. do { int c = raw[ptr++] & 0xff; + // Ignore CR in CRLF sequence if text + if (text && c == '\r' && ptr < end && raw[ptr] == '\n') + continue; + blockHashedCnt++; if (c == '\n') break; hash = (hash << 5) + hash + c; } while (ptr < end && ptr - start < 64); - add(hash, ptr - start); + hashedCnt += blockHashedCnt; + add(hash, blockHashedCnt); } } - void hash(InputStream in, long remaining) throws IOException, + void hash(InputStream in, long remaining, boolean text) throws IOException, TableFullException { byte[] buf = new byte[4096]; int ptr = 0; @@ -157,6 +171,7 @@ class SimilarityIndex { while (0 < remaining) { int hash = 5381; + int blockHashedCnt = 0; // Hash one line, or one block, whichever occurs first. int n = 0; @@ -170,11 +185,16 @@ class SimilarityIndex { n++; int c = buf[ptr++] & 0xff; + // Ignore CR in CRLF sequence if text + if (text && c == '\r' && ptr < cnt && buf[ptr] == '\n') + continue; + blockHashedCnt++; if (c == '\n') break; hash = (hash << 5) + hash + c; } while (n < 64 && n < remaining); - add(hash, n); + hashedCnt += blockHashedCnt; + add(hash, blockHashedCnt); remaining -= n; } } @@ -193,7 +213,7 @@ class SimilarityIndex { } int score(SimilarityIndex dst, int maxScore) { - long max = Math.max(fileSize, dst.fileSize); + long max = Math.max(hashedCnt, dst.hashedCnt); if (max == 0) return maxScore; return (int) ((common(dst) * maxScore) / max); From a4c2c8a3eea8a28b34e298f5ef3ccbd56dd87fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Herrmann?= Date: Fri, 17 Oct 2014 13:05:41 +0200 Subject: [PATCH 3/5] Trim author/committer name and email in commit header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit C Git trims name and email before inserting them into the commit header so that " A U Thor " and " author@example.com " becomes "A U Thor " with a single separating space. This changes PersonIdent#toExternalString() to trim name and email before concatenating them. Change-Id: Idd77b659d0db957626824f6632e2da38d7731625 Signed-off-by: Rüdiger Herrmann --- .../org/eclipse/jgit/lib/T0001_PersonIdentTest.java | 12 ++++++++++++ .../src/org/eclipse/jgit/lib/PersonIdent.java | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0001_PersonIdentTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0001_PersonIdentTest.java index 1b7276bf7..315c49560 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0001_PersonIdentTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0001_PersonIdentTest.java @@ -44,6 +44,7 @@ package org.eclipse.jgit.lib; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.Date; import java.util.TimeZone; @@ -83,4 +84,15 @@ public class T0001_PersonIdentTest { public void nullForEmailShouldThrowIllegalArgumentException() { new PersonIdent("A U Thor", null); } + + @Test + public void testToExternalStringTrimsNameAndEmail() throws Exception { + PersonIdent personIdent = new PersonIdent(" A U Thor ", + " author@example.com "); + + String externalString = personIdent.toExternalString(); + + assertTrue(externalString.startsWith("A U Thor ")); + } + } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java index 69f7fd440..8f7e3eff7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java @@ -254,9 +254,9 @@ public class PersonIdent implements Serializable { */ public String toExternalString() { final StringBuilder r = new StringBuilder(); - r.append(getName()); + r.append(getName().trim()); r.append(" <"); //$NON-NLS-1$ - r.append(getEmailAddress()); + r.append(getEmailAddress().trim()); r.append("> "); //$NON-NLS-1$ r.append(when / 1000); r.append(' '); From f1b2a5361fc465bc6d01b3ec0dda4e3a285c04ca Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 4 Jan 2015 00:46:52 +0100 Subject: [PATCH 4/5] JGit v3.6.1.201501031845-r Change-Id: I56e235a271f90ea2d8cdb7d99706f726d4a59c43 Signed-off-by: Matthias Sohn --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.console/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.console/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.java7.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.java7.test/pom.xml | 2 +- org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.java7/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.java7.feature/feature.xml | 2 +- .../org.eclipse.jgit.java7.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 ++-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 55 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 33310cceb..3f24d6be6 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 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 dd5fd8ce4..7ee498f8a 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 827da4255..d860d0db2 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index faf78cf7a..8da1faa94 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index bd58d7f13..4c5d5c18c 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index f285e0144..9ed06c063 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: 3.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.6.1.qualifier";roots="." +Bundle-Version: 3.6.1.201501031845-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.6.1.201501031845-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 309405fbc..bc50cb500 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index 7584aa52d..939c6561d 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.console -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.jgit.console;version="3.6.1" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index fdf60cbb4..343666c1c 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.console diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index b73116dff..6e7fa1b5a 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-RequiredExecutionEnvironment: J2SE-1.5 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 bd6163d4d..efc117ade 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index daa93214c..fba80be40 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.http.server;version="3.6.1", diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index e193abe5a..dc9504d41 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 3fe80bda6..d3c87ff15 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 4ec915d8b..44ca96bc2 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF index b35b89481..04ac75323 100644 --- a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7.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.java7.test -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.jgit.api;version="[3.6.1,3.7.0)", diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml index 9725a6f1d..fc833c217 100644 --- a/org.eclipse.jgit.java7.test/pom.xml +++ b/org.eclipse.jgit.java7.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.java7.test diff --git a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF index c6f0c7485..d326cad8b 100644 --- a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Fragment-Host: org.eclipse.jgit;bundle-version="3.1.1" Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7 -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF index c1ca16228..28dc65665 100644 --- a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.java7 - Sources Bundle-SymbolicName: org.eclipse.jgit.java7.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.6.1.qualifier";roots="." +Bundle-Version: 3.6.1.201501031845-r +Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.6.1.201501031845-r";roots="." diff --git a/org.eclipse.jgit.java7/pom.xml b/org.eclipse.jgit.java7/pom.xml index 8ecc26425..de11002f6 100644 --- a/org.eclipse.jgit.java7/pom.xml +++ b/org.eclipse.jgit.java7/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.java7 diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 7ebd99547..3222a622c 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-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 950c4fef8..304710b62 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 24b808459..87c1aeaa7 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-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 e2907fa5b..25459546f 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 8e50bd1ec..478fbd91a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 106e239b8..7eccf80e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index e5756e4e1..7af64d013 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index cb3167971..d3611cd38 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml index dc68c0758..6c6060944 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml index 46a776e66..f0feb7775 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 3f90e825c..118e1e646 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index a6768ac04..631f0d49b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 0546f1be0..188f1452d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index bff5be893..803193d16 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 29a377220..0a2d683bf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index 39e8f9760..aeee5b3f5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 9bafc667d..13785f8c2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 86a1fbd62..e1ea1ca00 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 0a30ef4ca..bc8fc01c2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index f51207318..0754ee12f 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-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 28eaba00b..f6151c4aa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 8a67fba78..86abdf709 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index a9b117798..1d53835df 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-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 14e978f6f..d6248260c 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index cb2e422b2..98610f4af 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 198bffd1a..30800bb04 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: 3.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.6.1.qualifier";roots="." +Bundle-Version: 3.6.1.201501031845-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.6.1.201501031845-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 9a81f6923..84064c83a 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index dc2f80099..e48e8c3b6 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-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 5330318d7..b731725f9 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 6026bd4ae..b4a493d89 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.jgit.awtui;version="3.6.1" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index ffee1d301..a1eafb8fc 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index bf9521b95..803bcce54 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: 3.6.1.qualifier +Bundle-Version: 3.6.1.201501031845-r Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: org.eclipse.jgit.api;version="3.6.1"; diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 0dd2eda6e..56de19e62 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: 3.6.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="3.6.1.qualifier";roots="." +Bundle-Version: 3.6.1.201501031845-r +Eclipse-SourceBundle: org.eclipse.jgit;version="3.6.1.201501031845-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 5852042cf..e82268edc 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 74f89476c..644bca99e 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 3.6.1-SNAPSHOT + 3.6.1.201501031845-r JGit - Parent ${jgit-url} From 741ebca8b71f5ca37de61349019fe66d5e7cfc85 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 4 Jan 2015 01:19:35 +0100 Subject: [PATCH 5/5] Prepare 3.6.2-SNAPSHOT builds Change-Id: I9699d84af2d4b5382d8ee88ed3517d6b91305421 Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 10 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.console/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 24 +++--- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 ++++----- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 +++--- org.eclipse.jgit.java7.test/pom.xml | 2 +- org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 4 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.java7/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++--- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 30 ++++---- org.eclipse.jgit.junit/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.java7.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 ++++----- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 62 +++++++-------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 76 +++++++++---------- 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 | 70 ++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 55 files changed, 266 insertions(+), 266 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 3f24d6be6..fd0a5a36b 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)", + org.eclipse.jgit.ant.tasks;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.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 7ee498f8a..35d072166 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index d860d0db2..51fdf1357 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)" + org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="3.6.1"; +Export-Package: org.eclipse.jgit.ant.tasks;version="3.6.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 8da1faa94..0f982496b 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 4c5d5c18c..0889446bc 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -12,13 +12,13 @@ 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="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.1,3.7.0)", + org.eclipse.jgit.api;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="3.6.1"; +Export-Package: org.eclipse.jgit.archive;version="3.6.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 9ed06c063..774a13c75 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: 3.6.1.201501031845-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.6.1.201501031845-r";roots="." +Bundle-Version: 3.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index bc50cb500..c2ddd4468 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index 939c6561d..89a9b8553 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.console -Bundle-Version: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.jgit.console;version="3.6.1" -Import-Package: org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)" +Export-Package: org.eclipse.jgit.console;version="3.6.2" +Import-Package: org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index 343666c1c..a7dad597f 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.console diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 6e7fa1b5a..b1b176f2e 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -18,10 +18,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="[3.6.1,3.7.0)", - org.eclipse.jgit.transport.http;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="3.6.1"; + org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport.http;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="3.6.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 efc117ade..331d3384d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index fba80be40..9a8a86ad8 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="3.6.1", - org.eclipse.jgit.http.server.glue;version="3.6.1"; +Export-Package: org.eclipse.jgit.http.server;version="3.6.2", + org.eclipse.jgit.http.server.glue;version="3.6.2"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="3.6.1"; + org.eclipse.jgit.http.server.resolver;version="3.6.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -17,11 +17,11 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.servlet;version="[2.5.0,3.0.0)", javax.servlet.http;version="[2.5.0,3.0.0)", - org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)" + org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport.resolver;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index dc9504d41..ce8834092 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index d3c87ff15..02ee66128 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -22,23 +22,23 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.thread;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.http.server;version="[3.6.1,3.7.0)", - org.eclipse.jgit.http.server.glue;version="[3.6.1,3.7.0)", - org.eclipse.jgit.http.server.resolver;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.1,3.7.0)", - org.eclipse.jgit.junit.http;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport.http;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport.http.apache;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)", + org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.http.server;version="[3.6.2,3.7.0)", + org.eclipse.jgit.http.server.glue;version="[3.6.2,3.7.0)", + org.eclipse.jgit.http.server.resolver;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", + org.eclipse.jgit.junit.http;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport.http;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport.http.apache;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport.resolver;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.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 44ca96bc2..b2fd07c80 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF index 04ac75323..caffc113f 100644 --- a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7.test -Bundle-Version: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[3.6.1,3.7.0)", - org.eclipse.jgit.diff;version="[3.6.1,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="3.6.1", - org.eclipse.jgit.junit;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)", +Import-Package: org.eclipse.jgit.api;version="[3.6.2,3.7.0)", + org.eclipse.jgit.diff;version="[3.6.2,3.7.0)", + org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="3.6.2", + org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)", org.junit;version="[4.11.0,5.0.0)" diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml index fc833c217..2ec5caa0e 100644 --- a/org.eclipse.jgit.java7.test/pom.xml +++ b/org.eclipse.jgit.java7.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.java7.test diff --git a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF index d326cad8b..fcd0454fe 100644 --- a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Fragment-Host: org.eclipse.jgit;bundle-version="3.1.1" Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7 -Bundle-Version: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.jgit.util;version="3.6.1" +Export-Package: org.eclipse.jgit.util;version="3.6.2" diff --git a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF index 28dc65665..120cdd01f 100644 --- a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.java7 - Sources Bundle-SymbolicName: org.eclipse.jgit.java7.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.6.1.201501031845-r -Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.6.1.201501031845-r";roots="." +Bundle-Version: 3.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.java7/pom.xml b/org.eclipse.jgit.java7/pom.xml index de11002f6..059179a49 100644 --- a/org.eclipse.jgit.java7/pom.xml +++ b/org.eclipse.jgit.java7/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.java7 diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3222a622c..382f60e28 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,13 +20,13 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.http.server;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.1,3.7.0)", + org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.http.server;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport.resolver;version="[3.6.2,3.7.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="3.6.1" +Export-Package: org.eclipse.jgit.junit.http;version="3.6.2" diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 304710b62..7177e40a3 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 87c1aeaa7..3fff2c3ff 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.6.1,3.7.0)", - org.eclipse.jgit.api.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.1,3.7.0)", - org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk.filter;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util.io;version="[3.6.1,3.7.0)", +Import-Package: org.eclipse.jgit.api;version="[3.6.2,3.7.0)", + org.eclipse.jgit.api.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", + org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.treewalk.filter;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util.io;version="[3.6.2,3.7.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="3.6.1" +Export-Package: org.eclipse.jgit.junit;version="3.6.2" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 25459546f..5b1096faa 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 478fbd91a..ab7f3a942 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 7eccf80e5..a4e2ad137 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 7af64d013..45c51f2fb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index d3611cd38..54bc122e1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml index 6c6060944..5c84a1e04 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml index f0feb7775..0734ef7c0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 118e1e646..32a22286e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 631f0d49b..98c12e545 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 188f1452d..cd76895eb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 803193d16..b78745c27 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 0a2d683bf..45d058cbd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index aeee5b3f5..dea2dfda5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 13785f8c2..466a538fd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index e1ea1ca00..b5cd124b9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index bc8fc01c2..2ada7e17e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 0754ee12f..5441d6e54 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index f6151c4aa..466ff7112 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 86abdf709..ca43c4661 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 1d53835df..f7a80d40e 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,27 +2,27 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.6.1,3.7.0)", - org.eclipse.jgit.api.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.diff;version="[3.6.1,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.1,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.merge;version="[3.6.1,3.7.0)", - org.eclipse.jgit.pgm;version="[3.6.1,3.7.0)", - org.eclipse.jgit.pgm.internal;version="[3.6.1,3.7.0)", - org.eclipse.jgit.pgm.opt;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util.io;version="[3.6.1,3.7.0)", +Import-Package: org.eclipse.jgit.api;version="[3.6.2,3.7.0)", + org.eclipse.jgit.api.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.diff;version="[3.6.2,3.7.0)", + org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", + org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.merge;version="[3.6.2,3.7.0)", + org.eclipse.jgit.pgm;version="[3.6.2,3.7.0)", + org.eclipse.jgit.pgm.internal;version="[3.6.2,3.7.0)", + org.eclipse.jgit.pgm.opt;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", + org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util.io;version="[3.6.2,3.7.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 d6248260c..8f7de4615 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 98610f4af..d605f3c02 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,43 +2,43 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", org.apache.commons.compress.archivers.tar;version="[1.3,2.0)", org.apache.commons.compress.archivers.zip;version="[1.3,2.0)", - org.eclipse.jgit.api;version="[3.6.1,3.7.0)", - org.eclipse.jgit.api.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.archive;version="[3.6.1,3.7.0)", - org.eclipse.jgit.awtui;version="[3.6.1,3.7.0)", - org.eclipse.jgit.blame;version="[3.6.1,3.7.0)", - org.eclipse.jgit.diff;version="[3.6.1,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.1,3.7.0)", - org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.gitrepo;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.merge;version="3.6.1", - org.eclipse.jgit.nls;version="[3.6.1,3.7.0)", - org.eclipse.jgit.notes;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revplot;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk.filter;version="[3.6.1,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.storage.pack;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk.filter;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util.io;version="[3.6.1,3.7.0)", + org.eclipse.jgit.api;version="[3.6.2,3.7.0)", + org.eclipse.jgit.api.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.archive;version="[3.6.2,3.7.0)", + org.eclipse.jgit.awtui;version="[3.6.2,3.7.0)", + org.eclipse.jgit.blame;version="[3.6.2,3.7.0)", + org.eclipse.jgit.diff;version="[3.6.2,3.7.0)", + org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", + org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.gitrepo;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.merge;version="3.6.2", + org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", + org.eclipse.jgit.notes;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revplot;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk.filter;version="[3.6.2,3.7.0)", + org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.storage.pack;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport.resolver;version="[3.6.2,3.7.0)", + org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.treewalk.filter;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util.io;version="[3.6.2,3.7.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.pgm;version="3.6.1"; +Export-Package: org.eclipse.jgit.pgm;version="3.6.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -49,10 +49,10 @@ Export-Package: org.eclipse.jgit.pgm;version="3.6.1"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="3.6.1"; + org.eclipse.jgit.pgm.debug;version="3.6.2"; uses:="org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="3.6.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="3.6.1"; + org.eclipse.jgit.pgm.internal;version="3.6.2";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="3.6.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 30800bb04..609cc012f 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: 3.6.1.201501031845-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.6.1.201501031845-r";roots="." +Bundle-Version: 3.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 84064c83a..19c1bae57 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index e48e8c3b6..e5e3b1be8 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,49 +2,49 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", - org.eclipse.jgit.api;version="[3.6.1,3.7.0)", - org.eclipse.jgit.api.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.awtui;version="[3.6.1,3.7.0)", - org.eclipse.jgit.blame;version="[3.6.1,3.7.0)", - org.eclipse.jgit.console;version="[3.6.1,3.7.0)", - org.eclipse.jgit.diff;version="[3.6.1,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.1,3.7.0)", - org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.events;version="[3.6.1,3.7.0)", - org.eclipse.jgit.fnmatch;version="[3.6.1,3.7.0)", - org.eclipse.jgit.gitrepo;version="[3.6.1,3.7.0)", - org.eclipse.jgit.ignore;version="[3.6.1,3.7.0)", - org.eclipse.jgit.ignore.internal;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.6.1,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.merge;version="[3.6.1,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.1,3.7.0)", - org.eclipse.jgit.notes;version="[3.6.1,3.7.0)", - org.eclipse.jgit.patch;version="[3.6.1,3.7.0)", - org.eclipse.jgit.pgm;version="[3.6.1,3.7.0)", - org.eclipse.jgit.pgm.internal;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revplot;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk.filter;version="[3.6.1,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.1,3.7.0)", - org.eclipse.jgit.storage.pack;version="[3.6.1,3.7.0)", - org.eclipse.jgit.submodule;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport.http;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk.filter;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util.io;version="[3.6.1,3.7.0)", + org.eclipse.jgit.api;version="[3.6.2,3.7.0)", + org.eclipse.jgit.api.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.awtui;version="[3.6.2,3.7.0)", + org.eclipse.jgit.blame;version="[3.6.2,3.7.0)", + org.eclipse.jgit.console;version="[3.6.2,3.7.0)", + org.eclipse.jgit.diff;version="[3.6.2,3.7.0)", + org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", + org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.events;version="[3.6.2,3.7.0)", + org.eclipse.jgit.fnmatch;version="[3.6.2,3.7.0)", + org.eclipse.jgit.gitrepo;version="[3.6.2,3.7.0)", + org.eclipse.jgit.ignore;version="[3.6.2,3.7.0)", + org.eclipse.jgit.ignore.internal;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.6.2,3.7.0)", + org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.merge;version="[3.6.2,3.7.0)", + org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", + org.eclipse.jgit.notes;version="[3.6.2,3.7.0)", + org.eclipse.jgit.patch;version="[3.6.2,3.7.0)", + org.eclipse.jgit.pgm;version="[3.6.2,3.7.0)", + org.eclipse.jgit.pgm.internal;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revplot;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk.filter;version="[3.6.2,3.7.0)", + org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", + org.eclipse.jgit.storage.pack;version="[3.6.2,3.7.0)", + org.eclipse.jgit.submodule;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport.http;version="[3.6.2,3.7.0)", + org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.treewalk.filter;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util.io;version="[3.6.2,3.7.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 b731725f9..904e4104c 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index b4a493d89..565dda59e 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: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jgit.awtui;version="3.6.1" -Import-Package: org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revplot;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.util;version="[3.6.1,3.7.0)" +Export-Package: org.eclipse.jgit.awtui;version="3.6.2" +Import-Package: org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", + org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", + org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revplot;version="[3.6.2,3.7.0)", + org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", + org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", + org.eclipse.jgit.util;version="[3.6.2,3.7.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a1eafb8fc..e3b3b3998 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 803bcce54..45f7b4d7c 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 3.6.1.201501031845-r +Bundle-Version: 3.6.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.api;version="3.6.1"; +Export-Package: org.eclipse.jgit.api;version="3.6.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -18,50 +18,50 @@ Export-Package: org.eclipse.jgit.api;version="3.6.1"; org.eclipse.jgit.blame, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="3.6.1"; + org.eclipse.jgit.api.errors;version="3.6.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.blame;version="3.6.1"; + org.eclipse.jgit.blame;version="3.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="3.6.1"; + org.eclipse.jgit.diff;version="3.6.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="3.6.1"; + org.eclipse.jgit.dircache;version="3.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events", - org.eclipse.jgit.errors;version="3.6.1"; + org.eclipse.jgit.errors;version="3.6.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="3.6.1"; + org.eclipse.jgit.events;version="3.6.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="3.6.1", - org.eclipse.jgit.gitrepo;version="3.6.1"; + org.eclipse.jgit.fnmatch;version="3.6.2", + org.eclipse.jgit.gitrepo;version="3.6.2"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.gitrepo.internal;version="3.6.1";x-internal:=true, - org.eclipse.jgit.ignore;version="3.6.1", - org.eclipse.jgit.ignore.internal;version="3.6.1";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="3.6.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.dfs;version="3.6.1";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.file;version="3.6.1"; + org.eclipse.jgit.gitrepo.internal;version="3.6.2";x-internal:=true, + org.eclipse.jgit.ignore;version="3.6.2", + org.eclipse.jgit.ignore.internal;version="3.6.2";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="3.6.2";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.dfs;version="3.6.2";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.storage.file;version="3.6.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.http.server, org.eclipse.jgit.java7.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="3.6.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="3.6.1"; + org.eclipse.jgit.internal.storage.pack;version="3.6.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="3.6.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -70,37 +70,37 @@ Export-Package: org.eclipse.jgit.api;version="3.6.1"; org.eclipse.jgit.internal.storage.file, org.eclipse.jgit.treewalk, org.eclipse.jgit.transport", - org.eclipse.jgit.merge;version="3.6.1"; + org.eclipse.jgit.merge;version="3.6.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.nls;version="3.6.1", - org.eclipse.jgit.notes;version="3.6.1"; + org.eclipse.jgit.nls;version="3.6.2", + org.eclipse.jgit.notes;version="3.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="3.6.1"; + org.eclipse.jgit.patch;version="3.6.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="3.6.1"; + org.eclipse.jgit.revplot;version="3.6.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="3.6.1"; + org.eclipse.jgit.revwalk;version="3.6.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="3.6.1"; + org.eclipse.jgit.revwalk.filter;version="3.6.2"; uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="3.6.1"; + org.eclipse.jgit.storage.file;version="3.6.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="3.6.1"; + org.eclipse.jgit.storage.pack;version="3.6.2"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="3.6.1"; + org.eclipse.jgit.submodule;version="3.6.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk,org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.transport;version="3.6.1"; + org.eclipse.jgit.transport;version="3.6.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -112,21 +112,21 @@ Export-Package: org.eclipse.jgit.api;version="3.6.1"; org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="3.6.1"; + org.eclipse.jgit.transport.http;version="3.6.2"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="3.6.1"; + org.eclipse.jgit.transport.resolver;version="3.6.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="3.6.1"; + org.eclipse.jgit.treewalk;version="3.6.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="3.6.1"; + org.eclipse.jgit.treewalk.filter;version="3.6.2"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="3.6.1"; + org.eclipse.jgit.util;version="3.6.2"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport.http,org.eclipse.jgit.storage.file", - org.eclipse.jgit.util.io;version="3.6.1" + org.eclipse.jgit.util.io;version="3.6.2" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 56de19e62..9986f9a97 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: 3.6.1.201501031845-r -Eclipse-SourceBundle: org.eclipse.jgit;version="3.6.1.201501031845-r";roots="." +Bundle-Version: 3.6.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="3.6.2.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e82268edc..c77c24eaf 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 644bca99e..6cc481fad 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 3.6.1.201501031845-r + 3.6.2-SNAPSHOT JGit - Parent ${jgit-url}