|
 |
998de9f |
From f96fbe9b7373e28fd2ee7a2f5352f8ac5382501f Mon Sep 17 00:00:00 2001
|
|
|
82921c4 |
From: Mat Booth <mat.booth@redhat.com>
|
|
|
82921c4 |
Date: Tue, 18 Jun 2019 15:35:48 +0100
|
|
|
82aede6 |
Subject: [PATCH 1/6] Fix manifests for guava and use OSGi-fied archetypes
|
|
|
82921c4 |
|
|
|
82921c4 |
---
|
|
|
82921c4 |
org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF | 4 +++-
|
|
|
293108a |
org.eclipse.m2e.core/META-INF/MANIFEST.MF | 4 +++-
|
|
|
82921c4 |
org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF | 2 +-
|
|
|
f6a869e |
org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 2 +-
|
|
|
82921c4 |
org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF | 2 +-
|
|
|
f6a869e |
5 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
82921c4 |
|
|
|
82921c4 |
diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
|
|
|
f789efe |
index 037fee4..fd7d01c 100644
|
|
|
82921c4 |
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
|
|
|
82921c4 |
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
|
|
|
f6a869e |
@@ -37,7 +37,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.16.0,1.17.0)",
|
|
 |
9887d4e |
org.eclipse.ui.forms;bundle-version="3.4.1",
|
|
|
9887d4e |
org.eclipse.jface.text,
|
|
|
f6a869e |
org.eclipse.core.filebuffers,
|
|
|
9887d4e |
- org.eclipse.ui
|
|
|
9887d4e |
+ org.eclipse.ui,
|
|
|
9887d4e |
+ org.apache.maven.archetype.catalog,
|
|
|
7bd2447 |
+ org.apache.maven.archetype.descriptor
|
|
|
9887d4e |
Import-Package: org.eclipse.compare.rangedifferencer,
|
|
|
827ceb6 |
org.eclipse.ltk.core.refactoring,
|
|
|
827ceb6 |
org.slf4j;version="1.6.2"
|
|
|
82921c4 |
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
|
|
|
f789efe |
index e27e14a..7f97012 100644
|
|
|
82921c4 |
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
|
|
|
82921c4 |
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
|
|
|
f789efe |
@@ -14,7 +14,9 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0",
|
|
|
f67571d |
org.eclipse.core.runtime;bundle-version="3.12.0",
|
|
|
9887d4e |
org.eclipse.core.resources;bundle-version="3.9.0",
|
|
|
53cc4bf |
org.eclipse.core.filesystem;bundle-version="1.7.700",
|
|
|
293108a |
- com.google.guava;bundle-version="[27.1,28.0)"
|
|
|
9887d4e |
+ org.apache.maven.archetype.catalog,
|
|
|
9887d4e |
+ org.apache.maven.archetype.descriptor,
|
|
|
293108a |
+ com.google.guava;bundle-version="[20.0,29.0)"
|
|
|
9887d4e |
Bundle-ActivationPolicy: lazy
|
|
|
293108a |
Bundle-ClassPath: .
|
|
|
9541a8b |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
|
82921c4 |
diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
|
|
|
f789efe |
index 0fcba39..519e140 100644
|
|
|
82921c4 |
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
|
|
|
82921c4 |
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
|
|
|
f6a869e |
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime,
|
|
|
827ceb6 |
org.eclipse.ui.ide,
|
|
|
9541a8b |
org.eclipse.core.filesystem,
|
|
|
9887d4e |
org.eclipse.ui.forms,
|
|
|
f6a869e |
- com.google.guava;bundle-version="[27.1,28.0)",
|
|
|
f6a869e |
+ com.google.guava;bundle-version="[20.0,29.0)",
|
|
|
f6a869e |
org.eclipse.m2e.editor;bundle-version="1.16.0",
|
|
|
f6a869e |
org.eclipse.search;bundle-version="3.11.700",
|
|
|
f6a869e |
org.eclipse.ui.views
|
|
|
f6a869e |
diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
|
|
|
f789efe |
index 5f1b2e6..bbf5492 100644
|
|
|
f6a869e |
--- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
|
|
|
f6a869e |
+++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
|
|
|
f6a869e |
@@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.core.runtime,
|
|
|
f6a869e |
org.eclipse.core.filesystem;bundle-version="1.7.500",
|
|
|
f6a869e |
org.eclipse.m2e.discovery;bundle-version="1.16.0",
|
|
|
f6a869e |
org.eclipse.m2e.model.edit;bundle-version="1.16.0",
|
|
|
f6a869e |
- com.google.guava;bundle-version="27.0.0"
|
|
|
293108a |
+ com.google.guava;bundle-version="[20.0,29.0)"
|
|
|
f6a869e |
Bundle-ActivationPolicy: lazy
|
|
|
f6a869e |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
|
f6a869e |
Bundle-Vendor: %Bundle-Vendor
|
|
|
82921c4 |
diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
|
|
|
f6a869e |
index 5993fbe..380c9dd 100644
|
|
|
82921c4 |
--- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
|
|
|
82921c4 |
+++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
|
|
|
f6a869e |
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="[1.16.0,1.17.0)",
|
|
|
c234084 |
org.eclipse.core.expressions;bundle-version="3.4.400",
|
|
|
c234084 |
org.eclipse.debug.ui;bundle-version="3.10.0",
|
|
|
c234084 |
org.eclipse.core.resources,
|
|
|
293108a |
- com.google.guava;bundle-version="[27.1,28.0)",
|
|
|
293108a |
+ com.google.guava;bundle-version="[20.0,29.0)",
|
|
|
c234084 |
com.google.gson;bundle-version="2.2.4",
|
|
|
c234084 |
org.eclipse.core.variables;bundle-version="3.2.0"
|
|
|
2488847 |
Import-Package: org.slf4j;version="1.6.2"
|
|
|
82921c4 |
--
|
|
|
f789efe |
2.28.0
|
|
|
f789efe |
|