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>

2 files changed, 37 insertions, 37 deletions

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 80399f6008..bf9521b951 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.0.qualifier
+Bundle-Version: 3.6.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.api;version="3.6.0";
+Export-Package: org.eclipse.jgit.api;version="3.6.1";
   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.0";
    org.eclipse.jgit.blame,
    org.eclipse.jgit.transport,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="3.6.0";
+ org.eclipse.jgit.api.errors;version="3.6.1";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
- org.eclipse.jgit.blame;version="3.6.0";
+ org.eclipse.jgit.blame;version="3.6.1";
   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.0";
+ org.eclipse.jgit.diff;version="3.6.1";
   uses:="org.eclipse.jgit.patch,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="3.6.0";
+ org.eclipse.jgit.dircache;version="3.6.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util,
    org.eclipse.jgit.events",
- org.eclipse.jgit.errors;version="3.6.0";
+ org.eclipse.jgit.errors;version="3.6.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.internal.storage.pack,
    org.eclipse.jgit.transport,
    org.eclipse.jgit.dircache",
- org.eclipse.jgit.events;version="3.6.0";
+ org.eclipse.jgit.events;version="3.6.1";
   uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="3.6.0",
- org.eclipse.jgit.gitrepo;version="3.6.0";
+ org.eclipse.jgit.fnmatch;version="3.6.1",
+ org.eclipse.jgit.gitrepo;version="3.6.1";
   uses:="org.eclipse.jgit.api,
    org.eclipse.jgit.lib",
- org.eclipse.jgit.gitrepo.internal;version="3.6.0";x-internal:=true,
- org.eclipse.jgit.ignore;version="3.6.0",
- org.eclipse.jgit.ignore.internal;version="3.6.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="3.6.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.storage.dfs;version="3.6.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.file;version="3.6.0";
+ 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";
   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.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.lib;version="3.6.0";
+ 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";
   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.0";
    org.eclipse.jgit.internal.storage.file,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.transport",
- org.eclipse.jgit.merge;version="3.6.0";
+ org.eclipse.jgit.merge;version="3.6.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.dircache",
- org.eclipse.jgit.nls;version="3.6.0",
- org.eclipse.jgit.notes;version="3.6.0";
+ org.eclipse.jgit.nls;version="3.6.1",
+ org.eclipse.jgit.notes;version="3.6.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="3.6.0";
+ org.eclipse.jgit.patch;version="3.6.1";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="3.6.0";
+ org.eclipse.jgit.revplot;version="3.6.1";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="3.6.0";
+ org.eclipse.jgit.revwalk;version="3.6.1";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.revwalk.filter",
- org.eclipse.jgit.revwalk.filter;version="3.6.0";
+ org.eclipse.jgit.revwalk.filter;version="3.6.1";
   uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="3.6.0";
+ org.eclipse.jgit.storage.file;version="3.6.1";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="3.6.0";
+ org.eclipse.jgit.storage.pack;version="3.6.1";
   uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="3.6.0";
+ org.eclipse.jgit.submodule;version="3.6.1";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk,org.eclipse.jgit.treewalk.filter",
- org.eclipse.jgit.transport;version="3.6.0";
+ org.eclipse.jgit.transport;version="3.6.1";
   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.0";
    org.eclipse.jgit.transport.http,
    org.eclipse.jgit.errors,
    org.eclipse.jgit.storage.pack",
- org.eclipse.jgit.transport.http;version="3.6.0";
+ org.eclipse.jgit.transport.http;version="3.6.1";
   uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="3.6.0";
+ org.eclipse.jgit.transport.resolver;version="3.6.1";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
- org.eclipse.jgit.treewalk;version="3.6.0";
+ org.eclipse.jgit.treewalk;version="3.6.1";
   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.0";
+ org.eclipse.jgit.treewalk.filter;version="3.6.1";
   uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="3.6.0";
+ org.eclipse.jgit.util;version="3.6.1";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport.http,org.eclipse.jgit.storage.file",
- org.eclipse.jgit.util.io;version="3.6.0"
+ org.eclipse.jgit.util.io;version="3.6.1"
 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 3954fc2e26..0dd2eda6ee 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.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="3.6.0.qualifier";roots="."
+Bundle-Version: 3.6.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="3.6.1.qualifier";roots="."