From 5987084e7e4496d683c7b80d6cd0ca3232dd0fa9 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Tue, 18 Jun 2019 15:35:48 +0100
Subject: [PATCH 1/6] Fix manifests for guava and use OSGi-fied archetypes

---
 org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF      | 4 +++-
 org.eclipse.m2e.core/META-INF/MANIFEST.MF         | 4 +++-
 org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF   | 2 +-
 org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
index a75496e..bd42d0f 100644
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -36,7 +36,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.13.0,1.14.1)",
  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"
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 3b76f79..57e619c 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0",
  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="[27.1,28.0)"
+ org.apache.maven.archetype.catalog,
+ org.apache.maven.archetype.descriptor,
+ com.google.guava;bundle-version="[20.0,29.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
index f6890f2..c75cc34 100644
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.ide,
  org.eclipse.core.filesystem,
  org.eclipse.ui.forms,
- com.google.guava;bundle-version="[27.1,28.0)"
+ com.google.guava;bundle-version="[20.0,29.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,
diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
index 32b4e32..ef462f8 100644
--- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="[1.13.0,1.14.1)",
  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="[27.1,28.0)",
+ com.google.guava;bundle-version="[20.0,29.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"
-- 
2.21.0