youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

version 2.0 is the Apache License (without "Software"). PR 43576. 

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@687719 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 17 years ago
parent
d0e9cd3ccd
commit
1bbf2f16f4
4 changed files with 42 additions and 64 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      WHATSNEW
  2. +2
    -2
      docs/ant_task_guidelines.html
  3. +36
    -58
      xdocs/external.xml
  4. +3
    -3
      xdocs/license.xml

+ 1
- 1
WHATSNEW View File

@@ -1897,7 +1897,7 @@ Changes from Ant 1.6.0 to Ant 1.6.1
Changes that could break older environments: Changes that could break older environments:
-------------------------------------------- --------------------------------------------


* License is now Apache Software License 2.0
* License is now Apache License 2.0
see http://www.apache.org/licenses/ for more information see http://www.apache.org/licenses/ for more information


Fixed bugs: Fixed bugs:


+ 2
- 2
docs/ant_task_guidelines.html View File

@@ -334,7 +334,7 @@ documentation build process trivial.
<h2>Licensing and Copyright</h2> <h2>Licensing and Copyright</h2>


Any code submitted to the Apache project must be compatible with the Any code submitted to the Apache project must be compatible with the
Apache Software License, and the act of submission must be viewed as
Apache License, and the act of submission must be viewed as
an implicit license of the submitted code to the Apache Software an implicit license of the submitted code to the Apache Software
Foundation. Foundation.


@@ -347,7 +347,7 @@ The fairly laissez-faire license of Apache is not currently considered
compatible with compatible with
either the GPL or the Lesser GPL of the Free Software Foundation--the either the GPL or the Lesser GPL of the Free Software Foundation--the
Gnu project. These licenses have stricter terms, &quot;copyleft&quot;, Gnu project. These licenses have stricter terms, &quot;copyleft&quot;,
which are not in the Apache Software Foundation license.
which are not in the Apache License.
This permits people and organisations to build This permits people and organisations to build
commercial and closed source applications atop the Apache libraries and source. commercial and closed source applications atop the Apache libraries and source.




+ 36
- 58
xdocs/external.xml View File

@@ -65,7 +65,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Eclipse Public License</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -82,15 +82,15 @@
</tr> </tr>
<tr> <tr>
<th>URL:</th> <th>URL:</th>
<td><a href="http://jakarta.apache.org/velocity/anakia.html">http://jakarta.apache.org/velocity/anakia.html</a></td>
<td><a href="http://velocity.apache.org/anakia/devel/">http://velocity.apache.org/anakia/devel/</a></td>
</tr> </tr>
<tr> <tr>
<th>Contact:</th> <th>Contact:</th>
<td><a href="http://jakarta.apache.org/site/mail2.html">Velocity mailing lists</a></td>
<td><a href="http://velocity.apache.org/contact.html">Velocity mailing lists</a></td>
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -144,7 +144,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>The Apache Software License 2.0</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -242,7 +242,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>The Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -301,7 +301,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -438,7 +438,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -487,7 +487,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License 2.0</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -628,7 +628,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -716,7 +716,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -747,7 +747,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>License derived from Apache Software License</td>
<td>License derived from Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -843,29 +843,6 @@
</subsection> </subsection>


<subsection name="Doxygen task"> <subsection name="Doxygen task">
<p>There are two Ant tasks for running the Doxygen
documentation system.</p>

<table class="externals">
<tr>
<th>Compatibility:</th>
<td>Ant 1.1 and later</td>
</tr>
<tr>
<th>URL:</th>
<td><a href="http://www.bgw.org/projects/java/ant/">http://www.bgw.org/projects/java/ant/</a></td>
</tr>
<tr>
<th>Contact:</th>
<td><a href="mailto:mortis@voicenet.com">Kyle R. Burton</a></td>
</tr>
<tr>
<th>License:</th>
<td>Apache Software Foundation License</td>
</tr>
</table>

<p>and</p>


<table class="externals"> <table class="externals">
<tr> <tr>
@@ -882,7 +859,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software Foundation License</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -1011,7 +988,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software Foundation License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -1068,7 +1045,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -1230,7 +1207,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -1345,19 +1322,19 @@
<table class="externals"> <table class="externals">
<tr> <tr>
<th>Compatibility:</th> <th>Compatibility:</th>
<td>1.5.1 (1.6.5 or 1.7.0 recommended)</td>
<td>1.5.1 (1.6.5 or 1.7.1 recommended)</td>
</tr> </tr>
<tr> <tr>
<th>URL:</th> <th>URL:</th>
<td><a href="http://incubator.apache.org/ivy/">http://incubator.apache.org/ivy/</a></td>
<td><a href="http://ant.apache.org/ivy/">http://ant.apache.org/ivy/</a></td>
</tr> </tr>
<tr> <tr>
<th>Contact:</th> <th>Contact:</th>
<td>ivy-user (at) incubator (dot) apache (dot) org [User Mailinglist]</td>
<td>ivy-user (at) ant (dot) apache (dot) org [User Mailinglist]</td>
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -1449,7 +1426,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsubsection> </subsubsection>
@@ -1779,7 +1756,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -1834,7 +1811,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>The Apache Software License 2.0</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -2104,7 +2081,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -2406,7 +2383,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software Foundation License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -2544,7 +2521,7 @@
</tr> </tr>
<tr> <tr>
<th>Licence:</th> <th>Licence:</th>
<td>Apache Software Foundation License</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -2591,7 +2568,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software Foundation License</td>
<td>BSD style license</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -2672,7 +2649,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License 2.0</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -2748,7 +2725,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>The Apache Software License</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -2807,7 +2784,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -3413,7 +3390,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -3442,7 +3419,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>Apache Software License 1.1</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -3528,7 +3505,8 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License 2.0</a></td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -3615,7 +3593,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>Apache Software License</td>
<td>GNU General Public License</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>
@@ -3981,7 +3959,7 @@
</tr> </tr>
<tr> <tr>
<th>License:</th> <th>License:</th>
<td>The Apache Software License 2.0</td>
<td>Apache License 2.0</td>
</tr> </tr>
</table> </table>
</subsection> </subsection>


+ 3
- 3
xdocs/license.xml View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0 The ASF licenses this file to You under the Apache License, Version 2.0
@@ -24,8 +24,8 @@


<body> <body>


<section name="The Apache Software License Version 2.0">
<p>The Apache Software License Version 2.0 applies
<section name="The Apache License Version 2.0">
<p>The Apache License Version 2.0 applies
to all releases of Ant starting with ant 1.6.1</p> to all releases of Ant starting with ant 1.6.1</p>


<source>/* <source>/*


Write Preview
Loading…
Cancel
Save