Author: ceki Date: Sat Aug 9 16:58:38 2008 New Revision: 1745 Modified: logback/trunk/LICENSE.txt logback/trunk/logback-access/LICENSE.txt logback/trunk/logback-classic/LICENSE.txt logback/trunk/logback-core/LICENSE.txt logback/trunk/logback-site/src/site/pages/license.html Log: - reverting to LGPL 2.1 license as in the previous versions of logback Given that GPL+classpath exception is rejected in the same way as LGPL by those requesting for a licensing change, there is no need for change if the end result is the same. Modified: logback/trunk/LICENSE.txt ============================================================================== --- logback/trunk/LICENSE.txt (original) +++ logback/trunk/LICENSE.txt Sat Aug 9 16:58:38 2008 @@ -1,4 +1,3 @@ - Logback LICENSE --------------- @@ -7,34 +6,17 @@ Copyright (C) 2000-2008, QOS.ch -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - - -CLASSPATH EXCEPTION TO THE GPL - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from or -based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not obliged -to do so. If you do not wish to do so, delete this exception statement -from your version. - - +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. Modified: logback/trunk/logback-access/LICENSE.txt ============================================================================== --- logback/trunk/logback-access/LICENSE.txt (original) +++ logback/trunk/logback-access/LICENSE.txt Sat Aug 9 16:58:38 2008 @@ -1,12 +1,22 @@ - -Logback Core Module LICENSE ---------------------------- +Logback LICENSE +--------------- -Logback Core Module source code and binaries are distributed under the -GNU Lesser General Public License as published by the Free Software Foundation. +Logback: the reliable, generic, fast and flexible logging library for +Java. -Logback: the generic, reliable, fast and flexible logging library for Java. +Copyright (C) 2000-2008, QOS.ch -Copyright (C) 2000-2006, QOS.ch This library is free software, you can -redistribute it and/or modify it under the terms of the GNU Lesser General Public License -as published by the Free Software Foundation. \ No newline at end of file +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. Modified: logback/trunk/logback-classic/LICENSE.txt ============================================================================== --- logback/trunk/logback-classic/LICENSE.txt (original) +++ logback/trunk/logback-classic/LICENSE.txt Sat Aug 9 16:58:38 2008 @@ -1,12 +1,22 @@ - -Logback Core Module LICENSE ---------------------------- +Logback LICENSE +--------------- -Logback Core Module source code and binaries are distributed under the -GNU Lesser General Public License as published by the Free Software Foundation. +Logback: the reliable, generic, fast and flexible logging library for +Java. -Logback: the generic, reliable, fast and flexible logging library for Java. +Copyright (C) 2000-2008, QOS.ch -Copyright (C) 2000-2006, QOS.ch This library is free software, you can -redistribute it and/or modify it under the terms of the GNU Lesser General Public License -as published by the Free Software Foundation. \ No newline at end of file +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. Modified: logback/trunk/logback-core/LICENSE.txt ============================================================================== --- logback/trunk/logback-core/LICENSE.txt (original) +++ logback/trunk/logback-core/LICENSE.txt Sat Aug 9 16:58:38 2008 @@ -1,12 +1,22 @@ - -Logback Core Module LICENSE ---------------------------- +Logback LICENSE +--------------- -Logback Core Module source code and binaries are distributed under the -GNU Lesser General Public License as published by the Free Software Foundation. +Logback: the reliable, generic, fast and flexible logging library for +Java. -Logback: the generic, reliable, fast and flexible logging library for Java. +Copyright (C) 2000-2008, QOS.ch -Copyright (C) 2000-2006, QOS.ch This library is free software, you can -redistribute it and/or modify it under the terms of the GNU Lesser General Public License -as published by the Free Software Foundation. \ No newline at end of file +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. Modified: logback/trunk/logback-site/src/site/pages/license.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/license.html (original) +++ logback/trunk/logback-site/src/site/pages/license.html Sat Aug 9 16:58:38 2008 @@ -23,34 +23,35 @@ <h2>Logback License</h2> </div> + <p>Logback source code and binaries are distributed under the <a - href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public - License version 2</a> as published by the Free Software Foundation. + href="http://www.gnu.org/licenses/lgpl-2.1.html">GNU Lesser General + Public License version 2.1</a> as published by the Free Software + Foundation. </p> <div class="source"><pre>Logback: the reliable, generic, fast and flexible logging library for Java. Copyright (C) 2000-2008, QOS.ch -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +Source code and binaries for logback, including logback-core, +logback-classic and logback-access modules, are distributed under the +GNU Lesser General Public License Version 2.1, as published by the +Free Software Foundation. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. </pre></div> <!-- =========================================== --> -<p>Logback will remain an open-source project distributed under the -GPL for the foreseeable future -- foreseeable as in the future you can -reasonably think or talk about. In other words, there are no plans -whatsoever to make logback a commercial project. -</p> - <p>Please note that logback is intended to be used behind the SLF4J API, which is licensed under <a href="http://www.slf4j.org/license.html">an X11 type license</a>. @@ -62,29 +63,6 @@ of your contribution and to protect the project in case of litigation. </p> - -<h3>Classpath Exception</h3> - -<p>Linking this library statically or dynamically with other modules -is making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. -</p> - -<p>As a special exception, the copyright holders of this library give -you permission to link this library with independent modules to -produce an executable, regardless of the license terms of these -independent modules, and to copy and distribute the resulting -executable under terms of your choice, provided that you also meet, -for each linked independent module, the terms and conditions of the -license of that module. An independent module is a module which is not -derived from or based on this library. If you modify this library, you -may extend this exception to your version of the library, but you are -not obliged to do so. If you do not wish to do so, delete this -exception statement from your version. -</p> - - <script src="templates/footer.js"></script> </div> </body>