diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 84e64ab28..392bb95e3 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.junit;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)",
+ org.eclipse.jgit.ant.tasks;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.junit;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.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 ecf865028..eb6cc4893 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ant.test</artifactId>
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index ba5d1295d..76b6d77bd 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.tools.ant,
-  org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)"
+  org.eclipse.jgit.storage.file;version="[4.0.0,4.1.0)"
 Bundle-Localization: plugin
 Bundle-Vendor: %Provider-Name
-Export-Package: org.eclipse.jgit.ant.tasks;version="3.7.0";
+Export-Package: org.eclipse.jgit.ant.tasks;version="4.0.0";
  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 326c9720b..eb7c4595d 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -48,7 +48,7 @@
 	<parent>
 		<groupId>org.eclipse.jgit</groupId>
 		<artifactId>org.eclipse.jgit-parent</artifactId>
-		<version>3.7.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.jgit.ant</artifactId>
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index a9dd94a87..c91080fb1 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.7.0.qualifier
+Bundle-Version: 4.0.0.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.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.nls;version="[3.7.0,3.8.0)",
+ org.eclipse.jgit.api;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.nls;version="[4.0.0,4.1.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.7.0";
+Export-Package: org.eclipse.jgit.archive;version="4.0.0";
   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 8de857518..fbeb56fb1 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.7.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.7.0.qualifier";roots="."
+Bundle-Version: 4.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index 4c1edba73..40be85174 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.archive</artifactId>
diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF
index 0ebd5c4f7..625c1e844 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.jgit.console;version="3.7.0"
-Import-Package: org.eclipse.jgit.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.nls;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)"
+Export-Package: org.eclipse.jgit.console;version="4.0.0"
+Import-Package: org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.nls;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)"
diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml
index e262faa8a..a1c7eaa72 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.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.console</artifactId>
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index d6e685741..d3746e412 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.7.0.qualifier
+Bundle-Version: 4.0.0.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.7.0,3.8.0)",
- org.eclipse.jgit.transport.http;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="3.7.0";
+ org.eclipse.jgit.nls;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport.http;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="4.0.0";
   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 28c8e842a..02df91484 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -48,7 +48,7 @@
 	<parent>
 		<groupId>org.eclipse.jgit</groupId>
 		<artifactId>org.eclipse.jgit-parent</artifactId>
-		<version>3.7.0-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.jgit.http.apache</artifactId>
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index aeb5b6f4a..a3e266e35 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.http.server;version="3.7.0",
- org.eclipse.jgit.http.server.glue;version="3.7.0";
+Export-Package: org.eclipse.jgit.http.server;version="4.0.0",
+ org.eclipse.jgit.http.server.glue;version="4.0.0";
   uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="3.7.0";
+ org.eclipse.jgit.http.server.resolver;version="4.0.0";
   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.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.nls;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport.resolver;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)"
+ org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.nls;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)"
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index dd11cd573..38aa64c9d 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.server</artifactId>
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 0588e54f6..6c5cc70a5 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.7.0.qualifier
+Bundle-Version: 4.0.0.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.7.0,3.8.0)",
- org.eclipse.jgit.http.server;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.http.server.glue;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.http.server.resolver;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.junit;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.junit.http;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.nls;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport.http;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport.http.apache;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport.resolver;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)",
+ org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.http.server;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.http.server.glue;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.http.server.resolver;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.junit;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.junit.http;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.nls;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport.http;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport.http.apache;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.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 819c9fa0d..9457933f2 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -51,7 +51,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.http.test</artifactId>
diff --git a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF
index a6e8f67dd..ad8800103 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.eclipse.jgit.api;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.diff;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.file;version="3.7.0",
- org.eclipse.jgit.junit;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)",
+Import-Package: org.eclipse.jgit.api;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.diff;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.dircache;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="4.0.0",
+ org.eclipse.jgit.junit;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.treewalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.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 5fb70a3fd..3dcf7efee 100644
--- a/org.eclipse.jgit.java7.test/pom.xml
+++ b/org.eclipse.jgit.java7.test/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.java7.test</artifactId>
diff --git a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF
index 938e06091..c37318123 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.jgit.util;version="3.7.0"
+Export-Package: org.eclipse.jgit.util;version="4.0.0"
diff --git a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF
index 58d294b92..77cc74c91 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.7.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.7.0.qualifier";roots="."
+Bundle-Version: 4.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.java7;version="4.0.0.qualifier";roots="."
 
diff --git a/org.eclipse.jgit.java7/pom.xml b/org.eclipse.jgit.java7/pom.xml
index 93c9b5c0b..9796223c7 100644
--- a/org.eclipse.jgit.java7/pom.xml
+++ b/org.eclipse.jgit.java7/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.java7</artifactId>
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index 5ede10778..67293e72c 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.7.0.qualifier
+Bundle-Version: 4.0.0.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.7.0,3.8.0)",
- org.eclipse.jgit.http.server;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.junit;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport.resolver;version="[3.7.0,3.8.0)",
+ org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.http.server;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.junit;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.0.0,4.1.0)",
  org.junit;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="3.7.0"
+Export-Package: org.eclipse.jgit.junit.http;version="4.0.0"
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index a082e50d5..2365907aa 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit.http</artifactId>
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 47e03420d..8ef4d49a1 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jgit.api;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.api.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.pack;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util.io;version="[3.7.0,3.8.0)",
+Import-Package: org.eclipse.jgit.api;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.api.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.dircache;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.treewalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util.io;version="[4.0.0,4.1.0)",
  org.junit;version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="3.7.0"
+Export-Package: org.eclipse.jgit.junit;version="4.0.0"
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 39a9e6049..77f0511b3 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.junit</artifactId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
index 10ea2c9e5..e630292d2 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
index 253342255..a6c12092d 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
index 71ad4ffef..40d325d3c 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.http.apache"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
index e7dd844a2..2fb5396b4 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
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 49ddae765..bd0f3b019 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 @@
 <feature
       id="org.eclipse.jgit.java7"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
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 ffbbb1427..fec2e3164 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 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
index 6446a2c82..bba437523 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.junit"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
index ce3355dbc..ed5c6b397 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index 3296f502a..df315bce3 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.pgm"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
@@ -27,7 +27,7 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.jgit" version="3.7.0" match="equivalent"/>
+      <import feature="org.eclipse.jgit" version="4.0.0" match="equivalent"/>
    </requires>
 
    <plugin
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 b8ee9ac0d..f80c8ce54 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
index 3a52006ca..caa2b44c6 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.pgm.source"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
index c3b8150f4..d91482530 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
index 96d74e5b3..f2aa7af61 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.repository</artifactId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
index b1eb163df..937c0fdbe 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jgit.source"
       label="%featureName"
-      version="3.7.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
index 257495510..69db69f20 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
index 46dcb3ff9..0550f9a06 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.7.0.qualifier
+Bundle-Version: 4.0.0.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 f303f08bf..b3e7d02c6 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -49,7 +49,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>jgit.tycho.parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.target</artifactId>
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 66adffa9d..40d9ceba6 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -53,7 +53,7 @@
 
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>jgit.tycho.parent</artifactId>
-  <version>3.7.0-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JGit Tycho Parent</name>
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index 1289f98ae..d43ff0910 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jgit.api;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.api.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.diff;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.junit;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.merge;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.pgm;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.pgm.internal;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.pgm.opt;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util.io;version="[3.7.0,3.8.0)",
+Import-Package: org.eclipse.jgit.api;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.api.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.diff;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.dircache;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.junit;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.merge;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.pgm;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.pgm.internal;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.pgm.opt;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.treewalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util.io;version="[4.0.0,4.1.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 2a87690fb..bd4317c1b 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm.test</artifactId>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index a8ff1b884..a701e3821 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.7.0.qualifier
+Bundle-Version: 4.0.0.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.7.0,3.8.0)",
- org.eclipse.jgit.api.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.archive;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.awtui;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.blame;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.diff;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.gitrepo;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.pack;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.merge;version="3.7.0",
- org.eclipse.jgit.nls;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.notes;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revplot;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk.filter;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.storage.pack;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport.resolver;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util.io;version="[3.7.0,3.8.0)",
+ org.eclipse.jgit.api;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.api.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.archive;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.awtui;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.blame;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.diff;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.dircache;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.gitrepo;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.merge;version="4.0.0",
+ org.eclipse.jgit.nls;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.notes;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revplot;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk.filter;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.storage.pack;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.treewalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util.io;version="[4.0.0,4.1.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.7.0";
+Export-Package: org.eclipse.jgit.pgm;version="4.0.0";
   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.7.0";
    org.eclipse.jgit.treewalk,
    javax.swing,
    org.eclipse.jgit.transport",
- org.eclipse.jgit.pgm.debug;version="3.7.0";
+ org.eclipse.jgit.pgm.debug;version="4.0.0";
   uses:="org.eclipse.jgit.pgm",
- org.eclipse.jgit.pgm.internal;version="3.7.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="3.7.0";
+ org.eclipse.jgit.pgm.internal;version="4.0.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
+ org.eclipse.jgit.pgm.opt;version="4.0.0";
   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 d1ba9ca4f..6810b9ff4 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.7.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.7.0.qualifier";roots="."
+Bundle-Version: 4.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 53dc7744a..c6dc83f65 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -50,7 +50,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.pgm</artifactId>
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index af40e883c..2e7ed203f 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -2,50 +2,50 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 4.0.0.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.7.0,3.8.0)",
- org.eclipse.jgit.api.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.attributes;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.awtui;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.blame;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.console;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.diff;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.events;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.fnmatch;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.gitrepo;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.ignore;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.ignore.internal;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.internal.storage.pack;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.junit;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.merge;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.nls;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.notes;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.patch;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.pgm;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.pgm.internal;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revplot;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk.filter;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.storage.pack;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.submodule;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport.http;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util.io;version="[3.7.0,3.8.0)",
+ org.eclipse.jgit.api;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.api.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.attributes;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.awtui;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.blame;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.console;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.diff;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.dircache;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.events;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.fnmatch;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.gitrepo;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.ignore;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.ignore.internal;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.junit;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.merge;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.nls;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.notes;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.patch;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.pgm;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.pgm.internal;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revplot;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk.filter;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.storage.file;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.storage.pack;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.submodule;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport.http;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.treewalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.treewalk.filter;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util.io;version="[4.0.0,4.1.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 1d3333793..f31f0f557 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.test</artifactId>
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF
index ff33691eb..773f8b8e9 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %provider_name
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jgit.awtui;version="3.7.0"
-Import-Package: org.eclipse.jgit.errors;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.lib;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.nls;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revplot;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.transport;version="[3.7.0,3.8.0)",
- org.eclipse.jgit.util;version="[3.7.0,3.8.0)"
+Export-Package: org.eclipse.jgit.awtui;version="4.0.0"
+Import-Package: org.eclipse.jgit.errors;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.lib;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.nls;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revplot;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.revwalk;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.transport;version="[4.0.0,4.1.0)",
+ org.eclipse.jgit.util;version="[4.0.0,4.1.0)"
diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml
index a808eb42b..df364d7cd 100644
--- a/org.eclipse.jgit.ui/pom.xml
+++ b/org.eclipse.jgit.ui/pom.xml
@@ -52,7 +52,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit.ui</artifactId>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index eea13ec7b..eeb9a952a 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.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.api;version="3.7.0";
+Export-Package: org.eclipse.jgit.api;version="4.0.0";
   uses:="org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff,
@@ -19,53 +19,53 @@ Export-Package: org.eclipse.jgit.api;version="3.7.0";
    org.eclipse.jgit.submodule,
    org.eclipse.jgit.transport,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="3.7.0";
+ org.eclipse.jgit.api.errors;version="4.0.0";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="3.7.0",
- org.eclipse.jgit.blame;version="3.7.0";
+ org.eclipse.jgit.attributes;version="4.0.0",
+ org.eclipse.jgit.blame;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="3.7.0";
+ org.eclipse.jgit.diff;version="4.0.0";
   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.7.0";
+ org.eclipse.jgit.dircache;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.util,
    org.eclipse.jgit.events,
    org.eclipse.jgit.attributes",
- org.eclipse.jgit.errors;version="3.7.0";
+ org.eclipse.jgit.errors;version="4.0.0";
   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.7.0";
+ org.eclipse.jgit.events;version="4.0.0";
   uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="3.7.0",
- org.eclipse.jgit.gitrepo;version="3.7.0";
+ org.eclipse.jgit.fnmatch;version="4.0.0",
+ org.eclipse.jgit.gitrepo;version="4.0.0";
   uses:="org.eclipse.jgit.api,
    org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk",
- org.eclipse.jgit.gitrepo.internal;version="3.7.0";x-internal:=true,
- org.eclipse.jgit.ignore;version="3.7.0",
- org.eclipse.jgit.ignore.internal;version="3.7.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="3.7.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.storage.dfs;version="3.7.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.file;version="3.7.0";
+ org.eclipse.jgit.gitrepo.internal;version="4.0.0";x-internal:=true,
+ org.eclipse.jgit.ignore;version="4.0.0",
+ org.eclipse.jgit.ignore.internal;version="4.0.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal;version="4.0.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
+ org.eclipse.jgit.internal.storage.dfs;version="4.0.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.storage.file;version="4.0.0";
   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.7.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.lib;version="3.7.0";
+ org.eclipse.jgit.internal.storage.pack;version="4.0.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.lib;version="4.0.0";
   uses:="org.eclipse.jgit.revwalk,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.util,
@@ -75,41 +75,41 @@ Export-Package: org.eclipse.jgit.api;version="3.7.0";
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.transport,
    org.eclipse.jgit.submodule",
- org.eclipse.jgit.merge;version="3.7.0";
+ org.eclipse.jgit.merge;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.diff,
    org.eclipse.jgit.dircache,
    org.eclipse.jgit.api",
- org.eclipse.jgit.nls;version="3.7.0",
- org.eclipse.jgit.notes;version="3.7.0";
+ org.eclipse.jgit.nls;version="4.0.0",
+ org.eclipse.jgit.notes;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="3.7.0";
+ org.eclipse.jgit.patch;version="4.0.0";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="3.7.0";
+ org.eclipse.jgit.revplot;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="3.7.0";
+ org.eclipse.jgit.revwalk;version="4.0.0";
   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.7.0";
+ org.eclipse.jgit.revwalk.filter;version="4.0.0";
   uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="3.7.0";
+ org.eclipse.jgit.storage.file;version="4.0.0";
   uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="3.7.0";
+ org.eclipse.jgit.storage.pack;version="4.0.0";
   uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="3.7.0";
+ org.eclipse.jgit.submodule;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.treewalk",
- org.eclipse.jgit.transport;version="3.7.0";
+ org.eclipse.jgit.transport;version="4.0.0";
   uses:="org.eclipse.jgit.transport.resolver,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.internal.storage.pack,
@@ -121,26 +121,26 @@ Export-Package: org.eclipse.jgit.api;version="3.7.0";
    org.eclipse.jgit.transport.http,
    org.eclipse.jgit.errors,
    org.eclipse.jgit.storage.pack",
- org.eclipse.jgit.transport.http;version="3.7.0";
+ org.eclipse.jgit.transport.http;version="4.0.0";
   uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="3.7.0";
+ org.eclipse.jgit.transport.resolver;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.transport",
- org.eclipse.jgit.treewalk;version="3.7.0";
+ org.eclipse.jgit.treewalk;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.revwalk,
    org.eclipse.jgit.attributes,
    org.eclipse.jgit.treewalk.filter,
    org.eclipse.jgit.util,
    org.eclipse.jgit.dircache",
- org.eclipse.jgit.treewalk.filter;version="3.7.0";
+ org.eclipse.jgit.treewalk.filter;version="4.0.0";
   uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="3.7.0";
+ org.eclipse.jgit.util;version="4.0.0";
   uses:="org.eclipse.jgit.lib,
    org.eclipse.jgit.transport.http,
    org.eclipse.jgit.storage.file,
    org.ietf.jgss",
- org.eclipse.jgit.util.io;version="3.7.0"
+ org.eclipse.jgit.util.io;version="4.0.0"
 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 ddb1e57d5..41b606663 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.7.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="3.7.0.qualifier";roots="."
+Bundle-Version: 4.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="4.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index 36a579ec2..02af2c199 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -53,7 +53,7 @@
   <parent>
     <groupId>org.eclipse.jgit</groupId>
     <artifactId>org.eclipse.jgit-parent</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.jgit</artifactId>
diff --git a/pom.xml b/pom.xml
index d222dc2ba..79e905ccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
   <groupId>org.eclipse.jgit</groupId>
   <artifactId>org.eclipse.jgit-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.7.0-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
 
   <name>JGit - Parent</name>
   <url>${jgit-url}</url>