Bug 386977 - org.eclipse.pde.api.tools.ee.feature has no license or copyright
diff --git a/apitools/org.eclipse.pde.api.tools.ee.feature/feature.properties b/apitools/org.eclipse.pde.api.tools.ee.feature/feature.properties
index 8b7698a..5252131 100644
--- a/apitools/org.eclipse.pde.api.tools.ee.feature/feature.properties
+++ b/apitools/org.eclipse.pde.api.tools.ee.feature/feature.properties
@@ -35,105 +35,4 @@
 \n\
 Contributors:\n\
     IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-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\
-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\
-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\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-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\
-    - 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\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
\ No newline at end of file
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.ee.feature/feature.xml b/apitools/org.eclipse.pde.api.tools.ee.feature/feature.xml
index 09d18a8..8755a89 100644
--- a/apitools/org.eclipse.pde.api.tools.ee.feature/feature.xml
+++ b/apitools/org.eclipse.pde.api.tools.ee.feature/feature.xml
@@ -3,24 +3,22 @@
       id="org.eclipse.pde.api.tools.ee.feature"
       label="%featureName"
       version="1.0.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
 
-   <description url="http://www.example.com/description">
+   <description>
       %description
    </description>
 
-   <copyright url="http://www.example.com/copyright">
+   <copyright>
       %copyright
    </copyright>
 
-   <license url="http://www.eclipse.org/org/documents/epl-v10.php">
+   <license url="%licenseURL">
       %license
    </license>
 
-   <url>
-      <update label="API Tools Execution Environment Descriptions" url="http://www.eclipse.org/pde/pde-api-tools/updates/"/>
-   </url>
-
    <plugin
          id="org.eclipse.pde.api.tools.ee.cdcfoundation10"
          download-size="0"
diff --git a/apitools/org.eclipse.pde.api.tools.ee.feature/p2.inf b/apitools/org.eclipse.pde.api.tools.ee.feature/p2.inf
deleted file mode 100644
index f3012e1..0000000
--- a/apitools/org.eclipse.pde.api.tools.ee.feature/p2.inf
+++ /dev/null
@@ -1,216 +0,0 @@
-units.1.id=org.eclipse.pde.api.tools.ee.fragments
-units.1.version=1.0.0.$qualifier$
-units.1.properties.1.name=org.eclipse.equinox.p2.name
-units.1.properties.1.value=API Tools Execution Environment Descriptions
-units.1.properties.2.name=org.eclipse.equinox.p2.type.category
-units.1.properties.2.value=true
-units.1.properties.3.name=org.elcipse.equinox.p2.description
-units.1.properties.3.value=API Tools Execution Environment Descriptions for the following environments: \n\
-JRE-1.1, J2SE-1.2, J2SE-1.3, J2SE-1.4, J2SE-1.5, JavaSE-1.6, JavaSE-1.7, \
-CDC-1.0/Foundation-1.0, CDC-1.1/Foundation-1.1, \
-OSGi/Minimum-1.0, OSGi/Minimum-1.1, OSGi/Minimum-1.2
-
-units.1.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation10.group
-units.1.requires.1.range=[$version$,$version$]
-units.1.requires.1.greedy=true
-units.1.requires.2.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.2.name=org.eclipse.pde.api.tools.ee.cdcfoundation11.group
-units.1.requires.2.range=[$version$,$version$]
-units.1.requires.2.greedy=true
-units.1.requires.3.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.3.name=org.eclipse.pde.api.tools.ee.cdcfoundation11.group
-units.1.requires.3.range=[$version$,$version$]
-units.1.requires.3.greedy=true
-units.1.requires.4.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.4.name=org.eclipse.pde.api.tools.ee.j2se13.group
-units.1.requires.4.range=[$version$,$version$]
-units.1.requires.4.greedy=true
-units.1.requires.5.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.5.name=org.eclipse.pde.api.tools.ee.j2se14.group
-units.1.requires.5.range=[$version$,$version$]
-units.1.requires.5.greedy=true
-units.1.requires.6.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.6.name=org.eclipse.pde.api.tools.ee.j2se15.group
-units.1.requires.6.range=[$version$,$version$]
-units.1.requires.6.greedy=true
-units.1.requires.7.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.7.name=org.eclipse.pde.api.tools.ee.javase16.group
-units.1.requires.7.range=[$version$,$version$]
-units.1.requires.7.greedy=true
-units.1.requires.8.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.8.name=org.eclipse.pde.api.tools.ee.jre11.group
-units.1.requires.8.range=[$version$,$version$]
-units.1.requires.8.greedy=true
-units.1.requires.9.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.9.name=org.eclipse.pde.api.tools.ee.osgiminimum10.group
-units.1.requires.9.range=[$version$,$version$]
-units.1.requires.9.greedy=true
-units.1.requires.10.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.10.name=org.eclipse.pde.api.tools.ee.osgiminimum11.group
-units.1.requires.10.range=[$version$,$version$]
-units.1.requires.10.greedy=true
-units.1.requires.11.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.11.name=org.eclipse.pde.api.tools.ee.osgiminimum12.group
-units.1.requires.11.range=[$version$,$version$]
-units.1.requires.11.greedy=true
-units.1.requires.12.namespace=org.eclipse.equinox.p2.iu
-units.1.requires.12.name=org.eclipse.pde.api.tools.ee.javase17.group						 
-units.1.requires.12.range=[$version$,$version$]
-units.1.requires.12.greedy=true
-
-units.2.id=org.eclipse.pde.api.tools.ee.cdcfoundation10.group
-units.2.version=$version$
-units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.2.provides.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation10.group
-units.2.provides.1.version=$version$
-units.2.properties.1.name=org.eclipse.equinox.p2.name
-units.2.properties.1.value=CDC-1.0/Foundation-1.0 Execution Environment Description 
-units.2.properties.2.name=org.eclipse.equinox.p2.type.group
-units.2.properties.2.value=true
-units.2.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.2.requires.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation10
-units.2.requires.1.greedy=true
-
-units.3.id=org.eclipse.pde.api.tools.ee.cdcfoundation11.group
-units.3.version=$version$
-units.3.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.3.provides.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation11.group
-units.3.provides.1.version=$version$
-units.3.properties.1.name=org.eclipse.equinox.p2.name
-units.3.properties.1.value=CDC-1.1/Foundation-1.1 Execution Environment Description
-units.3.properties.2.name=org.eclipse.equinox.p2.type.group
-units.3.properties.2.value=true
-units.3.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.3.requires.1.name=org.eclipse.pde.api.tools.ee.cdcfoundation11
-units.3.requires.1.greedy=true
-
-units.4.id=org.eclipse.pde.api.tools.ee.j2se12.group
-units.4.version=$version$
-units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.4.provides.1.name=org.eclipse.pde.api.tools.ee.j2se12.group
-units.4.provides.1.version=$version$
-units.4.properties.1.name=org.eclipse.equinox.p2.name
-units.4.properties.1.value=J2SE-1.2 Execution Environment Description 
-units.4.properties.2.name=org.eclipse.equinox.p2.type.group
-units.4.properties.2.value=true
-units.4.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.4.requires.1.name=org.eclipse.pde.api.tools.ee.j2se12
-units.4.requires.1.greedy=true
-
-units.5.id=org.eclipse.pde.api.tools.ee.j2se13.group
-units.5.version=$version$
-units.5.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.5.provides.1.name=org.eclipse.pde.api.tools.ee.j2se13.group
-units.5.provides.1.version=$version$
-units.5.properties.1.name=org.eclipse.equinox.p2.name
-units.5.properties.1.value=J2SE-1.3 Execution Environment Description 
-units.5.properties.2.name=org.eclipse.equinox.p2.type.group
-units.5.properties.2.value=true
-units.5.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.5.requires.1.name=org.eclipse.pde.api.tools.ee.j2se13
-units.5.requires.1.greedy=true
-
-units.6.id=org.eclipse.pde.api.tools.ee.j2se14.group
-units.6.version=$version$
-units.6.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.6.provides.1.name=org.eclipse.pde.api.tools.ee.j2se14.group
-units.6.provides.1.version=$version$
-units.6.properties.1.name=org.eclipse.equinox.p2.name
-units.6.properties.1.value=J2SE-1.4 Execution Environment Description 
-units.6.properties.2.name=org.eclipse.equinox.p2.type.group
-units.6.properties.2.value=true
-units.6.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.6.requires.1.name=org.eclipse.pde.api.tools.ee.j2se14
-units.6.requires.1.greedy=true
-
-units.7.id=org.eclipse.pde.api.tools.ee.j2se15.group
-units.7.version=$version$
-units.7.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.7.provides.1.name=org.eclipse.pde.api.tools.ee.j2se15.group
-units.7.provides.1.version=$version$
-units.7.properties.1.name=org.eclipse.equinox.p2.name
-units.7.properties.1.value=J2SE-1.5 Execution Environment Description 
-units.7.properties.2.name=org.eclipse.equinox.p2.type.group
-units.7.properties.2.value=true
-units.7.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.7.requires.1.name=org.eclipse.pde.api.tools.ee.j2se15
-units.7.requires.1.greedy=true
-
-units.8.id=org.eclipse.pde.api.tools.ee.javase16.group
-units.8.version=$version$
-units.8.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.8.provides.1.name=org.eclipse.pde.api.tools.ee.javase16.group
-units.8.provides.1.version=$version$
-units.8.properties.1.name=org.eclipse.equinox.p2.name
-units.8.properties.1.value=JavaSE-1.6 Execution Environment Description
-units.8.properties.2.name=org.eclipse.equinox.p2.type.group
-units.8.properties.2.value=true
-units.8.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.8.requires.1.name=org.eclipse.pde.api.tools.ee.javase16
-units.8.requires.1.greedy=true
-
-units.9.id=org.eclipse.pde.api.tools.ee.jre11.group
-units.9.version=$version$
-units.9.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.9.provides.1.name=org.eclipse.pde.api.tools.ee.jre11.group
-units.9.provides.1.version=$version$
-units.9.properties.1.name=org.eclipse.equinox.p2.name
-units.9.properties.1.value=JRE-1.1 Execution Environment Description
-units.9.properties.2.name=org.eclipse.equinox.p2.type.group
-units.9.properties.2.value=true
-units.9.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.9.requires.1.name=org.eclipse.pde.api.tools.ee.jre11
-units.9.requires.1.greedy=true
-
-units.10.id=org.eclipse.pde.api.tools.ee.osgiminimum10.group
-units.10.version=$version$
-units.10.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.10.provides.1.name=org.eclipse.pde.api.tools.ee.osgiminimum10.group
-units.10.provides.1.version=$version$
-units.10.properties.1.name=org.eclipse.equinox.p2.name
-units.10.properties.1.value=OSGi/Minimum-1.0 Execution Environment Description
-units.10.properties.2.name=org.eclipse.equinox.p2.type.group
-units.10.properties.2.value=true
-units.10.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.10.requires.1.name=org.eclipse.pde.api.tools.ee.osgiminimum10
-units.10.requires.1.greedy=true
-
-units.11.id=org.eclipse.pde.api.tools.ee.osgiminimum11.group
-units.11.version=$version$
-units.11.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.11.provides.1.name=org.eclipse.pde.api.tools.ee.osgiminimum11.group
-units.11.provides.1.version=$version$
-units.11.properties.1.name=org.eclipse.equinox.p2.name
-units.11.properties.1.value=OSGi/Minimum-1.1 Execution Environment Description
-units.11.properties.2.name=org.eclipse.equinox.p2.type.group
-units.11.properties.2.value=true
-units.11.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.11.requires.1.name=org.eclipse.pde.api.tools.ee.osgiminimum11
-units.11.requires.1.greedy=true
-
-units.12.id=org.eclipse.pde.api.tools.ee.osgiminimum12.group
-units.12.version=$version$
-units.12.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.12.provides.1.name=org.eclipse.pde.api.tools.ee.osgiminimum12.group
-units.12.provides.1.version=$version$
-units.12.properties.1.name=org.eclipse.equinox.p2.name
-units.12.properties.1.value=OSGi/Minimum-1.2 Execution Environment Description 
-units.12.properties.2.name=org.eclipse.equinox.p2.type.group
-units.12.properties.2.value=true
-units.12.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.12.requires.1.name=org.eclipse.pde.api.tools.ee.osgiminimum12
-units.12.requires.1.greedy=true
-
-units.13.id=org.eclipse.pde.api.tools.ee.javase17.group
-units.13.version=$version$
-units.13.provides.1.namespace=org.eclipse.equinox.p2.iu
-units.13.provides.1.name=org.eclipse.pde.api.tools.ee.javase17.group
-units.13.provides.1.version=$version$
-units.13.properties.1.name=org.eclipse.equinox.p2.name
-units.13.properties.1.value=JavaSE-1.7 Execution Environment Description 
-units.13.properties.2.name=org.eclipse.equinox.p2.type.group
-units.13.properties.2.value=true
-units.13.requires.1.namespace=org.eclipse.equinox.p2.iu
-units.13.requires.1.name=org.eclipse.pde.api.tools.ee.javase17
-units.13.requires.1.greedy=true