Merge branch 'stable-0.8'
* stable-0.8: Qualify post-0.8.4 builds JGit 0.8.4 JGit 0.8.3 Include about.html in org.eclipse.jgit artifact Fix build.properties of the JGit feature Added the standard SULA for JGit Add "resources/" as a source folder Change-Id: I4ecb0af41184ef84d104345fd1adcc4a240a38f6
This commit is contained in:
commit
44ba1bc78c
|
@ -1,3 +1,4 @@
|
|||
bin.includes = feature.xml,\
|
||||
edl-v10.html,\
|
||||
feature.properties
|
||||
feature.properties,\
|
||||
license.html
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
###############################################################################
|
||||
# Copyright (c) 2000, 2009 IBM Corporation and others.
|
||||
# Copyright (c) 2000, 2010 IBM Corporation and others.
|
||||
#
|
||||
# All rights reserved. This program and the accompanying materials
|
||||
# are made available under the terms of the Eclipse Public License v1.0
|
||||
|
@ -20,7 +20,7 @@ A pure Java implementation of the Git version control system.\n
|
|||
|
||||
# "copyright" property - text of the "Feature Update Copyright"
|
||||
copyright=\
|
||||
Copyright (c) 2005, 2009 Shawn Pearce, Robin Rosenberg, et.al.\n\
|
||||
Copyright (c) 2005, 2010 Shawn Pearce, Robin Rosenberg, et.al.\n\
|
||||
All rights reserved. This program and the accompanying materials\n\
|
||||
are made available under the terms of the Eclipse Distribution License v1.0\n\
|
||||
which accompanies this distribution, and is available at\n\
|
||||
|
@ -29,43 +29,131 @@ 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=http://www.eclipse.org/org/documents/edl-v10.html
|
||||
licenseURL=license.html
|
||||
|
||||
# "license" property - text of the "Feature Update License"
|
||||
# should be plain text version of license agreement pointed to be "licenseURL"
|
||||
license=\
|
||||
Eclipse Distribution License - v 1.0\n\
|
||||
Eclipse Foundation Software User Agreement\n\
|
||||
April 14, 2010\n\
|
||||
\n\
|
||||
Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.\n\
|
||||
Usage Of Content\n\
|
||||
\n\
|
||||
All rights reserved.\n\
|
||||
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
|
||||
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
|
||||
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
|
||||
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
|
||||
NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
|
||||
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
|
||||
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
|
||||
OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
|
||||
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
|
||||
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
|
||||
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
|
||||
\n\
|
||||
Redistribution and use in source and binary forms, with or without\n\
|
||||
modification, are permitted provided that the following conditions are\n\
|
||||
met:\n\
|
||||
Applicable Licenses\n\
|
||||
\n\
|
||||
* Redistributions of source code must retain the above copyright\n\
|
||||
notice, this list of conditions and the following disclaimer.\n\
|
||||
Unless otherwise indicated, all Content made available by the\n\
|
||||
Eclipse Foundation is provided to you under the terms and conditions of\n\
|
||||
the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
|
||||
provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
|
||||
For purposes of the EPL, "Program" will mean the Content.\n\
|
||||
\n\
|
||||
* Redistributions in binary form must reproduce the above\n\
|
||||
copyright notice, this list of conditions and the following\n\
|
||||
disclaimer in the documentation and/or other materials provided\n\
|
||||
with the distribution.\n\
|
||||
Content includes, but is not limited to, source code, object code,\n\
|
||||
documentation and other files maintained in the Eclipse Foundation source code\n\
|
||||
repository ("Repository") in software modules ("Modules") and made available\n\
|
||||
as downloadable archives ("Downloads").\n\
|
||||
\n\
|
||||
* Neither the name of the Eclipse Foundation, Inc. nor the names\n\
|
||||
of its contributors may be used to endorse or promote products\n\
|
||||
derived from this software without specific prior written\n\
|
||||
permission.\n\
|
||||
- Content may be structured and packaged into modules to facilitate delivering,\n\
|
||||
extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
|
||||
plug-in fragments ("Fragments"), and features ("Features").\n\
|
||||
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
|
||||
in a directory named "plugins".\n\
|
||||
- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
|
||||
Each Feature may be packaged as a sub-directory in a directory named "features".\n\
|
||||
Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
|
||||
numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
|
||||
- Features may also include other Features ("Included Features"). Within a Feature, files\n\
|
||||
named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
|
||||
\n\
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n\
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n\
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n\
|
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n\
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n\
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n\
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n\
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n\
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n
|
||||
The terms and conditions governing Plug-ins and Fragments should be\n\
|
||||
contained in files named "about.html" ("Abouts"). The terms and\n\
|
||||
conditions governing Features and Included Features should be contained\n\
|
||||
in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
|
||||
Licenses may be located in any directory of a Download or Module\n\
|
||||
including, but not limited to the following locations:\n\
|
||||
\n\
|
||||
- The top-level (root) directory\n\
|
||||
- Plug-in and Fragment directories\n\
|
||||
- Inside Plug-ins and Fragments packaged as JARs\n\
|
||||
- Sub-directories of the directory named "src" of certain Plug-ins\n\
|
||||
- Feature directories\n\
|
||||
\n\
|
||||
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
|
||||
Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
|
||||
Update License") during the installation process. If the Feature contains\n\
|
||||
Included Features, the Feature Update License should either provide you\n\
|
||||
with the terms and conditions governing the Included Features or inform\n\
|
||||
you where you can locate them. Feature Update Licenses may be found in\n\
|
||||
the "license" property of files named "feature.properties" found within a Feature.\n\
|
||||
Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
|
||||
terms and conditions (or references to such terms and conditions) that\n\
|
||||
govern your use of the associated Content in that directory.\n\
|
||||
\n\
|
||||
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
|
||||
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
|
||||
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
|
||||
\n\
|
||||
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
|
||||
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
|
||||
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
|
||||
- Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
|
||||
- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
|
||||
\n\
|
||||
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
|
||||
TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
|
||||
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
|
||||
govern that particular Content.\n\
|
||||
\n\
|
||||
\n\Use of Provisioning Technology\n\
|
||||
\n\
|
||||
The Eclipse Foundation makes available provisioning software, examples of which include,\n\
|
||||
but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
|
||||
the purpose of allowing users to install software, documentation, information and/or\n\
|
||||
other materials (collectively "Installable Software"). This capability is provided with\n\
|
||||
the intent of allowing such users to install, extend and update Eclipse-based products.\n\
|
||||
Information 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 shall be responsible for enabling the applicable license agreements relating to the\n\
|
||||
Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
|
||||
in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
|
||||
making it available in accordance with the Specification, you further acknowledge your\n\
|
||||
agreement to, and the acquisition of all necessary rights to permit the following:\n\
|
||||
\n\
|
||||
1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
|
||||
the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
|
||||
extending or updating the functionality of an Eclipse-based product.\n\
|
||||
2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
|
||||
Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
|
||||
3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
|
||||
govern the use of the Installable Software ("Installable Software Agreement") and such\n\
|
||||
Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
|
||||
with the Specification. Such Installable Software Agreement must inform the user of the\n\
|
||||
terms and conditions that govern the Installable Software and must solicit acceptance by\n\
|
||||
the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
|
||||
indication of agreement by the user, the provisioning Technology will complete installation\n\
|
||||
of the Installable Software.\n\
|
||||
\n\
|
||||
Cryptography\n\
|
||||
\n\
|
||||
Content may contain encryption software. The country in which you are\n\
|
||||
currently may have restrictions on the import, possession, and use,\n\
|
||||
and/or re-export to another country, of encryption software. BEFORE\n\
|
||||
using any encryption software, please check the country's laws,\n\
|
||||
regulations and policies concerning the import, possession, or use, and\n\
|
||||
re-export of encryption software, to see if this is permitted.\n\
|
||||
\n\
|
||||
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
|
||||
########### end of license property ##########################################
|
||||
|
|
|
@ -0,0 +1,176 @@
|
|||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml"><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>
|
||||
<p>April 14, 2010</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 THE
|
||||
TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
|
||||
CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
|
||||
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 APPLICABLE LICENSE AGREEMENTS OR
|
||||
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
|
||||
TERMS AND CONDITIONS OF THIS 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
|
||||
Eclipse Public License Version 1.0
|
||||
("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>.
|
||||
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
|
||||
modules may include plug-ins ("Plug-ins"), plug-in fragments
|
||||
("Fragments"), and features ("Features").</li>
|
||||
<li>Each Plug-in or Fragment may be packaged as a sub-directory
|
||||
or JAR (Java™ ARchive) in a directory named "plugins".</li>
|
||||
<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
|
||||
and/or Fragments associated with that Feature.</li>
|
||||
<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>
|
||||
</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
|
||||
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
|
||||
including, but not limited to the following locations:</p>
|
||||
|
||||
<ul>
|
||||
<li>The top-level (root) directory</li>
|
||||
<li>Plug-in and Fragment directories</li>
|
||||
<li>Inside Plug-ins and Fragments packaged as JARs</li>
|
||||
<li>Sub-directories of the directory named "src" of 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 the
|
||||
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
|
||||
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.
|
||||
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
|
||||
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>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>Metro Link Public License 1.00 (available at <a
|
||||
href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</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 ("Provisioning Technology") for the purpose of
|
||||
allowing users to install software, documentation, information and/or
|
||||
other materials (collectively "Installable Software"). 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>
|
||||
("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 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 ("Provisioning Process") in
|
||||
which a user may execute the Provisioning Technology
|
||||
on a machine ("Target Machine") 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 ("Installable Software Agreement") 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>
|
|
@ -1,4 +1,5 @@
|
|||
source.. = src/
|
||||
source.. = src/,\
|
||||
resources/
|
||||
output.. = bin/
|
||||
bin.includes = META-INF/,\
|
||||
.,\
|
||||
|
|
Loading…
Reference in New Issue