Skip to content

build: Upgrade log4j from 2.17.2 to 2.25.3 #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tonygermano wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: Upgrade log4j from 2.17.2 to 2.25.3 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions client/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@
<accessrule kind="nonaccessible" pattern="*/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-1.2-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-core-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-core-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-core/apidocs/"/>
</attributes>
Expand Down
Binary file removed client/lib/log4j-1.2-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added client/lib/log4j-1.2-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/log4j-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added client/lib/log4j-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/log4j-core-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added client/lib/log4j-core-2.25.3.jar
View file
Open in desktop
Binary file not shown.
9 changes: 2 additions & 7 deletions command/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,12 @@
<attribute name="javadoc_location" value="http://commons.apache.org/logging/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.17.2.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-1.2-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-core-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-core-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-core/apidocs/"/>
</attributes>
Expand Down
2 changes: 1 addition & 1 deletion command/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<manifest>
<attribute name="Main-Class" value="com.mirth.connect.cli.launcher.CommandLineLauncher" />
<attribute name="Class-Path" value="cli-lib/log4j-api-2.17.2.jar cli-lib/log4j-core-2.17.2.jar cli-lib/commons-io-2.13.0.jar conf/" />
<attribute name="Class-Path" value="cli-lib/log4j-api-2.25.3.jar cli-lib/log4j-core-2.25.3.jar cli-lib/commons-io-2.13.0.jar conf/" />
</manifest>
</jar>
</target>
Expand Down
Binary file removed command/lib/log4j-1.2-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file removed command/lib/log4j-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added command/lib/log4j-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed command/lib/log4j-core-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added command/lib/log4j-core-2.25.3.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions donkey/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
<attribute name="javadoc_location" value="http://commons.apache.org/logging/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-1.2-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-core-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-core-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-core/apidocs/"/>
</attributes>
Expand Down
Binary file removed donkey/lib/log4j-1.2-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added donkey/lib/log4j-1.2-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed donkey/lib/log4j-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added donkey/lib/log4j-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed donkey/lib/log4j-core-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added donkey/lib/log4j-core-2.25.3.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions generator/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<classpathentry kind="lib" path="lib/commons-collections4-4.4.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.30.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-1.2-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-core-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j-core-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-core/apidocs/"/>
</attributes>
Expand Down
Binary file removed generator/lib/log4j-1.2-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added generator/lib/log4j-1.2-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed generator/lib/log4j-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added generator/lib/log4j-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed generator/lib/log4j-core-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added generator/lib/log4j-core-2.25.3.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions server/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@
<classpathentry kind="lib" path="lib/commons/commons-io-2.13.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-math3-3.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-text-1.15.0.jar"/>
<classpathentry kind="lib" path="lib/log4j/log4j-1.2-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j/log4j-1.2-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-1.2-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j/log4j-api-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j/log4j-api-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-api/apidocs/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j/log4j-core-2.17.2.jar">
<classpathentry kind="lib" path="lib/log4j/log4j-core-2.25.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-core/apidocs/"/>
</attributes>
Expand Down
4 changes: 2 additions & 2 deletions server/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,8 +1228,8 @@
<pathelement location="classes" />
<pathelement location="${setup.conf}" />
<fileset dir="${lib}">
<include name="log4j/log4j-api-2.17.2.jar" />
<include name="log4j/log4j-core-2.17.2.jar" />
<include name="log4j/log4j-api-2.25.3.jar" />
<include name="log4j/log4j-core-2.25.3.jar" />
<include name="database/derby-10.10.2.0.jar" />
<include name="database/derbytools-10.10.2.0.jar" />
<include name="commons/commons-io-2.13.0.jar" />
Expand Down
Binary file removed server/lib/log4j/log4j-1.2-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added server/lib/log4j/log4j-1.2-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed server/lib/log4j/log4j-api-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added server/lib/log4j/log4j-api-2.25.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed server/lib/log4j/log4j-core-2.17.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added server/lib/log4j/log4j-core-2.25.3.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions server/src/com/mirth/connect/server/launcher/MirthLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading