Skip to content

feat: Upgrade to Spring Boot 4.1 - Meeds-io/meeds#3889 #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
boubaker wants to merge 3 commits into
base: feature/meeds-qaui
Choose a base branch
from
Draft

feat: Upgrade to Spring Boot 4.1 - Meeds-io/meeds#3889 #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13dbe83
Create FB develop-meed and update projects versions/dependencies
halaya May 7, 2024
1a4c630
Task-77677: Create FB meeds-qaui and update projects versions/depende…
halaya Mar 18, 2025
afa3cf9
feat: Upgrade to Spring Boot 4.1 - Meeds-io/meeds#3889
boubaker May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content-packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.meeds.content</groupId>
<artifactId>content</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>content-packaging</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion content-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.meeds.content</groupId>
<artifactId>content</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>content-service</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions content-service/src/test/java/io/meeds/content/AbstractSpringConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.PropertySource;
Expand Down
10 changes: 5 additions & 5 deletions content-service/src/test/java/io/meeds/content/image/plugin/ImageAttachmentPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.junit4.SpringRunner;

import org.exoplatform.commons.exception.ObjectNotFoundException;
Expand All @@ -49,16 +49,16 @@ public class ImageAttachmentPluginTest {

private static final String CMS_SETTING_NAME = "cmsSettingName";

@MockBean
@MockitoBean
private CMSService cmsService;

@MockBean
@MockitoBean
private IdentityManager identityManager;

@MockBean
@MockitoBean
private SpaceService spaceService;

@MockBean
@MockitoBean
private AttachmentService attachmentService;

@Autowired
Expand Down
2 changes: 1 addition & 1 deletion content-service/src/test/java/io/meeds/content/news/rest/NewsRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void shouldGetNewsWhenNewsExistsAndUserIsMemberOfTheSpace() throws Except
ResponseEntity response = newsRestController.getNewsById("1", null, null, false, null);

// Then
assertEquals(200, response.getStatusCodeValue());
assertTrue(response.getStatusCode().is2xxSuccessful());
News fetchedNews = (News) response.getBody();
assertNotNull(fetchedNews);
}
Expand Down
7 changes: 4 additions & 3 deletions content-service/src/test/java/io/meeds/content/news/rest/NewsTargetingRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -69,7 +70,7 @@ public void shouldReturnOkWhenGetTargets() {
ResponseEntity response = newsTargetingRestController.getAllTargets();

// Then
assertEquals(HttpStatus.OK.value(), response.getStatusCodeValue());
assertTrue(response.getStatusCode().is2xxSuccessful());
}

@Test
Expand All @@ -82,15 +83,15 @@ public void shouldReturnOkWhenGetAllowedTargets() {
ResponseEntity response = newsTargetingRestController.getAllowedTargets();

// Then
assertEquals(org.springframework.http.HttpStatus.OK.value(), response.getStatusCodeValue());
assertTrue(response.getStatusCode().is2xxSuccessful());

when(newsTargetingRestController.getAllowedTargets()).thenThrow(RuntimeException.class);

// When
response = newsTargetingRestController.getAllowedTargets();

// Then
assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), response.getStatusCodeValue());
assertTrue(response.getStatusCode().is5xxServerError());

}

Expand Down
2 changes: 1 addition & 1 deletion content-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.meeds.content</groupId>
<artifactId>content</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>content-webapp</artifactId>
<packaging>war</packaging>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>
<groupId>io.meeds.content</groupId>
<artifactId>content</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Meeds - Content Addon - Parent POM</name>
<description>Content</description>
Expand All @@ -38,9 +38,9 @@
</modules>

<properties>
<addon.meeds.notes.version>7.2.x-SNAPSHOT</addon.meeds.notes.version>
<addon.meeds.layout.version>7.2.x-SNAPSHOT</addon.meeds.layout.version>
<addon.meeds.mcp-server.version>7.2.x-SNAPSHOT</addon.meeds.mcp-server.version>
<addon.meeds.notes.version>7.2.x-meeds-qaui-SNAPSHOT</addon.meeds.notes.version>
<addon.meeds.layout.version>7.2.x-meeds-qaui-SNAPSHOT</addon.meeds.layout.version>
<addon.meeds.mcp-server.version>7.2.x-meeds-qaui-SNAPSHOT</addon.meeds.mcp-server.version>

<!-- Sonar properties -->
<sonar.organization>meeds-io</sonar.organization>
Expand Down
Loading