From 6de0b1710adfba82c96b75a5da6f52633a54c692 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sun, 11 Apr 2021 09:20:13 +0200
Subject: Get rid of apache-commons-logging

...using Java 1.4 java.util.logging.Logger instead also for the last remaining
uses in reportbuilder.

(The mention in swext/mediawiki/src/THIRDPARTYLICENSEREADME.html was presumably
a leftover from 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16 "swext: Wiki Publisher
does not use those apache-commons libraries".)

Change-Id: Ia0bc598fe5844ced11cae497548ec7d09453a99d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113939
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 readlicense_oo/license/NOTICE      | 8 --------
 readlicense_oo/license/license.xml | 6 ------
 2 files changed, 14 deletions(-)

(limited to 'readlicense_oo/license')

diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE
index b6cef3f0a679..656045830376 100644
--- a/readlicense_oo/license/NOTICE
+++ b/readlicense_oo/license/NOTICE
@@ -25,7 +25,6 @@ Apache projects:
 - Apache Lucene
 - Apache Portable Runtime
 - Apache Portable Runtime Utility Library
-- Apache Commons - used by MediaWiki Publisher extension
 - Apache Jakarta HttpClient - used by MediaWiki Publisher extension
 - Apache Tomcat - used by MediaWiki Publisher extension
 
@@ -77,13 +76,6 @@ modifications by Spyglass Inc., Carnegie Mellon University, and
 Bell Communications Research, Inc (Bellcore).
 
 
-Apache Commons Logging
-Copyright 2003-2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-
 Apache Tomcat
 Copyright 1999-2012 The Apache Software Foundation
 
diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index bfcbc224ecc8..290cdfdfee94 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -52,12 +52,6 @@
     <h1 style="text-align: center;"><a id="thirdparty" name="thirdparty">Third Party Code Additional Copyright
     Notices and License Terms</a></h1>
     <h1><a id="a__Libraries" name="a__Libraries">Libraries</a></h1>
-    <div class="APACHE_COMMONS">
-        <h2>Apache Commons</h2>
-        <p>The following software may be included in this product: Apache Commons (codec, httpclient, lang, logging).
-        Use of any of this software is governed by the terms of the license below:</p>
-        <p><a href="#a__Apache_License_version_2_0">Jump to Apache License Version 2.0</a></p>
-    </div>
     <div class="APR">
         <h2>Apache Portable Runtime (APR)</h2>
         <p>The following software may be included in this product: Apache Portable Runtime (APR).
-- 
cgit