From 51547e9e69f9651680445cb3826d8598cb635682 Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Wed, 17 May 2023 18:40:04 +0200 Subject: [PATCH] Require correct service levels for our own dependencies To prevent installing incompatible versions together. --- de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF | 2 +- de.prob.core.tests/META-INF/MANIFEST.MF | 2 +- de.prob.eventb.disprover.core/META-INF/MANIFEST.MF | 2 +- de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF | 4 ++-- de.prob.plugin/META-INF/MANIFEST.MF | 2 +- de.prob.symbolic/META-INF/MANIFEST.MF | 4 ++-- de.prob.ui/META-INF/MANIFEST.MF | 2 +- de.prob2.disprover.feature/feature.xml | 6 +++--- de.prob2.feature/feature.xml | 4 ++-- de.prob2.symbolic.feature/feature.xml | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF index b8d650d5..148bb37f 100644 --- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF +++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.jface.databinding;bundle-version="[1.2.1,2.0.0)", org.eclipse.core.databinding.beans;bundle-version="[1.1.1,2.0.0)", org.eclipse.gef;bundle-version="[3.7.0,4.0.0)";visibility:=reexport, - de.prob.core;bundle-version="[9.4.0,9.5.0)";visibility:=reexport, + de.prob.core;bundle-version="[9.4.4,9.5.0)";visibility:=reexport, org.eventb.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.help;bundle-version="3.5.100", org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", diff --git a/de.prob.core.tests/META-INF/MANIFEST.MF b/de.prob.core.tests/META-INF/MANIFEST.MF index 4b85c932..a77fcf35 100644 --- a/de.prob.core.tests/META-INF/MANIFEST.MF +++ b/de.prob.core.tests/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Require-Bundle: org.eclipse.ui, org.eventb.core.ast;bundle-version="[3.3.0,4.0.0)", org.junit;bundle-version="[4.0.0,5.0.0)", org.rodinp.core;bundle-version="[1.7.0,2.0.0)", - de.prob.core;bundle-version="[9.4.0,9.5.0)" + de.prob.core;bundle-version="[9.4.4,9.5.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF b/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF index 4d5b7dab..82fe998b 100644 --- a/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF +++ b/de.prob.eventb.disprover.core/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.prob.eventb.disprover.core;singleton:=true Bundle-Version: 2.0.5.qualifier Bundle-Vendor: Heinrich-Heine University Dusseldorf Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - de.prob.core;bundle-version="[9.4.0,9.5.0)", + de.prob.core;bundle-version="[9.4.4,9.5.0)", org.eventb.core.seqprover;bundle-version="[3.0.0,4.0.0)", org.eventb.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", diff --git a/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF b/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF index 5dbf8856..f46b2f51 100644 --- a/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF +++ b/de.prob.eventb.disprover.ui/META-INF/MANIFEST.MF @@ -8,13 +8,13 @@ Require-Bundle: org.eclipse.core.runtime, org.eventb.ui;bundle-version="[3.0.0,4.0.0)", de.prob.eventb.disprover.core;bundle-version="[2.0.0,2.1.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", - de.prob.core, + de.prob.core;bundle-version="[9.4.4,9.5.0)", org.eventb.core.ast;bundle-version="[3.0.0,4.0.0)", org.eventb.core.seqprover;bundle-version="[3.0.0,4.0.0)", org.eclipse.osgi, org.rodinp.core;bundle-version="[1.7.0,2.0.0)", org.eventb.core;bundle-version="[3.0.0,4.0.0)", - de.prob.ui;bundle-version="7.4.0" + de.prob.ui;bundle-version="[7.4.2,7.5.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/de.prob.plugin/META-INF/MANIFEST.MF b/de.prob.plugin/META-INF/MANIFEST.MF index 0eac426f..65060d52 100644 --- a/de.prob.plugin/META-INF/MANIFEST.MF +++ b/de.prob.plugin/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: ProB Rodin2 UI Bindings Bundle-SymbolicName: de.prob.plugin;singleton:=true Bundle-Version: 2.3.2.qualifier -Fragment-Host: de.prob.ui;bundle-version="[7.4.0,7.5.0)" +Fragment-Host: de.prob.ui;bundle-version="[7.4.2,7.5.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: HHU Düsseldorf STUPS Group diff --git a/de.prob.symbolic/META-INF/MANIFEST.MF b/de.prob.symbolic/META-INF/MANIFEST.MF index 6ad338be..aa1e9394 100644 --- a/de.prob.symbolic/META-INF/MANIFEST.MF +++ b/de.prob.symbolic/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-SymbolicName: de.prob.symbolic;singleton:=true Bundle-Version: 7.4.2.qualifier Bundle-Activator: de.prob.symbolic.Activator Require-Bundle: org.eclipse.core.runtime, - de.prob.core;bundle-version="[9.4.0,9.5.0)", + de.prob.core;bundle-version="[9.4.4,9.5.0)", org.eventb.ui;bundle-version="[3.0.0,4.0.0)", - de.prob.ui;bundle-version="[7.4.0,7.5.0)", + de.prob.ui;bundle-version="[7.4.2,7.5.0)", org.rodinp.core;bundle-version="[1.7.0,2.0.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eventb.core;bundle-version="[3.0.0,4.0.0)" diff --git a/de.prob.ui/META-INF/MANIFEST.MF b/de.prob.ui/META-INF/MANIFEST.MF index 19d5178a..a7cf999f 100644 --- a/de.prob.ui/META-INF/MANIFEST.MF +++ b/de.prob.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", - de.prob.core;bundle-version="[9.4.0,9.5.0)", + de.prob.core;bundle-version="[9.4.4,9.5.0)", org.eventb.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.4.101,4.0.0)", org.eclipse.gef;bundle-version="[3.7.0,4.0.0)", diff --git a/de.prob2.disprover.feature/feature.xml b/de.prob2.disprover.feature/feature.xml index 2ce2d666..f5d073c3 100644 --- a/de.prob2.disprover.feature/feature.xml +++ b/de.prob2.disprover.feature/feature.xml @@ -229,7 +229,7 @@ litigation. <requires> <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/> - <import plugin="de.prob.core" version="9.4.0" match="equivalent"/> + <import plugin="de.prob.core" version="9.4.4" match="equivalent"/> <import plugin="org.eventb.core.seqprover" version="3.0.0"/> <import plugin="org.eventb.core" version="3.0.0"/> <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/> @@ -237,8 +237,8 @@ litigation. <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/> <import plugin="org.eventb.ui" version="3.0.0"/> <import plugin="org.eclipse.osgi"/> - <import plugin="de.prob.ui" version="7.4.0" match="compatible"/> - <import plugin="de.prob.eventb.disprover.core" version="2.0.0" match="equivalent"/> + <import plugin="de.prob.ui" version="7.4.2" match="equivalent"/> + <import plugin="de.prob.eventb.disprover.core" version="2.0.5" match="equivalent"/> </requires> <plugin diff --git a/de.prob2.feature/feature.xml b/de.prob2.feature/feature.xml index aa283ffb..b01de846 100644 --- a/de.prob2.feature/feature.xml +++ b/de.prob2.feature/feature.xml @@ -232,13 +232,13 @@ litigation. <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/> <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/> <import plugin="org.eclipse.gef" version="3.7.0" match="compatible"/> - <import plugin="de.prob.core" version="9.4.0" match="equivalent"/> + <import plugin="de.prob.core" version="9.4.4" match="equivalent"/> <import plugin="org.eventb.core" version="3.0.0"/> <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/> <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/> <import plugin="org.eventb.core.ast" version="3.0.0"/> <import plugin="org.eventb.core.seqprover" version="3.0.0"/> - <import plugin="de.prob.ui" version="7.4.0" match="equivalent"/> + <import plugin="de.prob.ui" version="7.4.2" match="equivalent"/> <import plugin="org.eclipse.core.expressions" version="3.4.101" match="compatible"/> <import plugin="org.eclipse.ui.views" version="3.5.0" match="compatible"/> <import plugin="org.eclipse.core.databinding" version="1.2.0" match="compatible"/> diff --git a/de.prob2.symbolic.feature/feature.xml b/de.prob2.symbolic.feature/feature.xml index 4765de44..a3a62428 100644 --- a/de.prob2.symbolic.feature/feature.xml +++ b/de.prob2.symbolic.feature/feature.xml @@ -229,8 +229,8 @@ litigation. <requires> <import plugin="org.eclipse.core.runtime"/> - <import plugin="de.prob.core" version="9.4.0" match="equivalent"/> - <import plugin="de.prob.ui" version="7.4.0" match="equivalent"/> + <import plugin="de.prob.core" version="9.4.4" match="equivalent"/> + <import plugin="de.prob.ui" version="7.4.2" match="equivalent"/> <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/> <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/> <import plugin="org.eventb.core" version="3.0.0"/> -- GitLab