Skip to content

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

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 4 commits into
base: feature/meeds-qaui
Choose a base branch
from
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e26726d
Create develop-meed and update project dependencies
houssemexo26 Jul 6, 2022
55d10e0
Task-77677: Create FB meeds-qaui and update projects versions/depende…
halaya Mar 18, 2025
82adb33
feat: Allow to add a hidden content link plugin - EXO-86750 - Meeds-i…
boubaker May 15, 2026
5b1a8ae
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 component/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>social-component-api</artifactId>
<name>Meeds:: PLF:: Social API</name>
Expand Down
14 changes: 14 additions & 0 deletions component/api/src/main/java/io/meeds/social/cms/model/ContentLinkExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class ContentLinkExtension {

private boolean drawer;

private boolean hidden;

public ContentLinkExtension(String objectType,
String titleKey,
String icon,
Expand All @@ -47,4 +49,16 @@ public ContentLinkExtension(String objectType,
this.command = command;
}

public ContentLinkExtension(String objectType,
String titleKey,
String icon,
String command,
boolean drawer) {
this.objectType = objectType;
this.titleKey = titleKey;
this.icon = icon;
this.command = command;
this.drawer = drawer;
}

}
2 changes: 1 addition & 1 deletion component/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<groupId>io.meeds.social</groupId>
<artifactId>social-component-common</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions component/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>social-component-core</artifactId>
<name>Meeds:: PLF:: Social Core Component</name>
Expand Down Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>6.6.49.Final</version>
<version>7.2.12.Final</version>
</dependency>
</dependencies>
</plugin>
Expand Down
5 changes: 4 additions & 1 deletion component/core/src/main/resources/jpa-entities.idx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
org.exoplatform.social.core.jpa.storage.entity.GroupSpaceBindingReportUserEntity
org.exoplatform.social.core.jpa.storage.entity.ProfilePropertySettingEntity
org.exoplatform.social.core.jpa.storage.entity.ProfilePropertyOptionEntity
org.exoplatform.social.core.jpa.storage.entity.UserSpaceBindingEntity
org.exoplatform.social.core.jpa.storage.entity.MetadataEntity
org.exoplatform.social.core.jpa.storage.entity.ActivityShareActionEntity
Expand All @@ -14,8 +15,10 @@ org.exoplatform.social.core.jpa.storage.entity.SpaceEntity
org.exoplatform.social.core.jpa.storage.entity.GroupSpaceBindingEntity
org.exoplatform.social.core.jpa.storage.entity.ProfileExperienceEntity
org.exoplatform.social.core.jpa.storage.entity.IdentityEntity
org.exoplatform.social.core.jpa.storage.entity.AppEntity
org.exoplatform.social.core.jpa.storage.entity.ProfileLabelEntity
org.exoplatform.social.core.jpa.storage.entity.SpaceExternalInvitationEntity
org.exoplatform.social.core.jpa.storage.entity.MetadataItemEntity
org.exoplatform.social.core.jpa.storage.entity.UserBindingsQueueEntity
org.exoplatform.social.core.jpa.storage.entity.UserSpaceBindingEntity
io.meeds.social.space.template.entity.SpaceTemplateEntity
io.meeds.social.space.invitation.entity.SpaceInvitationLinkEntity
2 changes: 1 addition & 1 deletion component/core/src/test/java/io/meeds/social/AbstractSpringConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.junit.Before;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.test.context.junit4.SpringRunner;

Expand Down
14 changes: 7 additions & 7 deletions component/core/src/test/java/io/meeds/social/category/service/CategoryServiceUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.junit.runner.RunWith;
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.portal.config.UserACL;
Expand Down Expand Up @@ -86,22 +86,22 @@ public class CategoryServiceUnitTest {

private static final String TEST_USER = "testuser";

@MockBean
@MockitoBean
private IdentityManager identityManager;

@MockBean
@MockitoBean
private TranslationService translationService;

@MockBean
@MockitoBean
private CategoryStorage categoryStorage;

@MockBean
@MockitoBean
private SpaceService spaceService;

@MockBean
@MockitoBean
private UserACL userAcl;

@MockBean
@MockitoBean
private CategoryPluginService categoryPluginService;

@Autowired
Expand Down
6 changes: 3 additions & 3 deletions component/core/src/test/java/io/meeds/social/coediting/service/CoeditingServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
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.api.settings.SettingService;
Expand All @@ -59,10 +59,10 @@ public class CoeditingServiceTest {

private static final String USERNAME = "username";

@MockBean
@MockitoBean
private SettingService settingService;

@MockBean
@MockitoBean
private CacheService cacheService;

@Autowired
Expand Down
10 changes: 5 additions & 5 deletions component/core/src/test/java/io/meeds/social/space/service/SpaceDirectoryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.junit.runner.RunWith;
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.portal.config.UserACL;
Expand Down Expand Up @@ -61,16 +61,16 @@ public class SpaceDirectoryServiceTest {

private static final String SETTING_NAME = "settingName";

@MockBean
@MockitoBean
private CategoryService categoryService;

@MockBean
@MockitoBean
private LayoutService layoutService;

@MockBean
@MockitoBean
private SpaceDirectoryStorage spaceDirectoryStorage;

@MockBean
@MockitoBean
private SecuritySettingService securitySettingService;

@Autowired
Expand Down
4 changes: 2 additions & 2 deletions component/core/src/test/java/io/meeds/social/space/storage/SpaceDirectoryStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.junit.runner.RunWith;
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.api.settings.SettingService;
Expand All @@ -48,7 +48,7 @@ public class SpaceDirectoryStorageTest {

private static final String SETTING_NAME = "settingName";

@MockBean
@MockitoBean
private SettingService settingService;

@Autowired
Expand Down
2 changes: 1 addition & 1 deletion component/notification/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>social-component-notification</artifactId>
<name>Meeds:: PLF:: Social Notification Component</name>
Expand Down
2 changes: 1 addition & 1 deletion component/oauth-auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion component/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>social-component</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion component/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>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>social-component-service</artifactId>
<name>Meeds:: PLF:: Social Service Component</name>
Expand Down
8 changes: 4 additions & 4 deletions component/service/src/test/java/io/meeds/social/category/rest/CategoryLinkRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc;
import org.springframework.http.MediaType;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
Expand Down Expand Up @@ -74,7 +74,7 @@ public class CategoryLinkRestTest {
@Autowired
private WebApplicationContext context;

@MockBean
@MockitoBean
private CategoryLinkService categoryLinkService;

private MockMvc mockMvc;
Expand Down
10 changes: 5 additions & 5 deletions component/service/src/test/java/io/meeds/social/category/rest/CategoryRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
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.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.http.MediaType;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.web.SecurityFilterChain;
Expand Down Expand Up @@ -94,10 +94,10 @@ public class CategoryRestTest {
@Autowired
private WebApplicationContext context;

@MockBean
@MockitoBean
private CategoryService categoryService;

@MockBean
@MockitoBean
private SpaceDirectoryService spaceDirectoryService;

private MockMvc mockMvc;
Expand Down
8 changes: 4 additions & 4 deletions component/service/src/test/java/io/meeds/social/cms/rest/ContentLinkRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
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.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.http.MediaType;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.web.SecurityFilterChain;
Expand Down Expand Up @@ -87,7 +87,7 @@ public class ContentLinkRestTest {
@Autowired
private WebApplicationContext context;

@MockBean
@MockitoBean
private ContentLinkService contentLinkService;

private MockMvc mockMvc;
Expand Down
8 changes: 4 additions & 4 deletions component/service/src/test/java/io/meeds/social/resource/rest/SkinRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired;
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.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
Expand Down Expand Up @@ -66,7 +66,7 @@ public class SkinRestTest {
@Autowired
private WebApplicationContext context;

@MockBean
@MockitoBean
private SkinService skinService;

@Mock
Expand Down
20 changes: 10 additions & 10 deletions component/service/src/test/java/io/meeds/social/security/rest/LoginRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
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.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.http.MediaType;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.web.SecurityFilterChain;
Expand Down Expand Up @@ -80,25 +80,25 @@ public class LoginRestTest {
@Autowired
private WebApplicationContext context;

@MockBean
@MockitoBean
private PasswordRecoveryService passwordRecoveryService;

@MockBean
@MockitoBean
private OrganizationService organizationService;

@MockBean
@MockitoBean
private UserDAOImpl userHandler;

@MockBean
@MockitoBean
private RegisterUIParamsExtension registerUIParamsExtension;

@MockBean
@MockitoBean
private SecuritySettingService securitySettingService;

@MockBean
@MockitoBean
private RemindPasswordTokenService remindPasswordTokenService;

@MockBean
@MockitoBean
private Captcha captcha;

@Before
Expand Down
2 changes: 1 addition & 1 deletion component/web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>social-component</artifactId>
<groupId>io.meeds.social</groupId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<groupId>io.meeds.social</groupId>
<artifactId>social-component-web</artifactId>
Expand Down
Loading
Loading