From: Ben Soares Date: Tue, 14 Dec 2021 23:23:08 +0000 (+0000) Subject: JAL-3933 updated log4j and slf4j jars with log4j1.2 compatibility API jar. Removed... X-Git-Tag: Release_2_11_2_0~18^2~1^2~6 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1abd3042358350c391c9a184061a2b7c552f84d1;p=jalview.git JAL-3933 updated log4j and slf4j jars with log4j1.2 compatibility API jar. Removed log4j from jabaws-min-client and Jmol jars --- diff --git a/j11lib/Jmol-14.31.53.jar b/j11lib/Jmol-NO_LOG4J-14.31.53.jar similarity index 63% rename from j11lib/Jmol-14.31.53.jar rename to j11lib/Jmol-NO_LOG4J-14.31.53.jar index 5c37cb0..df7aa7d 100644 Binary files a/j11lib/Jmol-14.31.53.jar and b/j11lib/Jmol-NO_LOG4J-14.31.53.jar differ 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/j11lib/slf4j-api-1.7.26.jar b/j11lib/slf4j-api-1.7.26.jar deleted file mode 100644 index d2f27ac..0000000 Binary files a/j11lib/slf4j-api-1.7.26.jar and /dev/null differ diff --git a/j11lib/slf4j-api-1.7.32.jar b/j11lib/slf4j-api-1.7.32.jar new file mode 100644 index 0000000..b16a078 Binary files /dev/null and b/j11lib/slf4j-api-1.7.32.jar differ diff --git a/j11lib/slf4j-log4j12-1.7.26.jar b/j11lib/slf4j-log4j12-1.7.32.jar similarity index 75% rename from j11lib/slf4j-log4j12-1.7.26.jar rename to j11lib/slf4j-log4j12-1.7.32.jar index aed1195..4b0e8b7 100644 Binary files a/j11lib/slf4j-log4j12-1.7.26.jar and b/j11lib/slf4j-log4j12-1.7.32.jar differ diff --git a/j8lib/Jmol-14.31.53.jar b/j8lib/Jmol-NO_LOG4J-14.31.53.jar similarity index 63% rename from j8lib/Jmol-14.31.53.jar rename to j8lib/Jmol-NO_LOG4J-14.31.53.jar index 5c37cb0..df7aa7d 100644 Binary files a/j8lib/Jmol-14.31.53.jar and b/j8lib/Jmol-NO_LOG4J-14.31.53.jar 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.32.jar b/j8lib/slf4j-api-1.7.32.jar new file mode 100644 index 0000000..b16a078 Binary files /dev/null and b/j8lib/slf4j-api-1.7.32.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.32.jar b/j8lib/slf4j-log4j12-1.7.32.jar new file mode 100644 index 0000000..4b0e8b7 Binary files /dev/null and b/j8lib/slf4j-log4j12-1.7.32.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 29f0d84..c93d611 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -331,8 +331,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 diff --git a/src/jalview/javascript/log4j/Layout.java b/src/jalview/javascript/log4j/Layout.java index ea79e1b..e467e36 100644 --- a/src/jalview/javascript/log4j/Layout.java +++ b/src/jalview/javascript/log4j/Layout.java @@ -24,7 +24,7 @@ import jalview.javascript.log4j.spi.LoggingEvent; import jalview.javascript.log4j.spi.OptionHandler; import org.apache.log4j.PatternLayout; -import org.apache.log4j.TTCCLayout; +//import org.apache.log4j.TTCCLayout; public abstract class Layout implements OptionHandler {