Split commons eclipse pde to remove UI dependency (#224)

* use new commons.eclipse.pde.ui plugin * adapt to commons.eclipse.pde * reduce dependencies use GemocPlugin in commons.eclipse instead of commons.eclipse.pde
eclipse · Dec 2, 2022 · ad07ea2 · ad07ea2
1 parent 980680f
commit ad07ea2
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/...tion_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF b/...tion_framework/plugins/org.eclipse.gemoc.executionframework.debugger/META-INF/MANIFEST.MF
@@ -23,8 +23,7 @@ Require-Bundle: com.google.guava,
  org.eclipse.emf.transaction;bundle-version="1.9.0",
  org.eclipse.gemoc.xdsmlframework.commons;bundle-version="2.4.0",
  org.eclipse.xtext;bundle-version="2.10.0",
- org.eclipse.gemoc.commons.eclipse;bundle-version="2.4.0",
- org.eclipse.gemoc.commons.eclipse.pde;bundle-version="2.4.0",
+ org.eclipse.gemoc.commons.eclipse;bundle-version="3.6.0",
  org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="2.4.0",
  fr.inria.diverse.melange.resource;bundle-version="0.2.1",
  org.eclipse.gemoc.trace.gemoc.api;bundle-version="3.0.0",

diff --git a/...cutionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/Activator.java b/...cutionframework.debugger/src/org/eclipse/gemoc/executionframework/debugger/Activator.java
@@ -13,7 +13,7 @@
 import java.util.function.Supplier;
 
 import org.eclipse.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend;
-import org.eclipse.gemoc.commons.eclipse.pde.GemocPlugin;
+import org.eclipse.gemoc.commons.eclipse.GemocPlugin;
 import org.eclipse.gemoc.xdsmlframework.api.core.IExecutionEngine;
 import org.osgi.framework.BundleContext;
 

diff --git a/...cution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/...cution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF
@@ -5,10 +5,9 @@ Bundle-SymbolicName: org.eclipse.gemoc.executionframework.engine;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.gemoc.executionframework.engine.Activator
 Require-Bundle: org.eclipse.gemoc.xdsmlframework.api,
- org.eclipse.gemoc.commons.eclipse,
+ org.eclipse.gemoc.commons.eclipse;bundle-version="3.6.0",
  org.eclipse.gemoc.commons.eclipse.messagingsystem.api;bundle-version="1.0.0",
  org.eclipse.gemoc.executionframework.reflectivetrace.model;visibility:=reexport,
- org.eclipse.gemoc.commons.eclipse.pde;bundle-version="0.1.0",
  org.eclipse.xtend.lib,
  org.eclipse.emf.transaction;bundle-version="1.8.0",
  org.eclipse.gemoc.trace.gemoc.api;bundle-version="1.0.0",

diff --git a/....executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/Activator.java b/....executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/Activator.java
@@ -11,7 +11,7 @@
 package org.eclipse.gemoc.executionframework.engine;
 
 import org.eclipse.gemoc.commons.eclipse.logging.backends.DefaultLoggingBackend;
-import org.eclipse.gemoc.commons.eclipse.pde.GemocPlugin;
+import org.eclipse.gemoc.commons.eclipse.GemocPlugin;
 import org.eclipse.gemoc.executionframework.engine.core.GemocRunningEnginesRegistry;
 import org.osgi.framework.BundleContext;
 

diff --git a/...ework_commons/plugins/org.eclipse.gemoc.xdsmlframework.commons.ui.k3/META-INF/MANIFEST.MF b/...ework_commons/plugins/org.eclipse.gemoc.xdsmlframework.commons.ui.k3/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui.workbench,
  org.eclipse.emf.codegen.ecore,
  org.eclipse.gemoc.executionframework.ui,
  org.eclipse.gemoc.xdsmlframework.ui.utils,
- org.eclipse.emf.ecore.xmi
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.gemoc.commons.eclipse.pde.ui;bundle-version="3.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.gemoc.xdsmlframework.commons.ui.k3
 Bundle-ActivationPolicy: lazy

diff --git a/...framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF b/...framework/plugins/org.eclipse.gemoc.xdsmlframework.extensions.sirius/META-INF/MANIFEST.MF
@@ -23,6 +23,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api,
  org.eclipse.emf.edit.ui,
  org.eclipse.sirius.ext.base;bundle-version="2.0.7",
  org.eclipse.gemoc.commons.eclipse.pde,
+ org.eclipse.gemoc.commons.eclipse.pde.ui,
  org.eclipse.core.filesystem,
  org.eclipse.sirius.editor;bundle-version="2.0.7",
  org.eclipse.gemoc.xdsmlframework.ui.utils,

diff --git a/...work/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF b/...work/xdsml_framework/plugins/org.eclipse.gemoc.xdsmlframework.ide.ui/META-INF/MANIFEST.MF
@@ -27,7 +27,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gemoc.dsl,
  org.eclipse.jdt.core,
  org.eclipse.gemoc.executionframework.extensions.sirius;bundle-version="4.0.0",
- org.eclipse.gemoc.commons.eclipse.jdt;bundle-version="3.0.0"
+ org.eclipse.gemoc.commons.eclipse.jdt;bundle-version="3.0.0",
+ org.eclipse.gemoc.commons.eclipse.pde.ui;bundle-version="3.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/...work/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF b/...work/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.gemoc.xdsmlframework.ide.ui;bundle-version="3.0.0",
  org.eclipse.swtbot.go;bundle-version="2.7.0",
  org.eclipse.xtext.testing;bundle-version="2.27.0",
- org.eclipse.xtext.ui.testing;bundle-version="2.27.0"
+ org.eclipse.xtext.ui.testing;bundle-version="2.27.0",
+ org.eclipse.pde.core;bundle-version="3.15.200"
 Export-Package: org.eclipse.gemoc.xdsmlframework.test.lib
 Automatic-Module-Name: org.eclipse.gemoc.xdsmlframework.test.lib
 Bundle-Vendor: Eclipse GEMOC Project