From f371639a3f078fd514fe9a93b4594b78d7bfe151 Mon Sep 17 00:00:00 2001
From: Ben Fortuna <fortuna@nodelogic.au>
Date: Thu, 29 Aug 2024 21:05:43 +1000
Subject: [PATCH] Fixed test logging

---
 build.gradle                                  |  3 ++-
 gradle.properties                             |  5 ++--
 .../{log4j.properties => log4j2.properties}   | 27 ++++---------------
 3 files changed, 10 insertions(+), 25 deletions(-)
 rename src/test/resources/{log4j.properties => log4j2.properties} (61%)

diff --git a/build.gradle b/build.gradle
index 11120fe..db2ea1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,8 @@ dependencies {
     // spock
     testImplementation platform("org.spockframework:spock-bom:$spockVersion"),
             "org.spockframework:spock-core",
-            "org.apache.logging.log4j:log4j-core:$log4jVersion"
+            "org.apache.logging.log4j:log4j-core:$log4jVersion",
+            "org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion"
 }
 
 compileTestJava {
diff --git a/gradle.properties b/gradle.properties
index 8527cf4..c9c92fc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,6 @@
-ical4jVersion=4.0.0
-ical4jVCardVersion=2.0.0-beta4
+ical4jVersion=4.0.3
+ical4jVCardVersion=2.0.0-rc1
+
 groovyVersion=3.0.21
 log4jVersion=2.23.1
 bndVersion=6.2.0
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j2.properties
similarity index 61%
rename from src/test/resources/log4j.properties
rename to src/test/resources/log4j2.properties
index ff568cb..b2f8a75 100644
--- a/src/test/resources/log4j.properties
+++ b/src/test/resources/log4j2.properties
@@ -31,27 +31,10 @@
 #
 
 ## set root logging preferences..
-log4j.logger.net.fortuna.ical4j=info, stdout
-
-log4j.logger.net.fortuna.ical4j.filter=info, stdout
-log4j.additivity.net.fortuna.ical4j.filter=false
-
-log4j.logger.net.fortuna.ical4j.model=info, stdout
-log4j.additivity.net.fortuna.ical4j.model=false
-
-log4j.logger.net.fortuna.ical4j.model.TimeZoneTest=info, stdout
-log4j.additivity.net.fortuna.ical4j.model.TimeZoneTest=false
-
-log4j.logger.net.fortuna.ical4j.model.component.Observance=debug, stdout
-log4j.additivity.net.fortuna.ical4j.model.component.Observance=false
-
-log4j.logger.net.fortuna.ical4j.model.property.DateProperty=debug, stdout
-log4j.additivity.net.fortuna.ical4j.model.property.DateProperty=false
-
-log4j.logger.net.fortuna.ical4j.model.UtcOffsetTest=debug, stdout
-log4j.additivity.net.fortuna.ical4j.model.UtcOffsetTest=false
+rootLogger=info, stdout
 
 ## appender: stdout..
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d] %-5p [%t] %c{1} - %m%n
\ No newline at end of file
+appender.stdout.type=Console
+appender.stdout.name=stdout
+appender.stdout.layout.type=PatternLayout
+appender.stdout.layout.pattern=[%d] %-5p [%t] %c{1} - %m%n
\ No newline at end of file