directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1706760 - in /directory/apacheds/trunk: LICENSE installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE
Date Mon, 05 Oct 2015 08:10:16 GMT
Author: elecharny
Date: Mon Oct  5 08:10:16 2015
New Revision: 1706760

URL: http://svn.apache.org/viewvc?rev=1706760&view=rev
Log:
Removed the Safehaus JUG reference, we are not using it anymore. Also updated the slf4j license
and version. Also removed the Spring part from N&L, we are not using it anymore

Modified:
    directory/apacheds/trunk/LICENSE
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE

Modified: directory/apacheds/trunk/LICENSE
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/LICENSE?rev=1706760&r1=1706759&r2=1706760&view=diff
==============================================================================
--- directory/apacheds/trunk/LICENSE (original)
+++ directory/apacheds/trunk/LICENSE Mon Oct  5 08:10:16 2015
@@ -272,10 +272,34 @@ LIABILITY, WHETHER IN AN ACTION OF CONTR
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
 THE SOFTWARE. 
 
+==================================================================================================
+slf4j 1.7.10 license:
+--------------------------------------------------------------------------------------------------
+Copyright (c) 2004-2013 QOS.ch
+All rights reserved.
+
+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.
+
 ==========================================================================
 For the AVL Set code : http://bobah.net/d4d/source-code/misc/java-avl-tree
 --------------------------------------------------------------------------
-
 Copyright 2001-2014 Vladimir Lysyy
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this source code except in compliance with the License.

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE?rev=1706760&r1=1706759&r2=1706760&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE
(original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE
Mon Oct  5 08:10:16 2015
@@ -280,24 +280,30 @@ PURPOSE AND NONINFRINGEMENT. IN NO EVENT
 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 1.7.10 license:
 --------------------------------------------------------------------------------------------------
-JUG (package org/safehaus/uuid) is licensed under the AL v2.
---------------------------------------------------------------------------------------------------
-Spring is licensed under the AL v2.
---------------------------------------------------------------------------------------------------
-slf4j license:
-Copyright (c) 2004-2007 QOS.ch All rights reserved. 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.
+Copyright (c) 2004-2013 QOS.ch 
+All rights reserved. 
+
+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.
 --------------------------------------------------------------------------------------------------
 Copyright (c) 1999, 2004 Tanuki Software
 
@@ -343,7 +349,6 @@ included in all copies or substantial po
 ==========================================================================
 For the AVL Set code : http://bobah.net/d4d/source-code/misc/java-avl-tree
 --------------------------------------------------------------------------
-
 Copyright 2001-2014 Vladimir Lysyy
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this source code except in compliance with the License.



Mime
View raw message