[all] Move to Eclipse Neon.

close #415 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Jul 2, 2016 · ac98a2c · ac98a2c
1 parent 75f60c9
commit ac98a2c
Show file tree

Hide file tree

Showing 24 changed files with 668 additions and 533 deletions.
diff --git a/eclipse-products/io.sarl.lang.updatesite/io.sarl.lang.product b/eclipse-products/io.sarl.lang.updatesite/io.sarl.lang.product
@@ -255,22 +255,22 @@
    </plugins>
 
    <features>
-      <feature id="io.sarl.compiler" version="0.4.0.qualifier"/>
       <feature id="io.sarl.ide" version="0.4.0.qualifier"/>
-      <feature id="io.sarl.lib" version="0.4.0.qualifier"/>
-      <feature id="org.eclipse.egit" version="4.1.1.201511131810-r"/>
-      <feature id="org.eclipse.epp.mpc" version="1.4.2.v20160210-2005"/>
+      <feature id="io.sarl.baseplatform" version="0.4.0.qualifier"/>
       <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
-      <feature id="org.eclipse.help"/>
       <feature id="org.jboss.tools.m2e.jdt.feature"/>
+      <feature id="org.eclipse.help"/>
+      <feature id="io.sarl.lib"/>
       <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
       <feature id="org.eclipse.xtext.xbase.lib"/>
       <feature id="org.eclipse.jdt"/>
       <feature id="org.eclipse.emf.common"/>
       <feature id="org.eclipse.equinox.p2.core.feature"/>
+      <feature id="org.eclipse.egit"/>
       <feature id="org.eclipse.xtend.sdk"/>
       <feature id="org.eclipse.ecf.core.ssl.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+      <feature id="io.sarl.compiler"/>
       <feature id="org.eclipse.xtext.runtime"/>
       <feature id="org.eclipse.emf.ecore"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
@@ -280,12 +280,17 @@
       <feature id="org.eclipse.rcp"/>
       <feature id="org.eclipse.ecf.core.feature"/>
       <feature id="org.eclipse.jgit"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
       <feature id="org.eclipse.equinox.p2.discovery.feature"/>
+      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
       <feature id="org.eclipse.xtext.ui"/>
+      <feature id="org.eclipse.epp.mpc"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.e4.rcp"/>
+      <feature id="org.eclipse.wst.xml_core.feature"/>
+      <feature id="org.eclipse.wst.common_core.feature"/>
+      <feature id="org.eclipse.xsd"/>
+      <feature id="org.eclipse.wst.common_ui.feature"/>
    </features>
 
    <configurations>

diff --git a/eclipse-sarl/features/io.sarl.baseplatform/build.properties b/eclipse-sarl/features/io.sarl.baseplatform/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/eclipse-sarl/features/io.sarl.baseplatform/feature.xml b/eclipse-sarl/features/io.sarl.baseplatform/feature.xml
diff --git a/eclipse-sarl/features/io.sarl.baseplatform/pom.xml b/eclipse-sarl/features/io.sarl.baseplatform/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>io.sarl</groupId>
+		<artifactId>io.sarl.features</artifactId>
+		<version>0.4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>io.sarl.baseplatform</artifactId>
+	<packaging>eclipse-feature</packaging>
+	<name>SARL Base Platform Feature</name>
+	<description>Contains the Eclipse plugins that constritute to the base platform for a SARL product</description>
+
+</project>
diff --git a/eclipse-sarl/features/io.sarl.compiler/feature.xml b/eclipse-sarl/features/io.sarl.compiler/feature.xml
@@ -10,7 +10,7 @@
    </description>
 
    <copyright url="http://www.sarl.io/about/">
-      Copyright 2014-2015 the original authors and authors.
+      Copyright 2014-2016 the original authors and authors.
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0">
@@ -226,30 +226,51 @@
       <import plugin="org.eclipse.xtend.core" version="2.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext" version="2.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.util" version="2.10.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase" version="2.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase.lib" version="2.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.10.102" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.common" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="com.ibm.icu" version="54.1.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.common.types" version="2.10.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi" version="3.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.common" version="3.8.0" match="greaterOrEqual"/>
+      <import plugin="com.ibm.icu" version="56.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.codegen" version="2.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.12.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.common" 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.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui" version="2.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui.shared" version="2.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.10.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.ui" version="2.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.builder" version="2.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.ide" version="2.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.common.types.ui" version="2.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core" version="3.11.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.11.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.compare" version="3.5.600" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.107.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.7.101" match="greaterOrEqual"/>
+      <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core" version="3.12.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.ui" version="3.12.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.compare" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="3.10.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.108.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.debug.ui" version="3.7.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.common" version="2.12.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"/>
+      <import plugin="org.eclipse.jdt.launching" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.debug.core" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.text" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.12.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.codegen" version="2.11.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore.xmi" version="2.12.0" match="compatible"/>
       <import plugin="org.eclipse.xtext" version="2.10.0" match="compatible"/>
       <import plugin="org.eclipse.xtext.common.types" version="2.10.0" match="compatible"/>
       <import plugin="org.eclipse.xtext.util" version="2.10.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.10.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.common" version="2.10.1" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase.lib" version="2.10.0" match="compatible"/>
       <import plugin="org.eclipse.xtend.lib" version="2.10.0" match="compatible"/>
+      <import plugin="org.eclipse.xtext.xbase" version="2.10.0" match="compatible"/>
       <import plugin="org.eclipse.xtext.ui" version="2.10.0" match="compatible"/>
       <import plugin="org.eclipse.ui.editors" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.6.0" match="greaterOrEqual"/>
@@ -264,220 +285,56 @@
       <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" version="2.10.0" match="compatible"/>
-      <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"/>
-      <import plugin="org.eclipse.jdt.launching" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.text" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.11.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.xtext.builder.standalone" version="2.10.0" match="compatible"/>
-      <import plugin="com.google.guava" version="14.0.0"/>
-      <import plugin="org.eclipse.xtend"/>
-      <import plugin="org.eclipse.emf.mwe.core" version="1.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common" version="2.10.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.10.2" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.cli" version="1.2.0" match="compatible"/>
-      <import plugin="org.apache.commons.lang" version="2.0.0" match="compatible"/>
-      <import plugin="org.apache.commons.logging" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.xtext.ecore" version="2.10.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen.ecore" version="2.10.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.common" version="3.6.0" match="greaterOrEqual"/>
       <import feature="io.sarl.lib" version="0.4.0.qualifier"/>
-      <import feature="org.eclipse.xtend.sdk" version="2.8.4.v201508050135"/>
-      <import feature="org.eclipse.e4.rcp" version="1.4.0.v20150903-1804"/>
-      <import feature="org.eclipse.jdt" version="3.11.1.v20150904-0015"/>
-      <import feature="org.eclipse.platform" version="4.5.1.v20150904-0015"/>
-      <import feature="org.eclipse.emf.common" version="2.11.0.v20150805-0538"/>
-      <import feature="org.eclipse.emf.ecore" version="2.11.1.v20150805-0538"/>
-      <import feature="org.eclipse.xtext.runtime" version="2.8.4.v201508050135"/>
-      <import feature="org.eclipse.xtext.ui" version="2.8.4.v201508050135"/>
+      <import feature="org.eclipse.xtend.sdk" version="2.10.0.v201605250459"/>
    </requires>
 
    <plugin
          id="io.sarl.lang"
          download-size="0"
          install-size="0"
-         version="0.4.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="io.sarl.lang.ui"
          download-size="0"
          install-size="0"
-         version="0.4.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xtext.xbase"
-         download-size="0"
-         install-size="0"
-         version="2.10.0.v201605250459"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xtext.xbase.ui"
-         download-size="0"
-         install-size="0"
-         version="2.10.0.v201605250459"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.codegen"
          download-size="0"
          install-size="0"
-         version="2.11.0.v20160208-0841"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.common"
-         download-size="0"
-         install-size="0"
-         version="2.11.1.v20160208-0816"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.common.ui"
-         download-size="0"
-         install-size="0"
-         version="2.10.1.v20160208-0841"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore"
-         download-size="0"
-         install-size="0"
-         version="2.11.2.v20160208-0816"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.emf.ecore.edit"
+         id="org.eclipse.emf.codegen.ecore"
          download-size="0"
          install-size="0"
-         version="2.9.0.v20160208-0841"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.emf.ecore.editor"
+         id="org.eclipse.xtext.xbase"
          download-size="0"
          install-size="0"
-         version="2.11.0.v20160208-0841"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.emf.edit"
+         id="org.eclipse.xtext.xbase.ui"
          download-size="0"
          install-size="0"
-         version="2.11.1.v20160208-0841"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="com.google.inject"
          download-size="0"
          install-size="0"
-         version="3.0.0.v201312141243"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.edit.ui"
-         download-size="0"
-         install-size="0"
-         version="2.11.1.v20160208-0841"
-         unpack="false"/>
-
-   <plugin
-         id="org.objectweb.asm"
-         download-size="0"
-         install-size="0"
-         version="5.0.1.v201404251740"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xtext.junit4"
-         download-size="0"
-         install-size="0"
-         version="2.10.0.v201605250459"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xtext.xbase.junit"
-         download-size="0"
-         install-size="0"
-         version="2.10.0.v201605250459"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xtend.typesystem.emf"
-         download-size="0"
-         install-size="0"
-         version="2.1.0.v201505260349"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xtend"
-         download-size="0"
-         install-size="0"
-         version="2.1.0.v201505260349"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.mwe.core"
-         download-size="0"
-         install-size="0"
-         version="1.3.20.v201605261103"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.mwe.utils"
-         download-size="0"
-         install-size="0"
-         version="1.3.20.v201605261103"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.cli"
-         download-size="0"
-         install-size="0"
-         version="1.2.0.v201404270220"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.mwe2.runtime"
-         download-size="0"
-         install-size="0"
-         version="2.9.0.v201605261103"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xpand"
-         download-size="0"
-         install-size="0"
-         version="2.1.0.v201505260349"
-         unpack="false"/>
-
-   <plugin
-         id="org.antlr.runtime"
-         download-size="0"
-         install-size="0"
-         version="3.2.0.v201101311130"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.xtext.xtext.generator"
-         download-size="0"
-         install-size="0"
-         version="2.10.0.v201605250459"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.codegen.ecore"
-         download-size="0"
-         install-size="0"
          version="0.0.0"
          unpack="false"/>
 

diff --git a/eclipse-sarl/features/io.sarl.compiler/pom.xml b/eclipse-sarl/features/io.sarl.compiler/pom.xml
@@ -11,6 +11,6 @@
 	<groupId>io.sarl.lang</groupId>
 	<artifactId>io.sarl.compiler</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<name>Feature with the SARL Compiler</name>
+	<name>SARL Compiler Feature</name>
 
 </project>