From f96fbe9b7373e28fd2ee7a2f5352f8ac5382501f 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.editor/META-INF/MANIFEST.MF       | 2 +-
 org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
index 037fee4..fd7d01c 100644
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -37,7 +37,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.16.0,1.17.0)",
  org.eclipse.ui.forms;bundle-version="3.4.1",
  org.eclipse.jface.text,
  org.eclipse.core.filebuffers,
- 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 e27e14a..7f97012 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -14,7 +14,9 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.core.resources;bundle-version="3.9.0",
  org.eclipse.core.filesystem;bundle-version="1.7.700",
- 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 0fcba39..519e140 100644
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
@@ -23,7 +23,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)",
  org.eclipse.m2e.editor;bundle-version="1.16.0",
  org.eclipse.search;bundle-version="3.11.700",
  org.eclipse.ui.views
diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
index 5f1b2e6..bbf5492 100644
--- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem;bundle-version="1.7.500",
  org.eclipse.m2e.discovery;bundle-version="1.16.0",
  org.eclipse.m2e.model.edit;bundle-version="1.16.0",
- com.google.guava;bundle-version="27.0.0"
+ com.google.guava;bundle-version="[20.0,29.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
index 5993fbe..380c9dd 100644
--- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="[1.16.0,1.17.0)",
  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.28.0