diff --git a/pom.xml b/pom.xml index 6c6ac61aae1..ef81f69c9fc 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 1.78.1 7.0.2 com.oracle.coherence.ce - 24.03.1 + 24.09 3.0.2 4.8.168 2.2 @@ -167,15 +167,15 @@ 2.24.0 5.11.0 3.2.0 - 6.1.15 + 6.2.0 3.6.10 2.2.0 2.0.16 - 3.3.5 - 2023.0.3 - 2024.0.3 - 3.3.2 - 6.3.4 + 3.4.0 + 2024.0.0-RC1 + 2024.1.0 + 3.4.0 + 6.4.1 10.1.28 diff --git a/samples/spring-session-demo/spring-session-demo-app/src/test/java/com/oracle/coherence/spring/samples/session/RestTests.java b/samples/spring-session-demo/spring-session-demo-app/src/test/java/com/oracle/coherence/spring/samples/session/RestTests.java index 3181660fcbf..238fec3014d 100644 --- a/samples/spring-session-demo/spring-session-demo-app/src/test/java/com/oracle/coherence/spring/samples/session/RestTests.java +++ b/samples/spring-session-demo/spring-session-demo-app/src/test/java/com/oracle/coherence/spring/samples/session/RestTests.java @@ -1,11 +1,13 @@ /* - * Copyright (c) 2021, 2022, Oracle and/or its affiliates. + * Copyright (c) 2021, 2024, Oracle and/or its affiliates. * * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ package com.oracle.coherence.spring.samples.session; +import java.util.Base64; + import com.fasterxml.jackson.databind.ObjectMapper; import com.oracle.coherence.spring.samples.session.filter.AuthenticationRequest; import org.hamcrest.MatcherAssert; @@ -23,7 +25,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.util.Base64Utils; import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.is; @@ -62,7 +63,7 @@ public void shouldReturnDefaultMessage() throws Exception { public void shouldReturnOk() throws Exception { this.mockMvc .perform(get("/hello").header(HttpHeaders.AUTHORIZATION, - "Basic " + Base64Utils.encodeToString("coherence:rocks".getBytes()))) + "Basic " + Base64.getEncoder().encodeToString("coherence:rocks".getBytes()))) .andExpect(status().isOk()) .andExpect(content().string(is("Hello Coherence"))); } diff --git a/src/main/config/dependency-check-suppression.xml b/src/main/config/dependency-check-suppression.xml index b8283acd242..fa495b573d9 100644 --- a/src/main/config/dependency-check-suppression.xml +++ b/src/main/config/dependency-check-suppression.xml @@ -13,10 +13,4 @@ ]]> CVE-2024-7254 - - - CVE-2024-38828 -