From 29787843206a2a9bd73102e69e4ab346f10e3ea6 Mon Sep 17 00:00:00 2001 From: Houssem Ben Ali Date: Wed, 6 Jul 2022 10:44:24 +0200 Subject: [PATCH 1/3] Create develop-meed and update project dependencies --- gamification-github-packaging/pom.xml | 2 +- gamification-github-services/pom.xml | 2 +- gamification-github-webapp/pom.xml | 2 +- pom.xml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gamification-github-packaging/pom.xml b/gamification-github-packaging/pom.xml index 11bf8ecdb..b7d619700 100644 --- a/gamification-github-packaging/pom.xml +++ b/gamification-github-packaging/pom.xml @@ -24,7 +24,7 @@ io.meeds.gamification-github gamification-github - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT gamification-github-packaging pom diff --git a/gamification-github-services/pom.xml b/gamification-github-services/pom.xml index b9cd8470e..5d948dcd8 100644 --- a/gamification-github-services/pom.xml +++ b/gamification-github-services/pom.xml @@ -25,7 +25,7 @@ io.meeds.gamification-github gamification-github - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT 4.0.0 gamification-github-services diff --git a/gamification-github-webapp/pom.xml b/gamification-github-webapp/pom.xml index 6b4811490..dfd96c03d 100644 --- a/gamification-github-webapp/pom.xml +++ b/gamification-github-webapp/pom.xml @@ -24,7 +24,7 @@ io.meeds.gamification-github gamification-github - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT gamification-github-webapp war diff --git a/pom.xml b/pom.xml index 440583c34..3470fc35d 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.meeds.gamification-github gamification-github - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT pom Gamification - Github Connector - Parent POM Meeds Add-on for github gamification add-on connector @@ -45,10 +45,10 @@ https://github.com/meeds-io/gamification-github - 7.2.x-SNAPSHOT - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT + 7.2.x-meed-SNAPSHOT 2.4.2 - 7.2.x-SNAPSHOT + 7.2.x-meed-SNAPSHOT meeds-io From d882eaf45ece84bd6be4b111792a8fb957e4b963 Mon Sep 17 00:00:00 2001 From: halaya Date: Tue, 18 Mar 2025 15:32:53 +0100 Subject: [PATCH 2/3] Task-77677: Create FB meeds-qaui and update projects versions/dependencies --- gamification-github-packaging/pom.xml | 2 +- gamification-github-services/pom.xml | 2 +- gamification-github-webapp/pom.xml | 2 +- pom.xml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gamification-github-packaging/pom.xml b/gamification-github-packaging/pom.xml index b7d619700..b71b827da 100644 --- a/gamification-github-packaging/pom.xml +++ b/gamification-github-packaging/pom.xml @@ -24,7 +24,7 @@ io.meeds.gamification-github gamification-github - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT gamification-github-packaging pom diff --git a/gamification-github-services/pom.xml b/gamification-github-services/pom.xml index 5d948dcd8..6f90c3a88 100644 --- a/gamification-github-services/pom.xml +++ b/gamification-github-services/pom.xml @@ -25,7 +25,7 @@ io.meeds.gamification-github gamification-github - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT 4.0.0 gamification-github-services diff --git a/gamification-github-webapp/pom.xml b/gamification-github-webapp/pom.xml index dfd96c03d..b46eb5797 100644 --- a/gamification-github-webapp/pom.xml +++ b/gamification-github-webapp/pom.xml @@ -24,7 +24,7 @@ io.meeds.gamification-github gamification-github - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT gamification-github-webapp war diff --git a/pom.xml b/pom.xml index 3470fc35d..9d9f94dad 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.meeds.gamification-github gamification-github - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT pom Gamification - Github Connector - Parent POM Meeds Add-on for github gamification add-on connector @@ -45,10 +45,10 @@ https://github.com/meeds-io/gamification-github - 7.2.x-meed-SNAPSHOT - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT 2.4.2 - 7.2.x-meed-SNAPSHOT + 7.2.x-meeds-qaui-SNAPSHOT meeds-io From 9efb223c24f080c8ee357afc853353a800d1f575 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 18 May 2026 10:53:27 +0100 Subject: [PATCH 3/3] feat: Upgrade to Spring Boot 4.1 - Meeds-io/meeds#3889 --- .../listener/GithubEventsListenerTest.java | 6 +++--- .../gamification/rest/GithubWebHookRestTest.java | 9 +++++---- .../gamification/rest/HooksManagementRestTest.java | 10 +++++----- .../gamification/service/WebhookServiceTest.java | 10 +++++----- .../gamification/storage/WebHookStorageTest.java | 8 ++++---- gamification-github-webapp/package-lock.json | 4 +--- 6 files changed, 23 insertions(+), 24 deletions(-) diff --git a/gamification-github-services/src/test/java/io/meeds/github/gamification/listener/GithubEventsListenerTest.java b/gamification-github-services/src/test/java/io/meeds/github/gamification/listener/GithubEventsListenerTest.java index ad3ea819e..218d7eff4 100644 --- a/gamification-github-services/src/test/java/io/meeds/github/gamification/listener/GithubEventsListenerTest.java +++ b/gamification-github-services/src/test/java/io/meeds/github/gamification/listener/GithubEventsListenerTest.java @@ -31,7 +31,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.exoplatform.services.listener.Event; import org.exoplatform.services.listener.ListenerService; @@ -39,10 +39,10 @@ @SpringBootTest(classes = { GithubEventsListener.class, }) class GithubEventsListenerTest { - @MockBean + @MockitoBean private ListenerService listenerService; - @MockBean + @MockitoBean private Event, String> event; @Autowired diff --git a/gamification-github-services/src/test/java/io/meeds/github/gamification/rest/GithubWebHookRestTest.java b/gamification-github-services/src/test/java/io/meeds/github/gamification/rest/GithubWebHookRestTest.java index ccda0a25a..16cc46306 100644 --- a/gamification-github-services/src/test/java/io/meeds/github/gamification/rest/GithubWebHookRestTest.java +++ b/gamification-github-services/src/test/java/io/meeds/github/gamification/rest/GithubWebHookRestTest.java @@ -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; @@ -53,7 +54,7 @@ class GithubWebHookRestTest { private static final String REST_PATH = "/webhooks"; // NOSONAR - @MockBean + @MockitoBean private GithubTriggerService githubTriggerService; @Autowired diff --git a/gamification-github-services/src/test/java/io/meeds/github/gamification/rest/HooksManagementRestTest.java b/gamification-github-services/src/test/java/io/meeds/github/gamification/rest/HooksManagementRestTest.java index 77238cebe..549d78e45 100644 --- a/gamification-github-services/src/test/java/io/meeds/github/gamification/rest/HooksManagementRestTest.java +++ b/gamification-github-services/src/test/java/io/meeds/github/gamification/rest/HooksManagementRestTest.java @@ -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; @@ -73,10 +73,10 @@ class HooksManagementRestTest { private static final String TEST_PASSWORD = "testPassword"; - @MockBean + @MockitoBean private WebhookService webhookService; - @MockBean + @MockitoBean private GithubConsumerService githubConsumerService; @Autowired diff --git a/gamification-github-services/src/test/java/io/meeds/github/gamification/service/WebhookServiceTest.java b/gamification-github-services/src/test/java/io/meeds/github/gamification/service/WebhookServiceTest.java index 6748a0453..7d812b0af 100644 --- a/gamification-github-services/src/test/java/io/meeds/github/gamification/service/WebhookServiceTest.java +++ b/gamification-github-services/src/test/java/io/meeds/github/gamification/service/WebhookServiceTest.java @@ -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 }) @@ -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 diff --git a/gamification-github-services/src/test/java/io/meeds/github/gamification/storage/WebHookStorageTest.java b/gamification-github-services/src/test/java/io/meeds/github/gamification/storage/WebHookStorageTest.java index 4ec1a6816..0045ca091 100644 --- a/gamification-github-services/src/test/java/io/meeds/github/gamification/storage/WebHookStorageTest.java +++ b/gamification-github-services/src/test/java/io/meeds/github/gamification/storage/WebHookStorageTest.java @@ -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; @@ -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 diff --git a/gamification-github-webapp/package-lock.json b/gamification-github-webapp/package-lock.json index b85932c0a..8ba9584a7 100644 --- a/gamification-github-webapp/package-lock.json +++ b/gamification-github-webapp/package-lock.json @@ -5738,9 +5738,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, - "requires": { - "ajv": "^8.0.0" - } + "requires": {} }, "ajv-keywords": { "version": "5.1.0",