You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by br...@apache.org on 2013/04/24 14:00:46 UTC
svn commit: r1471377 - in /ace/trunk/build/resources: bin/LICENSE bin/NOTICE
deps/LICENSE deps/NOTICE
Author: bramk
Date: Wed Apr 24 12:00:46 2013
New Revision: 1471377
URL: http://svn.apache.org/r1471377
Log:
ACE-211 bin/deps LICENSE/NOTICE tweaks
Removed kxml license as it is BSD
Added license/notice for Bouncy Castle
Added notice for jclouds
Added notice for testng/junit/mockito
Formatting tweaks
Modified:
ace/trunk/build/resources/bin/LICENSE
ace/trunk/build/resources/bin/NOTICE
ace/trunk/build/resources/deps/LICENSE
ace/trunk/build/resources/deps/NOTICE
Modified: ace/trunk/build/resources/bin/LICENSE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/bin/LICENSE?rev=1471377&r1=1471376&r2=1471377&view=diff
==============================================================================
--- ace/trunk/build/resources/bin/LICENSE (original)
+++ ace/trunk/build/resources/bin/LICENSE Wed Apr 24 12:00:46 2013
@@ -289,31 +289,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAG
=========================================================================
-== KXML License ==
-=========================================================================
-
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-
-=========================================================================
== SLF4J License ==
=========================================================================
Modified: ace/trunk/build/resources/bin/NOTICE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/bin/NOTICE?rev=1471377&r1=1471376&r2=1471377&view=diff
==============================================================================
--- ace/trunk/build/resources/bin/NOTICE (original)
+++ ace/trunk/build/resources/bin/NOTICE Wed Apr 24 12:00:46 2013
@@ -3,6 +3,7 @@ Copyright 2011-2013 The Apache Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
This product includes software developed at The OSGi
Alliance (http://www.osgi.org/).
@@ -15,10 +16,8 @@ This product includes software developed
Licensed under the Apache License 2.0.
This product includes software developed at
-'XStream' (http://xstream.codehaus.org)
-Copyright (c) 2003-2006, Joe Walnes
-Copyright (c) 2006-2007, XStream Committers
-License under Xstream License
+Mortbay (http://mortbay.org)
+Licensed under the Apache License 2.0.
This product includes software developed at
'Extreme! Lab, Indiana University'
@@ -26,12 +25,6 @@ This product includes software developed
Copyright (c) all rights reserved
Licensed under Apache Software License 1.1
-This product includes software developed at
-'Stefan Haustein, Oberhausen, Rhld., Germany'
-Copyright (c) 2002-2007 Stefan Haustein, Oberhausen, Rhld., Germany
-(http://kxml.sourceforge.net/)
-Licensed under kXml License
-
This product includes software developed at
Vaadin (http://vaadin.com)
Copyright (c) 2011 Vaadin Ltd.
@@ -43,23 +36,54 @@ Copyright 2008-2011 Google Inc.
Licensed under Apache License 2.0
This product includes software developed at
-Oracle (http://www.oracle.com/)
-Copyright (c) 2010 Oracle and/or its affiliates.
-License under CDDL
+Testng (http://www.testng.org)
+Licensed under Apache License 2.0
This product includes software developed at
-JCraft (http://www.jcraft.com/).
-Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc.
-Licensed under jCraft License
+Jclouds, Inc. (http://www.jclouds.org/).
+Copyright 2009-2012 jclouds, Inc.
+Licensed under Apache License 2.0
This product includes software developed at
'GSON' (https://code.google.com/p/google-gson/).
License under Apache License 2.0
This product includes software developed at
-'SLF4J' (https://slf4j.org/).
+Oracle (http://www.oracle.com/)
+Copyright (c) 2010 Oracle and/or its affiliates.
+License under CDDL 1.0 License
+
+This product includes software developed at
+'Stefan Haustein, Oberhausen, Rhld., Germany'
+Copyright (c) 2002-2007 Stefan Haustein, Oberhausen, Rhld., Germany
+(http://kxml.sourceforge.net/)
+Licensed under BSD License
+
+This product includes software developed at
+SLF4J (https://slf4j.org/).
Licensed under MIT License
+This product includes software developed at
+Aopaliance (http://aopalliance.sourceforge.net/)
+Licensed under 'Public Domain'
+
+This product includes software developed at
+The Legion Of The Bouncy Castle
+(http://www.bouncycastle.org)
+Copyright (c) 2000-2006 The Legion Of The Bouncy Castle
+Licensed under Bouncy Castle License
+
+This product includes software developed at
+XStream (http://xstream.codehaus.org)
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+License under Xstream License
+
+This product includes software developed at
+JCraft (http://www.jcraft.com/).
+Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc.
+Licensed under jCraft License
+
=========================================================================
== Apache Ant Notice (v1.8.4) ==
@@ -95,3 +119,61 @@ This product includes/uses software(s) d
- Unnamed - log4j:log4j:jar:1.2.12
- Unnamed - logkit:logkit:jar:1.0.1
+
+=========================================================================
+== Apache Commons Codec (v1.4) ==
+=========================================================================
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains
+test data from http://aspell.sourceforge.net/test/batch0.tab.
+
+Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org). Verbatim copying
+and distribution of this entire article is permitted in any medium,
+provided this notice is preserved.
+
+
+=========================================================================
+== JClouds (v1.5.0) ==
+=========================================================================
+
+This product includes Common Annotations (JSR 250, https://jsr250.dev.java.net/)
+distributed under the CDDL Version 1.0 license.
+
+This product includes Jersey (https://jersey.dev.java.net/)
+distributed under the CDDL Version 1.0 license.
+
+This product includes net.oauth.core
+distributed under the Apache Software License, Version 2.0.
+
+This product includes Gson (http://code.google.com/p/google-gson)
+distributed under the Apache Software License, Version 2.0.
+
+This product includes Guice (http://code.google.com/p/google-guice)
+distributed under the Apache Software License, Version 2.0.
+
+This product includes Guava (http://code.google.com/p/guava-libraries)
+distributed under the Apache Software License, Version 2.0.
+
+org.jclouds.util.Suppliers2 and Suppliers2Test contain pieces of Guava's Suppliers
+distributed under the Apache Software License, Version 2.0.
+(c) 2010 Google Inc.
+
+This product includes BouncyCastle (http://www.bouncycastle.org/licence.html)
+distributed with the following notice:
+ "Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+
+This product includes findbugs jsr305 (http://code.google.com/p/findbugs)
+distributed under the GNU Lesser GPL License, Version 3.0.
+
+This product includes aopalliance (http://aopalliance.sourceforge.net/)
+distributed in the Public Domain
+
+This product includes software developed at Hewlett-Packard
+Copyright (c) 2011-2012 Hewlett-Packard Development Company, L.P
+
Modified: ace/trunk/build/resources/deps/LICENSE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/deps/LICENSE?rev=1471377&r1=1471376&r2=1471377&view=diff
==============================================================================
--- ace/trunk/build/resources/deps/LICENSE (original)
+++ ace/trunk/build/resources/deps/LICENSE Wed Apr 24 12:00:46 2013
@@ -376,32 +376,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================
-== kXml License ==
-=========================================================================
-
-Copyright (c) 2002-2007 Stefan Haustein, Oberhausen, Rhld., Germany
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-
-=========================================================================
-== CDDL License ==
+== CDDL 1.0 License ==
=========================================================================
Definitions.
@@ -494,4 +469,19 @@ Definitions.
10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
\ No newline at end of file
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+
+=========================================================================
+== Bouncy Castle License ==
+=========================================================================
+
+Copyright (c) 2000 - 2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
Modified: ace/trunk/build/resources/deps/NOTICE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/deps/NOTICE?rev=1471377&r1=1471376&r2=1471377&view=diff
==============================================================================
--- ace/trunk/build/resources/deps/NOTICE (original)
+++ ace/trunk/build/resources/deps/NOTICE Wed Apr 24 12:00:46 2013
@@ -3,6 +3,7 @@ Copyright 2011-2013 The Apache Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
This product includes software developed at The OSGi
Alliance (http://www.osgi.org/).
@@ -15,10 +16,8 @@ This product includes software developed
Licensed under the Apache License 2.0.
This product includes software developed at
-'XStream' (http://xstream.codehaus.org)
-Copyright (c) 2003-2006, Joe Walnes
-Copyright (c) 2006-2007, XStream Committers
-License under Xstream License
+Mortbay (http://mortbay.org)
+Licensed under the Apache License 2.0.
This product includes software developed at
'Extreme! Lab, Indiana University'
@@ -26,12 +25,6 @@ This product includes software developed
Copyright (c) all rights reserved
Licensed under Apache Software License 1.1
-This product includes software developed at
-'Stefan Haustein, Oberhausen, Rhld., Germany'
-Copyright (c) 2002-2007 Stefan Haustein, Oberhausen, Rhld., Germany
-(http://kxml.sourceforge.net/)
-Licensed under kXml License
-
This product includes software developed at
Vaadin (http://vaadin.com)
Copyright (c) 2011 Vaadin Ltd.
@@ -43,23 +36,64 @@ Copyright 2008-2011 Google Inc.
Licensed under Apache License 2.0
This product includes software developed at
-Oracle (http://www.oracle.com/)
-Copyright (c) 2010 Oracle and/or its affiliates.
-License under CDDL
+Testng (http://www.testng.org)
+Licensed under Apache License 2.0
This product includes software developed at
-JCraft (http://www.jcraft.com/).
-Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc.
-Licensed under jCraft License
+Jclouds, Inc. (http://www.jclouds.org/).
+Copyright 2009-2012 jclouds, Inc.
+Licensed under Apache License 2.0
This product includes software developed at
'GSON' (https://code.google.com/p/google-gson/).
License under Apache License 2.0
This product includes software developed at
-'SLF4J' (https://slf4j.org/).
+Oracle (http://www.oracle.com/)
+Copyright (c) 2010 Oracle and/or its affiliates.
+License under CDDL 1.0 License
+
+This product includes software developed at
+'Stefan Haustein, Oberhausen, Rhld., Germany'
+Copyright (c) 2002-2007 Stefan Haustein, Oberhausen, Rhld., Germany
+(http://kxml.sourceforge.net/)
+Licensed under BSD License
+
+This product includes software developed at
+Hamcrest (http://www.hamcrest.org)
+Copyright (c) 2000-2006, www.hamcrest.org
+Licensed under BSD License
+
+This product includes software developed at
+SLF4J (https://slf4j.org/).
Licensed under MIT License
+This product includes software developed at
+Mockito (http://www.hamcrest.org)
+Copyright (c) 2007 Mockito contributors
+Licensed under MIT License
+
+This product includes software developed at
+Aopaliance (http://aopalliance.sourceforge.net/)
+Licensed under 'Public Domain'
+
+This product includes software developed at
+The Legion Of The Bouncy Castle
+(http://www.bouncycastle.org)
+Copyright (c) 2000-2006 The Legion Of The Bouncy Castle
+Licensed under Bouncy Castle License
+
+This product includes software developed at
+XStream (http://xstream.codehaus.org)
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+License under Xstream License
+
+This product includes software developed at
+JCraft (http://www.jcraft.com/).
+Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc.
+Licensed under jCraft License
+
=========================================================================
== Apache Ant Notice (v1.8.4) ==
@@ -95,3 +129,93 @@ This product includes/uses software(s) d
- Unnamed - log4j:log4j:jar:1.2.12
- Unnamed - logkit:logkit:jar:1.0.1
+
+=========================================================================
+== Apache Commons Codec (v1.4) ==
+=========================================================================
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains
+test data from http://aspell.sourceforge.net/test/batch0.tab.
+
+Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org). Verbatim copying
+and distribution of this entire article is permitted in any medium,
+provided this notice is preserved.
+
+
+=========================================================================
+== EasyMock (v3.1.0) ==
+=========================================================================
+
+EasyMock
+Copyright 2001-2011 OFFIS, Tammo Freese, Henri Tremblay
+
+This product includes/uses software(s) developed by 'an unknown organization'
+ - Code Generation Library (http://cglib.sourceforge.net/)
+
+This product includes/uses software(s) developed by 'Joe Walnes, Henri Tremblay, Leonardo Mesquita'
+ - Objenesis (http://objenesis.googlecode.com/svn/docs/index.html)
+
+ Copyright 2009-2012 jclouds, Inc.
+
+
+=========================================================================
+== JClouds (v1.5.0) ==
+=========================================================================
+
+This product includes Common Annotations (JSR 250, https://jsr250.dev.java.net/)
+distributed under the CDDL Version 1.0 license.
+
+This product includes Jersey (https://jersey.dev.java.net/)
+distributed under the CDDL Version 1.0 license.
+
+This product includes net.oauth.core
+distributed under the Apache Software License, Version 2.0.
+
+This product includes Gson (http://code.google.com/p/google-gson)
+distributed under the Apache Software License, Version 2.0.
+
+This product includes Guice (http://code.google.com/p/google-guice)
+distributed under the Apache Software License, Version 2.0.
+
+This product includes Guava (http://code.google.com/p/guava-libraries)
+distributed under the Apache Software License, Version 2.0.
+
+org.jclouds.util.Suppliers2 and Suppliers2Test contain pieces of Guava's Suppliers
+distributed under the Apache Software License, Version 2.0.
+(c) 2010 Google Inc.
+
+This product includes BouncyCastle (http://www.bouncycastle.org/licence.html)
+distributed with the following notice:
+ "Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+
+This product includes findbugs jsr305 (http://code.google.com/p/findbugs)
+distributed under the GNU Lesser GPL License, Version 3.0.
+
+This product includes aopalliance (http://aopalliance.sourceforge.net/)
+distributed in the Public Domain
+
+This product includes software developed at Hewlett-Packard
+Copyright (c) 2011-2012 Hewlett-Packard Development Company, L.P
+
+
+=========================================================================
+== Mockito (v1.5.0) ==
+=========================================================================
+
+Libraries used:
+
+Cglib - Apache License 2.0
+ASM - BSD license
+
+Mockito all distribution:
+
+Objenesis - MIT license
+Hamcrest - BSD license
+
+
\ No newline at end of file