aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.console
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2014-12-24 01:08:58 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2014-12-24 01:09:25 +0100
commit988291581034075fab20bbd76147cbc9ad08151b (patch)
tree313e9e0dca107ba1eba79615e9e0ffb71749f2e3 /org.eclipse.jgit.console
parent90cccb96d2e215c633efa2b06cdd73fca9951489 (diff)
parent02b0660b8b749b078fc58f135d14206ebad98ad9 (diff)
downloadjgit-988291581034075fab20bbd76147cbc9ad08151b.tar.gz
jgit-988291581034075fab20bbd76147cbc9ad08151b.zip
Merge branch 'stable-3.6'
* stable-3.6: Prepare 3.6.1-SNAPSHOT builds JGit v3.6.0.201412230720-r [pgm] Add option --bare to clone command [pgm] Implement clone using CloneCommand Fix junit tests under windows when the platform is explicitly changed Fix unit tests for windows by explicitly closing test repos [pgm] Add option --tags for ls-remote [pgm] Add option --heads for ls-remote [pgm] Use LsRemoteCommand to implement ls-remote and add a test Change-Id: I8f31e76cb7e9416919f37e02c7e51ab1d221df40 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.console')
-rw-r--r--org.eclipse.jgit.console/META-INF/MANIFEST.MF12
-rw-r--r--org.eclipse.jgit.console/pom.xml2
2 files changed, 7 insertions, 7 deletions
diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF
index a1f4bbb4de..7584aa52db 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.0.qualifier
+Bundle-Version: 3.6.1.qualifier
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.jgit.console;version="3.6.0"
-Import-Package: org.eclipse.jgit.errors;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.nls;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.transport;version="[3.6.0,3.7.0)",
- org.eclipse.jgit.util;version="[3.6.0,3.7.0)"
+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)"
diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml
index 84a8dc5f12..fdf60cbb48 100644
--- a/org.eclipse.jgit.console/pom.xml
+++ b/org.eclipse.jgit.console/pom.xml
@@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.console</artifactId>