From ce7538d062d0ffde644c1cafe3518b46aa2078bf Mon Sep 17 00:00:00 2001 From: Ralph Schaer Date: Fri, 29 Mar 2024 13:28:53 +0100 Subject: [PATCH] Upgrade --- pom.xml | 93 ++++++++----------- .../util/ExtDirectSpringUtilTest.java | 3 +- 2 files changed, 41 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index 64f6c008..6689575f 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ org.springframework spring-framework-bom - 6.1.4 + 6.1.5 pom import @@ -100,14 +100,14 @@ com.fasterxml.jackson.core jackson-databind - 2.16.1 + 2.17.0 org.immutables value - 2.9.3 + 2.10.1 provided @@ -122,7 +122,7 @@ org.junit.jupiter junit-jupiter-params test - 5.9.2 + 5.10.2 org.junit.jupiter @@ -133,7 +133,7 @@ org.junit.platform junit-platform-runner - 1.9.2 + 1.10.2 test @@ -151,28 +151,28 @@ org.aspectj aspectjrt - 1.9.19 + 1.9.21.1 test org.aspectj aspectjweaver - 1.9.19 + 1.9.21.1 test ch.qos.logback logback-classic - 1.5.1 + 1.5.3 test org.slf4j jcl-over-slf4j - 2.0.9 + 2.0.12 test @@ -186,7 +186,7 @@ commons-io commons-io - 2.14.0 + 2.15.1 test @@ -219,14 +219,7 @@ org.springframework.boot spring-boot-starter-validation - 3.2.3 - test - - - - org.glassfish - javax.el - 3.0.0 + 3.2.4 test @@ -277,50 +270,36 @@ - org.hibernate + org.hibernate.orm hibernate-core - 5.5.2.Final - test - - - - javax.xml.bind - jaxb-api - 2.3.0 + 6.4.4.Final test org.glassfish.jaxb jaxb-runtime - 2.3.0.1 + 4.0.5 test org.javassist javassist - 3.29.2-GA + 3.30.2-GA test org.eclipse.jetty jetty-server - 9.4.44.v20210927 + 11.0.20 test - - - javax.servlet - javax.servlet-api - - - org.eclipse.jetty jetty-webapp - 9.4.44.v20210927 + 11.0.20 test @@ -360,9 +339,9 @@ org.apache.maven.plugins - maven-surefire-report-plugin - 3.1.2 - + maven-failsafe-plugin + 3.2.5 + org.codehaus.mojo cobertura-maven-plugin @@ -421,16 +400,18 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 3.1.2 - - classes - true - - - + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + + org.apache.maven.surefire + surefire-junit-platform + 3.2.5 + + + org.apache.maven.plugins maven-clean-plugin @@ -500,8 +481,10 @@ com.mycila license-maven-plugin - 4.1 + 4.3 + +
${basedir}/src/main/config/header.txt
**/*.xml @@ -521,8 +504,10 @@ .editorconfig .github/** - true - + + + true + check-headers diff --git a/src/test/java/ch/ralscha/extdirectspring/util/ExtDirectSpringUtilTest.java b/src/test/java/ch/ralscha/extdirectspring/util/ExtDirectSpringUtilTest.java index 7cfbdee3..2196ec21 100644 --- a/src/test/java/ch/ralscha/extdirectspring/util/ExtDirectSpringUtilTest.java +++ b/src/test/java/ch/ralscha/extdirectspring/util/ExtDirectSpringUtilTest.java @@ -22,6 +22,7 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; +import java.util.Locale; import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockHttpServletRequest; @@ -121,7 +122,7 @@ private static void assertResponse(MockHttpServletResponse response, int noOfHea assertThat(response.getHeader("Cache-Control")).isEqualTo("public, max-age=" + month * 30 * 24 * 60 * 60); String expiresHeader = (String) response.getHeaderValue("Expires"); - DateTimeFormatter fmt = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss z"); + DateTimeFormatter fmt = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH); LocalDateTime expires = LocalDateTime.parse(expiresHeader, fmt); LocalDateTime inSixMonths = LocalDateTime.now(ZoneOffset.UTC).plusSeconds(month * 30 * 24 * 60 * 60);