Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivian Kong2011-05-24 10:34:28 -0400
committerVivian Kong2011-05-24 10:34:28 -0400
commit356e6cf4b29b6cb290238081ac5393722025f166 (patch)
tree26e3e27e1d96aa368915dc4aa2d9ad074f59ea38 /upc/org.eclipse.cdt.bupc-feature
parent9a867fd85ee33a2dcd623b5c49b94e686dd5af9d (diff)
downloadorg.eclipse.cdt-356e6cf4b29b6cb290238081ac5393722025f166.tar.gz
org.eclipse.cdt-356e6cf4b29b6cb290238081ac5393722025f166.tar.xz
org.eclipse.cdt-356e6cf4b29b6cb290238081ac5393722025f166.zip
Bug 346568 - Update licenses for Indigo
Diffstat (limited to 'upc/org.eclipse.cdt.bupc-feature')
-rw-r--r--upc/org.eclipse.cdt.bupc-feature/feature.properties3
-rw-r--r--upc/org.eclipse.cdt.bupc-feature/feature.xml4
-rw-r--r--upc/org.eclipse.cdt.bupc-feature/license.html3
3 files changed, 7 insertions, 3 deletions
diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.properties b/upc/org.eclipse.cdt.bupc-feature/feature.properties
index d4dbeea5bb..5743aad4fb 100644
--- a/upc/org.eclipse.cdt.bupc-feature/feature.properties
+++ b/upc/org.eclipse.cdt.bupc-feature/feature.properties
@@ -42,7 +42,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\
@@ -111,6 +111,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/upc/org.eclipse.cdt.bupc-feature/feature.xml b/upc/org.eclipse.cdt.bupc-feature/feature.xml
index 46059ab3eb..07c2c17270 100644
--- a/upc/org.eclipse.cdt.bupc-feature/feature.xml
+++ b/upc/org.eclipse.cdt.bupc-feature/feature.xml
@@ -4,7 +4,9 @@
label="%featureName"
version="1.0.3.qualifier"
provider-name="%providerName"
- plugin="org.eclipse.cdt.managedbuilder.bupc.ui">
+ plugin="org.eclipse.cdt.managedbuilder.bupc.ui"
+ license-feature="org.eclipse.cdt.license"
+ license-feature-version="1.0.0.qualifier">
<description>
%description
diff --git a/upc/org.eclipse.cdt.bupc-feature/license.html b/upc/org.eclipse.cdt.bupc-feature/license.html
index c184ca36a9..f19c483b9c 100644
--- a/upc/org.eclipse.cdt.bupc-feature/license.html
+++ b/upc/org.eclipse.cdt.bupc-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