Skip to content

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

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 #512

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
04b647f
Create Dev Meed Branch
boubaker Feb 22, 2024
3b2e8cf
Task-77677: Create FB meeds-qaui and update projects versions/depende…
halaya Mar 18, 2025
d938385
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 layout-packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>io.meeds.layout</groupId>
<artifactId>layout</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>layout-packaging</artifactId>
<packaging>pom</packaging>
Expand Down
24 changes: 23 additions & 1 deletion layout-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>io.meeds.layout</groupId>
<artifactId>layout</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>layout-service</artifactId>
<packaging>jar</packaging>
Expand All @@ -45,6 +45,17 @@
<artifactId>social-component-service</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand All @@ -56,6 +67,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
Expand Down
1 change: 1 addition & 0 deletions layout-service/src/main/resources/jpa-entities.idx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
io.meeds.layout.entity.PageTemplateEntity
io.meeds.layout.entity.PortletInstanceEntity
io.meeds.layout.entity.PortletInstanceCategoryEntity
io.meeds.layout.entity.SectionTemplateEntity
18 changes: 9 additions & 9 deletions layout-service/src/test/java/io/meeds/layout/plugin/PageTemplateDatabindPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.mockito.junit.jupiter.MockitoExtension;
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.exoplatform.social.attachment.AttachmentService;

Expand All @@ -58,28 +58,28 @@
@ExtendWith(MockitoExtension.class)
class PageTemplateDatabindPluginTest {

@MockBean
@MockitoBean
private PageTemplateService pageTemplateService;

@MockBean
@MockitoBean
private DatabindService databindService;

@MockBean
@MockitoBean
private FileService fileService;

@MockBean
@MockitoBean
private TranslationService translationService;

@MockBean
@MockitoBean
private AttachmentService attachmentService;

@MockBean
@MockitoBean
private PortletInstanceService portletInstanceService;

@MockBean
@MockitoBean
private UserACL userAcl;

@MockBean
@MockitoBean
private IdentityManager identityManager;

@Autowired
Expand Down
16 changes: 8 additions & 8 deletions layout-service/src/test/java/io/meeds/layout/plugin/PortletInstanceDatabindPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.mockito.junit.jupiter.MockitoExtension;
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.exoplatform.services.security.Identity;
import org.exoplatform.social.attachment.AttachmentService;
Expand All @@ -59,25 +59,25 @@ class PortletInstanceDatabindPluginTest {
@Mock
private Identity userIdentity;

@MockBean
@MockitoBean
private PortletInstanceService portletInstanceService;

@MockBean
@MockitoBean
private DatabindService databindService;

@MockBean
@MockitoBean
private FileService fileService;

@MockBean
@MockitoBean
private TranslationService translationService;

@MockBean
@MockitoBean
private AttachmentService attachmentService;

@MockBean
@MockitoBean
private UserACL userAcl;

@MockBean
@MockitoBean
private IdentityManager identityManager;

@Autowired
Expand Down
24 changes: 12 additions & 12 deletions layout-service/src/test/java/io/meeds/layout/plugin/SectionTemplateDatabindPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.mockito.junit.jupiter.MockitoExtension;
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.exoplatform.commons.file.services.FileService;
import org.exoplatform.portal.config.UserACL;
Expand All @@ -62,37 +62,37 @@
@ExtendWith(MockitoExtension.class)
class SectionTemplateDatabindPluginTest {

@MockBean
@MockitoBean
private SectionTemplateService sectionTemplateService;

@MockBean
@MockitoBean
private DatabindService databindService;

@MockBean
@MockitoBean
private FileService fileService;

@MockBean
@MockitoBean
private TranslationService translationService;

@MockBean
@MockitoBean
private AttachmentService attachmentService;

@MockBean
@MockitoBean
private PortletInstanceService portletInstanceService;

@MockBean
@MockitoBean
private LayoutService layoutService;

@MockBean
@MockitoBean
private PageLayoutService pageLayoutService;

@MockBean
@MockitoBean
private ContainerLayoutService containerLayoutService;

@MockBean
@MockitoBean
private UserACL userAcl;

@MockBean
@MockitoBean
private IdentityManager identityManager;

@Autowired
Expand Down
28 changes: 14 additions & 14 deletions layout-service/src/test/java/io/meeds/layout/plugin/SiteTemplateDatabindPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
import org.mockito.junit.jupiter.MockitoExtension;
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.exoplatform.commons.file.services.FileService;
import org.exoplatform.portal.config.UserACL;
Expand All @@ -74,43 +74,43 @@ class SiteTemplateDatabindPluginTest {
@Mock
private Identity userIdentity;

@MockBean
@MockitoBean
private SiteTemplateService siteTemplateService;

@MockBean
@MockitoBean
LayoutService layoutService;

@MockBean
@MockitoBean
private DatabindService databindService;

@MockBean
@MockitoBean
private FileService fileService;

@MockBean
@MockitoBean
private TranslationService translationService;

@MockBean
@MockitoBean
private AttachmentService attachmentService;

@MockBean
@MockitoBean
private NavigationService navigationService;

@MockBean
@MockitoBean
private PortletInstanceService portletInstanceService;

@MockBean
@MockitoBean
private NavigationLayoutService navigationLayoutService;

@MockBean
@MockitoBean
DescriptionService descriptionService;

@MockBean
@MockitoBean
PageLayoutService pageLayoutService;

@MockBean
@MockitoBean
private UserACL userAcl;

@MockBean
@MockitoBean
private IdentityManager identityManager;

@Autowired
Expand Down
28 changes: 14 additions & 14 deletions layout-service/src/test/java/io/meeds/layout/plugin/SpaceNavigationDatabindPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import org.mockito.junit.jupiter.MockitoExtension;
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.exoplatform.commons.file.services.FileService;
import org.exoplatform.portal.config.UserACL;
Expand All @@ -70,43 +70,43 @@ class SpaceNavigationDatabindPluginTest {
@Mock
private Identity userIdentity;

@MockBean
@MockitoBean
protected DatabindService databindService;

@MockBean
@MockitoBean
protected FileService fileService;

@MockBean
@MockitoBean
protected TranslationService translationService;

@MockBean
@MockitoBean
protected SpaceTemplateService spaceTemplateService;

@MockBean
@MockitoBean
protected AttachmentService attachmentService;

@MockBean
@MockitoBean
LayoutService layoutService;

@MockBean
@MockitoBean
private NavigationService navigationService;

@MockBean
@MockitoBean
DescriptionService descriptionService;

@MockBean
@MockitoBean
private NavigationLayoutService navigationLayoutService;

@MockBean
@MockitoBean
private PageLayoutService pageLayoutService;

@MockBean
@MockitoBean
PortletInstanceService portletInstanceService;

@MockBean
@MockitoBean
protected UserACL userAcl;

@MockBean
@MockitoBean
private IdentityManager identityManager;

@Autowired
Expand Down
8 changes: 4 additions & 4 deletions ...rvice/src/test/java/io/meeds/layout/plugin/attachment/CmsPortletAttachmentPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.mockito.junit.jupiter.MockitoExtension;
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 static org.junit.jupiter.api.Assertions.assertEquals;
Expand All @@ -44,13 +44,13 @@
@ExtendWith(MockitoExtension.class)
class CmsPortletAttachmentPluginTest {

@MockBean
@MockitoBean
private AttachmentService attachmentService;

@MockBean
@MockitoBean
private LayoutAclService layoutAclService;

@MockBean
@MockitoBean
private PortletInstanceService portletInstanceService;

@Autowired
Expand Down
6 changes: 3 additions & 3 deletions ...ice/src/test/java/io/meeds/layout/plugin/attachment/PageTemplateAttachmentPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.mockito.junit.jupiter.MockitoExtension;
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.exoplatform.services.security.Identity;
import org.exoplatform.social.attachment.AttachmentService;
Expand All @@ -47,10 +47,10 @@ public class PageTemplateAttachmentPluginTest {
@Mock
private Identity userIdentity;

@MockBean
@MockitoBean
private AttachmentService attachmentService;

@MockBean
@MockitoBean
private LayoutAclService layoutAclService;

@Autowired
Expand Down
Loading
Loading