Bump eclipse 2021 12 (#213)

* bump tycho 2.5.0 and eclipse 2021-12
* fix diffviewer classpath

Signed-off-by: Didier Vojtisek <didier.vojtisek@inria.fr>

Author: dvojtise

.mvn/extensions.xml

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

simulationmodelanimation/pom.xml

@@ -27,7 +27,7 @@
 	</licenses>
 
 	<properties>
-		<tycho-version>2.2.0</tycho-version>
+		<tycho-version>2.5.0</tycho-version>
 		<tycho.scmUrl>scm:git:https://github.com/SiriusLab/ModelDebugging.git</tycho.scmUrl>
 	</properties>
 

trace/manager/plugins/org.eclipse.gemoc.addon.diffviewer/.classpath

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-<<<<<<< HEAD
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
-=======
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
->>>>>>> branch 'master' of https://github.com/eclipse/gemoc-studio-modeldebugging.git
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>