From 6f56d0095ca7db2ab1f05915c66a418ea3302c7b Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Thu, 17 Aug 2023 12:53:29 +0200 Subject: [PATCH] Update EventB EMF version ranges to allow version 7 Despite the major version bump, the EMF model and Java API *seem* to be backwards-compatible, at least for our purposes. This fixes the version conflict that prevented installing Camille together with current versions of CamilleX. --- org.eventb.texteditor.feature/feature.xml | 6 +++--- org.eventb.texteditor.ui/META-INF/MANIFEST.MF | 6 +++--- org.eventb.texttools/META-INF/MANIFEST.MF | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/org.eventb.texteditor.feature/feature.xml b/org.eventb.texteditor.feature/feature.xml index 9544570..50fa405 100644 --- a/org.eventb.texteditor.feature/feature.xml +++ b/org.eventb.texteditor.feature/feature.xml @@ -173,9 +173,9 @@ Inc. in the United States, other countries, or both. <import plugin="org.eclipse.ui.ide" version="3.8.2" match="compatible"/> <import plugin="org.eclipse.ui.workbench.texteditor"/> <import plugin="org.eventb.core.ast" version="3.1.0" match="compatible"/> - <import plugin="org.eventb.emf.core" version="4.0.0"/> - <import plugin="org.eventb.emf.formulas" version="1.4.0" match="compatible"/> - <import plugin="org.eventb.emf.persistence" version="3.1.1" match="compatible"/> + <import plugin="org.eventb.emf.core" version="4.0.0" match="greaterOrEqual"/> + <import plugin="org.eventb.emf.formulas" version="1.4.0" match="greaterOrEqual"/> + <import plugin="org.eventb.emf.persistence" version="3.1.1" match="greaterOrEqual"/> <import plugin="org.eventb.texteditor.parsers"/> <import plugin="org.eventb.ui" version="3.0.0" match="compatible"/> <import plugin="org.rodinp.core" version="1.7.0" match="compatible"/> diff --git a/org.eventb.texteditor.ui/META-INF/MANIFEST.MF b/org.eventb.texteditor.ui/META-INF/MANIFEST.MF index 7e780f5..7004101 100644 --- a/org.eventb.texteditor.ui/META-INF/MANIFEST.MF +++ b/org.eventb.texteditor.ui/META-INF/MANIFEST.MF @@ -16,9 +16,9 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.8.1", org.eclipse.ui.workbench.texteditor, org.eventb.core;bundle-version="3.1.0", org.eventb.core.ast;bundle-version="[3.1.0,4.0.0)", - org.eventb.emf.core;bundle-version="[4.0.0,6.0.0)", - org.eventb.emf.formulas;bundle-version="[1.4.0,2.0.0)", - org.eventb.emf.persistence;bundle-version="[3.1.1,4.0.0)";visibility:=reexport, + org.eventb.emf.core;bundle-version="[4.0.0,7.0.0)", + org.eventb.emf.formulas;bundle-version="[1.4.0,3.0.0)", + org.eventb.emf.persistence;bundle-version="[3.1.1,5.0.0)";visibility:=reexport, org.eventb.texteditor.parsers, org.eventb.texttools;bundle-version="[3.5.0,3.6.0)";visibility:=reexport, org.eventb.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, diff --git a/org.eventb.texttools/META-INF/MANIFEST.MF b/org.eventb.texttools/META-INF/MANIFEST.MF index 255d10f..dfd2068 100644 --- a/org.eventb.texttools/META-INF/MANIFEST.MF +++ b/org.eventb.texttools/META-INF/MANIFEST.MF @@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)", org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)", org.eventb.core;bundle-version="[3.1.0,4.0.0)", org.eventb.core.ast;bundle-version="[3.1.0,4.0.0)", - org.eventb.emf.core;bundle-version="[4.0.0,6.0.0)", - org.eventb.emf.formulas;bundle-version="[1.4.0,2.0.0)", - org.eventb.emf.persistence;bundle-version="[3.1.1,4.0.0)", + org.eventb.emf.core;bundle-version="[4.0.0,7.0.0)", + org.eventb.emf.formulas;bundle-version="[1.4.0,3.0.0)", + org.eventb.emf.persistence;bundle-version="[3.1.1,5.0.0)", org.eventb.texteditor.parsers, org.rodinp.core;bundle-version="1.7.0" Bundle-Vendor: Heinrich-Heine University Dusseldorf -- GitLab