Try to cherry-pick:

- updated Apache Log4J to 2.7

diff --git a/lib/log4j/log4j-api-2.6.2.jar b/lib/log4j/log4j-api-2.6.2.jar
deleted file mode 100644 (file)
index a40cc56..0000000
Binary files a/lib/log4j/log4j-api-2.6.2.jar and /dev/null differ

diff --git a/lib/log4j/log4j-api-2.7.jar b/lib/log4j/log4j-api-2.7.jar
new file mode 100644 (file)
index 0000000..b921631
Binary files /dev/null and b/lib/log4j/log4j-api-2.7.jar differ

diff --git a/lib/log4j/log4j-core-2.6.2.jar b/lib/log4j/log4j-core-2.6.2.jar
deleted file mode 100644 (file)
index 388918f..0000000
Binary files a/lib/log4j/log4j-core-2.6.2.jar and /dev/null differ

diff --git a/lib/log4j/log4j-core-2.7.jar b/lib/log4j/log4j-core-2.7.jar
new file mode 100644 (file)
index 0000000..c0feb23
Binary files /dev/null and b/lib/log4j/log4j-core-2.7.jar differ

diff --git a/lib/log4j/log4j-web-2.6.2.jar b/lib/log4j/log4j-web-2.6.2.jar
deleted file mode 100644 (file)
index 25b1530..0000000
Binary files a/lib/log4j/log4j-web-2.6.2.jar and /dev/null differ

diff --git a/lib/log4j/log4j-web-2.7.jar b/lib/log4j/log4j-web-2.7.jar
new file mode 100644 (file)
index 0000000..d142e6a
Binary files /dev/null and b/lib/log4j/log4j-web-2.7.jar differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index c153d19267e739e9f9728e6f8dbcb73a8b92e20c..c060dcd19c412d3106e80daad380640e81fb09a2 100644 (file)
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,11 +1,11 @@
-libs.Apache_Log4J.classpath=\
-    ${base}/log4j/log4j-api-2.6.2.jar;\
-    ${base}/log4j/log4j-core-2.6.2.jar;\
-    ${base}/log4j/log4j-web-2.6.2.jar
-libs.Apache_Log4J.displayName=Apache Log4J 2.x
-libs.Apache_Log4J.javadoc=\
-    https://logging.apache.org/log4j/2.x/log4j-api/apidocs/
-libs.CopyLibs.classpath=\
-    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
-libs.CopyLibs.displayName=CopyLibs Task
-libs.CopyLibs.prop-version=2.0
+libs.Apache_Log4J.classpath=\\r
+    ${base}/log4j/log4j-api-2.7.jar;\\r
+    ${base}/log4j/log4j-core-2.7.jar;\\r
+    ${base}/log4j/log4j-web-2.7.jar\r
+libs.Apache_Log4J.displayName=Apache Log4J 2.7\r
+libs.Apache_Log4J.javadoc=\\r
+    https://logging.apache.org/log4j/2.x/log4j-api/apidocs/\r
+libs.CopyLibs.classpath=\\r
+    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar\r
+libs.CopyLibs.displayName=CopyLibs Task\r
+libs.CopyLibs.prop-version=2.0\r