From 95c0098da1a55de985da926fef2125cc15a5ac74 Mon Sep 17 00:00:00 2001 From: Dennis Huebner Date: Tue, 13 Jan 2015 10:41:45 +0100 Subject: [PATCH] [457312] Remove version constraints to own project bundles. Let buckminster generate. https://bugs.eclipse.org/bugs/show_bug.cgi?id=457312 Change-Id: Iafc2483e12334922baae81f5ce4e8e4b26eab85a --- .../org.eclipse.xtext.junit4/META-INF/MANIFEST.MF | 6 +++--- plugins/org.eclipse.xtext/.settings/.api_filters | 8 ++++++++ plugins/org.eclipse.xtext/META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 +++--- tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF | 14 +++++++------- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF index 3e31a4369..6d49e365e 100644 --- a/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext.junit4/META-INF/MANIFEST.MF @@ -26,13 +26,13 @@ Import-Package: org.junit;version="4.5.0", org.junit.runner.notification;version="4.5.0", org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0" -Require-Bundle: org.eclipse.xtext;bundle-version="2.8.0", - org.eclipse.xtext.ui;bundle-version="2.8.0";resolution:=optional;x-installation:=greedy, +Require-Bundle: org.eclipse.xtext, + org.eclipse.xtext.ui;resolution:=optional;x-installation:=greedy, org.eclipse.core.runtime;bundle-version="3.6.0";resolution:=optional;x-installation:=greedy, org.eclipse.ui.ide;bundle-version="3.6.0";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.core;bundle-version="3.6.0";resolution:=optional;x-installation:=greedy, org.eclipse.jdt.ui;bundle-version="3.6.0";resolution:=optional, org.eclipse.jdt.launching;bundle-version="3.5.200";resolution:=optional;x-installation:=greedy, org.apache.log4j;bundle-version="1.2.15";resolution:=optional, - org.eclipse.xtext.xbase.lib;bundle-version="2.8.0";resolution:=optional + org.eclipse.xtext.xbase.lib;resolution:=optional diff --git a/plugins/org.eclipse.xtext/.settings/.api_filters b/plugins/org.eclipse.xtext/.settings/.api_filters index 790925b5c..26c7470e8 100644 --- a/plugins/org.eclipse.xtext/.settings/.api_filters +++ b/plugins/org.eclipse.xtext/.settings/.api_filters @@ -1,5 +1,13 @@ + + + + + + + + diff --git a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF index 658ba30ed..28562194e 100644 --- a/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -91,11 +91,11 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=re org.eclipse.emf.mwe.utils;bundle-version="1.2.0";resolution:=optional;visibility:=reexport;x-installation:=greedy, org.eclipse.xtend;bundle-version="1.1.0";resolution:=optional;x-installation:=greedy, org.eclipse.xtend.typesystem.emf;bundle-version="1.0.1";resolution:=optional;x-installation:=greedy, - org.eclipse.xtext.util;bundle-version="2.8.0";visibility:=reexport, - org.eclipse.xtext.smap;bundle-version="2.8.0";resolution:=optional;x-installation:=greedy, + org.eclipse.xtext.util;visibility:=reexport, + org.eclipse.xtext.smap;resolution:=optional;x-installation:=greedy, org.eclipse.core.runtime;bundle-version="3.6.0";resolution:=optional;x-installation:=greedy, org.eclipse.core.resources;bundle-version="3.6.0";resolution:=optional;x-installation:=greedy, - org.eclipse.xtend.lib;bundle-version="2.8.0";resolution:=optional, + org.eclipse.xtend.lib;resolution:=optional, org.eclipse.equinox.common;bundle-version="3.5.0" Import-Package: org.apache.log4j;version="1.2.15",org.osgi.framework Bundle-ActivationPolicy: lazy diff --git a/tests/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF index 6aa8983c8..28bae3ec9 100644 --- a/tests/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.xtext.junit4.tests/META-INF/MANIFEST.MF @@ -7,5 +7,5 @@ Bundle-Version: 2.8.0.qualifier Require-Bundle: org.junit, org.eclipse.xtext.junit4, com.google.inject;bundle-version="3.0.0", - org.eclipse.xtext;bundle-version="2.8.0" + org.eclipse.xtext Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF index 53991642f..41e5b3410 100644 --- a/tests/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-Vendor: Eclipse Modeling Project Bundle-Version: 2.8.0.qualifier Bundle-SymbolicName: org.eclipse.xtext.testlanguages; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.xtext;bundle-version="2.8.0", - org.eclipse.xtext.generator;bundle-version="2.8.0";resolution:=optional;x-installation:=greedy, +Require-Bundle: org.eclipse.xtext, + org.eclipse.xtext.generator;resolution:=optional;x-installation:=greedy, org.eclipse.emf.codegen.ecore;bundle-version="2.11.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.mwe.utils;bundle-version="1.0.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.mwe2.launch;bundle-version="2.0.0";resolution:=optional;x-installation:=greedy, - org.eclipse.xtext.util;bundle-version="2.8.0", + org.eclipse.xtext.util, org.eclipse.emf.ecore;bundle-version="2.11.0", org.eclipse.emf.common;bundle-version="2.11.0", org.antlr.runtime, diff --git a/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index 702c58711..fb2f80dc7 100644 --- a/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -6,20 +6,20 @@ Bundle-Version: 2.8.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.eclipse.xtext;bundle-version="2.8.0", - org.eclipse.xtext.generator;bundle-version="2.8.0", +Require-Bundle: org.eclipse.xtext, + org.eclipse.xtext.generator, org.eclipse.emf.mwe.utils;bundle-version="1.0.0", - org.eclipse.xtext.util;bundle-version="2.8.0", + org.eclipse.xtext.util, org.eclipse.emf.ecore;bundle-version="2.11.0", org.eclipse.emf.common;bundle-version="2.11.0", - org.eclipse.xtext.ecore;bundle-version="2.8.0", + org.eclipse.xtext.ecore, org.eclipse.emf.mwe2.launch;bundle-version="2.2.0";resolution:=optional;x-installation:=greedy, - org.eclipse.xtext.testlanguages;bundle-version="2.8.0", + org.eclipse.xtext.testlanguages, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.eclipse.xtext.junit4;bundle-version="2.8.0", + org.eclipse.xtext.junit4, org.hamcrest.core;bundle-version="1.1.0", org.eclipse.core.runtime;bundle-version="3.6.0", - org.eclipse.xtend.lib;bundle-version="2.8.0", + org.eclipse.xtend.lib, org.eclipse.ui.workbench;resolution:=optional Bundle-ActivationPolicy: lazy Bundle-ClassPath: lib/simple.jar,