Merge branch 'master' into dependabot/maven/org.springdoc-springdoc-o…

…penapi-data-rest-1.8.0
informatique-cdc · Jul 31, 2024 · b0c1c95 · b0c1c95
2 parents 72cafb3 + 0d40ca6
commit b0c1c95
Show file tree

Hide file tree

Showing 92 changed files with 800 additions and 608 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [15, 16, 17 ]
+        java: [ 17, 19 ]
     steps:
       - uses: actions/checkout@v1
       - name: Cache Maven Repo

diff --git a/README.md b/README.md
@@ -147,6 +147,12 @@ We use cypress for end to end tests with other ebad-front project
 
 Add additional notes about how to deploy this on a live system
 
+### Keycloak
+helm install keycloak -f values.yaml oci://registry-1.docker.io/bitnamicharts/keycloak 
+ingress:
+    enabled: true
+    hostname: idp.local
+
 
 ## Built With
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-boot-starter-parent</artifactId>
         <groupId>org.springframework.boot</groupId>
-        <version>2.7.5</version>
+        <version>3.0.0</version>
         <relativePath />
     </parent>
     <licenses>
@@ -61,8 +61,8 @@
         <usertype-core.version>7.0.0.CR1</usertype-core.version>
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <pf4j-spring.version>0.8.0</pf4j-spring.version>
+        <jobrunr.version>5.3.1</jobrunr.version>
         <pf4j.version>3.9.0</pf4j.version>
-        <jobrunr.version>4.0.10</jobrunr.version>
         <git.user />
         <git.password />
         <jacoco.agent.ut.arg />
@@ -71,7 +71,12 @@
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk15to18</artifactId>
+            <version>1.78</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
             <version>1.70</version>
         </dependency>
 
@@ -131,11 +136,6 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-json-org</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>2.15.3</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
@@ -217,26 +217,32 @@
         <dependency>
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
+            <version>3.10.6</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId> org.hibernate.orm</groupId>
             <artifactId>hibernate-jcache</artifactId>
+            <version>6.1.5.Final</version>
         </dependency>
         <dependency>
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache-transactions</artifactId>
+            <version>3.10.6</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId> org.hibernate.orm</groupId>
             <artifactId>hibernate-envers</artifactId>
+            <version>6.1.5.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <version>8.0.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <version>5.6.12.Final</version>
         </dependency>
 
         <dependency>
@@ -311,11 +317,12 @@
             <artifactId>spring-security-messaging</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.security.oauth.boot</groupId>
-            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
-            <version>2.6.8</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+            <version>3.0.6</version>
         </dependency>
 
+
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
@@ -383,17 +390,20 @@
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
-            <version>5.0.0</version>
+            <classifier>jakarta</classifier>
+            <version>5.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-jpa</artifactId>
+            <classifier>jakarta</classifier>
             <version>5.0.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
-            <version>2.7.5</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -468,7 +478,7 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
-            <version>4.12.0</version>
+            <version>4.17.2</version>
         </dependency>
 
         <!-- WEBSOCKET -->
@@ -485,6 +495,7 @@
             <artifactId>mapstruct</artifactId>
             <version>1.5.5.Final</version>
         </dependency>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>

diff --git a/settings.xml b/settings.xml
@@ -21,13 +21,13 @@
     <servers>
         <server>
             <id>github-public</id>
-            <username>${env.USERNAME}</username>
-            <password>${env.PASSWORD}</password>
+            <username>${env.GITHUB_USERNAME}</username>
+            <password>${env.GITHUB_pASSWORD}</password>
         </server>
         <server>
             <id>github</id>
-            <username>${env.USERNAME}</username>
-            <password>${env.PASSWORD}</password>
+            <username>${env.GITHUB_USERNAME}</username>
+            <password>${env.GITHUB_PASSWORD}</password>
         </server>
     </servers>
 </settings>
diff --git a/src/main/java/fr/icdc/ebad/EbadApplication.java b/src/main/java/fr/icdc/ebad/EbadApplication.java
@@ -2,23 +2,26 @@
 
 import fr.icdc.ebad.config.properties.EbadProperties;
 import fr.icdc.ebad.domain.Application;
+import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.data.rest.SpringDocDataRestConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import javax.annotation.PostConstruct;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 
-@SpringBootApplication(exclude = SpringDocDataRestConfiguration.class)
+@SpringBootApplication
+@ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=SpringDocDataRestConfiguration.class)})
 @EnableConfigurationProperties(EbadProperties.class)
 @EnableAsync
 @EnableScheduling

diff --git a/src/main/java/fr/icdc/ebad/config/JobRunrConfiguration.java b/src/main/java/fr/icdc/ebad/config/JobRunrConfiguration.java
@@ -0,0 +1,40 @@
+package fr.icdc.ebad.config;
+
+import org.jobrunr.jobs.mappers.JobMapper;
+import org.jobrunr.spring.autoconfigure.JobRunrAutoConfiguration;
+import org.jobrunr.spring.autoconfigure.storage.JobRunrSqlStorageAutoConfiguration;
+import org.jobrunr.storage.StorageProvider;
+import org.jobrunr.storage.StorageProviderUtils;
+import org.jobrunr.storage.sql.common.DefaultSqlStorageProvider;
+import org.jobrunr.storage.sql.h2.H2StorageProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import javax.sql.DataSource;
+
+@Configuration
+@Import({JobRunrSqlStorageAutoConfiguration.class, JobRunrAutoConfiguration.class})
+public class JobRunrConfiguration {
+
+    private final DataSource dataSource;
+
+    public JobRunrConfiguration(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+//    @Bean
+//    public StorageProvider storageProvider(JobMapper jobMapper) {
+//
+//        DefaultSqlStorageProvider storageProvider = new DefaultSqlStorageProvider(dataSource, new AnsiDialect(), StorageProviderUtils.DatabaseOptions.CREATE);
+//        storageProvider.setJobMapper(jobMapper);
+//        return storageProvider;
+//    }
+
+    @Bean
+    public StorageProvider storageProvider2(JobMapper jobMapper) {
+
+        DefaultSqlStorageProvider storageProvider = new H2StorageProvider(dataSource, StorageProviderUtils.DatabaseOptions.CREATE);
+        storageProvider.setJobMapper(jobMapper);
+        return storageProvider;
+    }
+}
diff --git a/src/main/java/fr/icdc/ebad/config/MailConfig.java b/src/main/java/fr/icdc/ebad/config/MailConfig.java
@@ -3,7 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ResourceBundleMessageSource;
-import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring6.SpringTemplateEngine;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 
 @Configuration

diff --git a/src/main/java/fr/icdc/ebad/config/apikey/ApiSecurityConfig.java b/src/main/java/fr/icdc/ebad/config/apikey/ApiSecurityConfig.java
@@ -7,14 +7,14 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.preauth.RequestHeaderAuthenticationFilter;
 
 @Configuration
 @EnableWebSecurity
 @Order(2)
-public class ApiSecurityConfig extends WebSecurityConfigurerAdapter {
+public class ApiSecurityConfig {
 
     private final ApiKeyAuthenticationManager apiKeyAuthenticationManager;
     private final EbadProperties ebadProperties;
@@ -35,11 +35,11 @@ public RequestHeaderAuthenticationFilter requestHeaderAuthenticationFilter() {
         return requestHeaderAuthenticationFilter;
     }
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
+    @Bean
+    public SecurityFilterChain configure(HttpSecurity http) throws Exception {
         // @formatter:off
         http
-                .requestMatcher(request -> {
+                .securityMatcher(request -> {
                     String auth = request.getHeader(ebadProperties.getSecurity().getApiKeyHeaderName());
                     return (auth != null);
                 })
@@ -51,5 +51,6 @@ protected void configure(HttpSecurity http) throws Exception {
                 .sessionManagement()
                 .sessionCreationPolicy(SessionCreationPolicy.STATELESS);
         // @formatter:on
+        return http.build();
     }
 }