Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2011-05-19 09:55:22 +0000
committerMarkus Knauer2011-05-19 09:55:22 +0000
commit96d86d70a9d222cce58e803efcf42a467edc62df (patch)
tree617e52f5755609103bbce706a37a8ba8ab96d7b2 /packages/org.eclipse.epp.package.javascript.feature
parentcb861f640c0076cef2cdf0b9201ca3becc84d469 (diff)
downloadorg.eclipse.epp.packages-96d86d70a9d222cce58e803efcf42a467edc62df.tar.gz
org.eclipse.epp.packages-96d86d70a9d222cce58e803efcf42a467edc62df.tar.xz
org.eclipse.epp.packages-96d86d70a9d222cce58e803efcf42a467edc62df.zip
* all: Bug 346410 - Indigo license update of all EPP packages
Diffstat (limited to 'packages/org.eclipse.epp.package.javascript.feature')
-rw-r--r--packages/org.eclipse.epp.package.javascript.feature/feature.properties5
-rw-r--r--packages/org.eclipse.epp.package.javascript.feature/license.html3
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/org.eclipse.epp.package.javascript.feature/feature.properties b/packages/org.eclipse.epp.package.javascript.feature/feature.properties
index c6c60e8e..63f2b749 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/feature.properties
+++ b/packages/org.eclipse.epp.package.javascript.feature/feature.properties
@@ -30,7 +30,7 @@ It also include support and tools for Databases and team collaboration.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2010 IBM Corporation and others.\n\
+Copyright (c) 2011 IBM Corporation and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -48,7 +48,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\
@@ -117,6 +117,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/packages/org.eclipse.epp.package.javascript.feature/license.html b/packages/org.eclipse.epp.package.javascript.feature/license.html
index c184ca36..f19c483b 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/license.html
+++ b/packages/org.eclipse.epp.package.javascript.feature/license.html
@@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
+<p>February 1, 2011</p>
<h3>Usage Of Content</h3>
@@ -58,6 +58,7 @@ that directory.</p>
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

Back to the top