Merge branch 'master' into 0.80-SNAPSHOT
Change-Id: I16aad7f314233dcbec533d18ba3de600531b9953
diff --git a/pom.xml b/pom.xml
index c4f7d20..fdec52f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,18 +8,19 @@
<properties>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jersey.version>3.1.5</jersey.version>
- <hibernate.ehcache.version>6.0.0.Alpha7</hibernate.ehcache.version>
- <hibernate.version>6.1.7.Final</hibernate.version>
- <spring.version>6.1.21</spring.version>
+ <jersey.version>3.1.11</jersey.version>
+ <hibernate.version>7.1.3.Final</hibernate.version>
+ <spring.version>6.2.11</spring.version>
<!-- spring6.version is used in jersey and defined here
to make sure that jersey uses the correct spring version-->
<spring6.version>${spring.version}</spring6.version>
- <jetty.version>11.0.24</jetty.version>
- <flyway.version>10.6.0</flyway.version>
- <log4j.version>2.22.1</log4j.version>
- <krill.version>[0.64.2,)</krill.version>
- <koral.version>[0.44,)</koral.version>
+ <jetty.version>12.1.1</jetty.version>
+ <flyway.version>11.13.2</flyway.version>
+ <log4j.version>2.25.2</log4j.version>
+ <krill.version>[0.64.4,)</krill.version>
+ <koral.version>[0.47,)</koral.version>
+ <!-- Align JBoss Logging with Hibernate Validator 9 requirements -->
+ <jboss.logging.version>3.6.1.Final</jboss.logging.version>
</properties>
<profiles>
<profile>
@@ -31,7 +32,7 @@
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.6.1</version>
<executions>
<!-- option 1 -->
<execution>
@@ -94,7 +95,7 @@
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.6.1</version>
<executions>
<!--option 2 -->
<execution>
@@ -197,7 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.14.1</version>
<configuration>
<compilerVersion>${java.version}</compilerVersion>
<source>${java.version}</source>
@@ -214,7 +215,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -227,7 +228,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.2.5</version>
+ <version>3.5.4</version>
<configuration>
<reuseForks>true</reuseForks>
<forkCount>1</forkCount>
@@ -371,7 +372,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>2.0.11</version>
+ <version>2.0.17</version>
+ </dependency>
+
+ <!-- Explicitly pin JBoss Logging to a version compatible with HV 9 -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss.logging.version}</version>
</dependency>
<!-- Java Assist -->
@@ -437,13 +445,13 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-webapp</artifactId>
<version>${jetty.version}</version>
</dependency>
@@ -472,7 +480,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.45.0.0</version>
+ <version>3.50.3.0</version>
</dependency>
@@ -487,7 +495,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.9.0</version>
+ <version>2.13.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -514,17 +522,7 @@
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${hibernate.version}</version>
</dependency>
- <dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.ehcache.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- Remove hibernate-ehcache (Ehcache 2 integration removed in modern Hibernate) -->
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-c3p0</artifactId>
@@ -542,13 +540,13 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
- <version>3.0.2</version>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>8.0.1.Final</version>
+ <version>9.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -560,31 +558,47 @@
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
+ </dependency>
+ <!-- Ensure jakarta.transaction.* classes are available for Hibernate 6 -->
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
+ <version>6.1.0</version>
</dependency>
<!-- Utilities -->
<dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>2.10.9.2</version>
+ </dependency>
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.12.6</version>
+ <version>2.14.0</version>
</dependency>
+ <!-- Apache Commons Lang 3 (maintained) -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.19.0</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.15.1</version>
+ <version>2.20.0</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.8.0</version>
+ <version>1.10.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -595,7 +609,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.11.0</version>
+ <version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -612,21 +626,21 @@
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
- <version>6.0.11</version>
+ <version>7.0.3</version>
</dependency>
<!-- OAuth -->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
- <version>11.9.1</version>
+ <version>11.29.2</version>
</dependency>
<!-- Project Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.30</version>
+ <version>1.18.42</version>
</dependency>
<!-- Test -->
@@ -639,7 +653,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>5.10.1</version>
+ <version>6.0.0</version>
<scope>test</scope>
</dependency>
<!-- Jersey Test -->