From 13dbe83cf86b6ffba5d952c939dc7ffacc61a1cb Mon Sep 17 00:00:00 2001 From: halaya Date: Tue, 7 May 2024 13:03:58 +0100 Subject: [PATCH 1/3] Create FB develop-meed and update projects versions/dependencies --- content-packaging/pom.xml | 2 +- content-service/pom.xml | 2 +- content-webapp/pom.xml | 2 +- pom.xml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/content-packaging/pom.xml b/content-packaging/pom.xml index e8fcaf75e..db8fc0f89 100644 --- a/content-packaging/pom.xml +++ b/content-packaging/pom.xml @@ -22,7 +22,7 @@ io.meeds.content content - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT content-packaging pom diff --git a/content-service/pom.xml b/content-service/pom.xml index 3804a946a..fbe3cc6d8 100644 --- a/content-service/pom.xml +++ b/content-service/pom.xml @@ -22,7 +22,7 @@ io.meeds.content content - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT content-service jar diff --git a/content-webapp/pom.xml b/content-webapp/pom.xml index 72a41fdcc..1b2f9c9a6 100644 --- a/content-webapp/pom.xml +++ b/content-webapp/pom.xml @@ -22,7 +22,7 @@ io.meeds.content content - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT content-webapp war diff --git a/pom.xml b/pom.xml index 7dcbcf5d2..bb1baf8b7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ io.meeds.content content - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT pom Meeds - Content Addon - Parent POM Content @@ -38,9 +38,9 @@ - 7.2.x-SNAPSHOT - 7.2.x-SNAPSHOT - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT + 7.2.x-meed-SNAPSHOT + 7.2.x-meed-SNAPSHOT meeds-io From 1a4c630f32308e6fb3d7e16b28f44e87f4bf63ad Mon Sep 17 00:00:00 2001 From: halaya Date: Tue, 18 Mar 2025 15:31:37 +0100 Subject: [PATCH 2/3] Task-77677: Create FB meeds-qaui and update projects versions/dependencies --- content-packaging/pom.xml | 2 +- content-service/pom.xml | 2 +- content-webapp/pom.xml | 2 +- pom.xml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/content-packaging/pom.xml b/content-packaging/pom.xml index db8fc0f89..8013f32a1 100644 --- a/content-packaging/pom.xml +++ b/content-packaging/pom.xml @@ -22,7 +22,7 @@ io.meeds.content content - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT content-packaging pom diff --git a/content-service/pom.xml b/content-service/pom.xml index fbe3cc6d8..f898fbfcb 100644 --- a/content-service/pom.xml +++ b/content-service/pom.xml @@ -22,7 +22,7 @@ io.meeds.content content - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT content-service jar diff --git a/content-webapp/pom.xml b/content-webapp/pom.xml index 1b2f9c9a6..462546c14 100644 --- a/content-webapp/pom.xml +++ b/content-webapp/pom.xml @@ -22,7 +22,7 @@ io.meeds.content content - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT content-webapp war diff --git a/pom.xml b/pom.xml index bb1baf8b7..86b239d09 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ io.meeds.content content - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT pom Meeds - Content Addon - Parent POM Content @@ -38,9 +38,9 @@ - 7.2.x-meed-SNAPSHOT - 7.2.x-meed-SNAPSHOT - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT meeds-io From afa3cf995e85a3efe62f7023066a178b406c1702 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 18 May 2026 10:50:38 +0100 Subject: [PATCH 3/3] feat: Upgrade to Spring Boot 4.1 - Meeds-io/meeds#3889 --- .../meeds/content/AbstractSpringConfigurationTest.java | 4 ++-- .../image/plugin/ImageAttachmentPluginTest.java | 10 +++++----- .../java/io/meeds/content/news/rest/NewsRestTest.java | 2 +- .../meeds/content/news/rest/NewsTargetingRestTest.java | 7 ++++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/content-service/src/test/java/io/meeds/content/AbstractSpringConfigurationTest.java b/content-service/src/test/java/io/meeds/content/AbstractSpringConfigurationTest.java index 392a3d3be..3afb0298a 100644 --- a/content-service/src/test/java/io/meeds/content/AbstractSpringConfigurationTest.java +++ b/content-service/src/test/java/io/meeds/content/AbstractSpringConfigurationTest.java @@ -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; diff --git a/content-service/src/test/java/io/meeds/content/image/plugin/ImageAttachmentPluginTest.java b/content-service/src/test/java/io/meeds/content/image/plugin/ImageAttachmentPluginTest.java index d29c0c335..b66370f57 100644 --- a/content-service/src/test/java/io/meeds/content/image/plugin/ImageAttachmentPluginTest.java +++ b/content-service/src/test/java/io/meeds/content/image/plugin/ImageAttachmentPluginTest.java @@ -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; @@ -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 diff --git a/content-service/src/test/java/io/meeds/content/news/rest/NewsRestTest.java b/content-service/src/test/java/io/meeds/content/news/rest/NewsRestTest.java index a569528ed..1f0577c7b 100644 --- a/content-service/src/test/java/io/meeds/content/news/rest/NewsRestTest.java +++ b/content-service/src/test/java/io/meeds/content/news/rest/NewsRestTest.java @@ -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); } diff --git a/content-service/src/test/java/io/meeds/content/news/rest/NewsTargetingRestTest.java b/content-service/src/test/java/io/meeds/content/news/rest/NewsTargetingRestTest.java index dec04a8a5..d5c9df50d 100644 --- a/content-service/src/test/java/io/meeds/content/news/rest/NewsTargetingRestTest.java +++ b/content-service/src/test/java/io/meeds/content/news/rest/NewsTargetingRestTest.java @@ -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; @@ -69,7 +70,7 @@ public void shouldReturnOkWhenGetTargets() { ResponseEntity response = newsTargetingRestController.getAllTargets(); // Then - assertEquals(HttpStatus.OK.value(), response.getStatusCodeValue()); + assertTrue(response.getStatusCode().is2xxSuccessful()); } @Test @@ -82,7 +83,7 @@ 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); @@ -90,7 +91,7 @@ public void shouldReturnOkWhenGetAllowedTargets() { response = newsTargetingRestController.getAllowedTargets(); // Then - assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), response.getStatusCodeValue()); + assertTrue(response.getStatusCode().is5xxServerError()); }