From 9a45455df58e5b984b9c1c86211aed4635fa61af Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Thu, 9 Sep 2021 16:11:23 +0200
Subject: [PATCH] Prepare 6.0.0-SNAPSHOT builds

Change-Id: I049efc7618aaa342e02bdd683132b428f2c7c98b
---
 org.eclipse.egit-feature/feature.xml               |  10 +-
 org.eclipse.egit-feature/pom.xml                   |   2 +-
 org.eclipse.egit.core.junit/META-INF/MANIFEST.MF   |  30 +--
 org.eclipse.egit.core.junit/pom.xml                |   2 +-
 org.eclipse.egit.core.test/META-INF/MANIFEST.MF    |  24 +-
 org.eclipse.egit.core.test/pom.xml                 |   2 +-
 org.eclipse.egit.core/META-INF/MANIFEST.MF         | 204 +++++++--------
 org.eclipse.egit.core/pom.xml                      |   2 +-
 org.eclipse.egit.doc/META-INF/MANIFEST.MF          |   2 +-
 org.eclipse.egit.doc/pom.xml                       |   2 +-
 org.eclipse.egit.gitflow-feature/feature.xml       |   8 +-
 org.eclipse.egit.gitflow-feature/pom.xml           |   2 +-
 org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF |   8 +-
 org.eclipse.egit.gitflow.test/pom.xml              |   2 +-
 org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF   | 114 ++++----
 org.eclipse.egit.gitflow.ui/pom.xml                |   2 +-
 org.eclipse.egit.gitflow/META-INF/MANIFEST.MF      |  26 +-
 org.eclipse.egit.gitflow/pom.xml                   |   2 +-
 org.eclipse.egit.mylyn-feature/feature.xml         |   4 +-
 org.eclipse.egit.mylyn-feature/pom.xml             |   2 +-
 .../META-INF/MANIFEST.MF                           |   2 +-
 org.eclipse.egit.mylyn.ui.test/pom.xml             |   2 +-
 org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF     |  28 +-
 org.eclipse.egit.mylyn.ui/pom.xml                  |   2 +-
 org.eclipse.egit.repository/pom.xml                |   2 +-
 org.eclipse.egit.source-feature/feature.xml        |   4 +-
 org.eclipse.egit.source-feature/pom.xml            |   2 +-
 org.eclipse.egit.target/pom.xml                    |   2 +-
 org.eclipse.egit.ui.test/META-INF/MANIFEST.MF      |  34 +--
 org.eclipse.egit.ui.test/pom.xml                   |   2 +-
 org.eclipse.egit.ui/META-INF/MANIFEST.MF           | 290 ++++++++++-----------
 org.eclipse.egit.ui/pom.xml                        |   2 +-
 org.eclipse.egit/META-INF/MANIFEST.MF              |   2 +-
 org.eclipse.egit/pom.xml                           |   2 +-
 pom.xml                                            |   4 +-
 35 files changed, 415 insertions(+), 415 deletions(-)
 rewrite org.eclipse.egit.core/META-INF/MANIFEST.MF (60%)
 rewrite org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF (71%)
 rewrite org.eclipse.egit.ui/META-INF/MANIFEST.MF (70%)

diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
index d23fc6558..67d291dbd 100644
--- a/org.eclipse.egit-feature/feature.xml
+++ b/org.eclipse.egit-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.egit"
       label="%featureName"
-      version="5.13.1.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.egit"
       license-feature="org.eclipse.license"
@@ -37,10 +37,10 @@
       <import plugin="org.eclipse.compare" version="3.6.0" match="compatible"/>
       <import plugin="org.eclipse.core.net" version="1.3.0" match="compatible"/>
       <import plugin="org.eclipse.team.core" version="3.8.0" match="compatible"/>
-      <import feature="org.eclipse.jgit" version="5.13.1" match="equivalent"/>
-      <import feature="org.eclipse.jgit.gpg.bc" version="5.13.1" match="equivalent"/>
-      <import feature="org.eclipse.jgit.http.apache" version="5.13.1" match="equivalent"/>
-      <import feature="org.eclipse.jgit.ssh.apache" version="5.13.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="6.0.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit.gpg.bc" version="6.0.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit.http.apache" version="6.0.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit.ssh.apache" version="6.0.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml
index 17a21cb1f..0d3aed4cd 100644
--- a/org.eclipse.egit-feature/pom.xml
+++ b/org.eclipse.egit-feature/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.egit.feature</groupId>
diff --git a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF
index 496388ec1..4102dcd95 100644
--- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF
@@ -4,26 +4,26 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.egit.core.junit
 Bundle-SymbolicName: org.eclipse.egit.core.junit
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.8.100,4.0.0)",
  org.junit;bundle-version="[4.13.0,5.0.0)"
-Import-Package: org.eclipse.egit.core;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.op;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.dircache;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.1,5.14.0)"
+Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.op;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.egit.core.test;version="5.13.1";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test"
+Export-Package: org.eclipse.egit.core.test;version="6.0.0";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test"
 Bundle-Localization: plugin
diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml
index c056f5f69..440e7f82d 100644
--- a/org.eclipse.egit.core.junit/pom.xml
+++ b/org.eclipse.egit.core.junit/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.core.junit</artifactId>
diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
index 6c6784f6b..cbdb46e11 100644
--- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.egit.core.test
 Bundle-SymbolicName: org.eclipse.egit.core.test;singleton:=true
 Fragment-Host: org.eclipse.egit.core
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
@@ -13,19 +13,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
  org.hamcrest;bundle-version="[1.1.0,3.0.0)",
  org.junit;bundle-version="[4.13.0,5.0.0)",
- org.eclipse.egit.core.junit;bundle-version="[5.13.1,5.14.0)"
+ org.eclipse.egit.core.junit;bundle-version="[6.0.0,6.1.0)"
 Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
  net.bytebuddy.agent;version="[1.7.9,2.0.0)",
- org.eclipse.egit.core;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.op;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.project;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.attributes;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.1,5.14.0)",
+ org.eclipse.egit.core;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.op;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.project;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
  org.mockito;version="[2.13.0,3.0.0)",
  org.mockito.junit;version="[2.13.0,3.0.0)",
  org.mockito.stubbing;version="[2.13.0,3.0.0)"
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index 47f18b794..3728a4288 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.core.test</artifactId>
diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF
dissimilarity index 60%
index de44ac7bc..9d2658c94 100644
--- a/org.eclipse.egit.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF
@@ -1,102 +1,102 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Automatic-Module-Name: org.eclipse.egit.core
-Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true
-Bundle-Version: 5.13.1.qualifier
-Bundle-Activator: org.eclipse.egit.core.Activator
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.team.core;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)",
- org.eclipse.core.variables;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.osgi.services;bundle-version="[3.5.100,4.0.0)"
-Export-Package: org.eclipse.egit.core;version="5.13.1";
-  x-friends:="org.eclipse.egit.ui,
-   org.eclipse.egit.ui.test,
-   org.eclipse.egit.mylyn.ui,
-   org.eclipse.egit.gitflow.test,
-   org.eclipse.egit.gitflow.ui,
-   org.eclipse.mylyn.github.ui,
-   org.eclipse.mylyn.github.core,
-   org.eclipse.egit.core.junit",
- org.eclipse.egit.core.attributes;version="5.13.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.egit.core.credentials;version="5.13.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.egit.core.info;version="5.13.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.egit.core.internal;version="5.13.1";
-  x-friends:="org.eclipse.egit.ui,
-   org.eclipse.egit.import,
-   org.eclipse.egit.gitflow.ui,
-   org.eclipse.egit.gitflow,
-   org.eclipse.egit.mylyn.ui",
- org.eclipse.egit.core.internal.credentials;version="5.13.1";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.efs;version="5.13.1";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.gerrit;version="5.13.1";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.indexdiff;version="5.13.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
- org.eclipse.egit.core.internal.info;version="5.13.1";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.job;version="5.13.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow",
- org.eclipse.egit.core.internal.rebase;version="5.13.1";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.signing;version="5.13.1";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.internal.start;version="5.13.1";x-internal:=true,
- org.eclipse.egit.core.internal.storage;version="5.13.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test",
- org.eclipse.egit.core.internal.trace;version="5.13.1";x-internal:=true,
- org.eclipse.egit.core.internal.util;version="5.13.1";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.op;version="5.13.1";
-  x-friends:="org.eclipse.egit.ui.test,
-   org.eclipse.egit.ui,
-   org.eclipse.egit.gitflow,
-   org.eclipse.egit.gitflow.test,
-   org.eclipse.egit.gitflow.ui,
-   org.eclipse.egit.github.core,
-   org.eclipse.mylyn.github.ui,
-   org.eclipse.egit.core.junit",
- org.eclipse.egit.core.project;version="5.13.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.core.revisions;version="5.13.1",
- org.eclipse.egit.core.settings;version="5.13.1",
- org.eclipse.egit.core.storage;version="5.13.1";
-  uses:="org.eclipse.core.runtime,
-   org.eclipse.jgit.dircache,
-   org.eclipse.jgit.lib,
-   org.eclipse.core.resources",
- org.eclipse.egit.core.synchronize;version="5.13.1";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
- org.eclipse.egit.core.synchronize.dto;version="5.13.1";x-friends:="org.eclipse.egit.ui",
- org.eclipse.egit.core.util;version="5.13.1"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.core.net.proxy;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jgit.annotations;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.attributes;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.diff;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.dircache;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.events;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.gpg.bc;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.internal.storage.file;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.lfs;version="[5.13.1,5.14.0)";resolution:=optional,
- org.eclipse.jgit.lib;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.merge;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.submodule;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport.http;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport.http.apache;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport.sshd;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.util.io;version="[5.13.1,5.14.0)"
-Service-Component: OSGI-INF/org.eclipse.egit.core.RepositoryInitializer.xml,
- OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml,
- OSGI-INF/org.eclipse.egit.core.internal.start.PreferencesMigrator.xml,
- OSGI-INF/org.eclipse.egit.core.internal.start.WorkspaceConnector.xml,
- OSGI-INF/org.eclipse.egit.core.internal.trace.DebugOptionsHandler.xml,
- OSGI-INF/org.eclipse.egit.core.internal.MergeStrategies$Loader.xml,
- OSGI-INF/org.eclipse.egit.core.internal.credentials.EGitSecureStore.xml
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Automatic-Module-Name: org.eclipse.egit.core
+Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true
+Bundle-Version: 6.0.0.qualifier
+Bundle-Activator: org.eclipse.egit.core.Activator
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.team.core;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)",
+ org.eclipse.core.variables;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.core.filebuffers;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.osgi.services;bundle-version="[3.5.100,4.0.0)"
+Export-Package: org.eclipse.egit.core;version="6.0.0";
+  x-friends:="org.eclipse.egit.ui,
+   org.eclipse.egit.ui.test,
+   org.eclipse.egit.mylyn.ui,
+   org.eclipse.egit.gitflow.test,
+   org.eclipse.egit.gitflow.ui,
+   org.eclipse.mylyn.github.ui,
+   org.eclipse.mylyn.github.core,
+   org.eclipse.egit.core.junit",
+ org.eclipse.egit.core.attributes;version="6.0.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.egit.core.credentials;version="6.0.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.egit.core.info;version="6.0.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.egit.core.internal;version="6.0.0";
+  x-friends:="org.eclipse.egit.ui,
+   org.eclipse.egit.import,
+   org.eclipse.egit.gitflow.ui,
+   org.eclipse.egit.gitflow,
+   org.eclipse.egit.mylyn.ui",
+ org.eclipse.egit.core.internal.credentials;version="6.0.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.efs;version="6.0.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.gerrit;version="6.0.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.indexdiff;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
+ org.eclipse.egit.core.internal.info;version="6.0.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.job;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow",
+ org.eclipse.egit.core.internal.rebase;version="6.0.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.signing;version="6.0.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.internal.start;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.core.internal.storage;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test",
+ org.eclipse.egit.core.internal.trace;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.core.internal.util;version="6.0.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.op;version="6.0.0";
+  x-friends:="org.eclipse.egit.ui.test,
+   org.eclipse.egit.ui,
+   org.eclipse.egit.gitflow,
+   org.eclipse.egit.gitflow.test,
+   org.eclipse.egit.gitflow.ui,
+   org.eclipse.egit.github.core,
+   org.eclipse.mylyn.github.ui,
+   org.eclipse.egit.core.junit",
+ org.eclipse.egit.core.project;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.core.revisions;version="6.0.0",
+ org.eclipse.egit.core.settings;version="6.0.0",
+ org.eclipse.egit.core.storage;version="6.0.0";
+  uses:="org.eclipse.core.runtime,
+   org.eclipse.jgit.dircache,
+   org.eclipse.jgit.lib,
+   org.eclipse.core.resources",
+ org.eclipse.egit.core.synchronize;version="6.0.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test",
+ org.eclipse.egit.core.synchronize.dto;version="6.0.0";x-friends:="org.eclipse.egit.ui",
+ org.eclipse.egit.core.util;version="6.0.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.eclipse.core.net.proxy;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.diff;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.events;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.gpg.bc;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lfs;version="[6.0.0,6.1.0)";resolution:=optional,
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.merge;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.submodule;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.sshd;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)"
+Service-Component: OSGI-INF/org.eclipse.egit.core.RepositoryInitializer.xml,
+ OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml,
+ OSGI-INF/org.eclipse.egit.core.internal.start.PreferencesMigrator.xml,
+ OSGI-INF/org.eclipse.egit.core.internal.start.WorkspaceConnector.xml,
+ OSGI-INF/org.eclipse.egit.core.internal.trace.DebugOptionsHandler.xml,
+ OSGI-INF/org.eclipse.egit.core.internal.MergeStrategies$Loader.xml,
+ OSGI-INF/org.eclipse.egit.core.internal.credentials.EGitSecureStore.xml
diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml
index e8ff3e470..784b6174c 100644
--- a/org.eclipse.egit.core/pom.xml
+++ b/org.eclipse.egit.core/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.core</artifactId>
diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
index 6fc0ec146..95b2ff292 100644
--- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml
index ba690bbbc..fbf868eda 100644
--- a/org.eclipse.egit.doc/pom.xml
+++ b/org.eclipse.egit.doc/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.doc</artifactId>
diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml
index 7475fa9ac..f5231d682 100644
--- a/org.eclipse.egit.gitflow-feature/feature.xml
+++ b/org.eclipse.egit.gitflow-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.egit.gitflow.feature"
       label="%featureName"
-      version="5.13.1.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.egit.gitflow"
       license-feature="org.eclipse.license"
@@ -26,9 +26,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="5.13.1" match="equivalent"/>
-      <import plugin="org.eclipse.egit.core" version="5.13.1" match="equivalent"/>
-      <import plugin="org.eclipse.egit.ui" version="5.13.1" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="6.0.0" match="equivalent"/>
+      <import plugin="org.eclipse.egit.core" version="6.0.0" match="equivalent"/>
+      <import plugin="org.eclipse.egit.ui" version="6.0.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.egit.gitflow-feature/pom.xml b/org.eclipse.egit.gitflow-feature/pom.xml
index d27b09acf..3429ad14a 100644
--- a/org.eclipse.egit.gitflow-feature/pom.xml
+++ b/org.eclipse.egit.gitflow-feature/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.egit.feature</groupId>
diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
index 5f0c77e18..8c670fb67 100644
--- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2
 Bundle-Name: GitFlow Test
 Automatic-Module-Name: org.eclipse.egit.gitflow.test
 Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Fragment-Host: org.eclipse.egit.gitflow
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.egit.core;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.1,5.14.0)",
+Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
  org.junit.rules;version="[4.13.0,5.0.0)",
  org.junit;version="[4.13.0,5.0.0)"
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.egit.core.junit;bundle-version="[5.13.1,5.14.0)",
+ org.eclipse.egit.core.junit;bundle-version="[6.0.0,6.1.0)",
  org.hamcrest;bundle-version="[1.1.0,3.0.0)"
diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml
index 3eb19a976..53e01aedc 100644
--- a/org.eclipse.egit.gitflow.test/pom.xml
+++ b/org.eclipse.egit.gitflow.test/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.egit</groupId>
 		<artifactId>egit-parent</artifactId>
-		<version>5.13.1-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.egit.gitflow.test</artifactId>
diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
dissimilarity index 71%
index 578fe672a..8bf04c728 100644
--- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
@@ -1,57 +1,57 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Automatic-Module-Name: org.eclipse.egit.gitflow.ui
-Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true
-Bundle-Version: 5.13.1.qualifier
-Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Import-Package: org.eclipse.egit.core;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.job;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.op;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.project;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.settings;version="[5.13.1,5.14.0)",
- org.eclipse.egit.gitflow;version="[5.13.1,5.14.0)",
- org.eclipse.egit.gitflow.op;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.actions;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.branch;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.commit;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.components;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.decorators;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.dialogs;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.expressions;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.push;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.rebase;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.repository.tree;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.selection;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.annotations;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revplot;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.1,5.14.0)"
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
- org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.core.databinding.beans;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)"
-Export-Package: org.eclipse.egit.gitflow.ui;version="5.13.1";x-friends:="org.eclipse.egit.ui.test",
- org.eclipse.egit.gitflow.ui.internal;version="5.13.1";x-friends:="org.eclipse.egit.ui.test",
- org.eclipse.egit.gitflow.ui.internal.actions;version="5.13.1";x-friends:="org.eclipse.egit.ui.test",
- org.eclipse.egit.gitflow.ui.internal.decorators;version="5.13.1";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.dialogs;version="5.13.1";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.factories;version="5.13.1";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.menu;version="5.13.1";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.properties;version="5.13.1";x-internal:=true,
- org.eclipse.egit.gitflow.ui.internal.validation;version="5.13.1";x-internal:=true
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Automatic-Module-Name: org.eclipse.egit.gitflow.ui
+Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true
+Bundle-Version: 6.0.0.qualifier
+Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
+Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.job;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.op;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.project;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.settings;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.gitflow;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.gitflow.op;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.actions;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.branch;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.commit;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.components;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.decorators;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.dialogs;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.expressions;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.push;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.rebase;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.repository.tree;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.selection;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revplot;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)"
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.5.100,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.100,2.0.0)",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)"
+Export-Package: org.eclipse.egit.gitflow.ui;version="6.0.0";x-friends:="org.eclipse.egit.ui.test",
+ org.eclipse.egit.gitflow.ui.internal;version="6.0.0";x-friends:="org.eclipse.egit.ui.test",
+ org.eclipse.egit.gitflow.ui.internal.actions;version="6.0.0";x-friends:="org.eclipse.egit.ui.test",
+ org.eclipse.egit.gitflow.ui.internal.decorators;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.dialogs;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.factories;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.menu;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.properties;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.gitflow.ui.internal.validation;version="6.0.0";x-internal:=true
diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml
index 9ca205f6b..3618efae1 100644
--- a/org.eclipse.egit.gitflow.ui/pom.xml
+++ b/org.eclipse.egit.gitflow.ui/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.gitflow.ui</artifactId>
diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF
index 691340443..c4d501a8a 100644
--- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF
@@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.egit.gitflow
 Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Activator: org.eclipse.egit.gitflow.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)"
-Export-Package: org.eclipse.egit.gitflow;version="5.13.1";
+Export-Package: org.eclipse.egit.gitflow;version="6.0.0";
   uses:="org.osgi.framework,
    org.eclipse.jgit.transport,
    org.eclipse.core.runtime,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk",
  org.eclipse.egit.gitflow.internal;x-internal:=true,
- org.eclipse.egit.gitflow.op;version="5.13.1";
+ org.eclipse.egit.gitflow.op;version="6.0.0";
   uses:="org.eclipse.jgit.transport,
    org.eclipse.core.runtime.jobs,
    org.eclipse.core.runtime,
@@ -26,13 +26,13 @@ Export-Package: org.eclipse.egit.gitflow;version="5.13.1";
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.lib,
    org.eclipse.egit.core.op"
-Import-Package: org.eclipse.egit.core.internal.job;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.op;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.annotations;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.1,5.14.0)"
+Import-Package: org.eclipse.egit.core.internal.job;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.op;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)"
diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml
index 6ebcd4dad..cc5cfbc22 100644
--- a/org.eclipse.egit.gitflow/pom.xml
+++ b/org.eclipse.egit.gitflow/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.gitflow</artifactId>
diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml
index e8d4569c1..ced04e1c0 100644
--- a/org.eclipse.egit.mylyn-feature/feature.xml
+++ b/org.eclipse.egit.mylyn-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.egit.mylyn"
       label="%featureName"
-      version="5.13.1.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.egit"
       license-feature="org.eclipse.license"
@@ -26,7 +26,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.egit" version="5.13.1" match="equivalent"/>
+      <import feature="org.eclipse.egit" version="6.0.0" match="equivalent"/>
       <import feature="org.eclipse.mylyn.team_feature" version="3.20.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml
index 575617ee5..8dd048035 100644
--- a/org.eclipse.egit.mylyn-feature/pom.xml
+++ b/org.eclipse.egit.mylyn-feature/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.egit.feature</groupId>
diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF
index 960ac0b0c..6d0c6bc58 100644
--- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Git Team Provider Mylyn UI Test Fragment
 Automatic-Module-Name: org.eclipse.egit.mylyn.ui.test
 Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Fragment-Host: org.eclipse.egit.mylyn.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse.org
diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml
index 2a424ab0a..e1c40b8d5 100644
--- a/org.eclipse.egit.mylyn.ui.test/pom.xml
+++ b/org.eclipse.egit.mylyn.ui.test/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.mylyn.ui.test</artifactId>
diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF
index 0e91457d7..21b4c2702 100644
--- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.egit.mylyn.ui
 Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
@@ -19,17 +19,17 @@ Require-Bundle: org.eclipse.jface;bundle-version="[3.12.0,4.0.0)",
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Export-Package: org.eclipse.egit.internal.mylyn.ui;version="5.13.1";x-friends:="org.eclipse.egit.ui.test",
- org.eclipse.egit.internal.mylyn.ui.commit;version="5.13.1";x-internal:=true
-Import-Package: org.eclipse.egit.core;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.synchronize;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.commit;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.staging;version="[5.13.1,5.14.0)",
- org.eclipse.egit.ui.internal.synchronize.model;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.1,5.14.0)",
+Export-Package: org.eclipse.egit.internal.mylyn.ui;version="6.0.0";x-friends:="org.eclipse.egit.ui.test",
+ org.eclipse.egit.internal.mylyn.ui.commit;version="6.0.0";x-internal:=true
+Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.synchronize;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.commit;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.staging;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.ui.internal.synchronize.model;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
  org.eclipse.ui.plugin;bundle-version="[3.108.0,4.0.0)"
diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml
index 3c36cea76..0d6d35d24 100644
--- a/org.eclipse.egit.mylyn.ui/pom.xml
+++ b/org.eclipse.egit.mylyn.ui/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.mylyn.ui</artifactId>
diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml
index a1d0645cd..2d7e12208 100644
--- a/org.eclipse.egit.repository/pom.xml
+++ b/org.eclipse.egit.repository/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.repository</artifactId>
diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml
index 40003b590..6eddc9dae 100644
--- a/org.eclipse.egit.source-feature/feature.xml
+++ b/org.eclipse.egit.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.egit.source"
       label="%featureName"
-      version="5.13.1.qualifier"
+      version="6.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.egit"
       license-feature="org.eclipse.license"
@@ -26,7 +26,7 @@
    </url>
 
    <requires>
-       <import feature="org.eclipse.egit" version="5.13.1" match="equivalent"/>
+       <import feature="org.eclipse.egit" version="6.0.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml
index 98596e1b5..4975441d8 100644
--- a/org.eclipse.egit.source-feature/pom.xml
+++ b/org.eclipse.egit.source-feature/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.egit.feature</groupId>
diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml
index 8cc34abf2..6ad2fba20 100644
--- a/org.eclipse.egit.target/pom.xml
+++ b/org.eclipse.egit.target/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
index af20241c2..944ed7074 100644
--- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: Eclipse.org
 Automatic-Module-Name: org.eclipse.egit.ui.test
 Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true
 Fragment-Host: org.eclipse.egit.ui
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
@@ -14,25 +14,25 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.search;bundle-version="[3.11.0,4.0.0)";resolution:=optional,
  org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.8.100,4.0.0)",
- org.eclipse.egit.core.junit;bundle-version="[5.13.1,5.14.0)",
+ org.eclipse.egit.core.junit;bundle-version="[6.0.0,6.1.0)",
  org.hamcrest;bundle-version="[1.1.0,3.0.0)"
 Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
  org.eclipse.core.net.proxy;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.egit.gitflow;version="[5.13.1,5.14.0)",
- org.eclipse.egit.gitflow.op;version="[5.13.1,5.14.0)",
- org.eclipse.egit.gitflow.ui;version="[5.13.1,5.14.0)",
- org.eclipse.egit.gitflow.ui.internal;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.attributes;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.junit;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.junit.http;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport.resolver;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.1,5.14.0)",
+ org.eclipse.egit.gitflow;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.gitflow.op;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.gitflow.ui;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.gitflow.ui.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.junit.http;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
  org.eclipse.swt.widgets,
  org.eclipse.swtbot.eclipse.finder,
  org.eclipse.swtbot.eclipse.finder.waits,
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 1aceb9f48..910bf3732 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.ui.test</artifactId>
diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
dissimilarity index 70%
index fbe92e0ce..d7dcd8937 100644
--- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -1,145 +1,145 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Automatic-Module-Name: org.eclipse.egit.ui
-Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true
-Bundle-Version: 5.13.1.qualifier
-Bundle-Activator: org.eclipse.egit.ui.Activator
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.core.variables;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
- org.eclipse.team.core;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.compare;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.6.100,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)",
- org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.11.0,4.0.0)";resolution:=optional,
- org.eclipse.debug.ui;bundle-version="[3.11.200,4.0.0)";resolution:=optional,
- org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)";resolution:=optional,
- org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)";resolution:=optional,
- org.eclipse.ui.views;bundle-version="[3.8.100,4.0.0)",
- org.eclipse.osgi.services;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.e4.core.contexts;bundle-version="[1.5.1,2.0.0)",
- org.eclipse.e4.core.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.egit.core;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.attributes;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.credentials;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.info;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.credentials;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.efs;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.gerrit;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.indexdiff;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.info;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.job;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.rebase;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.signing;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.storage;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.internal.util;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.op;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.project;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.settings;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.synchronize;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.synchronize.dto;version="[5.13.1,5.14.0)",
- org.eclipse.egit.core.util;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.annotations;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.api.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.attributes;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.blame;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.diff;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.dircache;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.errors;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.events;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.ignore;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.lib;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.merge;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.notes;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revplot;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.revwalk.filter;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.storage.file;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.submodule;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.transport;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.treewalk;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.treewalk.filter;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.util;version="[5.13.1,5.14.0)",
- org.eclipse.jgit.util.io;version="[5.13.1,5.14.0)"
-Export-Package: org.eclipse.egit.ui;version="5.13.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.history;version="5.13.1",
- org.eclipse.egit.ui.internal;version="5.13.1";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.actions;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.blame;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.branch;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.clean;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.clone;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.commands;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.commands.shared;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.commit;version="5.13.1";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.commit.command;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.components;version="5.13.1";x-friends:="org.eclipse.mylyn.github.ui,org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.credentials;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.decorators;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.dialogs;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.expressions;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.factories;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.fetch;version="5.13.1";x-friends:="org.eclipse.mylyn.github.ui",
- org.eclipse.egit.ui.internal.gerrit;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.groups;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.handler;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.history;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.history.command;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.importing;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.jobs;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.merge;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.operations;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.patch;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.preferences;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.properties;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.provisional.wizards;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.pull;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.push;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.rebase;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.reflog;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.reflog.command;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.repository;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.repository.tree;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.repository.tree.command;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.repository.tree.filter;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.resources;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.revision;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.search;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.selection;version="5.13.1";x-friends:="org.eclipse.egit.gitflow.ui",
- org.eclipse.egit.ui.internal.sharing;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.staging;version="5.13.1";x-friends:="org.eclipse.egit.mylyn.ui",
- org.eclipse.egit.ui.internal.stash;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.submodule;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize.action;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize.compare;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize.mapping;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.synchronize.model;version="5.13.1";x-friends:="org.eclipse.egit.mylyn.ui",
- org.eclipse.egit.ui.internal.trace;version="5.13.1";x-internal:=true,
- org.eclipse.egit.ui.internal.variables;version="5.13.1";x-internal:=true
-Service-Component: OSGI-INF/org.eclipse.egit.ui.internal.clone.GitCloneDropAdapter.xml,
- OSGI-INF/org.eclipse.egit.ui.internal.StartEventListener.xml,
- OSGI-INF/org.eclipse.egit.ui.internal.ApplicationActiveListener.xml,
- OSGI-INF/org.eclipse.egit.ui.internal.ExternalRepositoryScanner.xml,
- OSGI-INF/org.eclipse.egit.ui.internal.trace.DebugOptionsHandler.xml,
- OSGI-INF/org.eclipse.egit.ui.internal.ConfigurationChecker$Checker.xml,
- OSGI-INF/org.eclipse.egit.ui.internal.credentials.EGitCredentialsUI.xml
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Automatic-Module-Name: org.eclipse.egit.ui
+Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true
+Bundle-Version: 6.0.0.qualifier
+Bundle-Activator: org.eclipse.egit.ui.Activator
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.core.variables;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.5.100,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
+ org.eclipse.team.core;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.team.ui;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.11.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.compare;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.ui.editors;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.6.100,4.0.0)",
+ org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)",
+ org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.search;bundle-version="[3.11.0,4.0.0)";resolution:=optional,
+ org.eclipse.debug.ui;bundle-version="[3.11.200,4.0.0)";resolution:=optional,
+ org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)";resolution:=optional,
+ org.eclipse.jdt.ui;bundle-version="[3.12.0,4.0.0)";resolution:=optional,
+ org.eclipse.ui.views;bundle-version="[3.8.100,4.0.0)",
+ org.eclipse.osgi.services;bundle-version="[3.5.100,4.0.0)",
+ org.eclipse.e4.core.contexts;bundle-version="[1.5.1,2.0.0)",
+ org.eclipse.e4.core.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.e4.ui.workbench;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.eclipse.egit.core;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.attributes;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.credentials;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.info;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.credentials;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.efs;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.gerrit;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.indexdiff;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.info;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.job;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.rebase;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.signing;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.storage;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.internal.util;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.op;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.project;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.settings;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.synchronize;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.synchronize.dto;version="[6.0.0,6.1.0)",
+ org.eclipse.egit.core.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.annotations;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.api.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.attributes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.blame;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.diff;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.dircache;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.errors;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.events;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.ignore;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.lib;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.merge;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.notes;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revplot;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.storage.file;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.submodule;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.transport;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util;version="[6.0.0,6.1.0)",
+ org.eclipse.jgit.util.io;version="[6.0.0,6.1.0)"
+Export-Package: org.eclipse.egit.ui;version="6.0.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.history;version="6.0.0",
+ org.eclipse.egit.ui.internal;version="6.0.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.actions;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.blame;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.branch;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.clean;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.clone;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.commands;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.commands.shared;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.commit;version="6.0.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.commit.command;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.components;version="6.0.0";x-friends:="org.eclipse.mylyn.github.ui,org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.credentials;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.decorators;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.dialogs;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.expressions;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.factories;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.fetch;version="6.0.0";x-friends:="org.eclipse.mylyn.github.ui",
+ org.eclipse.egit.ui.internal.gerrit;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.groups;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.handler;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.history;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.history.command;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.importing;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.jobs;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.merge;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.operations;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.patch;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.preferences;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.properties;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.provisional.wizards;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.pull;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.push;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.rebase;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.reflog;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.reflog.command;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.repository;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.repository.tree;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.repository.tree.command;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.repository.tree.filter;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.resources;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.revision;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.search;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.selection;version="6.0.0";x-friends:="org.eclipse.egit.gitflow.ui",
+ org.eclipse.egit.ui.internal.sharing;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.staging;version="6.0.0";x-friends:="org.eclipse.egit.mylyn.ui",
+ org.eclipse.egit.ui.internal.stash;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.submodule;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize.action;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize.compare;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize.mapping;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.synchronize.model;version="6.0.0";x-friends:="org.eclipse.egit.mylyn.ui",
+ org.eclipse.egit.ui.internal.trace;version="6.0.0";x-internal:=true,
+ org.eclipse.egit.ui.internal.variables;version="6.0.0";x-internal:=true
+Service-Component: OSGI-INF/org.eclipse.egit.ui.internal.clone.GitCloneDropAdapter.xml,
+ OSGI-INF/org.eclipse.egit.ui.internal.StartEventListener.xml,
+ OSGI-INF/org.eclipse.egit.ui.internal.ApplicationActiveListener.xml,
+ OSGI-INF/org.eclipse.egit.ui.internal.ExternalRepositoryScanner.xml,
+ OSGI-INF/org.eclipse.egit.ui.internal.trace.DebugOptionsHandler.xml,
+ OSGI-INF/org.eclipse.egit.ui.internal.ConfigurationChecker$Checker.xml,
+ OSGI-INF/org.eclipse.egit.ui.internal.credentials.EGitCredentialsUI.xml
diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml
index 0142b9dc0..465534967 100644
--- a/org.eclipse.egit.ui/pom.xml
+++ b/org.eclipse.egit.ui/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit.ui</artifactId>
diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF
index 6ec31f73a..94aa6d1a3 100644
--- a/org.eclipse.egit/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.egit;singleton:=true
-Bundle-Version: 5.13.1.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml
index d8cae7fbf..540dd0834 100644
--- a/org.eclipse.egit/pom.xml
+++ b/org.eclipse.egit/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.egit</groupId>
     <artifactId>egit-parent</artifactId>
-    <version>5.13.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.egit</artifactId>
diff --git a/pom.xml b/pom.xml
index 64afe316e..863fbcc07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
   <groupId>org.eclipse.egit</groupId>
   <artifactId>egit-parent</artifactId>
-  <version>5.13.1-SNAPSHOT</version>
+  <version>6.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>EGit Parent</name>
@@ -60,7 +60,7 @@
   </licenses>
 
   <properties>
-    <egit-version>5.13.1-SNAPSHOT</egit-version>
+    <egit-version>6.0.0-SNAPSHOT</egit-version>
     <tycho-version>1.7.0</tycho-version>
     <tycho-extras-version>${tycho-version}</tycho-extras-version>
     <jboss-tycho-plugins-version>1.5.1</jboss-tycho-plugins-version>
-- 
2.11.4.GIT