Skip to content

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

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

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
97eb971
Create develop-meed and update project dependencies
houssemexo26 Jul 6, 2022
0060a50
Task-77677: Create FB meeds-qaui and update projects versions/depende…
halaya Mar 18, 2025
97f05cd
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 kudos-packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>io.meeds.kudos</groupId>
<artifactId>kudos</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>kudos-packaging</artifactId>
<packaging>pom</packaging>
Expand Down
24 changes: 23 additions & 1 deletion kudos-services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.meeds.kudos</groupId>
<artifactId>kudos</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>kudos-services</artifactId>
<name>Meeds:: Add-on:: eXo Kudos - Services</name>
Expand Down Expand Up @@ -60,6 +60,17 @@
<type>test-jar</type>
<scope>test</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 @@ -71,6 +82,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>kudos-services</finalName>
Expand Down
3 changes: 1 addition & 2 deletions kudos-services/src/main/resources/jpa-entities.idx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
io.meeds.appcenter.entity.ApplicationEntity
io.meeds.appcenter.entity.FavoriteApplicationEntity
io.meeds.kudos.entity.KudosEntity
10 changes: 5 additions & 5 deletions kudos-services/src/test/java/io/meeds/kudos/rest/KudosRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
import org.mockito.MockedStatic;
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 @@ -103,10 +103,10 @@ public class KudosRestTest {
@Autowired
private WebApplicationContext context;

@MockBean
@MockitoBean
private KudosService kudosService;

@MockBean
@MockitoBean
private IdentityManager identityManager;

private MockMvc mockMvc;
Expand Down
4 changes: 1 addition & 3 deletions kudos-webapps/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 kudos-webapps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>io.meeds.kudos</groupId>
<artifactId>kudos</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
</parent>
<artifactId>kudos-webapps</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 @@ -28,7 +28,7 @@
</parent>
<groupId>io.meeds.kudos</groupId>
<artifactId>kudos</artifactId>
<version>7.2.x-SNAPSHOT</version>
<version>7.2.x-meeds-qaui-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Meeds:: Add-on:: Kudos - Parent POM</name>
<description>Meeds Kudos Addon</description>
Expand All @@ -45,9 +45,9 @@
</scm>
<properties>
<!-- 3rd party libraries versions -->
<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>
<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>
<io.meeds.platform-ui.version>7.2.x-meeds-qaui-SNAPSHOT</io.meeds.platform-ui.version>
<addon.meeds.analytics.version>7.2.x-meeds-qaui-SNAPSHOT</addon.meeds.analytics.version>

<!-- **************************************** -->
<!-- Jenkins Settings -->
Expand Down
Loading