diff --git a/.classpath b/.classpath index a314b2b8e9aead34dfd118cf0f46e5f258279dae..b35a4dfd4e75b852849d6eeab40d33956c0c8d6c 100644 --- a/.classpath +++ b/.classpath @@ -10,7 +10,8 @@ <classpathentry kind="lib" path="prism/lib/pepa.zip"/> <classpathentry kind="lib" path="prism/lib/lpsolve55j.jar"/> <classpathentry kind="lib" path="prism/lib/jas.jar"/> - <classpathentry kind="lib" path="prism/lib/log4j.jar"/> + <classpathentry kind="lib" path="prism/lib/log4j-api.jar"/> + <classpathentry kind="lib" path="prism/lib/log4j-core.jar"/> <classpathentry kind="lib" path="prism/lib/nailgun-server.jar"/> <classpathentry kind="output" path="prism/classes"/> </classpath> diff --git a/prism/.classpath b/prism/.classpath index 1bef3aa5af968cb21a171b089ea716385977dd7f..49b69b9ad2ea5692d2c11a23b2ce557c11807f7c 100644 --- a/prism/.classpath +++ b/prism/.classpath @@ -10,7 +10,8 @@ <classpathentry kind="lib" path="lib/pepa.zip"/> <classpathentry kind="lib" path="lib/lpsolve55j.jar"/> <classpathentry kind="lib" path="lib/jas.jar"/> - <classpathentry kind="lib" path="lib/log4j.jar"/> + <classpathentry kind="lib" path="lib/log4j-core.jar"/> + <classpathentry kind="lib" path="lib/log4j-api.jar"/> <classpathentry kind="lib" path="lib/nailgun-server.jar"/> <classpathentry kind="output" path="classes"/> </classpath> diff --git a/prism/lib/README.md b/prism/lib/README.md index cfc604f34d913a1965f176948cd464a6a921417d..c5e5ce04de1453ebea5b481f9b2e0ef67a3e2262 100644 --- a/prism/lib/README.md +++ b/prism/lib/README.md @@ -2,8 +2,8 @@ To simplify maintenance of scripts and config files, we mostly omit version numb * colt.jar - Colt version 1.2.0 * epsgraphics.jar - EPS Graphics version 1.0.0 -* jas.jar - Java Algebra System (JAS) version 2.5.5246 -* log4j.jar - Apache log4j (dependency of JAS) +* jas.jar - Java Algebra System (JAS) version 2.7.90 +* log4j-core.jar, log4j-api.jar - Apache Log4j version 2.16.0 (dependency of JAS) * jcommon.jar - JCommon, version 1.0.16 * jfreechart.jar - JFreeChart, version 1.0.13 * jhoafparser.jar - jhoafparser, version 1.1.1 diff --git a/prism/lib/jas.jar b/prism/lib/jas.jar index f2bd565457d9179b6fa505e79a1c7a897ff885b9..a55a49a6fdd58c74e68f993e47793f9db1bcf48b 100644 Binary files a/prism/lib/jas.jar and b/prism/lib/jas.jar differ diff --git a/prism/lib/log4j-api.jar b/prism/lib/log4j-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cdcc4b07db3ad09612c684548672a45967ba4dc Binary files /dev/null and b/prism/lib/log4j-api.jar differ diff --git a/prism/lib/log4j-core.jar b/prism/lib/log4j-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..bc913bc53127205f45c2f87050f448733456e6da Binary files /dev/null and b/prism/lib/log4j-core.jar differ diff --git a/prism/lib/log4j.jar b/prism/lib/log4j.jar deleted file mode 100644 index 1595a56ef29615a8e3c77827071a03500cb32fe9..0000000000000000000000000000000000000000 Binary files a/prism/lib/log4j.jar and /dev/null differ