From 6f4b615f8497f345c658ac834e22e83846877cd0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2020 08:19:06 +0000 Subject: [PATCH 1/2] Bump slf4j-log4j12 from 1.7.18 to 1.7.30 Bumps [slf4j-log4j12](https://github.com/qos-ch/slf4j) from 1.7.18 to 1.7.30. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.18...v_1.7.30) Signed-off-by: dependabot-preview[bot] --- main/pom.xml | 2 +- server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index 38b622923..c6eb4d412 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -188,7 +188,7 @@ org.slf4j slf4j-log4j12 - 1.7.18 + 1.7.30 org.slf4j diff --git a/server/pom.xml b/server/pom.xml index 5ac253bee..df7e2bd95 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -185,7 +185,7 @@ org.slf4j slf4j-log4j12 - 1.7.18 + 1.7.30 org.slf4j From 761858cfe381439a798b415b8624b7be764d3ac5 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Tue, 16 Jun 2020 17:07:21 -0400 Subject: [PATCH 2/2] Use property for all SLF4J versions --- main/pom.xml | 4 ++-- pom.xml | 1 + server/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index c6eb4d412..cd5516b3a 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -188,12 +188,12 @@ org.slf4j slf4j-log4j12 - 1.7.30 + ${slf4j.version} org.slf4j slf4j-api - 1.7.30 + ${slf4j.version} org.apache.commons diff --git a/pom.xml b/pom.xml index b5c7c8ce4..30c79e7d8 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,7 @@ -Dfile.encoding=cp1252 UTF-8 2.11.0 + 1.7.30 diff --git a/server/pom.xml b/server/pom.xml index df7e2bd95..06fa8d2a0 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -185,12 +185,12 @@ org.slf4j slf4j-log4j12 - 1.7.30 + ${slf4j.version} org.slf4j slf4j-api - 1.7.30 + ${slf4j.version}