Merge branch 'main' into development

qbicsoftware · Sep 5, 2024 · 94e0961 · 94e0961
2 parents 0b11090 + b8ce284
commit 94e0961
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 28 deletions.
diff --git a/logging/pom.xml b/logging/pom.xml
@@ -26,12 +26,12 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>1.5.6</version>
+        <version>1.5.7</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/logging/src/test/resources/logger.xml b/logging/src/test/resources/logger.xml
@@ -3,13 +3,12 @@
 
   <property name="LOGS" value="${LOG_PATH:-./logs}"/>
 
-  <appender name="Console"
-    class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
+  <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
       <Pattern>
         %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%C{1.}): %msg%n%throwable
       </Pattern>
-    </layout>
+    </encoder>
   </appender>
 
   <!-- LOG everything at INFO level -->

diff --git a/pom.xml b/pom.xml
@@ -30,18 +30,18 @@
 
   <properties>
     <java.version>17</java.version>
-    <vaadin.version>24.4.8</vaadin.version>
+    <vaadin.version>24.4.11</vaadin.version>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <jakarta.persistence.version>3.1.0</jakarta.persistence.version>
+    <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jackson.version>2.17.2</jackson.version>
   </properties>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.2</version>
+    <version>3.3.3</version>
   </parent>
 
   <repositories>
@@ -173,13 +173,6 @@
         <artifactId>jackson-annotations</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-
-      <!--If not specified, spring-boot-starter-parent dependency will introduce transitively the 1.33 version of snakeyaml, for a CVE exists. -->
-      <dependency>
-        <groupId>org.yaml</groupId>
-        <artifactId>snakeyaml</artifactId>
-        <version>2.2</version>
-      </dependency>
     </dependencies>
 
   </dependencyManagement>
@@ -223,7 +216,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M5</version>
+        <version>3.5.0</version>
         <configuration>
           <useModulePath>false</useModulePath>
           <includes>

diff --git a/user-interface/src/main/resources/logback-spring.xml b/user-interface/src/main/resources/logback-spring.xml
@@ -5,31 +5,28 @@
 
   <appender name="Console"
     class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
       <Pattern>
         %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%logger{36}): %msg%n%throwable
       </Pattern>
-    </layout>
+    </encoder>
   </appender>
 
   <appender name="RollingFile"
     class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>${LOGS}/datamanager-logger.log</file>
-    <encoder
-      class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <Pattern>%d %p %C{1} [%t] %m%n</Pattern>
-    </encoder>
 
     <rollingPolicy
-      class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
       <!-- rollover daily and when the file reaches 10 MegaBytes -->
       <fileNamePattern>${LOGS}/archived/spring-boot-logger-%d{yyyy-MM-dd}.%i.log
       </fileNamePattern>
-      <timeBasedFileNamingAndTriggeringPolicy
-        class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-        <maxFileSize>10MB</maxFileSize>
-      </timeBasedFileNamingAndTriggeringPolicy>
+      <maxFileSize>10MB</maxFileSize>
     </rollingPolicy>
+    <encoder
+      class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <Pattern>%d %p %C{1} [%t] %m%n</Pattern>
+    </encoder>
   </appender>
 
   <!-- LOG everything at INFO level -->