From: Ben Soares Date: Tue, 14 Dec 2021 20:00:40 +0000 (+0000) Subject: JAL-3933 Updated log4j jars with log4j-2.16.0 and compatibility API log4j-1.2-api... X-Git-Tag: Release_2_11_1_5~3^2~5 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ed96e73a6db654d52a6a1b1d27c2ee707876a4c7;p=jalview.git JAL-3933 Updated log4j jars with log4j-2.16.0 and compatibility API log4j-1.2-api-2.16.0. Stripped log4j classes from jabaws-min-client jar. Updated sl4j jars in j8lib --- diff --git a/j11lib/jabaws-min-client-2.2.0.jar b/j11lib/jabaws-min-client-2.2.0.jar deleted file mode 100644 index 37426c3..0000000 Binary files a/j11lib/jabaws-min-client-2.2.0.jar and /dev/null differ diff --git a/j11lib/jabaws-min-client-NO_LOG4J-2.2.0.jar b/j11lib/jabaws-min-client-NO_LOG4J-2.2.0.jar new file mode 100644 index 0000000..3838eeb Binary files /dev/null and b/j11lib/jabaws-min-client-NO_LOG4J-2.2.0.jar differ diff --git a/j11lib/log4j-1.2-api-2.16.0.jar b/j11lib/log4j-1.2-api-2.16.0.jar new file mode 100644 index 0000000..6bfe217 Binary files /dev/null and b/j11lib/log4j-1.2-api-2.16.0.jar differ diff --git a/j11lib/log4j-api-2.16.0.jar b/j11lib/log4j-api-2.16.0.jar new file mode 100644 index 0000000..2cdcc4b Binary files /dev/null and b/j11lib/log4j-api-2.16.0.jar differ diff --git a/j11lib/log4j-core-2.16.0.jar b/j11lib/log4j-core-2.16.0.jar new file mode 100644 index 0000000..bc913bc Binary files /dev/null and b/j11lib/log4j-core-2.16.0.jar differ diff --git a/j11lib/log4j-slf4j18-impl-2.16.0.jar b/j11lib/log4j-slf4j18-impl-2.16.0.jar new file mode 100644 index 0000000..ad6dd5b Binary files /dev/null and b/j11lib/log4j-slf4j18-impl-2.16.0.jar differ diff --git a/j11lib/log4j-to-slf4j-2.0-rc2.jar b/j11lib/log4j-to-slf4j-2.0-rc2.jar deleted file mode 100644 index 4bbf54a..0000000 Binary files a/j11lib/log4j-to-slf4j-2.0-rc2.jar and /dev/null differ diff --git a/j8lib/jabaws-min-client-2.2.0.jar b/j8lib/jabaws-min-client-2.2.0.jar deleted file mode 100644 index 37426c3..0000000 Binary files a/j8lib/jabaws-min-client-2.2.0.jar and /dev/null differ diff --git a/j8lib/jabaws-min-client-NO_LOG4J-2.2.0.jar b/j8lib/jabaws-min-client-NO_LOG4J-2.2.0.jar new file mode 100644 index 0000000..3838eeb Binary files /dev/null and b/j8lib/jabaws-min-client-NO_LOG4J-2.2.0.jar differ diff --git a/j8lib/log4j-1.2-api-2.16.0.jar b/j8lib/log4j-1.2-api-2.16.0.jar new file mode 100644 index 0000000..6bfe217 Binary files /dev/null and b/j8lib/log4j-1.2-api-2.16.0.jar differ diff --git a/j8lib/log4j-api-2.16.0.jar b/j8lib/log4j-api-2.16.0.jar new file mode 100644 index 0000000..2cdcc4b Binary files /dev/null and b/j8lib/log4j-api-2.16.0.jar differ diff --git a/j8lib/log4j-core-2.16.0.jar b/j8lib/log4j-core-2.16.0.jar new file mode 100644 index 0000000..bc913bc Binary files /dev/null and b/j8lib/log4j-core-2.16.0.jar differ diff --git a/j8lib/log4j-slf4j18-impl-2.16.0.jar b/j8lib/log4j-slf4j18-impl-2.16.0.jar new file mode 100644 index 0000000..ad6dd5b Binary files /dev/null and b/j8lib/log4j-slf4j18-impl-2.16.0.jar differ diff --git a/j8lib/log4j-to-slf4j-2.0-rc2.jar b/j8lib/log4j-to-slf4j-2.0-rc2.jar deleted file mode 100644 index 4bbf54a..0000000 Binary files a/j8lib/log4j-to-slf4j-2.0-rc2.jar and /dev/null differ diff --git a/j8lib/slf4j-api-1.7.26.jar b/j8lib/slf4j-api-1.7.26.jar new file mode 100644 index 0000000..d2f27ac Binary files /dev/null and b/j8lib/slf4j-api-1.7.26.jar differ diff --git a/j8lib/slf4j-api-1.7.7.jar b/j8lib/slf4j-api-1.7.7.jar deleted file mode 100644 index b28e220..0000000 Binary files a/j8lib/slf4j-api-1.7.7.jar and /dev/null differ diff --git a/j8lib/slf4j-log4j12-1.7.26.jar b/j8lib/slf4j-log4j12-1.7.26.jar new file mode 100644 index 0000000..aed1195 Binary files /dev/null and b/j8lib/slf4j-log4j12-1.7.26.jar differ diff --git a/j8lib/slf4j-log4j12-1.7.7.jar b/j8lib/slf4j-log4j12-1.7.7.jar deleted file mode 100644 index 12c804e..0000000 Binary files a/j8lib/slf4j-log4j12-1.7.7.jar and /dev/null differ diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index 579b490..afabf02 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -304,8 +304,9 @@ public class Cache // TODO: redirect stdout and stderr here in order to grab the output of // the log - ConsoleAppender ap = new ConsoleAppender(new SimpleLayout(), - "System.err"); + ConsoleAppender ap = new ConsoleAppender(); + ap.setLayout(new SimpleLayout()); + // ap.setTarget("System.err"); ap.setName("JalviewLogger"); org.apache.log4j.Logger.getRootLogger().addAppender(ap); // catch all for // log output