Merge branch 'stable-5.0'

* stable-5.0: Fix description property in feature.properties of pgm source feature Update SUA Change-Id: I891a7b8b922ecae49872eb642d6917e8c85c2f51 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
7 years ago · cc0ba3b82d
14 changed files with 2184 additions and 1477 deletions
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
@ -35,125 +35,143 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+\n\
 November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+AGREEMENTS 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 OF ANY\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+MAY NOT USE THE CONTENT.\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+"Program" will mean the Content.\n\
-\n\
+\n\
-Content includes, but is not limited to, source code, object code,\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+("Repository") in software modules ("Modules") and made available as\n\
-as downloadable archives ("Downloads").\n\
+downloadable archives ("Downloads").\n\
-\n\
+\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
+-   Content may be structured and packaged into modules to facilitate\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+    features ("Features").\n\
-         in a directory named "plugins".\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+    Fragments associated with that Feature.\n\
-\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
+    version numbers of Included Features.\n\
-conditions governing Features and Included Features should be contained\n\
+\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
-Licenses may be located in any directory of a Download or Module\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
-including, but not limited to the following locations:\n\
+and Included Features should be contained in files named "license.html"\n\
-\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
-       - The top-level (root) directory\n\
+directory of a Download or Module including, but not limited to the following\n\
-       - Plug-in and Fragment directories\n\
+locations:\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
+\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   The top-level (root) directory\n\
-       - Feature directories\n\
+-   Plug-in and Fragment directories\n\
-\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+-   Feature directories\n\
-Update License") during the installation process. If the Feature contains\n\
+\n\
-Included Features, the Feature Update License should either provide you\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
-with the terms and conditions governing the Included Features or inform\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
+("Feature Update License") during the installation process. If the Feature\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
+contains Included Features, the Feature Update License should either provide you\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+with the terms and conditions governing the Included Features or inform you\n\
-terms and conditions (or references to such terms and conditions) that\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
-govern your use of the associated Content in that directory.\n\
+property of files named "feature.properties" found within a Feature. Such\n\
-\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+the associated Content in that directory.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
-\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
-\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+-   Common Public License Version 1.0 (available at\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
-govern that particular Content.\n\
+-   Apache Software License 1.1 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE)\n\
-\n\Use of Provisioning Technology\n\
+-   Apache Software License 2.0 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+-   Mozilla Public License Version 1.1 (available at\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
+\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
-Information about packaging Installable Software is available at\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
 conditions govern that particular Content.\n\
 \n\
 Use of Provisioning Technology\n\
 \n\
 The Eclipse Foundation makes available provisioning software, examples of which\n\
 include, but are not limited to, p2 and the Eclipse Update Manager\n\
 ("Provisioning Technology") for the purpose of allowing users to install\n\
 software, documentation, information and/or other materials (collectively\n\
 "Installable Software"). This capability is provided with the intent of allowing\n\
 such users to install, extend and update Eclipse-based products. Information\n\
 about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You may use Provisioning Technology to allow other parties to install\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+license agreements relating to the Installable Software to be presented to, and\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+available in accordance with the Specification, you further acknowledge your\n\
-\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+following:\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+    intent of installing, extending or updating the functionality of an\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+    Eclipse-based product.\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+    the Target Machine.\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
-          of the Installable Software.\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
    Installable Software Agreement must inform the user of the terms and\n\
    conditions that govern the Installable Software and must solicit acceptance\n\
    by the end user in the manner prescribed in such Installable\n\
    Software Agreement. Upon such indication of agreement by the user, the\n\
    provisioning Technology will complete installation of the\n\
    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
+Content may contain encryption software. The country in which you are currently\n\
-currently may have restrictions on the import, possession, and use,\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
-using any encryption software, please check the country's laws,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
-regulations and policies concerning the import, possession, or use, and\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
-re-export of encryption software, to see if this is permitted.\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
 United States, other countries, or both.\n
 ########### end of license property ##########################################
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/license.html
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/license.html
@ -1,106 +1,189 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<head>
-
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
+	<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
+	<p>November 22, 2017</p>
-
+
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
-
+
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-<h3>Applicable Licenses</h3>
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-   For purposes of the EPL, "Program" will mean the Content.</p>
+		USE THE CONTENT.</p>
-
+
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+	<h3>Applicable Licenses</h3>
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
-
+	<p>
-<ul>
+		Unless otherwise indicated, all Content made available by the Eclipse
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+		Foundation is provided to you under the terms and conditions of the
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+		EPL is provided with this Content and is also available at <a
-      and/or Fragments associated with that Feature.</li>
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-</ul>
+	</p>
-
+
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+	<p>Content includes, but is not limited to, source code, object
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+		code, documentation and other files maintained in the Eclipse
-including, but not limited to the following locations:</p>
+		Foundation source code repository (&quot;Repository&quot;) in software
-
+		modules (&quot;Modules&quot;) and made available as downloadable
-<ul>
+		archives (&quot;Downloads&quot;).</p>
-       <li>The top-level (root) directory</li>
+
-       <li>Plug-in and Fragment directories</li>
+	<ul>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Content may be structured and packaged into modules to
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+			facilitate delivering, extending, and upgrading the Content. Typical
-       <li>Feature directories</li>
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
-</ul>
+			fragments (&quot;Fragments&quot;), and features
-
+			(&quot;Features&quot;).</li>
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+			or JAR (Java&trade; ARchive) in a directory named
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+			&quot;plugins&quot;.</li>
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+		<li>A Feature is a bundle of one or more Plug-ins and/or
-that directory.</p>
+			Fragments and associated material. Each Feature may be packaged as a
-
+			sub-directory in a directory named &quot;features&quot;. Within a
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+			Feature, files named &quot;feature.xml&quot; may contain a list of
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+			the names and version numbers of the Plug-ins and/or Fragments
-
+			associated with that Feature.</li>
-<ul>
+		<li>Features may also include other Features (&quot;Included
-       <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>
+			Features&quot;). Within a Feature, files named
-       <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>
+			&quot;feature.xml&quot; may contain a list of the names and version
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+			numbers of Included Features.</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>
+	</ul>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+
-</ul>
+	<p>The terms and conditions governing Plug-ins and Fragments should
-
+		be contained in files named &quot;about.html&quot;
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+		Included Features should be contained in files named
-
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
-
+		Feature Licenses may be located in any directory of a Download or
-<h3>Use of Provisioning Technology</h3>
+		Module including, but not limited to the following locations:</p>
-
+
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+	<ul>
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+		<li>The top-level (root) directory</li>
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+		<li>Plug-in and Fragment directories</li>
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-   ("Specification").</p>
+		<li>Sub-directories of the directory named &quot;src&quot; of
-
+			certain Plug-ins</li>
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+		<li>Feature directories</li>
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+	</ul>
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
-
+		installed using the Provisioning Technology (as defined below), you
-<ol>
+		must agree to a license (&quot;Feature Update License&quot;) during
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+		the installation process. If the Feature contains Included Features,
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+		the Feature Update License should either provide you with the terms
-       product.</li>
+		and conditions governing the Included Features or inform you where you
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+		can locate them. Feature Update Licenses may be found in the
-       accessed and copied to the Target Machine.</li>
+		&quot;license&quot; property of files named
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+		Feature Licenses, and Feature Update Licenses contain the terms and
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+		conditions (or references to such terms and conditions) that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+		your use of the associated Content in that directory.</p>
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+
-</ol>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-<h3>Cryptography</h3>
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-
+		ARE NOT LIMITED TO):</p>
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+	<ul>
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+		<li>Eclipse Public License Version 1.0 (available at <a
-
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+		</li>
-
+		<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>)
-</body></html>
+		</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>
 		<li>Mozilla Public License Version 1.1 (available at <a
 			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
 		</li>
 	</ul>
 	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
 		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
 		or Feature Update License is provided, please contact the Eclipse
 		Foundation to determine what terms and conditions govern that
 		particular Content.</p>
 	<h3>Use of Provisioning Technology</h3>
 	<p>
 		The Eclipse Foundation makes available provisioning software, examples
 		of which include, but are not limited to, p2 and the Eclipse Update
 		Manager (&quot;Provisioning Technology&quot;) for the purpose of
 		allowing users to install software, documentation, information and/or
 		other materials (collectively &quot;Installable Software&quot;). This
 		capability is provided with the intent of allowing such users to
 		install, extend and update Eclipse-based products. Information about
 		packaging Installable Software is available at <a
 			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
 		(&quot;Specification&quot;).
 	</p>
 	<p>You may use Provisioning Technology to allow other parties to
 		install Installable Software. You shall be responsible for enabling
 		the applicable license agreements relating to the Installable Software
 		to be presented to, and accepted by, the users of the Provisioning
 		Technology in accordance with the Specification. By using Provisioning
 		Technology in such a manner and making it available in accordance with
 		the Specification, you further acknowledge your agreement to, and the
 		acquisition of all necessary rights to permit the following:</p>
 	<ol>
 		<li>A series of actions may occur (&quot;Provisioning
 			Process&quot;) in which a user may execute the Provisioning
 			Technology on a machine (&quot;Target Machine&quot;) with the intent
 			of installing, extending or updating the functionality of an
 			Eclipse-based product.</li>
 		<li>During the Provisioning Process, the Provisioning Technology
 			may cause third party Installable Software or a portion thereof to be
 			accessed and copied to the Target Machine.</li>
 		<li>Pursuant to the Specification, you will provide to the user
 			the terms and conditions that govern the use of the Installable
 			Software (&quot;Installable Software Agreement&quot;) and such
 			Installable Software Agreement shall be accessed from the Target
 			Machine in accordance with the Specification. Such Installable
 			Software Agreement must inform the user of the terms and conditions
 			that govern the Installable Software and must solicit acceptance by
 			the end user in the manner prescribed in such Installable Software
 			Agreement. Upon such indication of agreement by the user, the
 			provisioning Technology will complete installation of the Installable
 			Software.</li>
 	</ol>
 	<h3>Cryptography</h3>
 	<p>Content may contain encryption software. The country in which
 		you are currently may have restrictions on the import, possession, and
 		use, and/or re-export to another country, of encryption software.
 		BEFORE using any encryption software, please check the country's laws,
 		regulations and policies concerning the import, possession, or use,
 		and re-export of encryption software, to see if this is permitted.</p>
 	<p>
 		<small>Java and all Java-based trademarks are trademarks of
 			Oracle Corporation in the United States, other countries, or both.</small>
 	</p>
 </body>
 </html>
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.properties
@ -35,125 +35,143 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+\n\
 November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+AGREEMENTS 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 OF ANY\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+MAY NOT USE THE CONTENT.\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+"Program" will mean the Content.\n\
-\n\
+\n\
-Content includes, but is not limited to, source code, object code,\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+("Repository") in software modules ("Modules") and made available as\n\
-as downloadable archives ("Downloads").\n\
+downloadable archives ("Downloads").\n\
-\n\
+\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
+-   Content may be structured and packaged into modules to facilitate\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+    features ("Features").\n\
-         in a directory named "plugins".\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+    Fragments associated with that Feature.\n\
-\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
+    version numbers of Included Features.\n\
-conditions governing Features and Included Features should be contained\n\
+\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
-Licenses may be located in any directory of a Download or Module\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
-including, but not limited to the following locations:\n\
+and Included Features should be contained in files named "license.html"\n\
-\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
-       - The top-level (root) directory\n\
+directory of a Download or Module including, but not limited to the following\n\
-       - Plug-in and Fragment directories\n\
+locations:\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
+\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   The top-level (root) directory\n\
-       - Feature directories\n\
+-   Plug-in and Fragment directories\n\
-\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+-   Feature directories\n\
-Update License") during the installation process. If the Feature contains\n\
+\n\
-Included Features, the Feature Update License should either provide you\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
-with the terms and conditions governing the Included Features or inform\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
+("Feature Update License") during the installation process. If the Feature\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
+contains Included Features, the Feature Update License should either provide you\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+with the terms and conditions governing the Included Features or inform you\n\
-terms and conditions (or references to such terms and conditions) that\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
-govern your use of the associated Content in that directory.\n\
+property of files named "feature.properties" found within a Feature. Such\n\
-\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+the associated Content in that directory.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
-\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
-\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+-   Common Public License Version 1.0 (available at\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
-govern that particular Content.\n\
+-   Apache Software License 1.1 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE)\n\
-\n\Use of Provisioning Technology\n\
+-   Apache Software License 2.0 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+-   Mozilla Public License Version 1.1 (available at\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
+\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
-Information about packaging Installable Software is available at\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
 conditions govern that particular Content.\n\
 \n\
 Use of Provisioning Technology\n\
 \n\
 The Eclipse Foundation makes available provisioning software, examples of which\n\
 include, but are not limited to, p2 and the Eclipse Update Manager\n\
 ("Provisioning Technology") for the purpose of allowing users to install\n\
 software, documentation, information and/or other materials (collectively\n\
 "Installable Software"). This capability is provided with the intent of allowing\n\
 such users to install, extend and update Eclipse-based products. Information\n\
 about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You may use Provisioning Technology to allow other parties to install\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+license agreements relating to the Installable Software to be presented to, and\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+available in accordance with the Specification, you further acknowledge your\n\
-\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+following:\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+    intent of installing, extending or updating the functionality of an\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+    Eclipse-based product.\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+    the Target Machine.\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
-          of the Installable Software.\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
    Installable Software Agreement must inform the user of the terms and\n\
    conditions that govern the Installable Software and must solicit acceptance\n\
    by the end user in the manner prescribed in such Installable\n\
    Software Agreement. Upon such indication of agreement by the user, the\n\
    provisioning Technology will complete installation of the\n\
    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
+Content may contain encryption software. The country in which you are currently\n\
-currently may have restrictions on the import, possession, and use,\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
-using any encryption software, please check the country's laws,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
-regulations and policies concerning the import, possession, or use, and\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
-re-export of encryption software, to see if this is permitted.\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
 United States, other countries, or both.\n
 ########### end of license property ##########################################
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/license.html
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/license.html
@ -1,106 +1,189 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<head>
-
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
+	<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
+	<p>November 22, 2017</p>
-
+
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
-
+
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-<h3>Applicable Licenses</h3>
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-   For purposes of the EPL, "Program" will mean the Content.</p>
+		USE THE CONTENT.</p>
-
+
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+	<h3>Applicable Licenses</h3>
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
-
+	<p>
-<ul>
+		Unless otherwise indicated, all Content made available by the Eclipse
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+		Foundation is provided to you under the terms and conditions of the
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+		EPL is provided with this Content and is also available at <a
-      and/or Fragments associated with that Feature.</li>
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-</ul>
+	</p>
-
+
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+	<p>Content includes, but is not limited to, source code, object
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+		code, documentation and other files maintained in the Eclipse
-including, but not limited to the following locations:</p>
+		Foundation source code repository (&quot;Repository&quot;) in software
-
+		modules (&quot;Modules&quot;) and made available as downloadable
-<ul>
+		archives (&quot;Downloads&quot;).</p>
-       <li>The top-level (root) directory</li>
+
-       <li>Plug-in and Fragment directories</li>
+	<ul>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Content may be structured and packaged into modules to
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+			facilitate delivering, extending, and upgrading the Content. Typical
-       <li>Feature directories</li>
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
-</ul>
+			fragments (&quot;Fragments&quot;), and features
-
+			(&quot;Features&quot;).</li>
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+			or JAR (Java&trade; ARchive) in a directory named
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+			&quot;plugins&quot;.</li>
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+		<li>A Feature is a bundle of one or more Plug-ins and/or
-that directory.</p>
+			Fragments and associated material. Each Feature may be packaged as a
-
+			sub-directory in a directory named &quot;features&quot;. Within a
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+			Feature, files named &quot;feature.xml&quot; may contain a list of
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+			the names and version numbers of the Plug-ins and/or Fragments
-
+			associated with that Feature.</li>
-<ul>
+		<li>Features may also include other Features (&quot;Included
-       <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>
+			Features&quot;). Within a Feature, files named
-       <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>
+			&quot;feature.xml&quot; may contain a list of the names and version
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+			numbers of Included Features.</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>
+	</ul>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+
-</ul>
+	<p>The terms and conditions governing Plug-ins and Fragments should
-
+		be contained in files named &quot;about.html&quot;
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+		Included Features should be contained in files named
-
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
-
+		Feature Licenses may be located in any directory of a Download or
-<h3>Use of Provisioning Technology</h3>
+		Module including, but not limited to the following locations:</p>
-
+
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+	<ul>
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+		<li>The top-level (root) directory</li>
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+		<li>Plug-in and Fragment directories</li>
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-   ("Specification").</p>
+		<li>Sub-directories of the directory named &quot;src&quot; of
-
+			certain Plug-ins</li>
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+		<li>Feature directories</li>
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+	</ul>
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
-
+		installed using the Provisioning Technology (as defined below), you
-<ol>
+		must agree to a license (&quot;Feature Update License&quot;) during
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+		the installation process. If the Feature contains Included Features,
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+		the Feature Update License should either provide you with the terms
-       product.</li>
+		and conditions governing the Included Features or inform you where you
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+		can locate them. Feature Update Licenses may be found in the
-       accessed and copied to the Target Machine.</li>
+		&quot;license&quot; property of files named
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+		Feature Licenses, and Feature Update Licenses contain the terms and
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+		conditions (or references to such terms and conditions) that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+		your use of the associated Content in that directory.</p>
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+
-</ol>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-<h3>Cryptography</h3>
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-
+		ARE NOT LIMITED TO):</p>
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+	<ul>
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+		<li>Eclipse Public License Version 1.0 (available at <a
-
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+		</li>
-
+		<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>)
-</body></html>
+		</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>
 		<li>Mozilla Public License Version 1.1 (available at <a
 			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
 		</li>
 	</ul>
 	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
 		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
 		or Feature Update License is provided, please contact the Eclipse
 		Foundation to determine what terms and conditions govern that
 		particular Content.</p>
 	<h3>Use of Provisioning Technology</h3>
 	<p>
 		The Eclipse Foundation makes available provisioning software, examples
 		of which include, but are not limited to, p2 and the Eclipse Update
 		Manager (&quot;Provisioning Technology&quot;) for the purpose of
 		allowing users to install software, documentation, information and/or
 		other materials (collectively &quot;Installable Software&quot;). This
 		capability is provided with the intent of allowing such users to
 		install, extend and update Eclipse-based products. Information about
 		packaging Installable Software is available at <a
 			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
 		(&quot;Specification&quot;).
 	</p>
 	<p>You may use Provisioning Technology to allow other parties to
 		install Installable Software. You shall be responsible for enabling
 		the applicable license agreements relating to the Installable Software
 		to be presented to, and accepted by, the users of the Provisioning
 		Technology in accordance with the Specification. By using Provisioning
 		Technology in such a manner and making it available in accordance with
 		the Specification, you further acknowledge your agreement to, and the
 		acquisition of all necessary rights to permit the following:</p>
 	<ol>
 		<li>A series of actions may occur (&quot;Provisioning
 			Process&quot;) in which a user may execute the Provisioning
 			Technology on a machine (&quot;Target Machine&quot;) with the intent
 			of installing, extending or updating the functionality of an
 			Eclipse-based product.</li>
 		<li>During the Provisioning Process, the Provisioning Technology
 			may cause third party Installable Software or a portion thereof to be
 			accessed and copied to the Target Machine.</li>
 		<li>Pursuant to the Specification, you will provide to the user
 			the terms and conditions that govern the use of the Installable
 			Software (&quot;Installable Software Agreement&quot;) and such
 			Installable Software Agreement shall be accessed from the Target
 			Machine in accordance with the Specification. Such Installable
 			Software Agreement must inform the user of the terms and conditions
 			that govern the Installable Software and must solicit acceptance by
 			the end user in the manner prescribed in such Installable Software
 			Agreement. Upon such indication of agreement by the user, the
 			provisioning Technology will complete installation of the Installable
 			Software.</li>
 	</ol>
 	<h3>Cryptography</h3>
 	<p>Content may contain encryption software. The country in which
 		you are currently may have restrictions on the import, possession, and
 		use, and/or re-export to another country, of encryption software.
 		BEFORE using any encryption software, please check the country's laws,
 		regulations and policies concerning the import, possession, or use,
 		and re-export of encryption software, to see if this is permitted.</p>
 	<p>
 		<small>Java and all Java-based trademarks are trademarks of
 			Oracle Corporation in the United States, other countries, or both.</small>
 	</p>
 </body>
 </html>
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.properties
@ -36,125 +36,143 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+\n\
 November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+AGREEMENTS 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 OF ANY\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+MAY NOT USE THE CONTENT.\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+"Program" will mean the Content.\n\
-\n\
+\n\
-Content includes, but is not limited to, source code, object code,\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+("Repository") in software modules ("Modules") and made available as\n\
-as downloadable archives ("Downloads").\n\
+downloadable archives ("Downloads").\n\
-\n\
+\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
+-   Content may be structured and packaged into modules to facilitate\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+    features ("Features").\n\
-         in a directory named "plugins".\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+    Fragments associated with that Feature.\n\
-\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
+    version numbers of Included Features.\n\
-conditions governing Features and Included Features should be contained\n\
+\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
-Licenses may be located in any directory of a Download or Module\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
-including, but not limited to the following locations:\n\
+and Included Features should be contained in files named "license.html"\n\
-\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
-       - The top-level (root) directory\n\
+directory of a Download or Module including, but not limited to the following\n\
-       - Plug-in and Fragment directories\n\
+locations:\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
+\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   The top-level (root) directory\n\
-       - Feature directories\n\
+-   Plug-in and Fragment directories\n\
-\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+-   Feature directories\n\
-Update License") during the installation process. If the Feature contains\n\
+\n\
-Included Features, the Feature Update License should either provide you\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
-with the terms and conditions governing the Included Features or inform\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
+("Feature Update License") during the installation process. If the Feature\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
+contains Included Features, the Feature Update License should either provide you\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+with the terms and conditions governing the Included Features or inform you\n\
-terms and conditions (or references to such terms and conditions) that\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
-govern your use of the associated Content in that directory.\n\
+property of files named "feature.properties" found within a Feature. Such\n\
-\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+the associated Content in that directory.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
-\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
-\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+-   Common Public License Version 1.0 (available at\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
-govern that particular Content.\n\
+-   Apache Software License 1.1 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE)\n\
-\n\Use of Provisioning Technology\n\
+-   Apache Software License 2.0 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+-   Mozilla Public License Version 1.1 (available at\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
+\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
-Information about packaging Installable Software is available at\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
 conditions govern that particular Content.\n\
 \n\
 Use of Provisioning Technology\n\
 \n\
 The Eclipse Foundation makes available provisioning software, examples of which\n\
 include, but are not limited to, p2 and the Eclipse Update Manager\n\
 ("Provisioning Technology") for the purpose of allowing users to install\n\
 software, documentation, information and/or other materials (collectively\n\
 "Installable Software"). This capability is provided with the intent of allowing\n\
 such users to install, extend and update Eclipse-based products. Information\n\
 about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You may use Provisioning Technology to allow other parties to install\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+license agreements relating to the Installable Software to be presented to, and\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+available in accordance with the Specification, you further acknowledge your\n\
-\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+following:\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+    intent of installing, extending or updating the functionality of an\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+    Eclipse-based product.\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+    the Target Machine.\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
-          of the Installable Software.\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
    Installable Software Agreement must inform the user of the terms and\n\
    conditions that govern the Installable Software and must solicit acceptance\n\
    by the end user in the manner prescribed in such Installable\n\
    Software Agreement. Upon such indication of agreement by the user, the\n\
    provisioning Technology will complete installation of the\n\
    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
+Content may contain encryption software. The country in which you are currently\n\
-currently may have restrictions on the import, possession, and use,\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
-using any encryption software, please check the country's laws,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
-regulations and policies concerning the import, possession, or use, and\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
-re-export of encryption software, to see if this is permitted.\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
 United States, other countries, or both.\n
 ########### end of license property ##########################################
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/license.html
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/license.html
@ -1,106 +1,189 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<head>
-
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
+	<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
+	<p>November 22, 2017</p>
-
+
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
-
+
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-<h3>Applicable Licenses</h3>
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-   For purposes of the EPL, "Program" will mean the Content.</p>
+		USE THE CONTENT.</p>
-
+
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+	<h3>Applicable Licenses</h3>
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
-
+	<p>
-<ul>
+		Unless otherwise indicated, all Content made available by the Eclipse
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+		Foundation is provided to you under the terms and conditions of the
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+		EPL is provided with this Content and is also available at <a
-      and/or Fragments associated with that Feature.</li>
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-</ul>
+	</p>
-
+
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+	<p>Content includes, but is not limited to, source code, object
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+		code, documentation and other files maintained in the Eclipse
-including, but not limited to the following locations:</p>
+		Foundation source code repository (&quot;Repository&quot;) in software
-
+		modules (&quot;Modules&quot;) and made available as downloadable
-<ul>
+		archives (&quot;Downloads&quot;).</p>
-       <li>The top-level (root) directory</li>
+
-       <li>Plug-in and Fragment directories</li>
+	<ul>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Content may be structured and packaged into modules to
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+			facilitate delivering, extending, and upgrading the Content. Typical
-       <li>Feature directories</li>
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
-</ul>
+			fragments (&quot;Fragments&quot;), and features
-
+			(&quot;Features&quot;).</li>
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+			or JAR (Java&trade; ARchive) in a directory named
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+			&quot;plugins&quot;.</li>
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+		<li>A Feature is a bundle of one or more Plug-ins and/or
-that directory.</p>
+			Fragments and associated material. Each Feature may be packaged as a
-
+			sub-directory in a directory named &quot;features&quot;. Within a
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+			Feature, files named &quot;feature.xml&quot; may contain a list of
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+			the names and version numbers of the Plug-ins and/or Fragments
-
+			associated with that Feature.</li>
-<ul>
+		<li>Features may also include other Features (&quot;Included
-       <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>
+			Features&quot;). Within a Feature, files named
-       <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>
+			&quot;feature.xml&quot; may contain a list of the names and version
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+			numbers of Included Features.</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>
+	</ul>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+
-</ul>
+	<p>The terms and conditions governing Plug-ins and Fragments should
-
+		be contained in files named &quot;about.html&quot;
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+		Included Features should be contained in files named
-
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
-
+		Feature Licenses may be located in any directory of a Download or
-<h3>Use of Provisioning Technology</h3>
+		Module including, but not limited to the following locations:</p>
-
+
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+	<ul>
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+		<li>The top-level (root) directory</li>
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+		<li>Plug-in and Fragment directories</li>
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-   ("Specification").</p>
+		<li>Sub-directories of the directory named &quot;src&quot; of
-
+			certain Plug-ins</li>
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+		<li>Feature directories</li>
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+	</ul>
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
-
+		installed using the Provisioning Technology (as defined below), you
-<ol>
+		must agree to a license (&quot;Feature Update License&quot;) during
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+		the installation process. If the Feature contains Included Features,
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+		the Feature Update License should either provide you with the terms
-       product.</li>
+		and conditions governing the Included Features or inform you where you
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+		can locate them. Feature Update Licenses may be found in the
-       accessed and copied to the Target Machine.</li>
+		&quot;license&quot; property of files named
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+		Feature Licenses, and Feature Update Licenses contain the terms and
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+		conditions (or references to such terms and conditions) that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+		your use of the associated Content in that directory.</p>
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+
-</ol>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-<h3>Cryptography</h3>
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-
+		ARE NOT LIMITED TO):</p>
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+	<ul>
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+		<li>Eclipse Public License Version 1.0 (available at <a
-
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+		</li>
-
+		<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>)
-</body></html>
+		</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>
 		<li>Mozilla Public License Version 1.1 (available at <a
 			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
 		</li>
 	</ul>
 	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
 		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
 		or Feature Update License is provided, please contact the Eclipse
 		Foundation to determine what terms and conditions govern that
 		particular Content.</p>
 	<h3>Use of Provisioning Technology</h3>
 	<p>
 		The Eclipse Foundation makes available provisioning software, examples
 		of which include, but are not limited to, p2 and the Eclipse Update
 		Manager (&quot;Provisioning Technology&quot;) for the purpose of
 		allowing users to install software, documentation, information and/or
 		other materials (collectively &quot;Installable Software&quot;). This
 		capability is provided with the intent of allowing such users to
 		install, extend and update Eclipse-based products. Information about
 		packaging Installable Software is available at <a
 			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
 		(&quot;Specification&quot;).
 	</p>
 	<p>You may use Provisioning Technology to allow other parties to
 		install Installable Software. You shall be responsible for enabling
 		the applicable license agreements relating to the Installable Software
 		to be presented to, and accepted by, the users of the Provisioning
 		Technology in accordance with the Specification. By using Provisioning
 		Technology in such a manner and making it available in accordance with
 		the Specification, you further acknowledge your agreement to, and the
 		acquisition of all necessary rights to permit the following:</p>
 	<ol>
 		<li>A series of actions may occur (&quot;Provisioning
 			Process&quot;) in which a user may execute the Provisioning
 			Technology on a machine (&quot;Target Machine&quot;) with the intent
 			of installing, extending or updating the functionality of an
 			Eclipse-based product.</li>
 		<li>During the Provisioning Process, the Provisioning Technology
 			may cause third party Installable Software or a portion thereof to be
 			accessed and copied to the Target Machine.</li>
 		<li>Pursuant to the Specification, you will provide to the user
 			the terms and conditions that govern the use of the Installable
 			Software (&quot;Installable Software Agreement&quot;) and such
 			Installable Software Agreement shall be accessed from the Target
 			Machine in accordance with the Specification. Such Installable
 			Software Agreement must inform the user of the terms and conditions
 			that govern the Installable Software and must solicit acceptance by
 			the end user in the manner prescribed in such Installable Software
 			Agreement. Upon such indication of agreement by the user, the
 			provisioning Technology will complete installation of the Installable
 			Software.</li>
 	</ol>
 	<h3>Cryptography</h3>
 	<p>Content may contain encryption software. The country in which
 		you are currently may have restrictions on the import, possession, and
 		use, and/or re-export to another country, of encryption software.
 		BEFORE using any encryption software, please check the country's laws,
 		regulations and policies concerning the import, possession, or use,
 		and re-export of encryption software, to see if this is permitted.</p>
 	<p>
 		<small>Java and all Java-based trademarks are trademarks of
 			Oracle Corporation in the United States, other countries, or both.</small>
 	</p>
 </body>
 </html>
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties
@ -35,125 +35,143 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+\n\
 November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+AGREEMENTS 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 OF ANY\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+MAY NOT USE THE CONTENT.\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+"Program" will mean the Content.\n\
-\n\
+\n\
-Content includes, but is not limited to, source code, object code,\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+("Repository") in software modules ("Modules") and made available as\n\
-as downloadable archives ("Downloads").\n\
+downloadable archives ("Downloads").\n\
-\n\
+\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
+-   Content may be structured and packaged into modules to facilitate\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+    features ("Features").\n\
-         in a directory named "plugins".\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+    Fragments associated with that Feature.\n\
-\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
+    version numbers of Included Features.\n\
-conditions governing Features and Included Features should be contained\n\
+\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
-Licenses may be located in any directory of a Download or Module\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
-including, but not limited to the following locations:\n\
+and Included Features should be contained in files named "license.html"\n\
-\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
-       - The top-level (root) directory\n\
+directory of a Download or Module including, but not limited to the following\n\
-       - Plug-in and Fragment directories\n\
+locations:\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
+\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   The top-level (root) directory\n\
-       - Feature directories\n\
+-   Plug-in and Fragment directories\n\
-\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+-   Feature directories\n\
-Update License") during the installation process. If the Feature contains\n\
+\n\
-Included Features, the Feature Update License should either provide you\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
-with the terms and conditions governing the Included Features or inform\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
+("Feature Update License") during the installation process. If the Feature\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
+contains Included Features, the Feature Update License should either provide you\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+with the terms and conditions governing the Included Features or inform you\n\
-terms and conditions (or references to such terms and conditions) that\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
-govern your use of the associated Content in that directory.\n\
+property of files named "feature.properties" found within a Feature. Such\n\
-\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+the associated Content in that directory.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
-\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
-\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+-   Common Public License Version 1.0 (available at\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
-govern that particular Content.\n\
+-   Apache Software License 1.1 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE)\n\
-\n\Use of Provisioning Technology\n\
+-   Apache Software License 2.0 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+-   Mozilla Public License Version 1.1 (available at\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
+\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
-Information about packaging Installable Software is available at\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
 conditions govern that particular Content.\n\
 \n\
 Use of Provisioning Technology\n\
 \n\
 The Eclipse Foundation makes available provisioning software, examples of which\n\
 include, but are not limited to, p2 and the Eclipse Update Manager\n\
 ("Provisioning Technology") for the purpose of allowing users to install\n\
 software, documentation, information and/or other materials (collectively\n\
 "Installable Software"). This capability is provided with the intent of allowing\n\
 such users to install, extend and update Eclipse-based products. Information\n\
 about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You may use Provisioning Technology to allow other parties to install\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+license agreements relating to the Installable Software to be presented to, and\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+available in accordance with the Specification, you further acknowledge your\n\
-\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+following:\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+    intent of installing, extending or updating the functionality of an\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+    Eclipse-based product.\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+    the Target Machine.\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
-          of the Installable Software.\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
    Installable Software Agreement must inform the user of the terms and\n\
    conditions that govern the Installable Software and must solicit acceptance\n\
    by the end user in the manner prescribed in such Installable\n\
    Software Agreement. Upon such indication of agreement by the user, the\n\
    provisioning Technology will complete installation of the\n\
    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
+Content may contain encryption software. The country in which you are currently\n\
-currently may have restrictions on the import, possession, and use,\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
-using any encryption software, please check the country's laws,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
-regulations and policies concerning the import, possession, or use, and\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
-re-export of encryption software, to see if this is permitted.\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
 United States, other countries, or both.\n
 ########### end of license property ##########################################
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/license.html
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/license.html
@ -1,106 +1,189 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<head>
-
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
+	<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
+	<p>November 22, 2017</p>
-
+
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
-
+
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-<h3>Applicable Licenses</h3>
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-   For purposes of the EPL, "Program" will mean the Content.</p>
+		USE THE CONTENT.</p>
-
+
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+	<h3>Applicable Licenses</h3>
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
-
+	<p>
-<ul>
+		Unless otherwise indicated, all Content made available by the Eclipse
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+		Foundation is provided to you under the terms and conditions of the
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+		EPL is provided with this Content and is also available at <a
-      and/or Fragments associated with that Feature.</li>
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-</ul>
+	</p>
-
+
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+	<p>Content includes, but is not limited to, source code, object
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+		code, documentation and other files maintained in the Eclipse
-including, but not limited to the following locations:</p>
+		Foundation source code repository (&quot;Repository&quot;) in software
-
+		modules (&quot;Modules&quot;) and made available as downloadable
-<ul>
+		archives (&quot;Downloads&quot;).</p>
-       <li>The top-level (root) directory</li>
+
-       <li>Plug-in and Fragment directories</li>
+	<ul>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Content may be structured and packaged into modules to
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+			facilitate delivering, extending, and upgrading the Content. Typical
-       <li>Feature directories</li>
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
-</ul>
+			fragments (&quot;Fragments&quot;), and features
-
+			(&quot;Features&quot;).</li>
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+			or JAR (Java&trade; ARchive) in a directory named
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+			&quot;plugins&quot;.</li>
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+		<li>A Feature is a bundle of one or more Plug-ins and/or
-that directory.</p>
+			Fragments and associated material. Each Feature may be packaged as a
-
+			sub-directory in a directory named &quot;features&quot;. Within a
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+			Feature, files named &quot;feature.xml&quot; may contain a list of
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+			the names and version numbers of the Plug-ins and/or Fragments
-
+			associated with that Feature.</li>
-<ul>
+		<li>Features may also include other Features (&quot;Included
-       <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>
+			Features&quot;). Within a Feature, files named
-       <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>
+			&quot;feature.xml&quot; may contain a list of the names and version
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+			numbers of Included Features.</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>
+	</ul>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+
-</ul>
+	<p>The terms and conditions governing Plug-ins and Fragments should
-
+		be contained in files named &quot;about.html&quot;
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+		Included Features should be contained in files named
-
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
-
+		Feature Licenses may be located in any directory of a Download or
-<h3>Use of Provisioning Technology</h3>
+		Module including, but not limited to the following locations:</p>
-
+
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+	<ul>
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+		<li>The top-level (root) directory</li>
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+		<li>Plug-in and Fragment directories</li>
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-   ("Specification").</p>
+		<li>Sub-directories of the directory named &quot;src&quot; of
-
+			certain Plug-ins</li>
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+		<li>Feature directories</li>
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+	</ul>
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
-
+		installed using the Provisioning Technology (as defined below), you
-<ol>
+		must agree to a license (&quot;Feature Update License&quot;) during
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+		the installation process. If the Feature contains Included Features,
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+		the Feature Update License should either provide you with the terms
-       product.</li>
+		and conditions governing the Included Features or inform you where you
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+		can locate them. Feature Update Licenses may be found in the
-       accessed and copied to the Target Machine.</li>
+		&quot;license&quot; property of files named
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+		Feature Licenses, and Feature Update Licenses contain the terms and
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+		conditions (or references to such terms and conditions) that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+		your use of the associated Content in that directory.</p>
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+
-</ol>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-<h3>Cryptography</h3>
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-
+		ARE NOT LIMITED TO):</p>
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+	<ul>
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+		<li>Eclipse Public License Version 1.0 (available at <a
-
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+		</li>
-
+		<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>)
-</body></html>
+		</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>
 		<li>Mozilla Public License Version 1.1 (available at <a
 			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
 		</li>
 	</ul>
 	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
 		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
 		or Feature Update License is provided, please contact the Eclipse
 		Foundation to determine what terms and conditions govern that
 		particular Content.</p>
 	<h3>Use of Provisioning Technology</h3>
 	<p>
 		The Eclipse Foundation makes available provisioning software, examples
 		of which include, but are not limited to, p2 and the Eclipse Update
 		Manager (&quot;Provisioning Technology&quot;) for the purpose of
 		allowing users to install software, documentation, information and/or
 		other materials (collectively &quot;Installable Software&quot;). This
 		capability is provided with the intent of allowing such users to
 		install, extend and update Eclipse-based products. Information about
 		packaging Installable Software is available at <a
 			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
 		(&quot;Specification&quot;).
 	</p>
 	<p>You may use Provisioning Technology to allow other parties to
 		install Installable Software. You shall be responsible for enabling
 		the applicable license agreements relating to the Installable Software
 		to be presented to, and accepted by, the users of the Provisioning
 		Technology in accordance with the Specification. By using Provisioning
 		Technology in such a manner and making it available in accordance with
 		the Specification, you further acknowledge your agreement to, and the
 		acquisition of all necessary rights to permit the following:</p>
 	<ol>
 		<li>A series of actions may occur (&quot;Provisioning
 			Process&quot;) in which a user may execute the Provisioning
 			Technology on a machine (&quot;Target Machine&quot;) with the intent
 			of installing, extending or updating the functionality of an
 			Eclipse-based product.</li>
 		<li>During the Provisioning Process, the Provisioning Technology
 			may cause third party Installable Software or a portion thereof to be
 			accessed and copied to the Target Machine.</li>
 		<li>Pursuant to the Specification, you will provide to the user
 			the terms and conditions that govern the use of the Installable
 			Software (&quot;Installable Software Agreement&quot;) and such
 			Installable Software Agreement shall be accessed from the Target
 			Machine in accordance with the Specification. Such Installable
 			Software Agreement must inform the user of the terms and conditions
 			that govern the Installable Software and must solicit acceptance by
 			the end user in the manner prescribed in such Installable Software
 			Agreement. Upon such indication of agreement by the user, the
 			provisioning Technology will complete installation of the Installable
 			Software.</li>
 	</ol>
 	<h3>Cryptography</h3>
 	<p>Content may contain encryption software. The country in which
 		you are currently may have restrictions on the import, possession, and
 		use, and/or re-export to another country, of encryption software.
 		BEFORE using any encryption software, please check the country's laws,
 		regulations and policies concerning the import, possession, or use,
 		and re-export of encryption software, to see if this is permitted.</p>
 	<p>
 		<small>Java and all Java-based trademarks are trademarks of
 			Oracle Corporation in the United States, other countries, or both.</small>
 	</p>
 </body>
 </html>
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.properties
@ -35,125 +35,143 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+\n\
 November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+AGREEMENTS 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 OF ANY\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+MAY NOT USE THE CONTENT.\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+"Program" will mean the Content.\n\
-\n\
+\n\
-Content includes, but is not limited to, source code, object code,\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+("Repository") in software modules ("Modules") and made available as\n\
-as downloadable archives ("Downloads").\n\
+downloadable archives ("Downloads").\n\
-\n\
+\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
+-   Content may be structured and packaged into modules to facilitate\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+    features ("Features").\n\
-         in a directory named "plugins".\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+    Fragments associated with that Feature.\n\
-\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
+    version numbers of Included Features.\n\
-conditions governing Features and Included Features should be contained\n\
+\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
-Licenses may be located in any directory of a Download or Module\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
-including, but not limited to the following locations:\n\
+and Included Features should be contained in files named "license.html"\n\
-\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
-       - The top-level (root) directory\n\
+directory of a Download or Module including, but not limited to the following\n\
-       - Plug-in and Fragment directories\n\
+locations:\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
+\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   The top-level (root) directory\n\
-       - Feature directories\n\
+-   Plug-in and Fragment directories\n\
-\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+-   Feature directories\n\
-Update License") during the installation process. If the Feature contains\n\
+\n\
-Included Features, the Feature Update License should either provide you\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
-with the terms and conditions governing the Included Features or inform\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
+("Feature Update License") during the installation process. If the Feature\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
+contains Included Features, the Feature Update License should either provide you\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+with the terms and conditions governing the Included Features or inform you\n\
-terms and conditions (or references to such terms and conditions) that\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
-govern your use of the associated Content in that directory.\n\
+property of files named "feature.properties" found within a Feature. Such\n\
-\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+the associated Content in that directory.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
-\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
-\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+-   Common Public License Version 1.0 (available at\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
-govern that particular Content.\n\
+-   Apache Software License 1.1 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE)\n\
-\n\Use of Provisioning Technology\n\
+-   Apache Software License 2.0 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+-   Mozilla Public License Version 1.1 (available at\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
+\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
-Information about packaging Installable Software is available at\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
 conditions govern that particular Content.\n\
 \n\
 Use of Provisioning Technology\n\
 \n\
 The Eclipse Foundation makes available provisioning software, examples of which\n\
 include, but are not limited to, p2 and the Eclipse Update Manager\n\
 ("Provisioning Technology") for the purpose of allowing users to install\n\
 software, documentation, information and/or other materials (collectively\n\
 "Installable Software"). This capability is provided with the intent of allowing\n\
 such users to install, extend and update Eclipse-based products. Information\n\
 about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You may use Provisioning Technology to allow other parties to install\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+license agreements relating to the Installable Software to be presented to, and\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+available in accordance with the Specification, you further acknowledge your\n\
-\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+following:\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+    intent of installing, extending or updating the functionality of an\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+    Eclipse-based product.\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+    the Target Machine.\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
-          of the Installable Software.\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
    Installable Software Agreement must inform the user of the terms and\n\
    conditions that govern the Installable Software and must solicit acceptance\n\
    by the end user in the manner prescribed in such Installable\n\
    Software Agreement. Upon such indication of agreement by the user, the\n\
    provisioning Technology will complete installation of the\n\
    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
+Content may contain encryption software. The country in which you are currently\n\
-currently may have restrictions on the import, possession, and use,\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
-using any encryption software, please check the country's laws,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
-regulations and policies concerning the import, possession, or use, and\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
-re-export of encryption software, to see if this is permitted.\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
 United States, other countries, or both.\n
 ########### end of license property ##########################################
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/license.html
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/license.html
@ -1,106 +1,189 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<head>
-
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
+	<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
+	<p>November 22, 2017</p>
-
+
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
-
+
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-<h3>Applicable Licenses</h3>
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-   For purposes of the EPL, "Program" will mean the Content.</p>
+		USE THE CONTENT.</p>
-
+
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+	<h3>Applicable Licenses</h3>
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
-
+	<p>
-<ul>
+		Unless otherwise indicated, all Content made available by the Eclipse
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+		Foundation is provided to you under the terms and conditions of the
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+		EPL is provided with this Content and is also available at <a
-      and/or Fragments associated with that Feature.</li>
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-</ul>
+	</p>
-
+
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+	<p>Content includes, but is not limited to, source code, object
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+		code, documentation and other files maintained in the Eclipse
-including, but not limited to the following locations:</p>
+		Foundation source code repository (&quot;Repository&quot;) in software
-
+		modules (&quot;Modules&quot;) and made available as downloadable
-<ul>
+		archives (&quot;Downloads&quot;).</p>
-       <li>The top-level (root) directory</li>
+
-       <li>Plug-in and Fragment directories</li>
+	<ul>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Content may be structured and packaged into modules to
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+			facilitate delivering, extending, and upgrading the Content. Typical
-       <li>Feature directories</li>
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
-</ul>
+			fragments (&quot;Fragments&quot;), and features
-
+			(&quot;Features&quot;).</li>
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+			or JAR (Java&trade; ARchive) in a directory named
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+			&quot;plugins&quot;.</li>
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+		<li>A Feature is a bundle of one or more Plug-ins and/or
-that directory.</p>
+			Fragments and associated material. Each Feature may be packaged as a
-
+			sub-directory in a directory named &quot;features&quot;. Within a
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+			Feature, files named &quot;feature.xml&quot; may contain a list of
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+			the names and version numbers of the Plug-ins and/or Fragments
-
+			associated with that Feature.</li>
-<ul>
+		<li>Features may also include other Features (&quot;Included
-       <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>
+			Features&quot;). Within a Feature, files named
-       <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>
+			&quot;feature.xml&quot; may contain a list of the names and version
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+			numbers of Included Features.</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>
+	</ul>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+
-</ul>
+	<p>The terms and conditions governing Plug-ins and Fragments should
-
+		be contained in files named &quot;about.html&quot;
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+		Included Features should be contained in files named
-
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
-
+		Feature Licenses may be located in any directory of a Download or
-<h3>Use of Provisioning Technology</h3>
+		Module including, but not limited to the following locations:</p>
-
+
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+	<ul>
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+		<li>The top-level (root) directory</li>
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+		<li>Plug-in and Fragment directories</li>
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-   ("Specification").</p>
+		<li>Sub-directories of the directory named &quot;src&quot; of
-
+			certain Plug-ins</li>
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+		<li>Feature directories</li>
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+	</ul>
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
-
+		installed using the Provisioning Technology (as defined below), you
-<ol>
+		must agree to a license (&quot;Feature Update License&quot;) during
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+		the installation process. If the Feature contains Included Features,
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+		the Feature Update License should either provide you with the terms
-       product.</li>
+		and conditions governing the Included Features or inform you where you
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+		can locate them. Feature Update Licenses may be found in the
-       accessed and copied to the Target Machine.</li>
+		&quot;license&quot; property of files named
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+		Feature Licenses, and Feature Update Licenses contain the terms and
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+		conditions (or references to such terms and conditions) that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+		your use of the associated Content in that directory.</p>
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+
-</ol>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-<h3>Cryptography</h3>
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-
+		ARE NOT LIMITED TO):</p>
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+	<ul>
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+		<li>Eclipse Public License Version 1.0 (available at <a
-
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+		</li>
-
+		<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>)
-</body></html>
+		</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>
 		<li>Mozilla Public License Version 1.1 (available at <a
 			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
 		</li>
 	</ul>
 	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
 		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
 		or Feature Update License is provided, please contact the Eclipse
 		Foundation to determine what terms and conditions govern that
 		particular Content.</p>
 	<h3>Use of Provisioning Technology</h3>
 	<p>
 		The Eclipse Foundation makes available provisioning software, examples
 		of which include, but are not limited to, p2 and the Eclipse Update
 		Manager (&quot;Provisioning Technology&quot;) for the purpose of
 		allowing users to install software, documentation, information and/or
 		other materials (collectively &quot;Installable Software&quot;). This
 		capability is provided with the intent of allowing such users to
 		install, extend and update Eclipse-based products. Information about
 		packaging Installable Software is available at <a
 			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
 		(&quot;Specification&quot;).
 	</p>
 	<p>You may use Provisioning Technology to allow other parties to
 		install Installable Software. You shall be responsible for enabling
 		the applicable license agreements relating to the Installable Software
 		to be presented to, and accepted by, the users of the Provisioning
 		Technology in accordance with the Specification. By using Provisioning
 		Technology in such a manner and making it available in accordance with
 		the Specification, you further acknowledge your agreement to, and the
 		acquisition of all necessary rights to permit the following:</p>
 	<ol>
 		<li>A series of actions may occur (&quot;Provisioning
 			Process&quot;) in which a user may execute the Provisioning
 			Technology on a machine (&quot;Target Machine&quot;) with the intent
 			of installing, extending or updating the functionality of an
 			Eclipse-based product.</li>
 		<li>During the Provisioning Process, the Provisioning Technology
 			may cause third party Installable Software or a portion thereof to be
 			accessed and copied to the Target Machine.</li>
 		<li>Pursuant to the Specification, you will provide to the user
 			the terms and conditions that govern the use of the Installable
 			Software (&quot;Installable Software Agreement&quot;) and such
 			Installable Software Agreement shall be accessed from the Target
 			Machine in accordance with the Specification. Such Installable
 			Software Agreement must inform the user of the terms and conditions
 			that govern the Installable Software and must solicit acceptance by
 			the end user in the manner prescribed in such Installable Software
 			Agreement. Upon such indication of agreement by the user, the
 			provisioning Technology will complete installation of the Installable
 			Software.</li>
 	</ol>
 	<h3>Cryptography</h3>
 	<p>Content may contain encryption software. The country in which
 		you are currently may have restrictions on the import, possession, and
 		use, and/or re-export to another country, of encryption software.
 		BEFORE using any encryption software, please check the country's laws,
 		regulations and policies concerning the import, possession, or use,
 		and re-export of encryption software, to see if this is permitted.</p>
 	<p>
 		<small>Java and all Java-based trademarks are trademarks of
 			Oracle Corporation in the United States, other countries, or both.</small>
 	</p>
 </body>
 </html>
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.properties
@ -16,7 +16,7 @@ updateSiteName=Eclipse JGit Update Site
 # description property - text of the "Feature Description"
 description=\
 Do not install in your IDE: this feature is meant to provision Target Platforms.\n\
-Source code for the support for PDE's JUnit runner for a Target Platform\n\
+Source code for the support for PDE's JUnit runner for a Target Platform\n
 ################ end of description property ##################################
 # "copyright" property - text of the "Feature Update Copyright"
@ -36,125 +36,143 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+\n\
 November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+AGREEMENTS 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 OF ANY\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+MAY NOT USE THE CONTENT.\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+"Program" will mean the Content.\n\
-\n\
+\n\
-Content includes, but is not limited to, source code, object code,\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+("Repository") in software modules ("Modules") and made available as\n\
-as downloadable archives ("Downloads").\n\
+downloadable archives ("Downloads").\n\
-\n\
+\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
+-   Content may be structured and packaged into modules to facilitate\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+    features ("Features").\n\
-         in a directory named "plugins".\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+    Fragments associated with that Feature.\n\
-\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
+    version numbers of Included Features.\n\
-conditions governing Features and Included Features should be contained\n\
+\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
-Licenses may be located in any directory of a Download or Module\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
-including, but not limited to the following locations:\n\
+and Included Features should be contained in files named "license.html"\n\
-\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
-       - The top-level (root) directory\n\
+directory of a Download or Module including, but not limited to the following\n\
-       - Plug-in and Fragment directories\n\
+locations:\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
+\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   The top-level (root) directory\n\
-       - Feature directories\n\
+-   Plug-in and Fragment directories\n\
-\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+-   Feature directories\n\
-Update License") during the installation process. If the Feature contains\n\
+\n\
-Included Features, the Feature Update License should either provide you\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
-with the terms and conditions governing the Included Features or inform\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
+("Feature Update License") during the installation process. If the Feature\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
+contains Included Features, the Feature Update License should either provide you\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+with the terms and conditions governing the Included Features or inform you\n\
-terms and conditions (or references to such terms and conditions) that\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
-govern your use of the associated Content in that directory.\n\
+property of files named "feature.properties" found within a Feature. Such\n\
-\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+the associated Content in that directory.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
-\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
-\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+-   Common Public License Version 1.0 (available at\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
-govern that particular Content.\n\
+-   Apache Software License 1.1 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE)\n\
-\n\Use of Provisioning Technology\n\
+-   Apache Software License 2.0 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+-   Mozilla Public License Version 1.1 (available at\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
+\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
-Information about packaging Installable Software is available at\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
 conditions govern that particular Content.\n\
 \n\
 Use of Provisioning Technology\n\
 \n\
 The Eclipse Foundation makes available provisioning software, examples of which\n\
 include, but are not limited to, p2 and the Eclipse Update Manager\n\
 ("Provisioning Technology") for the purpose of allowing users to install\n\
 software, documentation, information and/or other materials (collectively\n\
 "Installable Software"). This capability is provided with the intent of allowing\n\
 such users to install, extend and update Eclipse-based products. Information\n\
 about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You may use Provisioning Technology to allow other parties to install\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+license agreements relating to the Installable Software to be presented to, and\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+available in accordance with the Specification, you further acknowledge your\n\
-\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+following:\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+    intent of installing, extending or updating the functionality of an\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+    Eclipse-based product.\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+    the Target Machine.\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
-          of the Installable Software.\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
    Installable Software Agreement must inform the user of the terms and\n\
    conditions that govern the Installable Software and must solicit acceptance\n\
    by the end user in the manner prescribed in such Installable\n\
    Software Agreement. Upon such indication of agreement by the user, the\n\
    provisioning Technology will complete installation of the\n\
    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
+Content may contain encryption software. The country in which you are currently\n\
-currently may have restrictions on the import, possession, and use,\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
-using any encryption software, please check the country's laws,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
-regulations and policies concerning the import, possession, or use, and\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
-re-export of encryption software, to see if this is permitted.\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
 United States, other countries, or both.\n
 ########### end of license property ##########################################
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/license.html
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/license.html
@ -1,106 +1,189 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<head>
-
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
+	<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
+	<p>November 22, 2017</p>
-
+
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
-
+
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-<h3>Applicable Licenses</h3>
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-   For purposes of the EPL, "Program" will mean the Content.</p>
+		USE THE CONTENT.</p>
-
+
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+	<h3>Applicable Licenses</h3>
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
-
+	<p>
-<ul>
+		Unless otherwise indicated, all Content made available by the Eclipse
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+		Foundation is provided to you under the terms and conditions of the
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+		EPL is provided with this Content and is also available at <a
-      and/or Fragments associated with that Feature.</li>
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-</ul>
+	</p>
-
+
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+	<p>Content includes, but is not limited to, source code, object
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+		code, documentation and other files maintained in the Eclipse
-including, but not limited to the following locations:</p>
+		Foundation source code repository (&quot;Repository&quot;) in software
-
+		modules (&quot;Modules&quot;) and made available as downloadable
-<ul>
+		archives (&quot;Downloads&quot;).</p>
-       <li>The top-level (root) directory</li>
+
-       <li>Plug-in and Fragment directories</li>
+	<ul>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Content may be structured and packaged into modules to
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+			facilitate delivering, extending, and upgrading the Content. Typical
-       <li>Feature directories</li>
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
-</ul>
+			fragments (&quot;Fragments&quot;), and features
-
+			(&quot;Features&quot;).</li>
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+			or JAR (Java&trade; ARchive) in a directory named
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+			&quot;plugins&quot;.</li>
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+		<li>A Feature is a bundle of one or more Plug-ins and/or
-that directory.</p>
+			Fragments and associated material. Each Feature may be packaged as a
-
+			sub-directory in a directory named &quot;features&quot;. Within a
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+			Feature, files named &quot;feature.xml&quot; may contain a list of
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+			the names and version numbers of the Plug-ins and/or Fragments
-
+			associated with that Feature.</li>
-<ul>
+		<li>Features may also include other Features (&quot;Included
-       <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>
+			Features&quot;). Within a Feature, files named
-       <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>
+			&quot;feature.xml&quot; may contain a list of the names and version
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+			numbers of Included Features.</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>
+	</ul>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+
-</ul>
+	<p>The terms and conditions governing Plug-ins and Fragments should
-
+		be contained in files named &quot;about.html&quot;
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+		Included Features should be contained in files named
-
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
-
+		Feature Licenses may be located in any directory of a Download or
-<h3>Use of Provisioning Technology</h3>
+		Module including, but not limited to the following locations:</p>
-
+
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+	<ul>
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+		<li>The top-level (root) directory</li>
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+		<li>Plug-in and Fragment directories</li>
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-   ("Specification").</p>
+		<li>Sub-directories of the directory named &quot;src&quot; of
-
+			certain Plug-ins</li>
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+		<li>Feature directories</li>
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+	</ul>
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
-
+		installed using the Provisioning Technology (as defined below), you
-<ol>
+		must agree to a license (&quot;Feature Update License&quot;) during
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+		the installation process. If the Feature contains Included Features,
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+		the Feature Update License should either provide you with the terms
-       product.</li>
+		and conditions governing the Included Features or inform you where you
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+		can locate them. Feature Update Licenses may be found in the
-       accessed and copied to the Target Machine.</li>
+		&quot;license&quot; property of files named
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+		Feature Licenses, and Feature Update Licenses contain the terms and
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+		conditions (or references to such terms and conditions) that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+		your use of the associated Content in that directory.</p>
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+
-</ol>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-<h3>Cryptography</h3>
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-
+		ARE NOT LIMITED TO):</p>
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+	<ul>
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+		<li>Eclipse Public License Version 1.0 (available at <a
-
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+		</li>
-
+		<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>)
-</body></html>
+		</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>
 		<li>Mozilla Public License Version 1.1 (available at <a
 			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
 		</li>
 	</ul>
 	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
 		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
 		or Feature Update License is provided, please contact the Eclipse
 		Foundation to determine what terms and conditions govern that
 		particular Content.</p>
 	<h3>Use of Provisioning Technology</h3>
 	<p>
 		The Eclipse Foundation makes available provisioning software, examples
 		of which include, but are not limited to, p2 and the Eclipse Update
 		Manager (&quot;Provisioning Technology&quot;) for the purpose of
 		allowing users to install software, documentation, information and/or
 		other materials (collectively &quot;Installable Software&quot;). This
 		capability is provided with the intent of allowing such users to
 		install, extend and update Eclipse-based products. Information about
 		packaging Installable Software is available at <a
 			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
 		(&quot;Specification&quot;).
 	</p>
 	<p>You may use Provisioning Technology to allow other parties to
 		install Installable Software. You shall be responsible for enabling
 		the applicable license agreements relating to the Installable Software
 		to be presented to, and accepted by, the users of the Provisioning
 		Technology in accordance with the Specification. By using Provisioning
 		Technology in such a manner and making it available in accordance with
 		the Specification, you further acknowledge your agreement to, and the
 		acquisition of all necessary rights to permit the following:</p>
 	<ol>
 		<li>A series of actions may occur (&quot;Provisioning
 			Process&quot;) in which a user may execute the Provisioning
 			Technology on a machine (&quot;Target Machine&quot;) with the intent
 			of installing, extending or updating the functionality of an
 			Eclipse-based product.</li>
 		<li>During the Provisioning Process, the Provisioning Technology
 			may cause third party Installable Software or a portion thereof to be
 			accessed and copied to the Target Machine.</li>
 		<li>Pursuant to the Specification, you will provide to the user
 			the terms and conditions that govern the use of the Installable
 			Software (&quot;Installable Software Agreement&quot;) and such
 			Installable Software Agreement shall be accessed from the Target
 			Machine in accordance with the Specification. Such Installable
 			Software Agreement must inform the user of the terms and conditions
 			that govern the Installable Software and must solicit acceptance by
 			the end user in the manner prescribed in such Installable Software
 			Agreement. Upon such indication of agreement by the user, the
 			provisioning Technology will complete installation of the Installable
 			Software.</li>
 	</ol>
 	<h3>Cryptography</h3>
 	<p>Content may contain encryption software. The country in which
 		you are currently may have restrictions on the import, possession, and
 		use, and/or re-export to another country, of encryption software.
 		BEFORE using any encryption software, please check the country's laws,
 		regulations and policies concerning the import, possession, or use,
 		and re-export of encryption software, to see if this is permitted.</p>
 	<p>
 		<small>Java and all Java-based trademarks are trademarks of
 			Oracle Corporation in the United States, other countries, or both.</small>
 	</p>
 </body>
 </html>
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.properties
@ -36,125 +36,143 @@ licenseURL=license.html
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
+\n\
 November 22, 2017\n\
 \n\
 Usage Of Content\n\
 \n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+AGREEMENTS 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 OF ANY\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+MAY NOT USE THE CONTENT.\n\
 BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
 \n\
 Applicable Licenses\n\
 \n\
-Unless otherwise indicated, all Content made available by the\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
+"Program" will mean the Content.\n\
-\n\
+\n\
-Content includes, but is not limited to, source code, object code,\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
+("Repository") in software modules ("Modules") and made available as\n\
-as downloadable archives ("Downloads").\n\
+downloadable archives ("Downloads").\n\
-\n\
+\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
+-   Content may be structured and packaged into modules to facilitate\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+    features ("Features").\n\
-         in a directory named "plugins".\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+    Fragments associated with that Feature.\n\
-\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
+    version numbers of Included Features.\n\
-conditions governing Features and Included Features should be contained\n\
+\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
-Licenses may be located in any directory of a Download or Module\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
-including, but not limited to the following locations:\n\
+and Included Features should be contained in files named "license.html"\n\
-\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
-       - The top-level (root) directory\n\
+directory of a Download or Module including, but not limited to the following\n\
-       - Plug-in and Fragment directories\n\
+locations:\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
+\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   The top-level (root) directory\n\
-       - Feature directories\n\
+-   Plug-in and Fragment directories\n\
-\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+-   Feature directories\n\
-Update License") during the installation process. If the Feature contains\n\
+\n\
-Included Features, the Feature Update License should either provide you\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
-with the terms and conditions governing the Included Features or inform\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
+("Feature Update License") during the installation process. If the Feature\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
+contains Included Features, the Feature Update License should either provide you\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+with the terms and conditions governing the Included Features or inform you\n\
-terms and conditions (or references to such terms and conditions) that\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
-govern your use of the associated Content in that directory.\n\
+property of files named "feature.properties" found within a Feature. Such\n\
-\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+the associated Content in that directory.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
-\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Eclipse Public License Version 1.0 (available at\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
-\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+-   Common Public License Version 1.0 (available at\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
-govern that particular Content.\n\
+-   Apache Software License 1.1 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE)\n\
-\n\Use of Provisioning Technology\n\
+-   Apache Software License 2.0 (available at\n\
-\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+-   Mozilla Public License Version 1.1 (available at\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
+\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
-Information about packaging Installable Software is available at\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
 conditions govern that particular Content.\n\
 \n\
 Use of Provisioning Technology\n\
 \n\
 The Eclipse Foundation makes available provisioning software, examples of which\n\
 include, but are not limited to, p2 and the Eclipse Update Manager\n\
 ("Provisioning Technology") for the purpose of allowing users to install\n\
 software, documentation, information and/or other materials (collectively\n\
 "Installable Software"). This capability is provided with the intent of allowing\n\
 such users to install, extend and update Eclipse-based products. Information\n\
 about packaging Installable Software is available at\n\
 http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
 \n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You may use Provisioning Technology to allow other parties to install\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+license agreements relating to the Installable Software to be presented to, and\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
+available in accordance with the Specification, you further acknowledge your\n\
-\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+following:\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+    intent of installing, extending or updating the functionality of an\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+    Eclipse-based product.\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+    the Target Machine.\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
-          of the Installable Software.\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
    Installable Software Agreement must inform the user of the terms and\n\
    conditions that govern the Installable Software and must solicit acceptance\n\
    by the end user in the manner prescribed in such Installable\n\
    Software Agreement. Upon such indication of agreement by the user, the\n\
    provisioning Technology will complete installation of the\n\
    Installable Software.\n\
 \n\
 Cryptography\n\
 \n\
-Content may contain encryption software. The country in which you are\n\
+Content may contain encryption software. The country in which you are currently\n\
-currently may have restrictions on the import, possession, and use,\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
-using any encryption software, please check the country's laws,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
-regulations and policies concerning the import, possession, or use, and\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
-re-export of encryption software, to see if this is permitted.\n\
+permitted.\n\
 \n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
 United States, other countries, or both.\n
 ########### end of license property ##########################################
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/license.html
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/license.html
@ -1,106 +1,189 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<html xmlns="http://www.w3.org/1999/xhtml">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<head>
-
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <title>Eclipse Foundation Software User Agreement</title>
 </head>
 <body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
+	<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 9, 2014</p>
+	<p>November 22, 2017</p>
-
+
-<h3>Usage Of Content</h3>
+	<h3>Usage Of Content</h3>
-
+
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-   (COLLECTIVELY "CONTENT").  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-<h3>Applicable Licenses</h3>
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-   ("EPL").  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-   For purposes of the EPL, "Program" will mean the Content.</p>
+		USE THE CONTENT.</p>
-
+
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+	<h3>Applicable Licenses</h3>
-   repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
-
+	<p>
-<ul>
+		Unless otherwise indicated, all Content made available by the Eclipse
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+		Foundation is provided to you under the terms and conditions of the
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named "features".  Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+		EPL is provided with this Content and is also available at <a
-      and/or Fragments associated with that Feature.</li>
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-       <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-</ul>
+	</p>
-
+
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+	<p>Content includes, but is not limited to, source code, object
-Included Features should be contained in files named "license.html" ("Feature Licenses").  Abouts and Feature Licenses may be located in any directory of a Download or Module
+		code, documentation and other files maintained in the Eclipse
-including, but not limited to the following locations:</p>
+		Foundation source code repository (&quot;Repository&quot;) in software
-
+		modules (&quot;Modules&quot;) and made available as downloadable
-<ul>
+		archives (&quot;Downloads&quot;).</p>
-       <li>The top-level (root) directory</li>
+
-       <li>Plug-in and Fragment directories</li>
+	<ul>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Content may be structured and packaged into modules to
-       <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+			facilitate delivering, extending, and upgrading the Content. Typical
-       <li>Feature directories</li>
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
-</ul>
+			fragments (&quot;Fragments&quot;), and features
-
+			(&quot;Features&quot;).</li>
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+			or JAR (Java&trade; ARchive) in a directory named
-inform you where you can locate them.  Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+			&quot;plugins&quot;.</li>
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+		<li>A Feature is a bundle of one or more Plug-ins and/or
-that directory.</p>
+			Fragments and associated material. Each Feature may be packaged as a
-
+			sub-directory in a directory named &quot;features&quot;. Within a
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+			Feature, files named &quot;feature.xml&quot; may contain a list of
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+			the names and version numbers of the Plug-ins and/or Fragments
-
+			associated with that Feature.</li>
-<ul>
+		<li>Features may also include other Features (&quot;Included
-       <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>
+			Features&quot;). Within a Feature, files named
-       <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>
+			&quot;feature.xml&quot; may contain a list of the names and version
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+			numbers of Included Features.</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>
+	</ul>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+
-</ul>
+	<p>The terms and conditions governing Plug-ins and Fragments should
-
+		be contained in files named &quot;about.html&quot;
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+		Included Features should be contained in files named
-
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
-
+		Feature Licenses may be located in any directory of a Download or
-<h3>Use of Provisioning Technology</h3>
+		Module including, but not limited to the following locations:</p>
-
+
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+	<ul>
-   Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+		<li>The top-level (root) directory</li>
-   other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+		<li>Plug-in and Fragment directories</li>
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-   ("Specification").</p>
+		<li>Sub-directories of the directory named &quot;src&quot; of
-
+			certain Plug-ins</li>
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+		<li>Feature directories</li>
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+	</ul>
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+	<p>Note: if a Feature made available by the Eclipse Foundation is
-
+		installed using the Provisioning Technology (as defined below), you
-<ol>
+		must agree to a license (&quot;Feature Update License&quot;) during
-       <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+		the installation process. If the Feature contains Included Features,
-       on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+		the Feature Update License should either provide you with the terms
-       product.</li>
+		and conditions governing the Included Features or inform you where you
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+		can locate them. Feature Update Licenses may be found in the
-       accessed and copied to the Target Machine.</li>
+		&quot;license&quot; property of files named
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
-       Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+		Feature Licenses, and Feature Update Licenses contain the terms and
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+		conditions (or references to such terms and conditions) that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+		your use of the associated Content in that directory.</p>
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+
-</ol>
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-<h3>Cryptography</h3>
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-
+		ARE NOT LIMITED TO):</p>
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+	<ul>
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+		<li>Eclipse Public License Version 1.0 (available at <a
-
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+		</li>
-
+		<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>)
-</body></html>
+		</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>
 		<li>Mozilla Public License Version 1.1 (available at <a
 			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
 		</li>
 	</ul>
 	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
 		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
 		or Feature Update License is provided, please contact the Eclipse
 		Foundation to determine what terms and conditions govern that
 		particular Content.</p>
 	<h3>Use of Provisioning Technology</h3>
 	<p>
 		The Eclipse Foundation makes available provisioning software, examples
 		of which include, but are not limited to, p2 and the Eclipse Update
 		Manager (&quot;Provisioning Technology&quot;) for the purpose of
 		allowing users to install software, documentation, information and/or
 		other materials (collectively &quot;Installable Software&quot;). This
 		capability is provided with the intent of allowing such users to
 		install, extend and update Eclipse-based products. Information about
 		packaging Installable Software is available at <a
 			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
 		(&quot;Specification&quot;).
 	</p>
 	<p>You may use Provisioning Technology to allow other parties to
 		install Installable Software. You shall be responsible for enabling
 		the applicable license agreements relating to the Installable Software
 		to be presented to, and accepted by, the users of the Provisioning
 		Technology in accordance with the Specification. By using Provisioning
 		Technology in such a manner and making it available in accordance with
 		the Specification, you further acknowledge your agreement to, and the
 		acquisition of all necessary rights to permit the following:</p>
 	<ol>
 		<li>A series of actions may occur (&quot;Provisioning
 			Process&quot;) in which a user may execute the Provisioning
 			Technology on a machine (&quot;Target Machine&quot;) with the intent
 			of installing, extending or updating the functionality of an
 			Eclipse-based product.</li>
 		<li>During the Provisioning Process, the Provisioning Technology
 			may cause third party Installable Software or a portion thereof to be
 			accessed and copied to the Target Machine.</li>
 		<li>Pursuant to the Specification, you will provide to the user
 			the terms and conditions that govern the use of the Installable
 			Software (&quot;Installable Software Agreement&quot;) and such
 			Installable Software Agreement shall be accessed from the Target
 			Machine in accordance with the Specification. Such Installable
 			Software Agreement must inform the user of the terms and conditions
 			that govern the Installable Software and must solicit acceptance by
 			the end user in the manner prescribed in such Installable Software
 			Agreement. Upon such indication of agreement by the user, the
 			provisioning Technology will complete installation of the Installable
 			Software.</li>
 	</ol>
 	<h3>Cryptography</h3>
 	<p>Content may contain encryption software. The country in which
 		you are currently may have restrictions on the import, possession, and
 		use, and/or re-export to another country, of encryption software.
 		BEFORE using any encryption software, please check the country's laws,
 		regulations and policies concerning the import, possession, or use,
 		and re-export of encryption software, to see if this is permitted.</p>
 	<p>
 		<small>Java and all Java-based trademarks are trademarks of
 			Oracle Corporation in the United States, other countries, or both.</small>
 	</p>
 </body>
 </html>