[feature] Update to log4j 2.15.0

eXist-db · Dec 14, 2021 · d68640f · d68640f
1 parent ccba288
commit d68640f
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 14 deletions.
diff --git a/.classpath b/.classpath
@@ -51,10 +51,10 @@
 	<classpathentry kind="lib" path="lib/core/jline-3.9.0.jar"/>
 	<classpathentry kind="lib" path="lib/core/jsr305-3.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/core/jta-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/core/log4j-api-2.11.0.jar"/>
-	<classpathentry kind="lib" path="lib/core/log4j-core-2.11.0.jar"/>
-	<classpathentry kind="lib" path="lib/core/log4j-jul-2.11.0.jar"/>
-	<classpathentry kind="lib" path="lib/core/log4j-slf4j-impl-2.11.0.jar"/>
+	<classpathentry kind="lib" path="lib/core/log4j-api-2.15.0.jar"/>
+	<classpathentry kind="lib" path="lib/core/log4j-core-2.15.0.jar"/>
+	<classpathentry kind="lib" path="lib/core/log4j-jul-2.15.0.jar"/>
+	<classpathentry kind="lib" path="lib/core/log4j-slf4j-impl-2.15.0.jar"/>
 	<classpathentry kind="lib" path="lib/core/lz4-java-1.5.0.jar"/>
 	<classpathentry kind="lib" path="lib/core/pkg-java-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/core/quartz-2.3.0.jar"/>

diff --git a/lib/core/log4j-1.2-api-2.11.0.jar b/lib/core/log4j-1.2-api-2.11.0.jar
diff --git a/lib/core/log4j-1.2-api-2.15.0.jar b/lib/core/log4j-1.2-api-2.15.0.jar
diff --git a/lib/core/log4j-NOTICE.txt b/lib/core/log4j-NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Log4j
-Copyright 1999-2014 Apache Software Foundation
+Copyright 1999-2021 Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -12,3 +12,6 @@ Copyright 2004 Jason Paul Kitchen
 
 TypeUtil.java
 Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
diff --git a/lib/core/log4j-api-2.11.0.jar b/lib/core/log4j-api-2.11.0.jar
diff --git a/lib/core/log4j-api-2.15.0.jar b/lib/core/log4j-api-2.15.0.jar
diff --git a/lib/core/log4j-core-2.11.0.jar b/lib/core/log4j-core-2.11.0.jar
diff --git a/lib/core/log4j-core-2.15.0.jar b/lib/core/log4j-core-2.15.0.jar
diff --git a/lib/core/log4j-jul-2.11.0.jar b/lib/core/log4j-jul-2.11.0.jar
diff --git a/lib/core/log4j-jul-2.15.0.jar b/lib/core/log4j-jul-2.15.0.jar
diff --git a/lib/core/log4j-slf4j-impl-2.11.0.jar b/lib/core/log4j-slf4j-impl-2.11.0.jar
diff --git a/lib/core/log4j-slf4j-impl-2.15.0.jar b/lib/core/log4j-slf4j-impl-2.15.0.jar
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -90,7 +90,7 @@ auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbpr
 annotation.processing.run.all.processors=true
 manifest.file=manifest.mf
 project.licensePath=./nbproject/licenseheader.txt
-file.reference.log4j-slf4j-impl-2.11.0.jar=lib/core/log4j-slf4j-impl-2.11.0.jar
+file.reference.log4j-slf4j-impl-2.15.0.jar=lib/core/log4j-slf4j-impl-2.15.0.jar
 jnlp.enabled=false
 manifest.custom.codebase=
 test.src3.dir=extensions/indexes/range/test/src/main/java
@@ -152,7 +152,7 @@ run.test.classpath=\
     ${build.test.classes.dir}:\
     ${file.reference.httpcore-4.4.8.jar}:\
     ${file.reference.httpclient-4.5.5.jar}
-file.reference.log4j-api-2.11.0.jar=lib/core/log4j-api-2.11.0.jar
+file.reference.log4j-api-2.15.0.jar=lib/core/log4j-api-2.15.0.jar
 file.reference.mail-1.4.7.jar=lib/user/mail-1.4.7.jar
 file.reference.jetty-servlet-9.4.14.v20181114.jar=tools/jetty/lib/jetty-servlet-9.4.14.v20181114.jar
 jmx.rmi.port=1099
@@ -201,7 +201,7 @@ eXist-1.33.dir=${file.reference.fluent-src}
 jmx.jconsole.period=4
 src.src3.dir=extensions/indexes/spatial/src/main/java
 file.reference.exquery-xquery-0.1.34.jar=extensions/exquery/lib/exquery-xquery-0.1.34.jar
-file.reference.xercesImpl-2.11.0.jar=lib/endorsed/xercesImpl-2.11.0.jar
+file.reference.xercesImpl-2.15.0.jar=lib/endorsed/xercesImpl-2.15.0.jar
 file.reference.isorelax-20041111.jar=lib/optional/isorelax-20041111.jar
 file.reference.fluent-src=extensions/fluent/src/main/java
 javadoc.use=true
@@ -213,7 +213,7 @@ file.reference.aspectjweaver-1.9.2.jar=tools/aspectj/lib/aspectjweaver-1.9.2.jar
 file.reference.commons-logging-1.2.jar=lib/core/commons-logging-1.2.jar
 file.reference.xqjapi-1.0-fr.jar=lib/optional/xqjapi-1.0-fr.jar
 test.eXist-1.32.dir=${file.reference.test-src-1}
-file.reference.log4j-jul-2.11.0.jar=lib/core/log4j-jul-2.11.0.jar
+file.reference.log4j-jul-2.15.0.jar=lib/core/log4j-jul-2.15.0.jar
 file.reference.aspectjrt-1.9.2.jar=tools/aspectj/lib/aspectjrt-1.9.2.jar
 excludes=**/spatial/*,**/modules/svn/*,**/modules/xmpp/**, **/xmlcalabash/**, **/xslfo/**,**/cssparser/**,**/oracle/**,**/memcached/**,**/cqlparser/**,**/contentextraction/**
 jnlp.descriptor=application
@@ -257,7 +257,7 @@ file.reference.xml-apis-1.4.01.jar=lib/endorsed/xml-apis-1.4.01.jar
 file.reference.jline-3.9.0.jar=lib/core/jline-3.9.0.jar
 file.reference.jansi-1.17.1.jar=lib/core/jansi-1.17.1.jar
 src.src15.dir=extensions/expath/src/main/java
-file.reference.log4j-core-2.11.0.jar=lib/core/log4j-core-2.11.0.jar
+file.reference.log4j-core-2.15.0.jar=lib/core/log4j-core-2.15.0.jar
 file.reference.jetty-annotations-9.4.14.v20181114.jar=tools/jetty/lib/jetty-annotations-9.4.14.v20181114.jar
 javadoc.notree=false
 file.reference.jetty-deploy-9.4.14.v20181114.jar=tools/jetty/lib/jetty-deploy-9.4.14.v20181114.jar
@@ -300,10 +300,10 @@ javac.classpath=\
     ${file.reference.jline-3.9.0.jar}:\
     ${file.reference.jansi-1.17.1.jar}:\
     ${file.reference.jta-1.1.jar}:\
-    ${file.reference.log4j-api-2.11.0.jar}:\
-    ${file.reference.log4j-core-2.11.0.jar}:\
-    ${file.reference.log4j-jul-2.11.0.jar}:\
-    ${file.reference.log4j-slf4j-impl-2.11.0.jar}:\
+    ${file.reference.log4j-api-2.15.0.jar}:\
+    ${file.reference.log4j-core-2.15.0.jar}:\
+    ${file.reference.log4j-jul-2.15.0.jar}:\
+    ${file.reference.log4j-slf4j-impl-2.15.0.jar}:\
     ${file.reference.slf4j-api-1.7.25.jar}:\
     ${file.reference.quartz-2.3.0.jar}:\
     ${file.reference.ws-commons-util-1.0.2.jar}:\