From 3468f52c7cf3e4004cc3f3d22b029405d1d4f072 Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Fri, 22 Nov 2019 14:32:50 +0100
Subject: [PATCH 1/3] 42: Port to 2019-09 and Xtext 2.19.0

Task-Url: http://github.com/LorenzoBettini/edelta/issues/42
---
 edelta.parent/edelta.feature/feature.xml         | 4 ++--
 edelta.parent/edelta.target/edelta.target.target | 6 +++---
 edelta.parent/edelta.tests/META-INF/MANIFEST.MF  | 2 +-
 edelta.parent/edelta/META-INF/MANIFEST.MF        | 5 +++--
 edelta.parent/pom.xml                            | 6 +++---
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/edelta.parent/edelta.feature/feature.xml b/edelta.parent/edelta.feature/feature.xml
index f65976ae7..21f1b43c0 100644
--- a/edelta.parent/edelta.feature/feature.xml
+++ b/edelta.parent/edelta.feature/feature.xml
@@ -6,8 +6,8 @@
       provider-name="Lorenzo Bettini">
 
    <requires>
-      <import feature="org.eclipse.xtext.xbase" version="2.17.1" match="equivalent"/>
-      <import feature="org.eclipse.xtext.ui" version="2.17.1" match="equivalent"/>
+      <import feature="org.eclipse.xtext.xbase" version="2.19.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.ui" version="2.19.0" match="equivalent"/>
       <import plugin="org.eclipse.pde.ui"/>
    </requires>
 
diff --git a/edelta.parent/edelta.target/edelta.target.target b/edelta.parent/edelta.target/edelta.target.target
index aaa4b67e1..469ae8231 100644
--- a/edelta.parent/edelta.target/edelta.target.target
+++ b/edelta.parent/edelta.target/edelta.target.target
@@ -17,15 +17,15 @@
 <unit id="org.hamcrest.library" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-03"/>
+<repository location="http://download.eclipse.org/releases/2019-09"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.10.0/"/>
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.17.1/"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.19.0/"/>
 </location>
 </locations>
 </target>
diff --git a/edelta.parent/edelta.tests/META-INF/MANIFEST.MF b/edelta.parent/edelta.tests/META-INF/MANIFEST.MF
index ffc3f6b09..b6074854d 100644
--- a/edelta.parent/edelta.tests/META-INF/MANIFEST.MF
+++ b/edelta.parent/edelta.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: edelta,
  edelta.testutils,
  org.junit;bundle-version="4.7.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
- org.objectweb.asm;bundle-version="[7.0.0,7.1.0)";resolution:=optional,
+ org.objectweb.asm;bundle-version="[7.1.0,7.2.0)";resolution:=optional,
  org.eclipse.xtext.ecore,
  org.eclipse.jdt.core,
  org.eclipse.xtext.testing,
diff --git a/edelta.parent/edelta/META-INF/MANIFEST.MF b/edelta.parent/edelta/META-INF/MANIFEST.MF
index 1d8746c28..4d5662599 100644
--- a/edelta.parent/edelta/META-INF/MANIFEST.MF
+++ b/edelta.parent/edelta/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.equinox.common;bundle-version="3.5.0",
  org.eclipse.emf.ecore,
  org.eclipse.xtext.common.types,
- org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib;bundle-version="2.13.0",
  org.eclipse.emf.common,
@@ -18,7 +19,7 @@ Require-Bundle: org.eclipse.xtext,
  edelta.mwe2;resolution:=optional,
  org.eclipse.jdt.core,
  org.eclipse.core.resources,
- org.objectweb.asm;bundle-version="[7.0.0,7.1.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="[7.1.0,7.2.0)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: edelta,
  edelta.compiler,
diff --git a/edelta.parent/pom.xml b/edelta.parent/pom.xml
index f0f93d6b0..835a6b7d4 100644
--- a/edelta.parent/pom.xml
+++ b/edelta.parent/pom.xml
@@ -8,9 +8,9 @@
 
   <properties>
     <tycho-version>1.3.0</tycho-version>
-    <xtextVersion>2.17.1</xtextVersion>
-    <eclipseVersion>2019-03</eclipseVersion>
-    <mwe2Version>2.10.0</mwe2Version>
+    <xtextVersion>2.19.0</xtextVersion>
+    <eclipseVersion>2019-09</eclipseVersion>
+    <mwe2Version>2.11.0</mwe2Version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>

From 9d6dc224ab4abaedd223ae3cdf34e4dd47411765 Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Fri, 22 Nov 2019 14:36:06 +0100
Subject: [PATCH 2/3] 42: use p2 mirrors

Task-Url: http://github.com/LorenzoBettini/edelta/issues/42
---
 travis_build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis_build.sh b/travis_build.sh
index a9af50aab..063d56c2a 100755
--- a/travis_build.sh
+++ b/travis_build.sh
@@ -4,13 +4,13 @@ set -ev
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
 	if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
 		echo "Build on MacOSX: Pull Request"
-		mvn -f edelta.parent/pom.xml clean verify $ADDITIONAL -Dtycho.disableP2Mirrors=true
+		mvn -f edelta.parent/pom.xml clean verify $ADDITIONAL
 	else
 		echo "Skipping build on MacOSX for standard commit"
 	fi
 else
 	echo "Build on Linux"
-	mvn -f edelta.parent/pom.xml clean verify $ADDITIONAL -Dtycho.disableP2Mirrors=true
+	mvn -f edelta.parent/pom.xml clean verify $ADDITIONAL
 fi 
 
 #  -Dtycho.disableP2Mirrors=true

From ebdae065057497ca61ecb5cb0416a577263c9bc8 Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Fri, 22 Nov 2019 14:45:55 +0100
Subject: [PATCH 3/3] 42: use Tycho 1.5.0

Task-Url: http://github.com/LorenzoBettini/edelta/issues/42
---
 edelta.parent/edelta.lib.tests/pom.xml | 24 ------------------------
 edelta.parent/edelta.tests/pom.xml     | 19 -------------------
 edelta.parent/pom.xml                  |  2 +-
 3 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/edelta.parent/edelta.lib.tests/pom.xml b/edelta.parent/edelta.lib.tests/pom.xml
index b82b3cb02..22cd5fa7e 100644
--- a/edelta.parent/edelta.lib.tests/pom.xml
+++ b/edelta.parent/edelta.lib.tests/pom.xml
@@ -17,28 +17,4 @@
     <sonar.tests>src</sonar.tests>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <dependency-resolution>
-            <extraRequirements>
-              <!-- 
-                Required in Java 11
-                See
-                https://bugs.eclipse.org/bugs/show_bug.cgi?id=539038
-                https://github.com/eclipse/xtext-core/pull/934 -->
-              <requirement>
-                <type>eclipse-feature</type>
-                <id>org.eclipse.rcp</id>
-                <versionRange>0.0.0</versionRange>
-              </requirement>
-            </extraRequirements>
-          </dependency-resolution>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/edelta.parent/edelta.tests/pom.xml b/edelta.parent/edelta.tests/pom.xml
index c2d347edb..76d720b8b 100644
--- a/edelta.parent/edelta.tests/pom.xml
+++ b/edelta.parent/edelta.tests/pom.xml
@@ -17,25 +17,6 @@
         <groupId>org.eclipse.xtend</groupId>
         <artifactId>xtend-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <dependency-resolution>
-            <extraRequirements>
-              <!-- Required in Java 11
-                See
-                https://bugs.eclipse.org/bugs/show_bug.cgi?id=539038
-                https://github.com/eclipse/xtext-core/pull/934 -->
-              <requirement>
-                <type>eclipse-feature</type>
-                <id>org.eclipse.rcp</id>
-                <versionRange>0.0.0</versionRange>
-              </requirement>
-            </extraRequirements>
-          </dependency-resolution>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/edelta.parent/pom.xml b/edelta.parent/pom.xml
index 835a6b7d4..7b0000b2f 100644
--- a/edelta.parent/pom.xml
+++ b/edelta.parent/pom.xml
@@ -7,7 +7,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <tycho-version>1.3.0</tycho-version>
+    <tycho-version>1.5.0</tycho-version>
     <xtextVersion>2.19.0</xtextVersion>
     <eclipseVersion>2019-09</eclipseVersion>
     <mwe2Version>2.11.0</mwe2Version>