[Libreoffice-commits] core.git: readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/license.xml |   32 --------------------------------
 1 file changed, 32 deletions(-)

New commits:
commit 3df74ac693f21a9add889d95d3368c26d70cae46
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Mar 21 15:12:46 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Mar 21 20:40:33 2019 +0100

    license: JDOM is not included in LibreOffice
    
    Change-Id: I36606503c469cb069f81f57ac4f0836842c12e0f
    Reviewed-on: https://gerrit.libreoffice.org/69513
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index d74f42c93171..44785fd53599 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -581,38 +581,6 @@
         <p>The Graphics Interchange Format(c) is the Copyright property of CompuServe Incorporated.  GIF(sm) is a
         Service Mark property of CompuServe Incorporated."</p>
     </div>
-    <h2>JDOM</h2>
-    <p>The following software may be included in this product: JDOM. Use of any of this software is governed by the
-    terms of the license below:</p>
-    <p>Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.</p>
-    <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-    following conditions are met:</p>
-    <p>1. Redistribution of source code must retain the above copyright notice, this list of conditions, and the
-    following disclaimer.</p>
-    <p>2. Redistribution in binary form must reproduce the above copyright notice, this list of conditions, and the
-    disclaimer that follows these conditions in the documentation and/or other materials provided with the
-    distribution.</p>
-    <p>3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior
-    written permission. For written permission, please contact <request_AT_jdom_DOT_org>.</p>
-    <p>4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without
-    prior written permission from the JDOM Project Management <request_AT_jdom_DOT_org>.</p>
-    <p>In addition, we request (but do not require) that you include in the end-user documentation provided with the
-    redistribution and/or in the software itself an acknowledgement equivalent to the following:</p>
-    <p>"This product includes software developed by the JDOM Project (<a href=
-    "http://www.jdom.org/">http://www.jdom.org/</a>)."</p>
-    <p>Alternatively, the acknowledgment may be graphical using the logos available at <a href=
-    "http://www.jdom.org/images/logos">http://www.jdom.org/images/logos</a>.</p>
-    <p>THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-    <p>This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was
-    originally created by Jason Hunter <jhunter_AT_jdom_DOT_org> and Brett McLaughlin
-    <brett_AT_jdom_DOT_org>. For more information on the JDOM Project, please see <a href=
-    "http://www.jdom.org/">http://www.jdom.org/</a>.</p>
     <div class="LIBATOMIC_OPS">
         <h2>libatomic_ops</h2>
         <p>The following software may be included in this product: libatomic_ops. Use of any of this software is