readlicense_oo/license/NOTICE | 17 ----
swext/Extension_wiki-publisher.mk | 1
swext/mediawiki/src/THIRDPARTYLICENSEREADME.html | 83 -----------------------
3 files changed, 101 deletions(-)
New commits:
commit 673219ea504b5358a30126dec15480d6b8376e39
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Feb 26 13:08:13 2025 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Feb 27 08:28:36 2025 +0100
Remove notice/license info about Apache Tomcat
Apache Tomcat was removed from the project in 2013.
cf. 2c92030ff07a Kill servlet-api and tomcat
Change-Id: Iaaeeda26fe983721cec74da3761fe55740f1e957
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182223
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE
index 15a5e5ad4101..12256808562c 100644
--- a/readlicense_oo/license/NOTICE
+++ b/readlicense_oo/license/NOTICE
@@ -24,7 +24,6 @@ As part of the base system this product also includes code
from the following
Apache projects:
- Apache Lucene
- Apache Jakarta HttpClient - used by MediaWiki Publisher extension
-- Apache Tomcat - used by MediaWiki Publisher extension
The notices from these projects are following:
@@ -40,22 +39,6 @@ were developed by Martin Porter and Richard Boulton.
The full snowball package is available from
http://snowball.tartarus.org/
-Apache Tomcat
-Copyright 1999-2012 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Java Management Extensions (JMX) support is provided by
-the MX4J package, which is open source software. The
-original software and related information is available
-at http://mx4j.sourceforge.net/.
-
-Java compilation software for JSP pages is provided by Eclipse,
-which is open source software. The original software and
-related information is available at
-http://www.eclipse.org/.
-
____
As part of the base system this product may also includes code from the
following
diff --git a/swext/Extension_wiki-publisher.mk
b/swext/Extension_wiki-publisher.mk
index ec31c9691c26..4ed62428b2e7 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -40,7 +40,6 @@ $(eval $(call
gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(cal
$(eval $(call
gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(call
gb_UnpackedTarball_get_dir,xsltml)/tables.xsl))
$(eval $(call
gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(call
gb_UnpackedTarball_get_dir,xsltml)/tokens.xsl))
$(eval $(call
gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(SRCDIR)/swext/mediawiki/src/filter/odt2mediawiki.xsl))
-$(eval $(call
gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(SRCDIR)/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html))
$(eval $(call
gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(SRCDIR)/swext/mediawiki/src/filter/mediawiki.ott))
$(eval $(call
gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wikisend.xhp,wikisend.xhp))
$(eval $(call
gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wikiformats.xhp,wikiformats.xhp))
diff --git a/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html
b/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html
deleted file mode 100644
index a9efb72a65f6..000000000000
--- a/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
-<html>
-<head>
- <meta content="text/html; charset=iso-8859-1"
- http-equiv="Content-Type">
- <title>THIRDPARTYLICENSEREADME</title>
-</head>
-<body>
-DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT<br>
-<br>
-<ul id="mozToc">
-<!--mozToc h2 1 h3 2-->
- <li><a href="#mozTocId3503">The Apache Software
-Foundation
- </a>
- <ul>
- <li><a href="#mozTocId520856">Tomcat
- </a></li>
- </ul>
- </li>
-</ul>
-<br>
-<hr style="width: 100%; height: 2px;">The following software may be
-included in this product: Tomcat 4.0 or higher; Use of any of this
-software is governed by the terms of the license below:<br>
-<h2><a class="mozTocH2" name="mozTocId3503"></a>The Apache Software
-Foundation<br>
-</h2>
-<h3><a class="mozTocH3" name="mozTocId520856"></a>Tomcat<br>
-</h3>
-<br>
-The Apache Software License, Version 1.1
-<br>
-<br>
-Copyright (c) 2001 The Apache Software Foundation. All rights
-reserved.
-<br>
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-<br>
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer. <br>
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution. <br>
-3. The end-user documentation included with the redistribution, if any,
-must include the following acknowledgment: "This product includes
-software developed by the Apache Software Foundation
-(http://www.apache.org/)." Alternately, this acknowledgment may appear
-in the software itself, if and wherever such third-party
-acknowledgments normally appear. <br>
-4. The names "XML-RPC" and "Apache Software Foundation" must not be
-used to endorse or promote products derived from this software without
-prior written permission. For written permission, please contact
-apa...@apache.org. <br>
-5. Products derived from this software may not be called "Apache", nor
-may "Apache" appear in their name, without prior written permission of
-the Apache Software Foundation. <br>
-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 APACHE SOFTWARE FOUNDATION OR
-ITS 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.
-<br>
-====================================================================
-<br>
-This software consists of voluntary contributions made by many
-individuals on behalf of the Apache Software Foundation. For more
-information on the Apache Software Foundation, please see
-<http:>.
-<br>
-</http:>
-<br>
-</body>
-</html>
