From 4a0e75bbefb01d606e6c147a34a2f84a93d13a81 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Mon, 14 Mar 2011 22:57:55 +0000
Subject: [PATCH] Bug 339954 - [releng] Update the SUA in the features to the
latest version
---
releng/org.eclipse.rse.build/template/notice.html | 3 ++-
.../rootfiles/notice.html | 3 ++-
.../rootfiles/notice.html | 3 ++-
.../org.eclipse.rse.tests-feature/rootfiles/notice.html | 3 ++-
.../feature.properties | 7 ++++---
terminal/org.eclipse.tm.terminal.test-feature/license.html | 3 ++-
.../rootfiles/notice.html | 3 ++-
7 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/releng/org.eclipse.rse.build/template/notice.html b/releng/org.eclipse.rse.build/template/notice.html
index c184ca36a99..f19c483b9c8 100644
--- a/releng/org.eclipse.rse.build/template/notice.html
+++ b/releng/org.eclipse.rse.build/template/notice.html
@@ -8,7 +8,7 @@
Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
Usage Of Content
@@ -58,6 +58,7 @@ that directory.
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/releng/org.eclipse.tm.releng.master-feature/rootfiles/notice.html b/releng/org.eclipse.tm.releng.master-feature/rootfiles/notice.html
index c184ca36a99..f19c483b9c8 100644
--- a/releng/org.eclipse.tm.releng.master-feature/rootfiles/notice.html
+++ b/releng/org.eclipse.tm.releng.master-feature/rootfiles/notice.html
@@ -8,7 +8,7 @@
Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
Usage Of Content
@@ -58,6 +58,7 @@ that directory.
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/releng/org.eclipse.tm.releng.test-feature/rootfiles/notice.html b/releng/org.eclipse.tm.releng.test-feature/rootfiles/notice.html
index c184ca36a99..f19c483b9c8 100644
--- a/releng/org.eclipse.tm.releng.test-feature/rootfiles/notice.html
+++ b/releng/org.eclipse.tm.releng.test-feature/rootfiles/notice.html
@@ -8,7 +8,7 @@
Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
Usage Of Content
@@ -58,6 +58,7 @@ that directory.
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/rse/tests/org.eclipse.rse.tests-feature/rootfiles/notice.html b/rse/tests/org.eclipse.rse.tests-feature/rootfiles/notice.html
index c184ca36a99..f19c483b9c8 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/rootfiles/notice.html
+++ b/rse/tests/org.eclipse.rse.tests-feature/rootfiles/notice.html
@@ -8,7 +8,7 @@
Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
Usage Of Content
@@ -58,6 +58,7 @@ that directory.
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/feature.properties b/terminal/org.eclipse.tm.terminal.test-feature/feature.properties
index d6a7baf6537..e32513a2fcf 100644
--- a/terminal/org.eclipse.tm.terminal.test-feature/feature.properties
+++ b/terminal/org.eclipse.tm.terminal.test-feature/feature.properties
@@ -43,7 +43,7 @@ licenseURL=license.html
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,10 +51,10 @@ THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
@@ -112,6 +112,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/license.html b/terminal/org.eclipse.tm.terminal.test-feature/license.html
index c184ca36a99..f19c483b9c8 100644
--- a/terminal/org.eclipse.tm.terminal.test-feature/license.html
+++ b/terminal/org.eclipse.tm.terminal.test-feature/license.html
@@ -8,7 +8,7 @@
Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
Usage Of Content
@@ -58,6 +58,7 @@ that directory.
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/terminal/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html b/terminal/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html
index c184ca36a99..f19c483b9c8 100644
--- a/terminal/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html
+++ b/terminal/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html
@@ -8,7 +8,7 @@
Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
Usage Of Content
@@ -58,6 +58,7 @@ that directory.
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):