diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9eb0f3a5db..21feb2d3ce 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -202,9 +202,9 @@ junit = { module = "junit:junit", version = "4.13.1" } junit-platform-console-standalone = { module = "org.junit.platform:junit-platform-console-standalone", version = "1.11.4" } libphonenumber = { module = "com.googlecode.libphonenumber:libphonenumber", version = "8.12.50" } listenablefuture = { module = "com.google.guava:listenablefuture", version = "9999.0-empty-to-avoid-conflict-with-guava" } -log4j-1-2-api = { module = "org.apache.logging.log4j:log4j-1.2-api", version.ref = "log4j" } log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" } log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } +log4j-slf4j-impl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" } miglayout-core = { module = "com.miglayout:miglayout-core", version.ref = "miglayout" } miglayout-swing = { module = "com.miglayout:miglayout-swing", version.ref = "miglayout" } mimepull = { module = "org.jvnet.mimepull:mimepull", version = "1.9.7" } @@ -241,7 +241,6 @@ reflections = { module = "org.reflections:reflections", version = "0.9.10" } rhino = { module = "org.mozilla:rhino", version = "1.7.13" } saaj-impl = { module = "com.sun.xml.messaging.saaj:saaj-impl", version = "1.4.0" } slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } -slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version.ref = "slf4j" } snakeyaml = { module = "org.yaml:snakeyaml", version = "2.5" } stax-ex = { module = "org.jvnet.staxex:stax-ex", version = "1.8" } staxon = { module = "de.odysseus.staxon:staxon", version = "1.3" } @@ -314,9 +313,9 @@ client-main = [ "jetty-util", "joda-time", "libphonenumber", - "log4j-1-2-api", "log4j-api", "log4j-core", + "log4j-slf4j-impl", "miglayout-core", "miglayout-swing", "mimepull", @@ -324,7 +323,6 @@ client-main = [ "reflections", "rhino", "slf4j-api", - "slf4j-log4j12", "staxon", "swagger-annotations", "swingx-core", @@ -374,11 +372,11 @@ command-main = [ "jetty-util", "log4j-api", "log4j-core", + "log4j-slf4j-impl", "mimepull", "reflections", "rhino", "slf4j-api", - "slf4j-log4j12", "staxon", "swagger-annotations", "velocity-engine-core", @@ -413,16 +411,15 @@ donkey-main = [ "javassist", "jsr305", "listenablefuture", - "log4j-1-2-api", "log4j-api", "log4j-core", + "log4j-slf4j-impl", "mssql-jdbc", "mysql-connector-j", "ojdbc8", "postgresql", "quartz", "slf4j-api", - "slf4j-log4j12", "xpp3", "xstream", ] @@ -440,11 +437,10 @@ generator-main = [ "commons-collections4", "commons-io", "commons-lang3", - "log4j-1-2-api", "log4j-api", "log4j-core", + "log4j-slf4j-impl", "slf4j-api", - "slf4j-log4j12", "velocity-engine-core", ] server-extensions = [ @@ -595,7 +591,6 @@ server-main = [ "joda-time", "jsch", "jsr181-api", - "log4j-1-2-api", "log4j-api", "log4j-core", "mimepull", diff --git a/gradle/vendored-layout.json b/gradle/vendored-layout.json index 7bffae2a4d..cb17f8972a 100644 --- a/gradle/vendored-layout.json +++ b/gradle/vendored-layout.json @@ -36,9 +36,9 @@ "org.apache.httpcomponents:httpclient": "", "org.apache.httpcomponents:httpcore": "", "org.apache.httpcomponents:httpmime": "", - "org.apache.logging.log4j:log4j-1.2-api": "", "org.apache.logging.log4j:log4j-api": "", "org.apache.logging.log4j:log4j-core": "", + "org.apache.logging.log4j:log4j-slf4j-impl": "", "org.apache.velocity.tools:velocity-tools-generic": "", "org.apache.velocity:velocity-engine-core": "", "org.bouncycastle:bcpkix-jdk18on": "", @@ -61,7 +61,6 @@ "org.quartz-scheduler:quartz": "", "org.reflections:reflections": "", "org.slf4j:slf4j-api": "", - "org.slf4j:slf4j-log4j12": "", "org.swinglabs:swingx-core": { "dir": "", "file": "swingx-core-1.6.2.jar" @@ -99,6 +98,7 @@ "org.apache.httpcomponents:httpmime": "", "org.apache.logging.log4j:log4j-api": "", "org.apache.logging.log4j:log4j-core": "", + "org.apache.logging.log4j:log4j-slf4j-impl": "", "org.apache.velocity.tools:velocity-tools-generic": "", "org.apache.velocity:velocity-engine-core": "", "org.bouncycastle:bcpkix-jdk18on": "", @@ -120,7 +120,6 @@ "org.mozilla:rhino": "", "org.reflections:reflections": "", "org.slf4j:slf4j-api": "", - "org.slf4j:slf4j-log4j12": "", "xpp3:xpp3": "" }, "donkey": { @@ -148,27 +147,25 @@ "org.apache.commons:commons-pool2": "commons", "org.apache.commons:commons-text": "commons", "org.apache.derby:derby": "database", - "org.apache.logging.log4j:log4j-1.2-api": "", "org.apache.logging.log4j:log4j-api": "", "org.apache.logging.log4j:log4j-core": "", + "org.apache.logging.log4j:log4j-slf4j-impl": "", "org.checkerframework:checker-qual": "guava", "org.javassist:javassist": "", "org.postgresql:postgresql": "database", "org.quartz-scheduler:quartz": "", "org.slf4j:slf4j-api": "", - "org.slf4j:slf4j-log4j12": "", "xpp3:xpp3": "xstream" }, "generator": { "commons-io:commons-io": "", "org.apache.commons:commons-collections4": "", "org.apache.commons:commons-lang3": "", - "org.apache.logging.log4j:log4j-1.2-api": "", "org.apache.logging.log4j:log4j-api": "", "org.apache.logging.log4j:log4j-core": "", + "org.apache.logging.log4j:log4j-slf4j-impl": "", "org.apache.velocity:velocity-engine-core": "", - "org.slf4j:slf4j-api": "", - "org.slf4j:slf4j-log4j12": "" + "org.slf4j:slf4j-api": "" }, "server": { "ca.uhn.hapi:hapi-structures-v27": "hapi", @@ -267,7 +264,6 @@ "org.apache.httpcomponents:httpclient": "commons", "org.apache.httpcomponents:httpcore": "commons", "org.apache.httpcomponents:httpmime": "commons", - "org.apache.logging.log4j:log4j-1.2-api": "log4j", "org.apache.logging.log4j:log4j-api": "log4j", "org.apache.logging.log4j:log4j-core": "log4j", "org.apache.taglibs:taglibs-standard-impl": { diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a55f913c97..080383add9 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1828,14 +1828,6 @@ - - - - - - - - @@ -1862,6 +1854,14 @@ + + + + + + + + @@ -3046,14 +3046,6 @@ - - - - - - - - diff --git a/server/lib/not-going-to-be-commons-ssl-0.3.18.jar b/server/lib/not-going-to-be-commons-ssl-0.3.18.jar deleted file mode 100644 index a112eee0a5..0000000000 Binary files a/server/lib/not-going-to-be-commons-ssl-0.3.18.jar and /dev/null differ diff --git a/server/src/main/java/com/mirth/connect/server/builders/JavaScriptBuilder.java b/server/src/main/java/com/mirth/connect/server/builders/JavaScriptBuilder.java index 65a34f6d83..1de219d628 100644 --- a/server/src/main/java/com/mirth/connect/server/builders/JavaScriptBuilder.java +++ b/server/src/main/java/com/mirth/connect/server/builders/JavaScriptBuilder.java @@ -335,7 +335,7 @@ protected static void appendTransformerScript(StringBuilder builder, Transformer builder.append("function doTransform() {"); if (!response) { - builder.append(" phase[0] = 'transformer'; logger = Packages.org.apache.log4j.Logger.getLogger(phase[0]);"); + builder.append(" phase[0] = 'transformer'; logger = Packages.org.apache.logging.log4j.LogManager.getLogger(phase[0]);"); } builder.append("\n\n\n"); diff --git a/server/src/main/java/com/mirth/connect/server/controllers/DefaultDebugUsageController.java b/server/src/main/java/com/mirth/connect/server/controllers/DefaultDebugUsageController.java index 918ab6356e..673e2bbef7 100644 --- a/server/src/main/java/com/mirth/connect/server/controllers/DefaultDebugUsageController.java +++ b/server/src/main/java/com/mirth/connect/server/controllers/DefaultDebugUsageController.java @@ -15,7 +15,8 @@ import org.apache.ibatis.exceptions.PersistenceException; import org.apache.ibatis.session.SqlSessionManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.mirth.connect.client.core.ControllerException; import com.mirth.connect.model.DebugUsage; @@ -30,7 +31,7 @@ public class DefaultDebugUsageController extends DebugUsageController { private static final String VACUUM_LOCK_ID = "DebugUsage.vacuumDebuggerUsageTable"; - private Logger logger = Logger.getLogger(this.getClass()); + private Logger logger = LogManager.getLogger(this.getClass()); private ConfigurationController configurationController = ControllerFactory.getFactory().createConfigurationController(); // singleton pattern private static DebugUsageController instance = null; @@ -50,7 +51,7 @@ public static DebugUsageController create() { try { instance.getClass().getMethod("initialize").invoke(instance); } catch (Exception e) { - Logger.getLogger(DefaultDebugUsageController.class).error("Error calling initialize method in DefaultConfigurationController", e); + LogManager.getLogger(DefaultDebugUsageController.class).error("Error calling initialize method in DefaultConfigurationController", e); } } } diff --git a/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusProvider.java b/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusProvider.java index 7b4a9cc33b..8899be4d34 100644 --- a/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusProvider.java +++ b/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatusProvider.java @@ -20,7 +20,7 @@ public ExtensionStatusProvider(Properties mirthProperties) { this.mirthProperties = mirthProperties; try { - logger = new LoggerWrapper(Thread.currentThread().getContextClassLoader().loadClass("org.apache.log4j.Logger").getMethod("getLogger", Class.class).invoke(null, ExtensionStatuses.class)); + logger = new LoggerWrapper(Thread.currentThread().getContextClassLoader().loadClass("org.apache.logging.log4j.LogManager").getMethod("getLogger", Class.class).invoke(null, ExtensionStatuses.class)); } catch (Throwable t) { logger = new LoggerWrapper(null); } diff --git a/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatuses.java b/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatuses.java index f205956e67..6360b5d4ac 100644 --- a/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatuses.java +++ b/server/src/main/java/com/mirth/connect/server/extprops/ExtensionStatuses.java @@ -43,7 +43,7 @@ public static ExtensionStatuses getInstance() { private ExtensionStatuses() { try { - logger = new LoggerWrapper(Thread.currentThread().getContextClassLoader().loadClass("org.apache.log4j.Logger").getMethod("getLogger", Class.class).invoke(null, ExtensionStatuses.class)); + logger = new LoggerWrapper(Thread.currentThread().getContextClassLoader().loadClass("org.apache.logging.log4j.LogManager").getMethod("getLogger", Class.class).invoke(null, ExtensionStatuses.class)); } catch (Throwable t) { logger = new LoggerWrapper(null); } diff --git a/server/src/main/java/com/mirth/connect/server/launcher/Log4jBootstrap.java b/server/src/main/java/com/mirth/connect/server/launcher/Log4jBootstrap.java index 215f588019..315566407d 100644 --- a/server/src/main/java/com/mirth/connect/server/launcher/Log4jBootstrap.java +++ b/server/src/main/java/com/mirth/connect/server/launcher/Log4jBootstrap.java @@ -15,7 +15,7 @@ /** Utility class for bootstrapping Log4j. */ final class Log4jBootstrap { private static final File LOG4J_LIB_DIR = new File("./server-lib/log4j"); - private static final String[] JAR_PATTERNS = { "log4j-core-*.jar", "log4j-api-*.jar", "log4j-1.2-api-*.jar" }; + private static final String[] JAR_PATTERNS = { "log4j-core-*.jar", "log4j-api-*.jar" }; private Log4jBootstrap() {} diff --git a/server/src/main/java/com/mirth/connect/server/util/SqlConfig.java b/server/src/main/java/com/mirth/connect/server/util/SqlConfig.java index ccb56d2b78..b6a02f4624 100644 --- a/server/src/main/java/com/mirth/connect/server/util/SqlConfig.java +++ b/server/src/main/java/com/mirth/connect/server/util/SqlConfig.java @@ -93,7 +93,7 @@ public boolean isWritePoolCache() { */ private void init() { try { - LogFactory.useLog4JLogging(); + LogFactory.useCommonsLogging(); System.setProperty("derby.stream.error.method", "com.mirth.connect.server.Mirth.getNullOutputStream"); DatabaseSettings databaseSettings = ControllerFactory.getFactory().createConfigurationController().getDatabaseSettings(); diff --git a/server/src/main/resources/com/eviware/soapui/resources/conf/soapui-log4j.xml b/server/src/main/resources/com/eviware/soapui/resources/conf/soapui-log4j.xml deleted file mode 100644 index 6a9c4aa566..0000000000 --- a/server/src/main/resources/com/eviware/soapui/resources/conf/soapui-log4j.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/server/src/test/java/com/mirth/connect/connectors/ws/WebServiceConnectorServletTest.java b/server/src/test/java/com/mirth/connect/connectors/ws/WebServiceConnectorServletTest.java deleted file mode 100644 index 2aff60334e..0000000000 --- a/server/src/test/java/com/mirth/connect/connectors/ws/WebServiceConnectorServletTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) Mirth Corporation. All rights reserved. - * - * http://www.mirthcorp.com - * - * The software in this package is published under the terms of the MPL license a copy of which has - * been included with this distribution in the LICENSE.txt file. - */ - -package com.mirth.connect.connectors.ws; - -import static org.junit.Assert.assertTrue; - -import java.security.Security; - -import org.apache.commons.ssl.TrustMaterial; -import org.junit.BeforeClass; -import org.junit.Test; - -import com.mirth.connect.server.api.ServletTestBase; - -public class WebServiceConnectorServletTest extends ServletTestBase { - - @BeforeClass - public static void setup() throws Exception { - ServletTestBase.setup(); - } - - @Test - public void testCommonsSSL() throws Exception { - // Emulate the default in Java9+ - Security.setProperty("keystore.type", "pkcs12"); - - // This would have thrown an exception before - TrustMaterial defaultTrustMaterial = TrustMaterial.DEFAULT; - - assertTrue(defaultTrustMaterial.getCertificates().size() > 0); - } -} diff --git a/server/src/test/java/com/mirth/connect/server/launcher/Log4jBootstrapTest.java b/server/src/test/java/com/mirth/connect/server/launcher/Log4jBootstrapTest.java index 1a27103e93..41d28667fd 100644 --- a/server/src/test/java/com/mirth/connect/server/launcher/Log4jBootstrapTest.java +++ b/server/src/test/java/com/mirth/connect/server/launcher/Log4jBootstrapTest.java @@ -23,7 +23,7 @@ public void testGetClasspathUrlsDoesNotDependOnVersions() throws Exception { File log4jLibDir = Files.createTempDirectory("log4j").toFile(); log4jLibDir.deleteOnExit(); - for (String name : Arrays.asList("log4j-core-99.0.0.jar", "log4j-api-99.0.0.jar", "log4j-1.2-api-99.0.0.jar")) { + for (String name : Arrays.asList("log4j-core-99.0.0.jar", "log4j-api-99.0.0.jar")) { File jarFile = new File(log4jLibDir, name); assertTrue(jarFile.createNewFile()); jarFile.deleteOnExit(); @@ -33,7 +33,6 @@ public void testGetClasspathUrlsDoesNotDependOnVersions() throws Exception { assertEquals(Arrays.asList( new File(log4jLibDir, "log4j-core-99.0.0.jar").toURI().toURL(), - new File(log4jLibDir, "log4j-api-99.0.0.jar").toURI().toURL(), - new File(log4jLibDir, "log4j-1.2-api-99.0.0.jar").toURI().toURL()), classpathUrls); + new File(log4jLibDir, "log4j-api-99.0.0.jar").toURI().toURL()), classpathUrls); } } \ No newline at end of file