diff --git a/m2e-core-tests b/m2e-core-tests
index 769b016..a9d03c1 160000
--- a/m2e-core-tests
+++ b/m2e-core-tests
@@ -1 +1 @@
-Subproject commit 769b016776bc9626b9efde4d4807cf41d3b35202
+Subproject commit a9d03c171499294bfca9003b3f95a595124513d7
diff --git a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/.factorypath b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/.factorypath
index 3634a6c..4fe4acd 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.archetype.common/.factorypath
+++ b/m2e-maven-runtime/org.eclipse.m2e.archetype.common/.factorypath
@@ -5,8 +5,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/archetype/archetype-registry/2.4/archetype-registry-2.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/net/sourceforge/jchardet/jchardet/1.0/jchardet-1.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.jar" enabled="true" runInBatchMode="false"/>
@@ -31,6 +29,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.0/org.eclipse.sisu.inject-0.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.4/org.eclipse.sisu.inject-0.3.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/dom4j/dom4j/2.1.1/dom4j-2.1.1.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/.factorypath b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/.factorypath
index b42f5b7..2277cd6 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/.factorypath
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.indexer/.factorypath
@@ -7,13 +7,8 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0-no_aop.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M2a/org.eclipse.sisu.inject-0.0.0.M2a.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.4/org.eclipse.sisu.inject-0.3.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/plexus/plexus-utils/3.0.17/plexus-utils-3.0.17.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime.slf4j.simple/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime.slf4j.simple/pom.xml
index 4b69ced..dcf4b7e 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime.slf4j.simple/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime.slf4j.simple/pom.xml
@@ -19,6 +19,7 @@
   </parent>
 
   <artifactId>org.eclipse.m2e.maven.runtime.slf4j.simple</artifactId>
+  <name>SLF4J-simple bundle</name>
   <packaging>bundle</packaging>
 
   <description>
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/.factorypath b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/.factorypath
index f82794b..72b8866 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/.factorypath
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/.factorypath
@@ -38,7 +38,7 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.4/org.eclipse.sisu.plexus-0.3.4.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/io/takari/aether/aether-connector-okhttp/0.17.6/aether-connector-okhttp-0.17.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/takari/aether/aether-connector-okhttp/0.17.8/aether-connector-okhttp-0.17.8.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/squareup/okhttp3/okhttp/3.14.1/okhttp-3.14.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/squareup/okio/okio/1.17.3/okio-1.17.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/maven/resolver/maven-resolver-impl/1.4.1/maven-resolver-impl-1.4.1.jar" enabled="true" runInBatchMode="false"/>
diff --git a/m2e-maven-runtime/pom.xml b/m2e-maven-runtime/pom.xml
index 7f79b38..c1511e5 100644
--- a/m2e-maven-runtime/pom.xml
+++ b/m2e-maven-runtime/pom.xml
@@ -23,7 +23,7 @@
   <artifactId>m2e-maven-runtime</artifactId>
   <version>1.16.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-
+  <name>M2E - Maven runtime bundles</name>
   <organization>
     <name>Eclipse.org - m2e</name>
     <url>www.eclipse.org</url>
diff --git a/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF
index f3a317d..fbd2af0 100644
--- a/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
-Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.15.0,1.16.1)",
- org.eclipse.m2e.maven.runtime;bundle-version="[1.15.0,1.16.0)",
- org.eclipse.m2e.sourcelookup;bundle-version="[1.15.0,1.16.1)",
- org.eclipse.m2e.jdt;bundle-version="[1.15.0,1.16.1)",
+Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.16.0,1.17.0)",
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.16.0,1.17.0)",
+ org.eclipse.m2e.sourcelookup;bundle-version="[1.16.0,1.17.0)",
+ org.eclipse.m2e.jdt;bundle-version="[1.16.0,1.17.0)",
  org.eclipse.equinox.common;bundle-version="3.6.0",
  org.eclipse.core.resources;bundle-version="3.7.0",
  org.eclipse.jdt.core;bundle-version="3.7.0",
diff --git a/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs
index fb5f3c1..08cce97 100644
--- a/org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.jdt.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.jdt.ui/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.jdt.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.jdt.ui/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.profiles.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.profiles.core/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.profiles.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.profiles.core/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.profiles.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.profiles.ui/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.profiles.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.profiles.ui/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs
index cfb8223..d15d09d 100644
--- a/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs
@@ -105,6 +105,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs
index 452de3e..c9be7ea 100644
--- a/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs
@@ -140,6 +140,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
diff --git a/pom.xml b/pom.xml
index 6c04d92..ebd38c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,8 @@
 
     <!-- Current target version of m2e, used to deduce some URL at verify and publish.
     This should usually be sync'd with the main feature version -->
-    <m2e.version>1.15.0</m2e.version>
-    <m2e-maven-runtime.version>1.15.0-SNAPSHOT</m2e-maven-runtime.version>
+    <m2e.version>1.16.0</m2e.version>
+    <m2e-maven-runtime.version>${project.version}</m2e-maven-runtime.version>
 
     <tycho-version>1.6.0</tycho-version>
     <tycho-extras-version>${tycho-version}</tycho-extras-version>
@@ -90,7 +90,7 @@
       <url>https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository</url>
     </repository>
   </repositories>
-
+  <!-- To use when building with Tycho Snapshots
   <pluginRepositories>
     <pluginRepository>
       <id>tycho-snapshots</id>
@@ -100,6 +100,7 @@
       </snapshots>
     </pluginRepository>
   </pluginRepositories>
+  -->
 
   <modules>
     <module>org.eclipse.m2e.model.edit</module>
@@ -249,6 +250,7 @@
             	<generate>true</generate>
             </sourceReferences>
             <jgit.ignore>pom.xml</jgit.ignore>
+            <jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
             <timestampProvider>jgit</timestampProvider>
           </configuration>
           <dependencies>