From 29b3acfe0a0686d1a9fab8e23f79492457a115e2 Mon Sep 17 00:00:00 2001
From: Kai Kreuzer <kai@openhab.org>
Date: Mon, 28 Aug 2017 17:08:17 +0200
Subject: [PATCH] updated IDE and Maven build to latest Xtext, MWE2 and Tycho
 plugins (#4149)

* updated setup file to latest Xtext, MWE2 and Tycho plugins
* switched to Xtext 2.12 for the Maven build code generation

Signed-off-by: Kai Kreuzer <kai@openhab.org>
---
 .../META-INF/MANIFEST.MF                      |  2 +-
 pom.xml                                       |  2 +-
 targetplatform/EclipseSmartHome.setup         | 20 +++++--------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/bundles/model/org.eclipse.smarthome.model.rule/META-INF/MANIFEST.MF b/bundles/model/org.eclipse.smarthome.model.rule/META-INF/MANIFEST.MF
index be59ebf3de3..fa6fc614797 100644
--- a/bundles/model/org.eclipse.smarthome.model.rule/META-INF/MANIFEST.MF
+++ b/bundles/model/org.eclipse.smarthome.model.rule/META-INF/MANIFEST.MF
@@ -32,11 +32,11 @@ Import-Package: com.google.common.collect,
  org.eclipse.smarthome.core.persistence,
  org.eclipse.smarthome.core.service,
  org.eclipse.smarthome.core.thing,
+ org.eclipse.smarthome.core.thing.events,
  org.eclipse.smarthome.core.types,
  org.eclipse.smarthome.model.core,
  org.eclipse.smarthome.model.items,
  org.eclipse.smarthome.model.persistence.extensions,
- org.eclipse.smarthome.core.thing.events,
  org.eclipse.smarthome.model.script,
  org.eclipse.smarthome.model.script.engine.action,
  org.eclipse.xtext.xbase.lib,
diff --git a/pom.xml b/pom.xml
index 3293e7cddc6..5ab6b721958 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <maven.compiler.compilerVersion>${esh.java.version}</maven.compiler.compilerVersion>
     <tycho-version>1.0.0</tycho-version>
     <tycho-groupid>org.eclipse.tycho</tycho-groupid>
-    <xtext-version>2.9.2</xtext-version>
+    <xtext-version>2.12.0</xtext-version>
     <karaf.version>4.0.3</karaf.version>
     <ds-annotations.version>1.2.8</ds-annotations.version>
     <jdt-annotations.version>2.1.0</jdt-annotations.version>
diff --git a/targetplatform/EclipseSmartHome.setup b/targetplatform/EclipseSmartHome.setup
index 7157f9e5b45..93f7075b322 100644
--- a/targetplatform/EclipseSmartHome.setup
+++ b/targetplatform/EclipseSmartHome.setup
@@ -2315,26 +2315,20 @@
           name="org.eclipse.m2e.logback.feature.feature.group"/>
       <requirement
           name="org.eclipse.xtend.sdk.feature.group"
-          versionRange="[2.9.2,2.9.3)"/>
+          versionRange="[2.12.0,2.13.0)"/>
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.9.2,2.9.3)"/>
+          versionRange="[2.12.0,2.13.0)"/>
       <requirement
           name="org.eclipse.emf.mwe2.language.sdk.feature.group"
-          versionRange="[2.8.3,2.8.4)"/>
+          versionRange="[2.9.1,2.10.0)"/>
       <requirement
           name="org.eclipse.emf.mwe2.runtime.sdk.feature.group"
-          versionRange="[2.8.3,2.8.4)"/>
-      <requirement
-          name="org.eclipse.emf.mwe.core.feature.group"
-          versionRange="[1.3.13,1.3.14)"/>
-      <requirement
-          name="org.eclipse.emf.mwe.sdk.feature.group"
-          versionRange="[1.3.13,1.3.14)"/>
+          versionRange="[2.9.1,2.10.0)"/>
       <requirement
           name="org.codehaus.groovy.eclipse.feature.feature.group"/>
       <requirement
-          name="org.sonatype.tycho.m2e.feature.feature.group"/>
+          name="org.eclipse.m2e.feature.feature.group"/>
       <requirement
           name="org.eclipse.emf.sdk.feature.group"/>
       <requirement
@@ -2351,12 +2345,8 @@
           name="org.eclipse.wst.jsdt.feature.feature.group"/>
       <requirement
           name="org.eclipse.wst.web_ui.feature.feature.group"/>
-      <repository
-          url="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.7.0/N/0.7.0.201309291400/"/>
       <repository
           url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
-      <repository
-          url="http://download.eclipse.org/modeling/emf/emf/updates/milestones/"/>
       <repository
           url="http://dist.springsource.org/snapshot/GRECLIPSE/e4.7/"/>
     </setupTask>