You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2011/05/09 13:20:57 UTC
svn commit: r1101017 - in /incubator/npanday/trunk: LICENSE.txt NOTICE.txt
Author: brett
Date: Mon May 9 13:20:57 2011
New Revision: 1101017
URL: http://svn.apache.org/viewvc?rev=1101017&view=rev
Log:
remove some unnecessary portions of the license files
Modified:
incubator/npanday/trunk/LICENSE.txt
incubator/npanday/trunk/NOTICE.txt
Modified: incubator/npanday/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/LICENSE.txt?rev=1101017&r1=1101016&r2=1101017&view=diff
==============================================================================
--- incubator/npanday/trunk/LICENSE.txt (original)
+++ incubator/npanday/trunk/LICENSE.txt Mon May 9 13:20:57 2011
@@ -1,10 +1,3 @@
-============================================================================================================================
-= The following libraries are licensed under the Apache License Version 2.0: =
-= =
-= * org/apache/ant/ant/1.7.1/ant-1.7.1.jar =
-= * org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar =
-=== ===
-
Apache License
Version 2.0, January 2004
@@ -233,18 +226,10 @@
the original software.
3. This notice may not be removed or altered from any source distribution.
-
- License Note
-
- This license is based on the open source zlib/libpng license. The idea was to keep the license
- as simple as possible to encourage use of NUnit in free and commercial applications and libraries,
- but to keep the source code together and to give credit to the NUnit contributors for their efforts.
- While this license allows shipping NUnit in source and binary form, if shipping a NUnit variant is the
- sole purpose of your product, please let us know.
===========================================================================================================================
===========================================================================================================================
-= The following librarie(s) are licensed under BSD License: =
+= The following libraries are licensed under BSD License: =
= =
= * info/aduna/aduna-collections/1.2/aduna-collections-1.2.jar =
= * info/aduna/aduna-concurrent/1.2/aduna-concurrent-1.2.jar =
@@ -283,4 +268,4 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-===========================================================================================================================
\ No newline at end of file
+===========================================================================================================================
Modified: incubator/npanday/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/NOTICE.txt?rev=1101017&r1=1101016&r2=1101017&view=diff
==============================================================================
--- incubator/npanday/trunk/NOTICE.txt (original)
+++ incubator/npanday/trunk/NOTICE.txt Mon May 9 13:20:57 2011
@@ -3,6 +3,3 @@ Copyright 2007-2011
This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
-This product includes software developed under zlib/libpng license (http://www.nunit.org/index.php?p=license&r=2.2.10).
-
-This product includes software developed under BSD License.