Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/org.apache.sshd-sshd-core…
Browse files Browse the repository at this point in the history 
…-2.13.2
  • Loading branch information
@dtrouillet
dtrouillet authored Jul 31, 2024
2 parents df6f2d5 + d3dd8c7 commit c6fa078
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 deletions.
56 changes: 28 additions & 28 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@

<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 +56,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>5.3.3</jobrunr.version>
<pf4j.version>3.12.0</pf4j.version>
<git.user />
<git.password />
<jacoco.agent.ut.arg />
Expand All @@ -72,7 +72,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
<version>1.73</version>
<version>1.78</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
Expand Down Expand Up @@ -145,7 +145,7 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
<version>1.4.200</version>
<version>2.3.230</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -189,12 +189,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 @@ -355,14 +355,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,19 +385,19 @@
<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>
<artifactId>querydsl-apt</artifactId>
<classifier>jakarta</classifier>
<version>5.0.0</version>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<classifier>jakarta</classifier>
<version>5.0.0</version>
<version>5.1.0</version>
</dependency>

<dependency>
Expand All @@ -408,7 +408,7 @@
<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>
Expand All @@ -428,7 +428,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 +438,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 +478,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>4.17.2</version>
<version>4.29.1</version>
</dependency>

<!-- WEBSOCKET -->
Expand Down Expand Up @@ -534,15 +534,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 +560,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 +589,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 +602,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 +615,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 +627,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 +688,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 +744,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
2 changes: 1 addition & 1 deletion src/main/java/fr/icdc/ebad/web/rest/errors/ApiError.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;
import jakarta.validation.ConstraintViolation;
import lombok.Data;
import org.hibernate.validator.internal.engine.path.PathImpl;
import org.springframework.http.HttpStatus;
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;

import javax.validation.ConstraintViolation;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
Expand Down

0 comments on commit c6fa078

Please sign in to comment.