From ca291a542f6b7c959aa4cef302abc564a5c87f3b Mon Sep 17 00:00:00 2001
From: Jonas Krukenberg <krukenberg@subshell.com>
Date: Wed, 16 Oct 2024 14:11:50 +0200
Subject: [PATCH] UNSOI-2211: update logback configuration for Spring 6
 compatibility

---
 charts/sophora-importer/Chart.yaml  |  2 +-
 charts/sophora-importer/values.yaml | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/charts/sophora-importer/Chart.yaml b/charts/sophora-importer/Chart.yaml
index 8f95ca1..a4db2a7 100644
--- a/charts/sophora-importer/Chart.yaml
+++ b/charts/sophora-importer/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.1
+version: 1.3.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/sophora-importer/values.yaml b/charts/sophora-importer/values.yaml
index 6fe629e..d2f9b25 100644
--- a/charts/sophora-importer/values.yaml
+++ b/charts/sophora-importer/values.yaml
@@ -78,14 +78,12 @@ logbackXml: |
       <jmxConfigurator/>
   
       <appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
-          <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-              <evaluator>
-                  <!-- No log messages marked as 'SPECIAL_EMAIL_NOTIFICATION' should be shown. -->
-                  <expression>marker != null &amp;&amp; marker.getName().equals("SPECIAL_EMAIL_NOTIFICATION")</expression>
-              </evaluator>
+          <!-- No log messages marked as 'SPECIAL_EMAIL_NOTIFICATION' should be shown. -->
+          <turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
+              <Marker>SPECIAL_EMAIL_NOTIFICATION</Marker>
               <OnMismatch>NEUTRAL</OnMismatch>
               <OnMatch>DENY</OnMatch>
-          </filter>
+          </turboFilter>
           <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
       </appender>