--- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -37,7 +37,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.core.expressions;bundle-version="3.4.101",
  org.eclipse.ui.forms;bundle-version="3.4.1",
  org.eclipse.jface.text,
- org.eclipse.ui
+ org.eclipse.ui,
+ org.apache.maven.archetype.catalog,
+ org.apache.maven.archetype.descriptor
 Import-Package: org.eclipse.compare.rangedifferencer,
  org.eclipse.ltk.core.refactoring,
  org.slf4j;version="1.6.2"
--- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig	2018-06-20 17:01:37.051314551 +0100
+++ org.eclipse.m2e.core/META-INF/MANIFEST.MF	2018-06-20 17:03:16.779998408 +0100
@@ -13,9 +13,10 @@
  org.eclipse.m2e.workspace.cli;bundle-version="0.1.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.core.resources;bundle-version="3.9.0",
- com.google.guava;bundle-version="[21.0,22.0)"
+ org.apache.maven.archetype.catalog,
+ org.apache.maven.archetype.descriptor,
+ com.google.guava;bundle-version="[18.0,21.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.m2e.core,
  org.eclipse.m2e.core.archetype;x-friends:="org.eclipse.m2e.core.ui",
--- org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF.orig	2018-06-20 17:03:28.068962622 +0100
+++ org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF	2018-06-20 17:03:41.050921469 +0100
@@ -22,7 +22,7 @@
  org.eclipse.ui.ide,
  org.eclipse.core.filesystem,
  org.eclipse.ui.forms,
- com.google.guava;bundle-version="[21.0,22.0)"
+ com.google.guava;bundle-version="[18.0,21.0)"
 Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true,
  org.eclipse.m2e.editor.xml.internal;x-internal:=true,
  org.eclipse.m2e.editor.xml.internal.lifecycle;x-internal:=true,
--- org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF.orig	2018-06-20 17:45:06.045000839 +0100
+++ org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF	2018-06-20 17:46:00.735826625 +0100
@@ -15,7 +15,7 @@
  org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.debug.ui;bundle-version="3.10.0",
  org.eclipse.core.resources,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="[18.0.0,21.0.0)",
  com.google.gson;bundle-version="2.2.4",
  org.eclipse.core.variables;bundle-version="3.2.0"
 Import-Package: org.slf4j;version="1.6.2"