diff --git a/client/.classpath b/client/.classpath index 82c3d85e47..5419017519 100644 --- a/client/.classpath +++ b/client/.classpath @@ -103,17 +103,17 @@ - + - + - + diff --git a/client/lib/log4j-1.2-api-2.17.2.jar b/client/lib/log4j-1.2-api-2.17.2.jar deleted file mode 100644 index bff129dc72..0000000000 Binary files a/client/lib/log4j-1.2-api-2.17.2.jar and /dev/null differ diff --git a/client/lib/log4j-1.2-api-2.25.3.jar b/client/lib/log4j-1.2-api-2.25.3.jar new file mode 100644 index 0000000000..680b5e1a8e Binary files /dev/null and b/client/lib/log4j-1.2-api-2.25.3.jar differ diff --git a/client/lib/log4j-api-2.17.2.jar b/client/lib/log4j-api-2.17.2.jar deleted file mode 100644 index a03f315165..0000000000 Binary files a/client/lib/log4j-api-2.17.2.jar and /dev/null differ diff --git a/client/lib/log4j-api-2.25.3.jar b/client/lib/log4j-api-2.25.3.jar new file mode 100644 index 0000000000..640998bb34 Binary files /dev/null and b/client/lib/log4j-api-2.25.3.jar differ diff --git a/client/lib/log4j-core-2.17.2.jar b/client/lib/log4j-core-2.17.2.jar deleted file mode 100644 index fbc0641dc4..0000000000 Binary files a/client/lib/log4j-core-2.17.2.jar and /dev/null differ diff --git a/client/lib/log4j-core-2.25.3.jar b/client/lib/log4j-core-2.25.3.jar new file mode 100644 index 0000000000..a26e5b0164 Binary files /dev/null and b/client/lib/log4j-core-2.25.3.jar differ diff --git a/command/.classpath b/command/.classpath index 201d91e87d..6e5caaa710 100644 --- a/command/.classpath +++ b/command/.classpath @@ -54,17 +54,12 @@ - - - - - - + - + diff --git a/command/build.xml b/command/build.xml index a591dabc10..bb9196882e 100644 --- a/command/build.xml +++ b/command/build.xml @@ -59,7 +59,7 @@ - + diff --git a/command/lib/log4j-1.2-api-2.17.2.jar b/command/lib/log4j-1.2-api-2.17.2.jar deleted file mode 100644 index bff129dc72..0000000000 Binary files a/command/lib/log4j-1.2-api-2.17.2.jar and /dev/null differ diff --git a/command/lib/log4j-api-2.17.2.jar b/command/lib/log4j-api-2.17.2.jar deleted file mode 100644 index a03f315165..0000000000 Binary files a/command/lib/log4j-api-2.17.2.jar and /dev/null differ diff --git a/command/lib/log4j-api-2.25.3.jar b/command/lib/log4j-api-2.25.3.jar new file mode 100644 index 0000000000..640998bb34 Binary files /dev/null and b/command/lib/log4j-api-2.25.3.jar differ diff --git a/command/lib/log4j-core-2.17.2.jar b/command/lib/log4j-core-2.17.2.jar deleted file mode 100644 index fbc0641dc4..0000000000 Binary files a/command/lib/log4j-core-2.17.2.jar and /dev/null differ diff --git a/command/lib/log4j-core-2.25.3.jar b/command/lib/log4j-core-2.25.3.jar new file mode 100644 index 0000000000..a26e5b0164 Binary files /dev/null and b/command/lib/log4j-core-2.25.3.jar differ diff --git a/donkey/.classpath b/donkey/.classpath index 65729a756a..0c7c3e49a8 100644 --- a/donkey/.classpath +++ b/donkey/.classpath @@ -28,17 +28,17 @@ - + - + - + diff --git a/donkey/lib/log4j-1.2-api-2.17.2.jar b/donkey/lib/log4j-1.2-api-2.17.2.jar deleted file mode 100644 index bff129dc72..0000000000 Binary files a/donkey/lib/log4j-1.2-api-2.17.2.jar and /dev/null differ diff --git a/donkey/lib/log4j-1.2-api-2.25.3.jar b/donkey/lib/log4j-1.2-api-2.25.3.jar new file mode 100644 index 0000000000..680b5e1a8e Binary files /dev/null and b/donkey/lib/log4j-1.2-api-2.25.3.jar differ diff --git a/donkey/lib/log4j-api-2.17.2.jar b/donkey/lib/log4j-api-2.17.2.jar deleted file mode 100644 index a03f315165..0000000000 Binary files a/donkey/lib/log4j-api-2.17.2.jar and /dev/null differ diff --git a/donkey/lib/log4j-api-2.25.3.jar b/donkey/lib/log4j-api-2.25.3.jar new file mode 100644 index 0000000000..640998bb34 Binary files /dev/null and b/donkey/lib/log4j-api-2.25.3.jar differ diff --git a/donkey/lib/log4j-core-2.17.2.jar b/donkey/lib/log4j-core-2.17.2.jar deleted file mode 100644 index fbc0641dc4..0000000000 Binary files a/donkey/lib/log4j-core-2.17.2.jar and /dev/null differ diff --git a/donkey/lib/log4j-core-2.25.3.jar b/donkey/lib/log4j-core-2.25.3.jar new file mode 100644 index 0000000000..a26e5b0164 Binary files /dev/null and b/donkey/lib/log4j-core-2.25.3.jar differ diff --git a/generator/.classpath b/generator/.classpath index f7f903c27c..643f3577fa 100644 --- a/generator/.classpath +++ b/generator/.classpath @@ -6,17 +6,17 @@ - + - + - + diff --git a/generator/lib/log4j-1.2-api-2.17.2.jar b/generator/lib/log4j-1.2-api-2.17.2.jar deleted file mode 100644 index bff129dc72..0000000000 Binary files a/generator/lib/log4j-1.2-api-2.17.2.jar and /dev/null differ diff --git a/generator/lib/log4j-1.2-api-2.25.3.jar b/generator/lib/log4j-1.2-api-2.25.3.jar new file mode 100644 index 0000000000..680b5e1a8e Binary files /dev/null and b/generator/lib/log4j-1.2-api-2.25.3.jar differ diff --git a/generator/lib/log4j-api-2.17.2.jar b/generator/lib/log4j-api-2.17.2.jar deleted file mode 100644 index a03f315165..0000000000 Binary files a/generator/lib/log4j-api-2.17.2.jar and /dev/null differ diff --git a/generator/lib/log4j-api-2.25.3.jar b/generator/lib/log4j-api-2.25.3.jar new file mode 100644 index 0000000000..640998bb34 Binary files /dev/null and b/generator/lib/log4j-api-2.25.3.jar differ diff --git a/generator/lib/log4j-core-2.17.2.jar b/generator/lib/log4j-core-2.17.2.jar deleted file mode 100644 index fbc0641dc4..0000000000 Binary files a/generator/lib/log4j-core-2.17.2.jar and /dev/null differ diff --git a/generator/lib/log4j-core-2.25.3.jar b/generator/lib/log4j-core-2.25.3.jar new file mode 100644 index 0000000000..a26e5b0164 Binary files /dev/null and b/generator/lib/log4j-core-2.25.3.jar differ diff --git a/server/.classpath b/server/.classpath index 099f1c15b5..78b9080196 100644 --- a/server/.classpath +++ b/server/.classpath @@ -50,17 +50,17 @@ - + - + - + diff --git a/server/build.xml b/server/build.xml index 8e7a8e346e..f3c8fa9131 100644 --- a/server/build.xml +++ b/server/build.xml @@ -1228,8 +1228,8 @@ - - + + diff --git a/server/lib/log4j/log4j-1.2-api-2.17.2.jar b/server/lib/log4j/log4j-1.2-api-2.17.2.jar deleted file mode 100644 index bff129dc72..0000000000 Binary files a/server/lib/log4j/log4j-1.2-api-2.17.2.jar and /dev/null differ diff --git a/server/lib/log4j/log4j-1.2-api-2.25.3.jar b/server/lib/log4j/log4j-1.2-api-2.25.3.jar new file mode 100644 index 0000000000..680b5e1a8e Binary files /dev/null and b/server/lib/log4j/log4j-1.2-api-2.25.3.jar differ diff --git a/server/lib/log4j/log4j-api-2.17.2.jar b/server/lib/log4j/log4j-api-2.17.2.jar deleted file mode 100644 index a03f315165..0000000000 Binary files a/server/lib/log4j/log4j-api-2.17.2.jar and /dev/null differ diff --git a/server/lib/log4j/log4j-api-2.25.3.jar b/server/lib/log4j/log4j-api-2.25.3.jar new file mode 100644 index 0000000000..640998bb34 Binary files /dev/null and b/server/lib/log4j/log4j-api-2.25.3.jar differ diff --git a/server/lib/log4j/log4j-core-2.17.2.jar b/server/lib/log4j/log4j-core-2.17.2.jar deleted file mode 100644 index fbc0641dc4..0000000000 Binary files a/server/lib/log4j/log4j-core-2.17.2.jar and /dev/null differ diff --git a/server/lib/log4j/log4j-core-2.25.3.jar b/server/lib/log4j/log4j-core-2.25.3.jar new file mode 100644 index 0000000000..a26e5b0164 Binary files /dev/null and b/server/lib/log4j/log4j-core-2.25.3.jar differ diff --git a/server/src/com/mirth/connect/server/launcher/MirthLauncher.java b/server/src/com/mirth/connect/server/launcher/MirthLauncher.java index 2152def843..c34919a833 100644 --- a/server/src/com/mirth/connect/server/launcher/MirthLauncher.java +++ b/server/src/com/mirth/connect/server/launcher/MirthLauncher.java @@ -42,9 +42,9 @@ public class MirthLauncher { private static final String MIRTH_PROPERTIES_FILE = "./conf/mirth.properties"; private static final String PROPERTY_APP_DATA_DIR = "dir.appdata"; private static final String PROPERTY_INCLUDE_CUSTOM_LIB = "server.includecustomlib"; - private static final String[] LOG4J_JAR_FILES = { "./server-lib/log4j/log4j-core-2.17.2.jar", - "./server-lib/log4j/log4j-api-2.17.2.jar", - "./server-lib/log4j/log4j-1.2-api-2.17.2.jar" }; + private static final String[] LOG4J_JAR_FILES = { "./server-lib/log4j/log4j-core-2.25.3.jar", + "./server-lib/log4j/log4j-api-2.25.3.jar", + "./server-lib/log4j/log4j-1.2-api-2.25.3.jar" }; private static String appDataDir = null;