From bfcc8e7f185c01f85d9775047e21ae6399b269ab Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 18 Jun 2019 15:35:48 +0100 Subject: [PATCH 1/5] 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 179c8e8..e4d7d7f 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.15.0,1.16.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" diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index e9a0428..3598d22 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 2f155c1..68f61bb 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 e964a7f..c08fb21 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.15.0,1.16.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.26.0.rc2