Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Jan 2025-11-26 20:43:31 +01:00
commit 33b051cba3
4 changed files with 15 additions and 15 deletions

View file

@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the # KIND, either express or implied. See the License for the
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
wrapperVersion=3.3.2 wrapperVersion=3.3.4
distributionType=only-script distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

2
mvnw vendored
View file

@ -19,7 +19,7 @@
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Apache Maven Wrapper startup batch script, version 3.3.2 # Apache Maven Wrapper startup batch script, version 3.3.4
# #
# Optional ENV vars # Optional ENV vars
# ----------------- # -----------------

2
mvnw.cmd vendored
View file

@ -19,7 +19,7 @@
@REM ---------------------------------------------------------------------------- @REM ----------------------------------------------------------------------------
@REM ---------------------------------------------------------------------------- @REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.3.2 @REM Apache Maven Wrapper startup batch script, version 3.3.4
@REM @REM
@REM Optional ENV vars @REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution @REM MVNW_REPOURL - repo url base for downloading maven distribution

22
pom.xml
View file

@ -28,7 +28,7 @@
</scm> </scm>
<properties> <properties>
<java.version>23</java.version> <java.version>23</java.version>
<spring-cloud-azure.version>5.20.0</spring-cloud-azure.version> <spring-cloud-azure.version>5.23.0</spring-cloud-azure.version>
<mockito.version>5.18.0</mockito.version> <mockito.version>5.18.0</mockito.version>
<flyway.version>11.1.0</flyway.version> <flyway.version>11.1.0</flyway.version>
</properties> </properties>
@ -86,7 +86,7 @@
<dependency> <dependency>
<groupId>org.jetbrains</groupId> <groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
<version>26.0.2</version> <version>26.0.2-1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -113,7 +113,7 @@
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>5.4.1</version> <version>5.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dhatim</groupId> <groupId>org.dhatim</groupId>
@ -128,7 +128,7 @@
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<version>5.4.1</version> <version>5.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dhatim</groupId> <groupId>org.dhatim</groupId>
@ -150,18 +150,18 @@
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId> <artifactId>jjwt-api</artifactId>
<version>0.12.5</version> <version>0.13.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId> <artifactId>jjwt-impl</artifactId>
<version>0.12.5</version> <version>0.13.0</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId> <artifactId>jjwt-jackson</artifactId>
<version>0.12.5</version> <version>0.13.0</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -185,13 +185,13 @@
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.2</version> <version>4.0.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.ben-manes.caffeine</groupId> <groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId> <artifactId>caffeine</artifactId>
<version>3.1.8</version> <version>3.2.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -212,7 +212,7 @@
<plugin> <plugin>
<groupId>org.jvnet.jaxb</groupId> <groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId> <artifactId>jaxb-maven-plugin</artifactId>
<version>4.0.0</version> <version>4.0.11</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -232,7 +232,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version> <version>3.5.4</version>
<configuration> <configuration>
<argLine> <argLine>
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar