springboot: spring boot 3.4.0

while1618 · Dec 8, 2024 · 8b31945 · 8b31945
1 parent d09d6c9
commit 8b31945
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 29 deletions.
diff --git a/backend/spring-boot/.run/AllTests.run.xml b/backend/spring-boot/.run/AllTests.run.xml
@@ -1,31 +1,32 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="AllTests" type="JUnit" factoryName="JUnit">
-    <module name="backend"/>
+    <module name="backend" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.bootstrapbugz.backend.*"/>
-        <option name="ENABLED" value="true"/>
+        <option name="PATTERN" value="org.bootstrapbugz.backend.*" />
+        <option name="ENABLED" value="true" />
       </pattern>
     </extension>
-    <option name="PACKAGE_NAME" value="org.bootstrapbugz.backend"/>
-    <option name="MAIN_CLASS_NAME" value=""/>
-    <option name="METHOD_NAME" value=""/>
-    <option name="TEST_OBJECT" value="pattern"/>
-    <dir value="$PROJECT_DIR$/backend/src/test/java/org/bootstrapbugz/backend/*/integration"/>
+    <option name="PACKAGE_NAME" value="org.bootstrapbugz.backend" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="pattern" />
+    <dir value="$PROJECT_DIR$/backend/src/test/java/org/bootstrapbugz/backend/*/integration" />
     <patterns>
-      <pattern testClass="org.bootstrapbugz.backend.user.integration.UserControllerIT"/>
-      <pattern testClass="org.bootstrapbugz.backend.user.integration.ProfileControllerIT"/>
-      <pattern testClass="org.bootstrapbugz.backend.auth.integration.AuthControllerIT"/>
-      <pattern testClass="org.bootstrapbugz.backend.admin.integration.UserControllerIT"/>
-      <pattern testClass="org.bootstrapbugz.backend.shared.integration.AccessingResourcesIT"/>
-      <pattern testClass="org.bootstrapbugz.backend.shared.unit.EmailServiceTest"/>
-      <pattern testClass="org.bootstrapbugz.backend.shared.unit.MessageServiceTest"/>
-      <pattern testClass="org.bootstrapbugz.backend.user.data.UserRepositoryIT"/>
-      <pattern testClass="org.bootstrapbugz.backend.user.data.RoleRepositoryIT"/>
-      <pattern testClass="org.bootstrapbugz.backend.auth.data.RefreshTokenStoreRepositoryIT"/>
+      <pattern testClass="org.bootstrapbugz.backend.user.integration.UserControllerIT" />
+      <pattern testClass="org.bootstrapbugz.backend.user.integration.RoleControllerIT" />
+      <pattern testClass="org.bootstrapbugz.backend.user.integration.ProfileControllerIT" />
+      <pattern testClass="org.bootstrapbugz.backend.auth.integration.AuthControllerIT" />
+      <pattern testClass="org.bootstrapbugz.backend.admin.integration.UserControllerIT" />
+      <pattern testClass="org.bootstrapbugz.backend.shared.integration.AccessingResourcesIT" />
+      <pattern testClass="org.bootstrapbugz.backend.shared.unit.EmailServiceTest" />
+      <pattern testClass="org.bootstrapbugz.backend.shared.unit.MessageServiceTest" />
+      <pattern testClass="org.bootstrapbugz.backend.user.data.UserRepositoryIT" />
+      <pattern testClass="org.bootstrapbugz.backend.user.data.RoleRepositoryIT" />
+      <pattern testClass="org.bootstrapbugz.backend.auth.data.RefreshTokenStoreRepositoryIT" />
     </patterns>
     <method v="2">
-      <option name="Make" enabled="true"/>
+      <option name="Make" enabled="true" />
     </method>
   </configuration>
 </component>
diff --git a/backend/spring-boot/.run/IntegrationTests.run.xml b/backend/spring-boot/.run/IntegrationTests.run.xml
@@ -8,6 +8,7 @@
     <dir value="$PROJECT_DIR$/backend/src/test/java/org/bootstrapbugz/backend/*/integration" />
     <patterns>
       <pattern testClass="org.bootstrapbugz.backend.user.integration.UserControllerIT" />
+      <pattern testClass="org.bootstrapbugz.backend.user.integration.RoleControllerIT" />
       <pattern testClass="org.bootstrapbugz.backend.user.integration.ProfileControllerIT" />
       <pattern testClass="org.bootstrapbugz.backend.auth.integration.AuthControllerIT" />
       <pattern testClass="org.bootstrapbugz.backend.admin.integration.UserControllerIT" />

diff --git a/backend/spring-boot/pom.xml b/backend/spring-boot/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.5</version>
+    <version>3.4.0</version>
     <relativePath/>
     <!-- lookup parent from repository -->
   </parent>
@@ -18,18 +18,18 @@
 
   <properties>
     <java.version>21</java.version>
-    <lombok.version>1.18.34</lombok.version>
+    <lombok.version>1.18.36</lombok.version>
     <gson.version>2.11.0</gson.version>
     <guava.version>33.3.1-jre</guava.version>
     <jwt.version>4.4.0</jwt.version>
-    <mapstruct.version>1.6.2</mapstruct.version>
+    <mapstruct.version>1.6.3</mapstruct.version>
     <jedis.version>5.2.0</jedis.version>
-    <springdoc.version>2.6.0</springdoc.version>
-    <datafaker.version>2.4.0</datafaker.version>
+    <springdoc.version>2.7.0</springdoc.version>
+    <datafaker.version>2.4.2</datafaker.version>
     <jacoco.version>0.8.12</jacoco.version>
     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
     <spotless.version>2.43.0</spotless.version>
-    <google-java-format.version>1.17.0</google-java-format.version>
+    <google-java-format.version>1.25.0</google-java-format.version>
     <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
   </properties>
 

diff --git a/...pring-boot/src/test/java/org/bootstrapbugz/backend/auth/integration/AuthControllerIT.java b/...pring-boot/src/test/java/org/bootstrapbugz/backend/auth/integration/AuthControllerIT.java
@@ -33,10 +33,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @DirtiesContext
@@ -50,7 +50,7 @@ class AuthControllerIT extends DatabaseContainers {
   @Autowired private ResetPasswordTokenServiceImpl resetPasswordService;
   @Autowired private UserRepository userRepository;
 
-  @MockBean private EmailService emailService;
+  @MockitoBean private EmailService emailService;
 
   @Test
   void registerUser() throws Exception {

diff --git a/...ng-boot/src/test/java/org/bootstrapbugz/backend/user/integration/ProfileControllerIT.java b/...ng-boot/src/test/java/org/bootstrapbugz/backend/user/integration/ProfileControllerIT.java
@@ -22,10 +22,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @DirtiesContext
@@ -36,7 +36,7 @@ class ProfileControllerIT extends DatabaseContainers {
   @Autowired private MockMvc mockMvc;
   @Autowired private ObjectMapper objectMapper;
 
-  @MockBean private EmailService emailService;
+  @MockitoBean private EmailService emailService;
 
   @Test
   void findProfile() throws Exception {