|
 |
0593cb3 |
From bfcc8e7f185c01f85d9775047e21ae6399b269ab 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
|
|
|
0593cb3 |
Subject: [PATCH 1/5] 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 +-
|
|
|
82921c4 |
org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF | 2 +-
|
|
|
293108a |
4 files changed, 8 insertions(+), 4 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
|
|
|
0593cb3 |
index 179c8e8..e4d7d7f 100644
|
|
|
82921c4 |
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
|
|
|
82921c4 |
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
|
|
|
0593cb3 |
@@ -36,7 +36,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.15.0,1.16.0)",
|
|
|
827ceb6 |
org.eclipse.core.expressions;bundle-version="3.4.101",
|
|
 |
9887d4e |
org.eclipse.ui.forms;bundle-version="3.4.1",
|
|
|
9887d4e |
org.eclipse.jface.text,
|
|
|
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
|
|
|
0593cb3 |
index e9a0428..3598d22 100644
|
|
|
82921c4 |
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
|
|
|
82921c4 |
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
|
|
|
293108a |
@@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0",
|
|
|
827ceb6 |
org.eclipse.m2e.workspace.cli;bundle-version="0.1.0",
|
|
|
f67571d |
org.eclipse.core.runtime;bundle-version="3.12.0",
|
|
|
9887d4e |
org.eclipse.core.resources;bundle-version="3.9.0",
|
|
|
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
|
|
|
0593cb3 |
index 2f155c1..68f61bb 100644
|
|
|
82921c4 |
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
|
|
|
82921c4 |
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
|
|
|
82921c4 |
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
|
|
|
827ceb6 |
org.eclipse.ui.ide,
|
|
|
9541a8b |
org.eclipse.core.filesystem,
|
|
|
9887d4e |
org.eclipse.ui.forms,
|
|
|
293108a |
- com.google.guava;bundle-version="[27.1,28.0)"
|
|
|
293108a |
+ com.google.guava;bundle-version="[20.0,29.0)"
|
|
|
9887d4e |
Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true,
|
|
|
9887d4e |
org.eclipse.m2e.editor.xml.internal;x-internal:=true,
|
|
|
9887d4e |
org.eclipse.m2e.editor.xml.internal.lifecycle;x-internal:=true,
|
|
|
82921c4 |
diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
|
|
|
0593cb3 |
index e964a7f..c08fb21 100644
|
|
|
82921c4 |
--- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
|
|
|
82921c4 |
+++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
|
|
|
0593cb3 |
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.m2e.launching;bundle-version="[1.15.0,1.16.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 |
--
|
|
|
0593cb3 |
2.26.0.rc2
|
|
|
82921c4 |
|