Skip to content

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

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

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
2978784
Create develop-meed and update project dependencies
houssemexo26 Jul 6, 2022
d882eaf
Task-77677: Create FB meeds-qaui and update projects versions/depende…
halaya Mar 18, 2025
9efb223
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 gamification-github-packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.meeds.gamification-github</groupId>
<artifactId>gamification-github</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>gamification-github-packaging</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion gamification-github-services/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.gamification-github</groupId>
<artifactId>gamification-github</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>gamification-github-services</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions ...ervices/src/test/java/io/meeds/github/gamification/listener/GithubEventsListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@
import org.junit.jupiter.api.Test;
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.Event;
import org.exoplatform.services.listener.ListenerService;

@SpringBootTest(classes = { GithubEventsListener.class, })
class GithubEventsListenerTest {

@MockBean
@MockitoBean
private ListenerService listenerService;

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

@Autowired
Expand Down
9 changes: 5 additions & 4 deletions ...ithub-services/src/test/java/io/meeds/github/gamification/rest/GithubWebHookRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@
import org.junit.jupiter.api.extension.ExtendWith;
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.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.web.SecurityFilterChain;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
Expand All @@ -53,7 +54,7 @@ class GithubWebHookRestTest {

private static final String REST_PATH = "/webhooks"; // NOSONAR

@MockBean
@MockitoBean
private GithubTriggerService githubTriggerService;

@Autowired
Expand Down
10 changes: 5 additions & 5 deletions ...hub-services/src/test/java/io/meeds/github/gamification/rest/HooksManagementRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
import org.junit.jupiter.api.extension.ExtendWith;
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.data.domain.PageImpl;
import org.springframework.http.MediaType;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
Expand Down Expand Up @@ -73,10 +73,10 @@ class HooksManagementRestTest {

private static final String TEST_PASSWORD = "testPassword";

@MockBean
@MockitoBean
private WebhookService webhookService;

@MockBean
@MockitoBean
private GithubConsumerService githubConsumerService;

@Autowired
Expand Down
10 changes: 5 additions & 5 deletions ...ithub-services/src/test/java/io/meeds/github/gamification/service/WebhookServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.junit.jupiter.api.Test;
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.data.domain.Pageable;

@SpringBootTest(classes = { WebhookServiceImpl.class })
Expand All @@ -51,16 +51,16 @@ class WebhookServiceTest {

private static final Pageable PAGEABLE = Pageable.ofSize(2);

@MockBean
@MockitoBean
private GithubConsumerService githubConsumerService;

@MockBean
@MockitoBean
private WebHookStorage webHookStorage;

@MockBean
@MockitoBean
private RuleService ruleService;

@MockBean
@MockitoBean
private SettingService settingService;

@Autowired
Expand Down
8 changes: 4 additions & 4 deletions ...ithub-services/src/test/java/io/meeds/github/gamification/storage/WebHookStorageTest.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.commons.ObjectAlreadyExistsException;
import org.springframework.data.domain.PageImpl;
Expand All @@ -57,13 +57,13 @@ class WebHookStorageTest {
@Autowired
private WebHookStorage webHookStorage;

@MockBean
@MockitoBean
private WebHookDAO webHookDAO;

@MockBean
@MockitoBean
private SettingService settingService;

@MockBean
@MockitoBean
private CodecInitializer codecInitializer;

@BeforeEach
Expand Down
4 changes: 1 addition & 3 deletions gamification-github-webapp/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gamification-github-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.meeds.gamification-github</groupId>
<artifactId>gamification-github</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>gamification-github-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 @@ -29,7 +29,7 @@
</parent>
<groupId>io.meeds.gamification-github</groupId>
<artifactId>gamification-github</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Gamification - Github Connector - Parent POM</name>
<description>Meeds Add-on for github gamification add-on connector</description>
Expand All @@ -45,10 +45,10 @@
<url>https://github.com/meeds-io/gamification-github</url>
</scm>
<properties>
<io.meeds.social.version>7.2.x-SNAPSHOT</io.meeds.social.version>
<io.meeds.platform-ui.version>7.2.x-SNAPSHOT</io.meeds.platform-ui.version>
<io.meeds.social.version>7.2.x-meeds-qaui-SNAPSHOT</io.meeds.social.version>
<io.meeds.platform-ui.version>7.2.x-meeds-qaui-SNAPSHOT</io.meeds.platform-ui.version>
<org.jackson.version>2.4.2</org.jackson.version>
<addon.meeds.gamification.version>7.2.x-SNAPSHOT</addon.meeds.gamification.version>
<addon.meeds.gamification.version>7.2.x-meeds-qaui-SNAPSHOT</addon.meeds.gamification.version>

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