Bump to Eclipse 2020-03

.github/pull_request_template.md

@@ -19,7 +19,7 @@ Closes #
 
 ## Companion Pull Requests
 
-<!-- optionnal, indicate if this PR must be accepted in conjunction with some PR in other GEMOC github repositories in order to provide a working Studio-->
-<!-- you may have to edit this PR afte submitting it in order to get all cross references between the PRs -->
+<!-- optional, indicate if this PR must be accepted in conjunction with some PR in other GEMOC github repositories in order to provide a working Studio-->
+<!-- you may have to edit this PR after submitting it in order to get all cross references between the PRs -->
 
  - PR # 

.gitignore

@@ -7,5 +7,5 @@ build.acceleo
 **/xtend-gen/*
 node_modules
 /package-lock.json
-**/.polyglot.build.properties
+**/.polyglot.*
 *.class

.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>1.5.1</version>
+    <version>1.7.0</version>
   </extension>
 </extensions>

pom.xml

@@ -7,12 +7,25 @@
     <version>2.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>    
     <properties>
-		<tycho-version>1.5.1</tycho-version>
-    	<xtend.version>2.14.0</xtend.version>
+		<tycho-version>1.7.0</tycho-version>
+    	<xtend.version>2.21.0</xtend.version>
 		<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse/gemoc-studio-execution-moccml.git</tycho.scmUrl>
 
 		<maven.deploy.skip>true</maven.deploy.skip>
+
+		<eclipse.release.p2.url>http://download.eclipse.org/releases/2020-03</eclipse.release.p2.url>
+    	<eclipse.photon.release.p2.url>http://download.eclipse.org/releases/photon</eclipse.photon.release.p2.url>
+		<k3.p2.url>http://www.kermeta.org/k3/update_2018-09-05</k3.p2.url>
+		<melange.p2.url>http://melange.inria.fr/updatesite/nightly/update_2020-06-19</melange.p2.url>
+		<elk.p2.url>http://download.eclipse.org/elk/updates/releases/0.4.1</elk.p2.url>
+		<app4mc.p2.url>http://download.eclipse.org/app4mc/updatesites/releases/0.8.1</app4mc.p2.url>
+		<aspectJ.p2.url>http://download.eclipse.org/tools/ajdt/48/dev/update</aspectJ.p2.url>
+		<!-- <timesquare.p2.url>http://www.i3s.unice.fr/~deantoni/photon/</timesquare.p2.url> -->
+		<timesquare.p2.url>http://timesquare.inria.fr/update_site/2020</timesquare.p2.url>
+		<diverse-commons.p2.url>http://www.kermeta.org/diverse-commons/updates/latest</diverse-commons.p2.url>
+		<sirius.p2.url>http://download.eclipse.org/sirius/updates/releases/6.1.3/photon</sirius.p2.url>
+		<efxclipse.p2.url>https://download.eclipse.org/efxclipse/updates-released/3.6.0/site</efxclipse.p2.url>
 	</properties>
     <modules>
 
@@ -45,30 +58,36 @@
   	<!-- List of P2 repositories of external tool used to build the components -->
   	<!--  must NOT include the repositories of the tools included in the Studio has it has its own complementary list -->
         <repository>
-            <id>Photon release</id>
+            <id>Eclipse release</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/releases/photon/</url>
+            <url>${eclipse.release.p2.url}</url>
         </repository>
+		<repository>
+			<!-- used due to current restriction on version of ocl by moccml mapping -->
+			<id>Eclipse Photon release</id>
+			<layout>p2</layout>
+			<url>${eclipse.photon.release.p2.url}</url>
+		</repository>
         <repository>
             <id>timesquare</id>
             <layout>p2</layout>
             <!-- <url>http://www.i3s.unice.fr/~deantoni/photon/</url> -->
-            <url>http://timesquare.inria.fr/update_site/photon</url>
+            <url>${timesquare.p2.url}</url>
         </repository>
 		<repository>
-            <id>kermeta-3</id>
+            <id>K3</id>
             <layout>p2</layout>
-            <url>http://www.kermeta.org/k3/update_2018-09-05</url>
+            <url>${k3.p2.url}</url>
         </repository>
         <repository>
-            <id>melange</id>
+            <id>Melange</id>
             <layout>p2</layout>
-            <url>http://melange.inria.fr/updatesite/nightly/update_2019-01-25/</url>
+            <url>${melange.p2.url}</url>
         </repository>
         <repository>
             <id>Sirius</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/sirius/updates/releases/6.1.3/photon</url>
+            <url>${sirius.p2.url}</url>
         </repository>
         <repository>
             <id>nebula</id>
@@ -84,7 +103,7 @@
         <repository> <!-- indirectly, required by the test that indirectly grabs sequential_addon.stategraph that depends on it -->
             <id>elk</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/elk/updates/releases/0.1.0/</url>
+            <url>${elk.p2.url}</url>
         </repository>
 		<repository> <!-- used in some tests -->
             <id>Groovy4Eclipse</id>
@@ -95,7 +114,7 @@
         <repository> <!-- used in some tests -->
             <id>AspectJ</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/tools/ajdt/46/dev/update</url>
+            <url>${aspectJ.p2.url}</url>
         </repository>
     </repositories>