bump(spring-boot): bump to 3.3.2

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-starter-parent</artifactId>
         <groupId>org.springframework.boot</groupId>
-        <version>3.0.0</version>
+        <version>3.3.2</version>
         <relativePath />
     </parent>
     <licenses>
@@ -41,7 +41,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <assertj-core.version>1.0.0m1</assertj-core.version>
-        <awaitility.version>1.7.0</awaitility.version>
         <commons-io.version>2.16.1</commons-io.version>
         <commons-lang.version>3.15.0</commons-lang.version>
         <gatling-maven-plugin.version>2.2.4</gatling-maven-plugin.version>
@@ -126,7 +125,7 @@
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-hibernate5</artifactId>
+            <artifactId>jackson-datatype-hibernate6</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -147,14 +146,6 @@
             <scope>runtime</scope>
             <version>2.3.230</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.jayway.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
@@ -222,17 +213,17 @@
         <dependency>
             <groupId> org.hibernate.orm</groupId>
             <artifactId>hibernate-jcache</artifactId>
-            <version>6.1.5.Final</version>
+            <version>6.5.2.Final</version>
         </dependency>
         <dependency>
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache-transactions</artifactId>
-            <version>3.10.6</version>
+            <version>3.10.8</version>
         </dependency>
         <dependency>
             <groupId> org.hibernate.orm</groupId>
             <artifactId>hibernate-envers</artifactId>
-            <version>6.1.5.Final</version>
+            <version>6.5.2.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
@@ -242,7 +233,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.6.12.Final</version>
+            <version>5.6.15.Final</version>
         </dependency>
 
         <dependency>
@@ -403,7 +394,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
-            <version>3.0.0</version>
+            <version>3.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -502,7 +493,7 @@
             <dependency>
                 <groupId>org.springframework.data</groupId>
                 <artifactId>spring-data-commons</artifactId>
-                <version>2.7.5</version>
+                <version>3.3.2</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

src/main/java/fr/icdc/ebad/EbadApplication.java

@@ -13,18 +13,22 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.core.env.Environment;
+import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 
+import static org.springframework.data.web.config.EnableSpringDataWebSupport.PageSerializationMode.VIA_DTO;
+
 @SpringBootApplication
 @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=SpringDocDataRestConfiguration.class)})
 @EnableConfigurationProperties(EbadProperties.class)
 @EnableAsync
 @EnableScheduling
+@EnableSpringDataWebSupport(pageSerializationMode = VIA_DTO)
 public class EbadApplication {
     private static final Logger APPLICATION_LOGGER = LoggerFactory.getLogger(EbadApplication.class);
 

src/main/java/fr/icdc/ebad/config/DatabaseConfiguration.java

@@ -1,6 +1,6 @@
 package fr.icdc.ebad.config;
 
-import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
+import com.fasterxml.jackson.datatype.hibernate6.Hibernate6Module;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@@ -14,7 +14,7 @@
 @EnableTransactionManagement
 public class DatabaseConfiguration {
     @Bean
-    public Hibernate5Module hibernate5Module() {
-        return new Hibernate5Module();
+    public Hibernate6Module hibernate5Module() {
+        return new Hibernate6Module();
     }
 }

src/main/java/fr/icdc/ebad/domain/GlobalSetting.java

@@ -24,10 +24,10 @@
 @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 public class GlobalSetting {
     @Id
-    @Column(name = "key")
+    @Column(name = "`key`")
     private String key;
 
-    @Column(name = "value", nullable = false)
+    @Column(name = "`value`", nullable = false)
     private String value;
 
     @Column(name = "label", nullable = false)

src/main/java/fr/icdc/ebad/repository/UserRepository.java

@@ -58,10 +58,10 @@ default void customize(QuerydslBindings bindings, QUser root) {
     @Query("select user from User user left join user.usageApplications usageApplication left join usageApplication.application application left join application.environnements environnement left join environnement.batchs batch where batch.id = :batch and user.login = :login and usageApplication.canManage = true")
     User findManagerFromBatch(@Param("batch") Long batch, @Param("login") String login);
 
-    @Query("select user from User user left join  user.usageApplications usageApplication on user.id = usageApplication.user left join usageApplication.application application where application.id = :application and user.login = :login and usageApplication.canUse = true")
+    @Query("select user from User user left join  user.usageApplications usageApplication on user.id = usageApplication.user.id left join usageApplication.application application where application.id = :application and user.login = :login and usageApplication.canUse = true")
     User findUserFromApplication(@Param("application") Long application, @Param("login") String login);
 
-    @Query("select user from User user left join  user.usageApplications usageApplication on user.id = usageApplication.user left join usageApplication.application application where application.id = :application and user.login = :login and usageApplication.canManage = true")
+    @Query("select user from User user left join  user.usageApplications usageApplication on user.id = usageApplication.user.id left join usageApplication.application application where application.id = :application and user.login = :login and usageApplication.canManage = true")
     User findManagerFromApplication(@Param("application") Long application, @Param("login") String login);
 
     @Query("select user from User user left join  user.usageApplications usageApplication left join usageApplication.application application left join application.environnements environnement where environnement.id = :env and user.login = :login and usageApplication.canUse = true")