Skip to content

Commit 0f0d8a4

Browse files
committed
build: Upgrade log4j from 2.17.2 to 2.25.3
maint: Remove unused log4j-1.2-api jar from command project The command project has no Log4j 1.x API imports, so the 1.2 bridge jar is unnecessary. Upgrade log4j-api, log4j-core, and log4j-1.2-api jars across all subprojects (client, command, donkey, generator, server). Update corresponding .classpath files and ant build.xml manifest/classpath references. Signed-off-by: Tony Germano <tony@germano.name>
1 parent 7723b34 commit 0f0d8a4

37 files changed

+20
-25
lines changed

client/.classpath

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,17 @@
103103
<accessrule kind="nonaccessible" pattern="*/**"/>
104104
</accessrules>
105105
</classpathentry>
106-
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.17.2.jar">
106+
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.25.3.jar">
107107
<attributes>
108108
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-1.2-api/apidocs/"/>
109109
</attributes>
110110
</classpathentry>
111-
<classpathentry kind="lib" path="lib/log4j-api-2.17.2.jar">
111+
<classpathentry kind="lib" path="lib/log4j-api-2.25.3.jar">
112112
<attributes>
113113
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-api/apidocs/"/>
114114
</attributes>
115115
</classpathentry>
116-
<classpathentry kind="lib" path="lib/log4j-core-2.17.2.jar">
116+
<classpathentry kind="lib" path="lib/log4j-core-2.25.3.jar">
117117
<attributes>
118118
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-core/apidocs/"/>
119119
</attributes>
-296 KB
Binary file not shown.
351 KB
Binary file not shown.

client/lib/log4j-api-2.17.2.jar

-295 KB
Binary file not shown.

client/lib/log4j-api-2.25.3.jar

342 KB
Binary file not shown.

client/lib/log4j-core-2.17.2.jar

-1.73 MB
Binary file not shown.

client/lib/log4j-core-2.25.3.jar

1.92 MB
Binary file not shown.

command/.classpath

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,12 @@
5454
<attribute name="javadoc_location" value="http://commons.apache.org/logging/apidocs/"/>
5555
</attributes>
5656
</classpathentry>
57-
<classpathentry kind="lib" path="lib/log4j-1.2-api-2.17.2.jar">
58-
<attributes>
59-
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-1.2-api/apidocs/"/>
60-
</attributes>
61-
</classpathentry>
62-
<classpathentry kind="lib" path="lib/log4j-api-2.17.2.jar">
57+
<classpathentry kind="lib" path="lib/log4j-api-2.25.3.jar">
6358
<attributes>
6459
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-api/apidocs/"/>
6560
</attributes>
6661
</classpathentry>
67-
<classpathentry kind="lib" path="lib/log4j-core-2.17.2.jar">
62+
<classpathentry kind="lib" path="lib/log4j-core-2.25.3.jar">
6863
<attributes>
6964
<attribute name="javadoc_location" value="https://logging.apache.org/log4j/2.x/log4j-core/apidocs/"/>
7065
</attributes>

command/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
<manifest>
6161
<attribute name="Main-Class" value="com.mirth.connect.cli.launcher.CommandLineLauncher" />
62-
<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/" />
62+
<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/" />
6363
</manifest>
6464
</jar>
6565
</target>
-296 KB
Binary file not shown.

0 commit comments

Comments
 (0)