diff --git a/WHATSNEW b/WHATSNEW index 049b039b6..9adbfcea3 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1897,7 +1897,7 @@ Changes from Ant 1.6.0 to Ant 1.6.1 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 Fixed bugs: diff --git a/docs/ant_task_guidelines.html b/docs/ant_task_guidelines.html index 077a2ce02..c22289d98 100644 --- a/docs/ant_task_guidelines.html +++ b/docs/ant_task_guidelines.html @@ -334,7 +334,7 @@ documentation build process trivial.

Licensing and Copyright

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 Foundation. @@ -347,7 +347,7 @@ The fairly laissez-faire license of Apache is not currently considered compatible with either the GPL or the Lesser GPL of the Free Software Foundation--the Gnu project. These licenses have stricter terms, "copyleft", -which are not in the Apache Software Foundation license. +which are not in the Apache License. This permits people and organisations to build commercial and closed source applications atop the Apache libraries and source. diff --git a/xdocs/external.xml b/xdocs/external.xml index dbd8ad24a..e6f2b967b 100644 --- a/xdocs/external.xml +++ b/xdocs/external.xml @@ -65,7 +65,7 @@ License: - Apache Software License + Eclipse Public License @@ -82,15 +82,15 @@ URL: - http://jakarta.apache.org/velocity/anakia.html + http://velocity.apache.org/anakia/devel/ Contact: - Velocity mailing lists + Velocity mailing lists License: - Apache Software License + Apache License 2.0 @@ -144,7 +144,7 @@ License: - The Apache Software License 2.0 + Apache License 2.0 @@ -242,7 +242,7 @@ License: - The Apache Software License + Apache Software License 1.1 @@ -301,7 +301,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -438,7 +438,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -487,7 +487,7 @@ License: - Apache Software License 2.0 + Apache License 2.0 @@ -628,7 +628,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -716,7 +716,7 @@ License: - Apache Software License + Apache License 2.0 @@ -747,7 +747,7 @@ License: - License derived from Apache Software License + License derived from Apache Software License 1.1 @@ -843,29 +843,6 @@ -

There are two Ant tasks for running the Doxygen - documentation system.

- - - - - - - - - - - - - - - - - - -
Compatibility:Ant 1.1 and later
URL:http://www.bgw.org/projects/java/ant/
Contact:Kyle R. Burton
License:Apache Software Foundation License
- -

and

@@ -882,7 +859,7 @@ - +
License:Apache Software Foundation LicenseApache License 2.0
@@ -1011,7 +988,7 @@ License: - Apache Software Foundation License + Apache Software License 1.1 @@ -1068,7 +1045,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -1230,7 +1207,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -1345,19 +1322,19 @@ - + - + - + - +
Compatibility:1.5.1 (1.6.5 or 1.7.0 recommended)1.5.1 (1.6.5 or 1.7.1 recommended)
URL:http://incubator.apache.org/ivy/http://ant.apache.org/ivy/
Contact:ivy-user (at) incubator (dot) apache (dot) org [User Mailinglist]ivy-user (at) ant (dot) apache (dot) org [User Mailinglist]
License:Apache Software LicenseApache License 2.0
@@ -1449,7 +1426,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -1779,7 +1756,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -1834,7 +1811,7 @@ License: - The Apache Software License 2.0 + Apache License 2.0 @@ -2104,7 +2081,7 @@ License: - Apache Software License + Apache License 2.0 @@ -2406,7 +2383,7 @@ License: - Apache Software Foundation License + Apache Software License 1.1 @@ -2544,7 +2521,7 @@ Licence: - Apache Software Foundation License + Apache License 2.0 @@ -2591,7 +2568,7 @@ License: - Apache Software Foundation License + BSD style license @@ -2672,7 +2649,7 @@ License: - Apache Software License 2.0 + Apache License 2.0 @@ -2748,7 +2725,7 @@ License: - The Apache Software License + Apache License 2.0 @@ -2807,7 +2784,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -3413,7 +3390,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -3442,7 +3419,7 @@ License: - Apache Software License + Apache Software License 1.1 @@ -3528,7 +3505,8 @@ License: - Apache Software License + Apache + License 2.0 @@ -3615,7 +3593,7 @@ License: - Apache Software License + GNU General Public License @@ -3981,7 +3959,7 @@ License: - The Apache Software License 2.0 + Apache License 2.0 diff --git a/xdocs/license.xml b/xdocs/license.xml index e9bcaf254..7404942e5 100644 --- a/xdocs/license.xml +++ b/xdocs/license.xml @@ -1,6 +1,6 @@