Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/io.jsonwebtoken-jjwt-0.12.6
Browse files Browse the repository at this point in the history
  • Loading branch information
dtrouillet authored Aug 1, 2024
2 parents bb28a7d + 4caf438 commit eb38cd0
Show file tree
Hide file tree
Showing 31 changed files with 117 additions and 100 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 17
java-version: 21
- name: Set env
run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF#refs/*/}
- name: Dockerize with Maven
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 17, 19 ]
java: [ 17, 21, 22 ]
steps:
- uses: actions/checkout@v1
- name: Cache Maven Repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 17
java-version: 21
- name: Build with Maven
run: mvn -B --no-transfer-progress org.jacoco:jacoco-maven-plugin:prepare-agent package --file pom.xml --settings settings.xml
env:
Expand Down
85 changes: 38 additions & 47 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -41,9 +41,8 @@
<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.14.0</commons-io.version>
<commons-lang.version>3.13.0</commons-lang.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>
<gatling.version>2.3.0</gatling.version>
<java.version>17</java.version>
Expand All @@ -56,13 +55,13 @@
<metrics-spark-reporter.version>1.2</metrics-spark-reporter.version>
<metrics-spring.version>3.1.3</metrics-spring.version>
<run.addResources>false</run.addResources>
<sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
<spring-security-oauth2.version>2.5.0.RELEASE</spring-security-oauth2.version>
<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>
<pf4j-spring.version>0.9.0</pf4j-spring.version>
<jobrunr.version>7.2.2</jobrunr.version>
<pf4j.version>3.12.0</pf4j.version>
<git.user />
<git.password />
<jacoco.agent.ut.arg />
Expand Down Expand Up @@ -96,7 +95,7 @@
</dependency>
<dependency>
<groupId>org.jobrunr</groupId>
<artifactId>jobrunr-spring-boot-starter</artifactId>
<artifactId>jobrunr-spring-boot-3-starter</artifactId>
<version>${jobrunr.version}</version>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -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>
Expand All @@ -145,20 +144,12 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
<version>1.4.200</version>
<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>
<version>2.8.0</version>
<version>2.13.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -189,12 +180,12 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>4.0.3</version>
<version>4.0.5</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.3</version>
<version>4.0.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -319,7 +310,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
<version>3.0.6</version>
<version>3.3.2</version>
</dependency>


Expand Down Expand Up @@ -355,14 +346,14 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<version>1.18.34</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.zalando</groupId>
<artifactId>problem-spring-web</artifactId>
<version>0.27.0</version>
<version>0.29.1</version>
</dependency>

<dependency>
Expand All @@ -385,7 +376,7 @@
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-core</artifactId>
<version>5.0.0</version>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
Expand All @@ -397,23 +388,23 @@
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<classifier>jakarta</classifier>
<version>5.0.0</version>
<version>5.1.0</version>
</dependency>

<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>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-data-rest</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -428,7 +419,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
<version>2.8.0</version>
<version>2.13.2</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
Expand All @@ -438,7 +429,7 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.agent</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
</dependency>
<dependency>
<groupId>org.pf4j</groupId>
Expand Down Expand Up @@ -478,7 +469,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>4.17.2</version>
<version>4.29.1</version>
</dependency>

<!-- WEBSOCKET -->
Expand All @@ -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>
Expand Down Expand Up @@ -534,15 +525,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.1</version>
<configuration>
<goals>install</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<executions>
<execution>
<phase>initialize</phase>
Expand All @@ -560,7 +551,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>

<executions>
<execution>
Expand Down Expand Up @@ -589,7 +580,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand All @@ -602,7 +593,7 @@
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<version>1.18.34</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
Expand All @@ -615,7 +606,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>3.3.1</version>
<configuration>
<forkCount>2</forkCount>
<reuseForks>true</reuseForks>
Expand All @@ -627,7 +618,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>3.2.5</version>
<version>3.3.1</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -688,7 +679,7 @@
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<!-- RELEASE_VERSION -->
<version>7.0.1</version>
<version>7.7.0</version>
<!-- /RELEASE_VERSION -->
<executions>
<execution>
Expand Down Expand Up @@ -744,7 +735,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.10.0.2594</version>
<version>4.0.0.4121</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/fr/icdc/ebad/EbadApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/icdc/ebad/config/DatabaseConfiguration.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -14,7 +14,7 @@
@EnableTransactionManagement
public class DatabaseConfiguration {
@Bean
public Hibernate5Module hibernate5Module() {
return new Hibernate5Module();
public Hibernate6Module hibernate5Module() {
return new Hibernate6Module();
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package fr.icdc.ebad.config.apidoc;

import com.querydsl.core.types.Predicate;
import org.springdoc.core.SpringDocConfigProperties;
import org.springdoc.core.customizers.DataRestDelegatingMethodParameterCustomizer;
import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer;
import org.springdoc.core.providers.RepositoryRestConfigurationProvider;
Expand Down Expand Up @@ -62,7 +63,7 @@ class QuerydslProvider {
QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
if (querydslBindingsFactory.isPresent()) {
getConfig().addRequestWrapperToIgnore(Predicate.class);
return new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get());
return new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get(), new SpringDocConfigProperties());
}
return null;
}
Expand Down
Loading

0 comments on commit eb38cd0

Please sign in to comment.