Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Constant2018-09-07 04:57:41 -0400
committerOlivier Constant2018-09-07 10:27:43 -0400
commit7b0d16d99b5a230af0e14d2d15766faeb2dc482c (patch)
tree6da33ae5cad3796ff24c67eb957bb308370923b5 /tests
parent306529ac44c8e6fc0398de8048d2f7865c2b253e (diff)
downloadorg.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.tar.gz
org.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.tar.xz
org.eclipse.emf.diffmerge.patch-7b0d16d99b5a230af0e14d2d15766faeb2dc482c.zip
Bug 535213 - Switch to EPL-2.0
Change-Id: Iaff61bc806c4918e58f96ce865d69940cfb3cf78 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/about.html26
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/build.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml11
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend9
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend9
64 files changed, 370 insertions, 288 deletions
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 902a23b..f2bd1af 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
@@ -20,4 +20,5 @@ Require-Bundle: com.google.guava,
org.eclipse.emf.diffmerge.patch.tests.persistence.emf;bundle-version="[0.1.0,0.2.0)"
Import-Package: org.apache.log4j;version="1.2.0"
Bundle-Vendor: %providerName
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.all
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties
index 8617b2f..d0cc9a2 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties
index d1a2ce7..6035930 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch All Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend
index f6627cd..ba4c570 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.all/src/org/eclipse/emf/diffmerge/patch/tests/all/RunAllTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
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 dd4d679..aafd8b6 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
@@ -25,3 +25,4 @@ Require-Bundle: com.google.guava;bundle-version="15.0.0",
org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
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.emf/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties
index 20a532d..836a07d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem
index 034b58b..a15d03e 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_modified.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem
index 1745b5e..6a85592 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo2_original.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem
index acc8a9a..513a7ac 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_modified.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem
index 9650842..43829d7 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_original.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem
index badc5a3..16c6e00 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTree.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem
index a69a848..cb4b910 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceFromOut.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem
index 50d7860..46e5560 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withExtraContainmentTreeAndReferenceToOut.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem
index 6bf13b1..4cdde17 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/model/demo_withModifiedRefWhichHasEOpposite.cyberphysicalsystem
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties
index 25875e8..9770ca7 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch EMF Support Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml
index a057286..4a65fa4 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend
index 4e0e2df..0213638 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchApplierTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend
index bd9a37c..292fabe 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/CPSModelPatchTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend
index 8d3dff5..962cd3d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFDiffMergeTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend
index 1c9083d..7f3679e 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelAccessTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend
index 7dfdb33..99b03f3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/EMFModelPatchMetadataTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend
index 9d592b8..2ce272d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchApplierSmokeTests.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend
index f36d197..00c7f0f 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchEmfTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend
index 4a0728f..7c8f60f 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchExporterTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend
index 388422e..293b5ed 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchRecorderTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java
index a5cd77e..75528d4 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/ModelPatchScalerTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Balazs Grill, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java
index 6baf67e..105464a 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/EMFIdentifierProviderTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java
index 51cb9e5..6414708 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifiedEMFObjectLocatorTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java
index 62ad3ae..cf8cbb7 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.emf/src/org/eclipse/emf/diffmerge/patch/tests/emf/identifier/IdentifierTestSuite.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
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 2a0987d..c2cd00a 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
@@ -24,3 +24,4 @@ Require-Bundle: org.junit;bundle-version="4.12.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
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.performance
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties
index cb502e4..7aa9f45 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties
index a49b113..d76e460 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch Performance Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml
index 4dfe82a..e9dd196 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java
index d2a974b..aa11a49 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/CpsModelLoader.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend
index 2720273..7297e00 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.performance/src/org/eclipse/emf/diffmerge/patch/tests/performance/ModelPatchPerformanceTests.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk (IncQuery Labs Ltd.) - initial API and implementation
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 f240da6..843e0ee 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
@@ -12,3 +12,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)"
Bundle-Vendor: %providerName
Export-Package: org.eclipse.emf.diffmerge.patch.tests.persistence.emf
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.persistence.emf
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties
index 909ef3f..89387f3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties
index 8cf3b92..a41a02d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch EMF Persistence Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml
index 7505279..d41345f 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java
index 7e60ea5..abe4abf 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/BaseModelPatchPersistenceEMFTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java
index ebabb58..8c5e5a2 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend
index 7b5d49a..56a9276 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchPersistenceEMFTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend
index 769470d..1dcb990 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.emf/src/org/eclipse/emf/diffmerge/patch/tests/persistence/emf/ModelPatchSerializerEMFTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
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 a1dee48..7a36d11 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
@@ -10,3 +10,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)"
Bundle-Vendor: %providerName
Export-Package: org.eclipse.emf.diffmerge.patch.tests.persistence.json
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests.persistence.json
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties
index 909ef3f..89387f3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties
index 9d5068f..da2c34e 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch JSON Persistence Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml
index 481bc2b..6519182 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java
index 3fef874..1eb99c0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTest.java
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend
index 2e43c30..fc0b6c3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.persistence.json/src/org/eclipse/emf/diffmerge/patch/tests/persistence/json/ModelPatchPersistenceJsonTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml
index 8cab5b9..19793b0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/pom.xml
@@ -1,9 +1,10 @@
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
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 c8154e6..2aa4da9 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
@@ -9,3 +9,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.xtend.lib
Bundle-Vendor: %providerName
Export-Package: org.eclipse.emf.diffmerge.patch.tests
+Automatic-Module-Name: org.eclipse.emf.diffmerge.patch.tests
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/about.html b/tests/org.eclipse.emf.diffmerge.patch.tests/about.html
index d8e1984..720a1d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/about.html
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/about.html
@@ -1,21 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
</head>
<body lang="EN-US">
<h2>About This Content</h2>
-<p>June 5, 2007</p>
+<p>August 17, 2018</p>
<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties b/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
index 909ef3f..89387f3 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/build.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties b/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
index ad5c98c..b27cc40 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/plugin.properties
@@ -1,9 +1,10 @@
###############################################################################
# Copyright (c) 2016-2017 Thales Global Services S.A.S.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
pluginName = Model Patch Tests Plug-In (Incubation)
providerName = Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml b/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
index 47d71cd..5d6831a 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/pom.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2016-2017 Thales Global Services S.A.S.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2016-2017 Thales Global Services S.A.S.
+ This program and the accompanying materials are made
+ available under the terms of the Eclipse Public License 2.0
+ which is available at https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend
index 7ae4369..080ea5d 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/BasicReverseModelPatchTests.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend
index 999dd65..4c85a45 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ComplexReverseModelPatchTest.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend
index 96b6b7c..553c2e5 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchFilterTest.xtend
@@ -1,9 +1,10 @@
/**
* Copyright (c) 2016-2017 Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus (IncQuery Labs Ltd.) - initial API and implementation
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend
index e5f9417..ed849d0 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests/src/org/eclipse/emf/diffmerge/patch/tests/ModelPatchTestSuite.xtend
@@ -1,9 +1,10 @@
/*******************************************************************************
* Copyright (c) 2016-2017, Thales Global Services S.A.S.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Abel Hegedus, Tamas Borbas, Peter Lunk, Daniel Segesdi (IncQuery Labs Ltd.) - initial API and implementation

Back to the top