Upgrade Eclipse JDT, M2E and UI.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Oct 20, 2017 · 58f5f8e · 58f5f8e
1 parent 5b31f89
commit 58f5f8e
Show file tree

Hide file tree

Showing 21 changed files with 127 additions and 103 deletions.
diff --git a/contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml b/contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml
@@ -226,8 +226,8 @@
       <import plugin="org.eclipse.ui" version="3.109.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.13.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common.ui" version="2.12.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.13.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.12.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.13.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/contribs/io.sarl.examples/io.sarl.examples.plugin/META-INF/MANIFEST.MF b/contribs/io.sarl.examples/io.sarl.examples.plugin/META-INF/MANIFEST.MF
@@ -10,6 +10,6 @@ Require-Bundle: io.sarl.eclipse;bundle-version="0.6.0",
  org.eclipse.ui;bundle-version="3.109.0",
  org.eclipse.core.runtime;bundle-version="3.13.0",
  org.eclipse.emf.common.ui;bundle-version="2.12.0",
- org.eclipse.ui.ide;bundle-version="3.13.0",
+ org.eclipse.ui.ide;bundle-version="3.13.1",
  org.eclipse.core.resources;bundle-version="3.12.0"
 Export-Package: io.sarl.examples.wizard
diff --git a/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml b/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml
@@ -226,12 +226,12 @@
       <import plugin="io.sarl.eclipse" version="0.6.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.lang.ui" version="0.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui" version="2.12.0" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.commands" version="3.9.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.13.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface" version="3.13.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.109.0" match="greaterOrEqual"/>
+      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi" version="3.12.50" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface" version="3.13.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/contribs/io.sarl.experienceindex/io.sarl.experienceindex.plugin/META-INF/MANIFEST.MF b/contribs/io.sarl.experienceindex/io.sarl.experienceindex.plugin/META-INF/MANIFEST.MF
@@ -12,10 +12,10 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0",
  io.sarl.eclipse;bundle-version="0.6.0",
  io.sarl.lang.ui;bundle-version="0.6.0",
  org.eclipse.xtext.ui;bundle-version="2.12.0",
- org.eclipse.osgi;bundle-version="3.12.0",
+ org.eclipse.osgi;bundle-version="3.12.50",
  org.eclipse.core.commands;bundle-version="3.9.0",
  org.eclipse.core.runtime;bundle-version="3.13.0",
- org.eclipse.jface;bundle-version="3.13.0",
+ org.eclipse.jface;bundle-version="3.13.1",
  org.eclipse.ui;bundle-version="3.109.0",
  com.google.inject;bundle-version="4.1.0"
 Bundle-Activator: io.sarl.experienceindex.eclipse.SarlExperienceIndexPlugin
diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.feature/feature.xml b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.feature/feature.xml
@@ -230,10 +230,10 @@
       <import plugin="org.eclipse.xtext.util" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.core" version="2.12.0" match="greaterOrEqual"/>
-      <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.12.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.forms" version="3.7.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.builder" version="2.12.0" match="greaterOrEqual"/>
+      <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi" version="3.12.50" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.forms" version="3.7.101" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/META-INF/MANIFEST.MF b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.plugin/META-INF/MANIFEST.MF
@@ -13,11 +13,11 @@ Require-Bundle: io.sarl.lang;bundle-version="0.6.0",
  org.eclipse.xtext.xbase;bundle-version="2.12.0",
  org.eclipse.xtext.util;bundle-version="2.12.0",
  org.eclipse.xtext.ui;bundle-version="2.12.0",
+ org.eclipse.xtext.builder;bundle-version="2.12.0",
  org.eclipse.xtend.core;bundle-version="2.12.0",
  javax.inject;bundle-version="1.0.0",
- org.eclipse.osgi;bundle-version="3.12.0",
- org.eclipse.ui.forms;bundle-version="3.7.100",
- org.eclipse.xtext.builder;bundle-version="2.12.0"
+ org.eclipse.osgi;bundle-version="3.12.50",
+ org.eclipse.ui.forms;bundle-version="3.7.101"
 Export-Package: io.sarl.pythongenerator,
  io.sarl.pythongenerator.configuration,
  io.sarl.pythongenerator.generator,

diff --git a/main/apiplugins/io.sarl.util/META-INF/MANIFEST.MF b/main/apiplugins/io.sarl.util/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Export-Package: io.sarl.eventdispatching,
  io.sarl.sarlspecification,
  io.sarl.util
 Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0";visibility:=reexport,
- org.eclipse.osgi;bundle-version="3.12.0"
+ org.eclipse.osgi;bundle-version="3.12.50"
 
diff --git a/main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF
@@ -12,20 +12,20 @@ Require-Bundle: io.sarl.lang.ui;bundle-version="0.6.0";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="2.12.0",
  org.eclipse.xtext.xbase.ui;bundle-version="2.12.0",
  org.eclipse.xtext.common.types.ui;bundle-version="2.12.0",
- org.eclipse.ui.ide;bundle-version="3.13.0",
+ org.eclipse.ui.ide;bundle-version="3.13.1",
  org.eclipse.core.filesystem;bundle-version="1.7.0",
  org.eclipse.equinox.bidi;bundle-version="1.1.0",
  org.eclipse.core.variables;bundle-version="3.4.0",
  org.eclipse.core.net;bundle-version="1.3.100",
- org.eclipse.debug.ui;bundle-version="3.12.0",
+ org.eclipse.debug.ui;bundle-version="3.12.50",
  org.eclipse.ui.navigator;bundle-version="3.7.0",
- org.eclipse.jdt.core;bundle-version="3.13.0",
- org.eclipse.jdt.ui;bundle-version="3.13.0",
- org.eclipse.jdt.launching;bundle-version="3.9.0",
- org.eclipse.jdt.debug.ui;bundle-version="3.8.0",
+ org.eclipse.jdt.core;bundle-version="3.13.50",
+ org.eclipse.jdt.ui;bundle-version="3.13.50",
+ org.eclipse.jdt.launching;bundle-version="3.9.50",
+ org.eclipse.jdt.debug.ui;bundle-version="3.8.50",
  org.eclipse.core.expressions;bundle-version="3.6.0",
  org.eclipse.search;bundle-version="3.11.100",
- org.eclipse.ui.console;bundle-version="3.7.0",
+ org.eclipse.ui.console;bundle-version="3.7.1",
  org.eclipse.ui;bundle-version="3.109.0",
  org.eclipse.ui.intro;bundle-version="3.5.100",
  org.eclipse.ui.intro.quicklinks;bundle-version="1.0.100",

diff --git a/main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0",
  org.eclipse.emf.mwe2.launch;bundle-version="2.9.1",
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.equinox.common;bundle-version="3.9.0",
- org.eclipse.jdt.core;bundle-version="3.13.0",
+ org.eclipse.jdt.core;bundle-version="3.13.50",
  org.objectweb.asm;bundle-version="5.0.1",
  org.apache.commons.logging;bundle-version="1.1.1",
  aopalliance;bundle-version="1.0.0"

diff --git a/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF
@@ -15,14 +15,14 @@ Require-Bundle: io.sarl.lang;bundle-version="0.6.0";visibility:=reexport,
  org.eclipse.xtend.core;bundle-version="2.12.0",
  org.eclipse.xtext.common.types.ui;bundle-version="2.12.0",
  org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.jdt.core;bundle-version="3.13.0",
- org.eclipse.jdt.ui;bundle-version="3.13.0",
- org.eclipse.compare;bundle-version="3.7.100",
- org.eclipse.jdt.debug.ui;bundle-version="3.8.0",
+ org.eclipse.jdt.core;bundle-version="3.13.50",
+ org.eclipse.jdt.ui;bundle-version="3.13.50",
+ org.eclipse.compare;bundle-version="3.7.101",
+ org.eclipse.jdt.debug.ui;bundle-version="3.8.50",
  org.eclipse.ui;bundle-version="3.109.0",
  org.eclipse.ui.editors;bundle-version="3.11.0",
  org.antlr.runtime;bundle-version="3.2.0",
- org.eclipse.ui.forms;bundle-version="3.7.100"
+ org.eclipse.ui.forms;bundle-version="3.7.101"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: io.sarl.lang.ui.internal.LangActivator
 Export-Package: io.sarl.lang.ide,

diff --git a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF
@@ -13,11 +13,11 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.6.0";visibility:=reexport,
  org.eclipse.xtext.xbase.lib;bundle-version="2.12.0",
  org.eclipse.xtext.common.types;bundle-version="2.12.0",
  org.eclipse.xtext.util;bundle-version="2.12.0",
- org.eclipse.osgi;bundle-version="3.12.0",
+ org.eclipse.osgi;bundle-version="3.12.50",
  org.eclipse.emf.codegen;bundle-version="2.12.0",
  org.antlr.runtime;bundle-version="3.2.0",
  org.objectweb.asm;bundle-version="5.0.1";resolution:=optional,
- org.eclipse.jdt.core;bundle-version="3.13.0"
+ org.eclipse.jdt.core;bundle-version="3.13.50"
 Bundle-Activator: io.sarl.lang.SARLLangActivator
 Export-Package: io.sarl.lang,
  io.sarl.lang.bugfixes.pending.bug621,

diff --git a/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF
@@ -11,10 +11,10 @@ Require-Bundle: io.sarl.eclipse;bundle-version="0.6.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.core.resources;bundle-version="3.12.0",
  org.eclipse.ui;bundle-version="3.109.0",
- org.eclipse.m2e.maven.runtime;bundle-version="1.8.0",
- org.eclipse.m2e.core;bundle-version="1.8.0",
- org.eclipse.m2e.jdt;bundle-version="1.8.0",
- org.eclipse.jdt.core;bundle-version="3.13.0",
- org.eclipse.ui.ide;bundle-version="3.13.0"
+ org.eclipse.m2e.maven.runtime;bundle-version="1.8.2",
+ org.eclipse.m2e.core;bundle-version="1.8.2",
+ org.eclipse.m2e.jdt;bundle-version="1.8.2",
+ org.eclipse.jdt.core;bundle-version="3.13.50",
+ org.eclipse.ui.ide;bundle-version="3.13.1"
 Export-Package: io.sarl.m2e;x-friends:="io.sarl.m2e.tests"
 
diff --git a/main/features/io.sarl.baseplatform/feature.xml b/main/features/io.sarl.baseplatform/feature.xml
@@ -309,21 +309,6 @@
       <import plugin="org.eclipse.ui.workbench" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jface" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.swt" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.core" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.server.discovery" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.engine" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.metadata" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.director" version="1.0.100"/>
-      <import plugin="org.eclipse.equinox.p2.updatesite" version="1.0.100" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.repository" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.p2.operations" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.ui.ide" version="3.13.0" match="compatible"/>
       <import plugin="org.eclipse.jface.text" version="3.10.0" match="compatible"/>
       <import plugin="org.eclipse.debug.ui" version="3.11.0" match="compatible"/>
@@ -361,8 +346,10 @@
       <import plugin="org.eclipse.jface" version="3.6.0" match="compatible"/>
       <import plugin="org.eclipse.ui" version="3.6.0" match="compatible"/>
       <import plugin="org.eclipse.userstorage" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.11.0" match="compatible"/>
+      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.team.core" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.update.configurator" version="3.1.0" match="compatible"/>
@@ -375,6 +362,9 @@
       <import plugin="org.eclipse.equinox.simpleconfigurator.manipulator" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.equinox.frameworkadmin" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.debug.core" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.equinox.p2.engine" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.equinox.p2.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.equinox.p2.metadata" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.equinox.p2.director" version="2.1.0" match="compatible"/>
       <import plugin="org.eclipse.equinox.p2.artifact.repository" version="1.0.100" match="compatible"/>
       <import plugin="org.eclipse.equinox.p2.repository" version="2.0.0"/>

diff --git a/main/features/io.sarl.compiler/feature.xml b/main/features/io.sarl.compiler/feature.xml
@@ -229,6 +229,7 @@
       <import plugin="org.eclipse.xtext.xbase.lib" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.common.types" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.util" version="2.12.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.codegen" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j"/>
       <import plugin="io.sarl.lang" version="0.6.0" match="greaterOrEqual"/>
@@ -240,6 +241,8 @@
       <import plugin="org.eclipse.xtend.ide" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.common.types.ui" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.109.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="3.11.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.jdt.core" version="3.5.0" match="compatible"/>
@@ -258,18 +261,12 @@
       <import plugin="org.eclipse.jdt.debug" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase.ide"/>
-      <import plugin="org.eclipse.osgi" version="3.12.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.codegen" version="2.12.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core" version="3.13.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.13.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.compare" version="3.7.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.109.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.common" version="2.13.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.13.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen" version="2.12.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.13.0" match="compatible"/>
+      <import plugin="org.eclipse.osgi" version="3.12.50" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core" version="3.13.50" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.ui" version="3.13.50" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.compare" version="3.7.101" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.debug.ui" version="3.8.50" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.forms" version="3.7.101" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
    </requires>