eclipse-diffmerge · arnauddieumegard · Aug 9, 2021
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.diffmerge.patch.examples/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.examples;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.common.ui;bundle-version="2.10.0"
 Bundle-Vendor: %providerName

diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.persistence.emf;singleton:=
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.emf.diffmerge.patch.persistence.emf,
  org.eclipse.emf.diffmerge.patch.persistence.emf.emodelpatch,
  org.eclipse.emf.diffmerge.patch.persistence.emf.emodelpatch.impl,

diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.persistence.json;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.gson;bundle-version="2.2.4",
  org.eclipse.emf.diffmerge.patch;bundle-version="[0.1.0,0.2.0)",
  com.google.guava;bundle-version="15.0.0"

diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.runtime
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.emf.diffmerge;bundle-version="0.7.0",
  org.eclipse.emf.diffmerge.patch;bundle-version="[0.1.0,0.2.0)",
  org.eclipse.emf.ecore;bundle-version="2.10.2",

diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.emf.common.ui;bundle-version="2.10.0",
  org.eclipse.viatra.query.runtime.base;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)",
  org.eclipse.emf.diffmerge.patch.persistence.emf;bundle-version="[0.1.0,0.2.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.emf.diffmerge.patch.ui,
  org.eclipse.emf.diffmerge.patch.ui.dialogs,
  org.eclipse.emf.diffmerge.patch.ui.editors,

diff --git a/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.guava;bundle-version="15.0.0",
  org.eclipse.xtend.lib
 Export-Package: org.eclipse.emf.diffmerge.patch,

diff --git a/releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml b/releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml
@@ -21,12 +21,12 @@
   <packaging>pom</packaging>
 
   <properties>
-    <tycho.version>1.4.0</tycho.version>
+    <tycho.version>2.0.0</tycho.version>
     <tycho.extras.version>${tycho.version}</tycho.extras.version>
     <xtend.compiler.version>2.17.0</xtend.compiler.version>
-    <cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
+    <cbi.jarsigner.version>1.3.2</cbi.jarsigner.version>
     <rcptt.version>2.3.0</rcptt.version>
-    <java.version>1.8</java.version>
+    <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
 
@@ -121,19 +121,6 @@
       </activation>
       <build>
         <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>pack200-normalize</id>
-                <goals>
-                  <goal>normalize</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
             <artifactId>eclipse-jarsigner-plugin</artifactId>
@@ -147,19 +134,6 @@
                 <phase>verify</phase>
               </execution>
             </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>pack200-pack</id>
-                <goals>
-                  <goal>pack</goal>
-                </goals>
-              </execution>
-            </executions>
           </plugin>
 		  <plugin>
 			<groupId>org.eclipse.tycho</groupId>
@@ -219,6 +193,7 @@
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho.version}</version>
         <configuration>
+          <executionEnvironment>JavaSE-11</executionEnvironment>
           <target>
             <artifact>
               <groupId>org.eclipse.emf.diffmerge.patch</groupId>

diff --git a/releng/org.eclipse.emf.diffmerge.patch.parent/toolchains-hipp.xml b/releng/org.eclipse.emf.diffmerge.patch.parent/toolchains-hipp.xml
@@ -1,4 +1,13 @@
 <toolchains>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <id>JavaSE-11</id>
+    </provides>
+    <configuration>
+      <jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome>
+    </configuration>
+  </toolchain>
   <toolchain>
     <type>jdk</type>
     <provides>

diff --git a/releng/org.eclipse.emf.diffmerge.patch.target/org.eclipse.emf.diffmerge.patch.target.target b/releng/org.eclipse.emf.diffmerge.patch.target/org.eclipse.emf.diffmerge.patch.target.target
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="EMF DiffMerge Model Patch" sequenceNumber="1568126316">
+<target name="EMF DiffMerge Model Patch" sequenceNumber="1628509241">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.0.v20180518-2029"/>
-      <unit id="org.eclipse.platform.sdk" version="4.8.0.I20180611-0500"/>
-      <unit id="org.eclipse.jdt.feature.group" version="3.14.0.v20180611-0500"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.13.100.v20180611-0826"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
-      <unit id="org.eclipse.platform.feature.group" version="4.8.0.v20180611-0656"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.14.0.v20180529-1157"/>
-      <unit id="org.eclipse.gmf.feature.group" version="1.12.0.201806010809"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1200.v20210527-0259"/>
+      <unit id="org.eclipse.platform.sdk" version="4.20.0.I20210611-1600"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.18.800.v20210611-1600"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.14.800.v20210611-1636"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.20.0.v20210611-1636"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.20.0.v20210611-1600"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.26.0.v20210506-1425"/>
+      <unit id="org.eclipse.gmf.feature.group" version="1.13.0.202004160913"/>
       <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/>
-      <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <repository location="http://download.eclipse.org/releases/photon/"/>
+      <unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
+      <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+      <repository location="http://download.eclipse.org/releases/2021-06/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.viatra.transformation.runtime.emf.feature.feature.group" version="1.6.0.201706141007"/>
@@ -30,5 +30,5 @@
       <repository location="http://download.eclipse.org/viatra/examples/cps/"/>
     </location>
   </locations>
-  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 </target>
diff --git a/releng/org.eclipse.emf.diffmerge.patch.target/org.eclipse.emf.diffmerge.patch.target.tpd b/releng/org.eclipse.emf.diffmerge.patch.target/org.eclipse.emf.diffmerge.patch.target.tpd
@@ -1,8 +1,8 @@
 target "EMF DiffMerge Model Patch"
-environment JavaSE-1.8
+environment JavaSE-11
 with requirements
 
-location "http://download.eclipse.org/releases/photon/" {
+location "http://download.eclipse.org/releases/2021-06/" {
   org.eclipse.equinox.executable.feature.group
   org.eclipse.platform.sdk
   org.eclipse.jdt.feature.group

diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.tests.all
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.guava,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,

diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF
@@ -23,6 +23,6 @@ Require-Bundle: com.google.guava;bundle-version="15.0.0",
  org.eclipse.emf.diffmerge.patch.runtime;bundle-version="[0.1.0,0.2.0)",
  org.eclipse.viatra.query.runtime.base.itc;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.apache.log4j;version="1.2.0"
 Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.emf
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF
@@ -23,5 +23,5 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)",
  org.eclipse.viatra.query.runtime.base.itc;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="2.9.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.performance
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.tests.persistence.emf
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.emf.diffmerge.patch;bundle-version="[0.1.0,0.2.0)",
  org.eclipse.xtend.lib,

diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.tests.persistence.json
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.emf.diffmerge.patch;bundle-version="[0.1.0,0.2.0)",
  org.eclipse.xtend.lib,

diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.tests
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.emf.diffmerge.patch;bundle-version="[0.1.0,0.2.0)",
  org.eclipse.xtend.lib