Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/.classpath6
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--examples/org.eclipse.emf.diffmerge.patch.examples/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.classpath10
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.classpath8
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.persistence.json/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/.classpath10
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/.classpath10
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/.classpath10
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF2
-rw-r--r--pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml10
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.parent/toolchains-hipp.xml4
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product11
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.setup/Modelpatch.setup4
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.target/org.eclipse.emf.diffmerge.patch.target.target34
-rw-r--r--releng/org.eclipse.emf.diffmerge.patch.target/org.eclipse.emf.diffmerge.patch.target.tpd4
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/.classpath10
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/.classpath10
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/.classpath10
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.classpath10
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.classpath10
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/.classpath10
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF2
43 files changed, 146 insertions, 145 deletions
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/.classpath b/examples/org.eclipse.emf.diffmerge.patch.examples/.classpath
index 2f1a48a..6de27b6 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/.classpath
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/examples/org.eclipse.emf.diffmerge.patch.examples/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.emf.diffmerge.patch.examples/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/examples/org.eclipse.emf.diffmerge.patch.examples/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/org.eclipse.emf.diffmerge.patch.examples/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index e94fe6b..5adea99 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.classpath
index e850b35..5b88563 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.classpath
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.emf/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index d41500b..7350810 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.classpath
index 7445162..4f83b23 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.classpath
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.patch.persistence.json/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index 89bd3db..0277c0c 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/plugins/org.eclipse.emf.diffmerge.patch.runtime/.classpath
index e850b35..5b88563 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/.classpath
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.diffmerge.patch.runtime/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index d434310..efd3d3d 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/plugins/org.eclipse.emf.diffmerge.patch.ui/.classpath
index e850b35..5b88563 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/.classpath
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.diffmerge.patch.ui/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index e6b3171..a0aaeb1 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/plugins/org.eclipse.emf.diffmerge.patch/.classpath
index e850b35..5b88563 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/.classpath
+++ b/plugins/org.eclipse.emf.diffmerge.patch/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.diffmerge.patch/.settings/org.eclipse.jdt.core.prefs
index f42de36..87b7a7a 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.patch/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,13 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch/META-INF/MANIFEST.MF
index b066f3f..3c16a01 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.google.guava;bundle-version="15.0.0",
org.eclipse.xtend.lib
Export-Package: org.eclipse.emf.diffmerge.patch,
diff --git a/pom.xml b/pom.xml
index c693d3b..0c78465 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,4 +25,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml b/releng/org.eclipse.emf.diffmerge.patch.parent/pom.xml
index 85065d0..6c415d0 100644
--- 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.0.0</tycho.version>
+ <tycho.version>1.4.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
- <xtend.compiler.version>2.10.0</xtend.compiler.version>
+ <xtend.compiler.version>2.17.0</xtend.compiler.version>
<cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
- <rcptt.version>2.0.0</rcptt.version>
- <java.version>1.7</java.version>
+ <rcptt.version>2.3.0</rcptt.version>
+ <java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -34,7 +34,7 @@
<sonar.skippedModules></sonar.skippedModules>
<!-- Refresh URL with correct CI build -->
- <core.repo.url>https://hudson.eclipse.org/diffmerge/job/emf-diffmerge-core-master/lastSuccessfulBuild/artifact/releng/org.eclipse.emf.diffmerge.update/target/repository/</core.repo.url>
+ <core.repo.url>https://ci-staging.eclipse.org/diffmerge/job/emf-diffmerge-core-master/lastSuccessfulBuild/artifact/releng/org.eclipse.emf.diffmerge.update/target/repository/</core.repo.url>
<viatra.repository.url>http://download.eclipse.org/viatra/updates/release/1.6.1</viatra.repository.url>
<viatra.compiler.version>1.6.1</viatra.compiler.version>
diff --git a/releng/org.eclipse.emf.diffmerge.patch.parent/toolchains-hipp.xml b/releng/org.eclipse.emf.diffmerge.patch.parent/toolchains-hipp.xml
index fd287be..918424a 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.parent/toolchains-hipp.xml
+++ b/releng/org.eclipse.emf.diffmerge.patch.parent/toolchains-hipp.xml
@@ -6,7 +6,7 @@
</provides>
<configuration>
<!-- Path to JDK; JRE will not work! -->
- <jdkHome>/opt/public/common/jdk1.7.0-latest</jdkHome>
+ <jdkHome>/opt/tools/java/oracle/jdk-7/latest</jdkHome>
<!-- Boot classpath setting is required, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=461239#c5 -->
<bootClassPath>
<includes>
@@ -24,7 +24,7 @@
</provides>
<configuration>
<!-- Path to JDK; JRE will not work! -->
- <jdkHome>/opt/public/common/jdk1.8.0_x64-latest</jdkHome>
+ <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
<!-- Boot classpath setting is required, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=461239#c5 -->
<bootClassPath>
<includes>
diff --git a/releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product b/releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product
index 4d90a58..85e9f20 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product
+++ b/releng/org.eclipse.emf.diffmerge.patch.product/modelpatch_rcp.product
@@ -14,7 +14,6 @@
<windowImages/>
<launcher>
- <solaris/>
<win useIco="false">
<bmp/>
</win>
@@ -54,31 +53,24 @@ Contributors:
<feature id="org.eclipse.help.source"/>
<feature id="org.eclipse.emf.codegen"/>
<feature id="org.eclipse.equinox.p2.core.feature"/>
- <feature id="org.eclipse.cvs.source"/>
<feature id="org.eclipse.rcp.source"/>
- <feature id="org.eclipse.ecf.core.ssl.feature"/>
- <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
<feature id="org.eclipse.gef"/>
<feature id="org.eclipse.draw2d"/>
<feature id="org.eclipse.emf.edit"/>
- <feature id="org.eclipse.ecf.core.ssl.source.feature"/>
<feature id="org.eclipse.emf.transaction"/>
<feature id="org.eclipse.equinox.p2.user.ui.source"/>
<feature id="org.eclipse.emf.codegen.ui"/>
- <feature id="org.eclipse.ecf.core.source.feature"/>
<feature id="org.eclipse.emf.databinding.edit"/>
<feature id="org.eclipse.emf.common.source"/>
<feature id="org.eclipse.jdt.source"/>
<feature id="org.eclipse.emf.codegen.ecore"/>
<feature id="org.eclipse.emf.converter"/>
<feature id="org.eclipse.emf.edit.ui"/>
- <feature id="org.eclipse.cvs"/>
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
<feature id="org.eclipse.ecf.filetransfer.feature"/>
<feature id="org.eclipse.emf.workspace"/>
<feature id="org.eclipse.equinox.p2.rcp.feature.source"/>
<feature id="org.eclipse.emf.ecore.source"/>
- <feature id="org.eclipse.ecf.filetransfer.source.feature"/>
<feature id="org.eclipse.pde"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
<feature id="org.eclipse.equinox.p2.core.feature.source"/>
@@ -88,7 +80,6 @@ Contributors:
<feature id="org.eclipse.platform.source"/>
<feature id="org.eclipse.pde.source"/>
<feature id="org.eclipse.emf.mapping"/>
- <feature id="org.eclipse.ecf.filetransfer.ssl.source.feature"/>
<feature id="org.eclipse.emf.ecore"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
<feature id="org.eclipse.equinox.p2.extras.feature"/>
@@ -97,9 +88,7 @@ Contributors:
<feature id="org.eclipse.gmf.runtime.notation"/>
<feature id="org.eclipse.ecf.core.feature"/>
<feature id="org.eclipse.emf.ecore.editor"/>
- <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature"/>
<feature id="org.eclipse.emf.mapping.ecore.editor"/>
- <feature id="org.eclipse.ecf.filetransfer.httpclient4.source.feature"/>
<feature id="org.eclipse.emf.databinding"/>
<feature id="org.eclipse.emf.ecore.edit"/>
<feature id="org.eclipse.emf.validation"/>
diff --git a/releng/org.eclipse.emf.diffmerge.patch.setup/Modelpatch.setup b/releng/org.eclipse.emf.diffmerge.patch.setup/Modelpatch.setup
index 6c2cc23..be5fcb5 100644
--- a/releng/org.eclipse.emf.diffmerge.patch.setup/Modelpatch.setup
+++ b/releng/org.eclipse.emf.diffmerge.patch.setup/Modelpatch.setup
@@ -16,8 +16,8 @@
label="Model Patch">
<setupTask
xsi:type="jdt:JRETask"
- version="JavaSE-1.7"
- location="${jre.location-1.7}">
+ version="JavaSE-1.8"
+ location="${jre.location-1.8}">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
</setupTask>
<setupTask
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
index 4b5376f..ed40085 100644
--- 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,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF DiffMerge Model Patch" sequenceNumber="1499791752">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="EMF DiffMerge Model Patch" sequenceNumber="1568126316">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.200.v20150602-1417"/>
- <unit id="org.eclipse.platform.sdk" version="4.5.2.M20160212-1500"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.11.2.v20160212-1500"/>
- <unit id="org.eclipse.pde.feature.group" version="3.11.2.v20160212-1500"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.5.2.v20160212-1500"/>
- <unit id="org.eclipse.platform.feature.group" version="4.5.2.v20160212-1500"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>
- <unit id="org.eclipse.gmf.feature.group" version="1.9.0.201506060219"/>
- <unit id="org.eclipse.xtend.feature.group" version="2.1.0.v201505260349"/>
- <unit id="com.google.gson" version="2.2.4.v201311231704"/>
+ <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.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/mars/201602261000/"/>
+ <repository location="http://download.eclipse.org/releases/photon/"/>
</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.1.201708020823"/>
- <repository location="http://download.eclipse.org/viatra/updates/release/1.6.1"/>
+ <unit id="org.eclipse.viatra.transformation.runtime.emf.feature.feature.group" version="1.6.0.201706141007"/>
+ <repository location="http://download.eclipse.org/viatra/updates/release/1.6.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
<repository location="http://download.eclipse.org/cbi/updates/license/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
@@ -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.7"/>
+ <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
</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
index 5e43951..baac1ee 100644
--- 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.7
+environment JavaSE-1.8
with requirements
-location "http://download.eclipse.org/releases/mars/201602261000/" {
+location "http://download.eclipse.org/releases/photon/" {
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/.classpath b/tests/org.eclipse.emf.diffmerge.patch.tests.all/.classpath
index e850b35..5b88563 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.patch.tests.all/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index f2bd1af..02bd578 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/.classpath
index e850b35..5b88563 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/.settings/org.eclipse.jdt.core.prefs
index f42de36..87b7a7a 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,13 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
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
index aafd8b6..73ce5ba 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/.classpath
index e850b35..5b88563 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index c2cd00a..7b767ee 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.performance
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.classpath b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.classpath
index e850b35..5b88563 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index 843e0ee..e1a3363 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.classpath
index e850b35..5b88563 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index 7a36d11..dd1480c 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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/.classpath b/tests/org.eclipse.emf.diffmerge.patch.tests/.classpath
index e850b35..5b88563 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.patch.tests/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
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
index 2aa4da9..5ac41b7 100644
--- 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.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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

Back to the top