Skip to content

Commit

Permalink
Upgrade Spring Boot to 3.4.0
Browse files Browse the repository at this point in the history
- Upgrade Coherence version to 24.09
- Upgrade Spring Framework version to 6.2.0
- Upgrade Spring Cloud version to 2024.0.0-RC1
- Upgrade Spring Data BOM version to 2024.1.0
- Upgrade Spring Session version to 3.4.0
- Upgrade Spring Security version to 6.4.1
  • Loading branch information
ghillert committed Dec 2, 2024
1 parent 171f0ce commit a93d3dc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<bcprov.version>1.78.1</bcprov.version>
<bedrock.version>7.0.2</bedrock.version>
<coherence.groupId>com.oracle.coherence.ce</coherence.groupId>
<coherence.version>24.03.1</coherence.version>
<coherence.version>24.09</coherence.version>
<coherence-hibernate.version>3.0.2</coherence-hibernate.version>
<classgraph.version>4.8.168</classgraph.version>
<hamcrest.version>2.2</hamcrest.version>
Expand All @@ -167,15 +167,15 @@
<log4j.version>2.24.0</log4j.version>
<mockito.version>5.11.0</mockito.version>
<modelmapper.version>3.2.0</modelmapper.version>
<org.springframework.version>6.1.15</org.springframework.version>
<org.springframework.version>6.2.0</org.springframework.version>
<reactor.version>3.6.10</reactor.version>
<resilience4j.version>2.2.0</resilience4j.version>
<slf4j-api.version>2.0.16</slf4j-api.version>
<spring-boot.version>3.3.5</spring-boot.version>
<spring-cloud.version>2023.0.3</spring-cloud.version>
<spring-data-bom.version>2024.0.3</spring-data-bom.version>
<spring-session.version>3.3.2</spring-session.version>
<spring-security.version>6.3.4</spring-security.version>
<spring-boot.version>3.4.0</spring-boot.version>
<spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
<spring-data-bom.version>2024.1.0</spring-data-bom.version>
<spring-session.version>3.4.0</spring-session.version>
<spring-security.version>6.4.1</spring-security.version>
<tomcat.version>10.1.28</tomcat.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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")));
}
Expand Down
6 changes: 0 additions & 6 deletions src/main/config/dependency-check-suppression.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,4 @@
]]></notes>
<vulnerabilityName>CVE-2024-7254</vulnerabilityName>
</suppress>
<suppress>
<notes><![CDATA[
spring-web-6.1.15.jar
]]></notes>
<vulnerabilityName>CVE-2024-38828</vulnerabilityName>
</suppress>
</suppressions>

0 comments on commit a93d3dc

Please sign in to comment.