diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-24 12:15:52 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-09-24 12:16:13 +0200 |
| commit | 84db92bb67caf4fabfc5a1281a49c6f41d96fafa (patch) | |
| tree | b030fbb7795f52ea0a859bb8f8a988c39de52ba6 /org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature | |
| parent | 9354d255eb7c95925f9c7fcb2fcc4b425dcbe796 (diff) | |
| download | jgit-84db92bb67caf4fabfc5a1281a49c6f41d96fafa.tar.gz jgit-84db92bb67caf4fabfc5a1281a49c6f41d96fafa.zip | |
Update Eclipse SUA to latest 2.0 version
This should fix errors raised in
https://download.eclipse.org/oomph/archive/simrel/egit.aggrcon/
The original is maintained in
https://git.eclipse.org/r/plugins/gitiles/cbi/org.eclipse.license/+/refs/heads/master/org.eclipse.license
Change-Id: I09325f04f3ae13b2558b212ad73b3f4f624ecb8d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/license.html | 23 |
2 files changed, 3 insertions, 25 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties index 8387585cda..5d953fa4c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties @@ -30,7 +30,6 @@ http://www.eclipse.org/org/documents/edl-v10.html\n # "licenseURL" property - URL of the "Feature License" # do not translate value - just change to point to a locale-specific HTML page licenseURL=license.html - # "license" property - text of the "Feature Update License" # should be plain text version of license agreement pointed to be "licenseURL" license=\ @@ -69,7 +68,7 @@ downloadable archives ("Downloads").\n\ include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\ features ("Features").\n\ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\ - (Java™ ARchive) in a directory named "plugins".\n\ + (Java\u2122 ARchive) in a directory named "plugins".\n\ - A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\ associated material. Each Feature may be packaged as a sub-directory in a\n\ directory named "features". Within a Feature, files named "feature.xml" may\n\ @@ -174,4 +173,4 @@ permitted.\n\ \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 ########################################## +########### end of license property ##########################################
\ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/license.html b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/license.html index 008b8018db..004b6dec6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/license.html +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/license.html @@ -5,13 +5,10 @@ <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> <p>November 22, 2017</p> - <h3>Usage Of Content</h3> - <p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY @@ -24,9 +21,7 @@ AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p> - <h3>Applicable Licenses</h3> - <p> Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the @@ -35,13 +30,11 @@ href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. For purposes of the EPL, "Program" will mean 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 repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p> - <ul> <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical @@ -62,7 +55,6 @@ "feature.xml" may contain a list of the names and version numbers of Included Features.</li> </ul> - <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 @@ -70,7 +62,6 @@ "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:</p> - <ul> <li>The top-level (root) directory</li> <li>Plug-in and Fragment directories</li> @@ -79,7 +70,6 @@ certain Plug-ins</li> <li>Feature directories</li> </ul> - <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 @@ -92,12 +82,10 @@ 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 that directory.</p> - <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 OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> - <ul> <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>) @@ -118,16 +106,12 @@ 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 @@ -140,7 +124,6 @@ href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a> ("Specification"). </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 @@ -149,7 +132,6 @@ 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 ("Provisioning Process") in which a user may execute the Provisioning @@ -171,19 +153,16 @@ 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> +</html>
\ No newline at end of file |