Skip to content

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

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

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
f1c509f
Create Develop Meed CI/CD Branch
boubaker Aug 19, 2024
3a7153a
Task-77677: Create FB meeds-qaui and update projects versions/depende…
halaya Mar 18, 2025
723677c
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 ide-packaging/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.ide</groupId>
<artifactId>ide</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>ide-packaging</artifactId>
<packaging>pom</packaging>
Expand Down
24 changes: 23 additions & 1 deletion ide-service/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.ide</groupId>
<artifactId>ide</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>ide-service</artifactId>
<packaging>jar</packaging>
Expand All @@ -52,6 +52,17 @@
<artifactId>analytics-api</artifactId>
<scope>provided</scope>
</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 @@ -63,6 +74,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>ide-service</finalName>
Expand Down
6 changes: 3 additions & 3 deletions ide-service/src/test/java/io/meeds/ide/listener/StaticResourcesAnalyticsListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.mockito.MockedStatic;
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.TestPropertySource;

import org.exoplatform.services.listener.Event;
Expand All @@ -47,10 +47,10 @@
@TestPropertySource(properties = { "spring.profiles.active=layout", })
class StaticResourcesAnalyticsListenerTest {

@MockBean
@MockitoBean
private ListenerService listenerService;

@MockBean
@MockitoBean
private Event<String, Widget> event;

@Mock
Expand Down
4 changes: 2 additions & 2 deletions ...src/test/java/io/meeds/ide/plugin/renderer/WidgetPortletInstancePreferencePluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import org.exoplatform.portal.pom.spi.portlet.Preference;

import io.meeds.layout.model.PortletInstancePreference;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;

@SpringBootTest(classes = { WidgetPortletInstancePreferencePlugin.class, })
@ExtendWith(MockitoExtension.class)
Expand All @@ -52,7 +52,7 @@ class WidgetPortletInstancePreferencePluginTest {

private static final String SETTING_NAME = "name";

@MockBean
@MockitoBean
private WidgetService widgetService;

@Autowired
Expand Down
8 changes: 4 additions & 4 deletions ide-service/src/test/java/io/meeds/ide/rest/StaticResourceRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
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 @@ -83,7 +83,7 @@ class StaticResourceRestTest {
OBJECT_MAPPER.registerModule(new JavaTimeModule());
}

@MockBean
@MockitoBean
private StaticResourceService staticResourceService;

@Autowired
Expand Down
8 changes: 4 additions & 4 deletions ide-service/src/test/java/io/meeds/ide/rest/WidgetRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
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.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
Expand Down Expand Up @@ -94,7 +94,7 @@ public class WidgetRestTest {
OBJECT_MAPPER.registerModule(new JavaTimeModule());
}

@MockBean
@MockitoBean
private WidgetService widgetService;

@Autowired
Expand Down
12 changes: 6 additions & 6 deletions ide-service/src/test/java/io/meeds/ide/service/StaticResourceServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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.listener.ListenerService;
import org.exoplatform.social.core.identity.model.Identity;
Expand All @@ -59,19 +59,19 @@ class StaticResourceServiceTest {

private static final String SITE_NAME = "siteName";

@MockBean
@MockitoBean
private LayoutAclService layoutAclService;

@MockBean
@MockitoBean
private IdentityManager identityManager;

@MockBean
@MockitoBean
private ListenerService listenerService;

@MockBean
@MockitoBean
private WidgetStorage widgetStorage;

@MockBean
@MockitoBean
private UserPortalConfigService userPortalConfigService;

@Autowired
Expand Down
10 changes: 5 additions & 5 deletions ide-service/src/test/java/io/meeds/ide/service/WidgetServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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.ObjectAlreadyExistsException;
import org.exoplatform.commons.exception.ObjectNotFoundException;
Expand All @@ -59,16 +59,16 @@ public class WidgetServiceTest {

private static final String JS_CONTENT = "...js...";

@MockBean
@MockitoBean
private LayoutAclService layoutAclService;

@MockBean
@MockitoBean
private IdentityManager identityManager;

@MockBean
@MockitoBean
private ListenerService listenerService;

@MockBean
@MockitoBean
private WidgetStorage widgetStorage;

@Autowired
Expand Down
4 changes: 2 additions & 2 deletions ide-service/src/test/java/io/meeds/ide/storage/WidgetStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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 io.meeds.ide.dao.WidgetDAO;
import io.meeds.ide.entity.WidgetEntity;
Expand All @@ -59,7 +59,7 @@ public class WidgetStorageTest {

private static final LocalDateTime MODIFIED_DATE = LocalDate.of(2024, 8, 22).atStartOfDay().minusHours(16);

@MockBean
@MockitoBean
private WidgetDAO widgetDAO;

@Autowired
Expand Down
2 changes: 1 addition & 1 deletion ide-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>io.meeds.ide</groupId>
<artifactId>ide</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>ide-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 @@ -31,7 +31,7 @@
</parent>
<groupId>io.meeds.ide</groupId>
<artifactId>ide</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Meeds - IDE - Parent POM</name>
<description>IDE addon for Meeds based Web Application</description>
Expand All @@ -47,9 +47,9 @@
<tag>HEAD</tag>
</scm>
<properties>
<io.meeds.social.version>7.2.x-SNAPSHOT</io.meeds.social.version>
<addon.meeds.layout.version>7.2.x-SNAPSHOT</addon.meeds.layout.version>
<addon.meeds.analytics.version>7.2.x-SNAPSHOT</addon.meeds.analytics.version>
<io.meeds.social.version>7.2.x-meeds-qaui-SNAPSHOT</io.meeds.social.version>
<addon.meeds.layout.version>7.2.x-meeds-qaui-SNAPSHOT</addon.meeds.layout.version>
<addon.meeds.analytics.version>7.2.x-meeds-qaui-SNAPSHOT</addon.meeds.analytics.version>

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