Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2019-09-01 05:15:39 +0000
committerEd Merks2019-09-01 05:15:39 +0000
commit4a8cad6bfc5d1841e6e59c6a131fa67d7c6e4212 (patch)
treeecc70ade727c1a49ecb24ae3d854e8c4338231b8 /packages/org.eclipse.epp.package.testing
parent03a7a88d6455ebe25a3ce739c21a117b83f9a943 (diff)
downloadorg.eclipse.epp.packages-4a8cad6bfc5d1841e6e59c6a131fa67d7c6e4212.tar.gz
org.eclipse.epp.packages-4a8cad6bfc5d1841e6e59c6a131fa67d7c6e4212.tar.xz
org.eclipse.epp.packages-4a8cad6bfc5d1841e6e59c6a131fa67d7c6e4212.zip
Bug 550628 - Migrate EPP to consistently use EPL 2.0 and SUA 2.0
Change each about.html to the 2.0 version. Change all copyright headers in all file types with references to EPL 2.0, including the copyright property in each feature.properties. Remove all epl-v10.html files and the one EPL-v2.0.html file; the appropriate license file is provided by the license feature resolution during the build. Remove references to the license file from the build.properties of each feature. Change each *.product file to embed a correct version of SUA 2.0 Change-Id: I0c2507d10520a65ff7fc45d8e9ee7aecfcc4ac1b Signed-off-by: Ed Merks <ed.merks@gmail.com>
Diffstat (limited to 'packages/org.eclipse.epp.package.testing')
-rw-r--r--packages/org.eclipse.epp.package.testing/about.html40
-rw-r--r--packages/org.eclipse.epp.package.testing/about.properties4
-rw-r--r--packages/org.eclipse.epp.package.testing/plugin.properties4
3 files changed, 28 insertions, 20 deletions
diff --git a/packages/org.eclipse.epp.package.testing/about.html b/packages/org.eclipse.epp.package.testing/about.html
index e6ecf1e5..0ef194fe 100644
--- a/packages/org.eclipse.epp.package.testing/about.html
+++ b/packages/org.eclipse.epp.package.testing/about.html
@@ -6,23 +6,31 @@
<title>About</title>
</head>
<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2011</p>
-<h3>License</h3>
+ <h2>About This Content</h2>
-<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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+ <p>November 30, 2017</p>
+ <h3>License</h3>
-<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>
+ 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="http://www.eclipse.org/legal/epl-2.0">http://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>
</body>
-</html>
+</html> \ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.testing/about.properties b/packages/org.eclipse.epp.package.testing/about.properties
index 35b2bef9..575098ca 100644
--- a/packages/org.eclipse.epp.package.testing/about.properties
+++ b/packages/org.eclipse.epp.package.testing/about.properties
@@ -1,9 +1,9 @@
###############################################################################
# Copyright (c) 2000, 2019 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
#
# Contributors:
# IBM Corporation - initial API and implementation
diff --git a/packages/org.eclipse.epp.package.testing/plugin.properties b/packages/org.eclipse.epp.package.testing/plugin.properties
index 759e1162..977af3d7 100644
--- a/packages/org.eclipse.epp.package.testing/plugin.properties
+++ b/packages/org.eclipse.epp.package.testing/plugin.properties
@@ -1,9 +1,9 @@
###############################################################################
# Copyright (c) 2000, 2016 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
#
# Contributors:
# IBM Corporation - initial API and implementation

Back to the top