Skip to main content
summaryrefslogtreecommitdiffstats
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/org.eclipse.emf.diffmerge.patch.tests.all
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/org.eclipse.emf.diffmerge.patch.tests.all')
-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
5 files changed, 31 insertions, 23 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

Back to the top