diff --git a/.gitignore b/.gitignore
index fe38e189179b48fe6cc6754d104208d807934164..eac1917e8fa220d6a423ba0d2eb4e983ab2572a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,6 +91,7 @@ target/
testdb/
tomcat.*/
/jams
+dependency-reduced-pom.xml
#userguide/site
versions.json
diff --git a/compile-libs/tomcat-annotations-api-10.0.0-M5.jar b/compile-libs/tomcat-annotations-api-10.0.0-M5.jar
deleted file mode 100644
index b997f7299fd0181569a13d688530eb42661e754f..0000000000000000000000000000000000000000
Binary files a/compile-libs/tomcat-annotations-api-10.0.0-M5.jar and /dev/null differ
diff --git a/compile-libs/tomcat-annotations-api-10.1.19.jar b/compile-libs/tomcat-annotations-api-10.1.19.jar
new file mode 100644
index 0000000000000000000000000000000000000000..eed5e6a27e8e13129a7957dc3f780544cfe6585f
Binary files /dev/null and b/compile-libs/tomcat-annotations-api-10.1.19.jar differ
diff --git a/compile-libs/tomcat-embed-core-10.0.0-M5.jar b/compile-libs/tomcat-embed-core-10.0.0-M5.jar
deleted file mode 100644
index 2f1d6c7ee4363654e453428ce5efbc685db8c94e..0000000000000000000000000000000000000000
Binary files a/compile-libs/tomcat-embed-core-10.0.0-M5.jar and /dev/null differ
diff --git a/compile-libs/tomcat-embed-core-10.1.19.jar b/compile-libs/tomcat-embed-core-10.1.19.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7e14ed5f5ec75c433bce7e4283411241faa9eac1
Binary files /dev/null and b/compile-libs/tomcat-embed-core-10.1.19.jar differ
diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/SystemAccountBuilder.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/SystemAccountBuilder.java
index 378c46c530627097d11bce7bd2162ede70eed12f..627c52e2654ee1c8b557901945b79545f41fb2e9 100644
--- a/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/SystemAccountBuilder.java
+++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/csr/builders/SystemAccountBuilder.java
@@ -85,7 +85,7 @@ public class SystemAccountBuilder {
new Date(
System.currentTimeMillis()
+ systemAccount.getX509Fields().getLifetime()),
- new X500Name("CN=" + systemAccount.getX509Fields().getDN()),
+ new X500Name(systemAccount.getX509Fields().getDN()),
SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()));
systemAccount.setPrivateKey(keyPair.getPrivate());
systemAccount.setCertificate(
diff --git a/jams-common/pom.xml b/jams-common/pom.xml
index 45d3f7874a7f2e77e1b350889e1e5367d92a3c42..b0f2a061114425bc2d323ac61e117d23d3909958 100644
--- a/jams-common/pom.xml
+++ b/jams-common/pom.xml
@@ -14,12 +14,12 @@
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
<version>${bouncy.castle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncy.castle.version}</version>
</dependency>
<dependency>
diff --git a/jams-common/src/main/java/net/jami/jams/common/annotations/ScopedServletProcessor.java b/jams-common/src/main/java/net/jami/jams/common/annotations/ScopedServletProcessor.java
index afb156e795a3523f179de5bb35c8fcba6aeff7d2..c6afcbdfb9ac3e3bee79e7f83f0708d5a0880f0e 100644
--- a/jams-common/src/main/java/net/jami/jams/common/annotations/ScopedServletProcessor.java
+++ b/jams-common/src/main/java/net/jami/jams/common/annotations/ScopedServletProcessor.java
@@ -113,13 +113,13 @@ public class ScopedServletProcessor extends AbstractProcessor {
"jar:file:"
+ parentDirectory
+ File.separator
- + "compile-libs/tomcat-embed-core-10.0.0-M5.jar!/");
+ + "compile-libs/tomcat-embed-core-10.1.19.jar!/");
URL cpUrl3 =
new URL(
"jar:file:"
+ parentDirectory
+ File.separator
- + "compile-libs/tomcat-annotations-api-10.0.0-M5.jar!/");
+ + "compile-libs/tomcat-annotations-api-10.1.19.jar!/");
URLClassLoader cpUrlLoader = new URLClassLoader(new URL[] {cpUrl1, cpUrl3});
diff --git a/pom.xml b/pom.xml
index 3dd6d76a373679ed0cc31b6e71a16631ffd0c924..3083370caac088f6c4af85af25977d3df95e6b96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,40 +27,35 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
- <maven.compiler.version>3.8.1</maven.compiler.version>
+ <maven.compiler.version>3.12.1</maven.compiler.version>
<java.version>11</java.version>
- <bouncy.castle.version>1.70</bouncy.castle.version>
+ <bouncy.castle.version>1.77</bouncy.castle.version>
<lombok.version>1.18.30</lombok.version>
<log4j.version>1.7.30</log4j.version>
<jupiter.api.version>5.7.0-M1</jupiter.api.version>
<mockito.version>5.10.0</mockito.version>
<mockito-inline.version>5.2.0</mockito-inline.version>
- <tomcat.version>10.0.0-M5</tomcat.version>
+ <tomcat.version>10.1.19</tomcat.version>
<map.struct.version>1.3.0.Final</map.struct.version>
- <maven.surefire.version>2.22.1</maven.surefire.version>
- <junit.surefire.version>1.1.0</junit.surefire.version>
+ <maven.surefire.version>3.2.5</maven.surefire.version>
<gson.version>2.10.1</gson.version>
<javassist.version>3.27.0-GA</javassist.version>
<derby.version>10.14.2.0</derby.version>
<msgpack.version>0.8.16</msgpack.version>
<commons.codec.version>1.11</commons.codec.version>
<xbean.version>4.17</xbean.version>
- <maven.shade.version>3.2.3</maven.shade.version>
+ <maven.shade.version>3.5.2</maven.shade.version>
<imperva.ddc.version>7.3.3.0.0.0</imperva.ddc.version>
<ldaptive.version>2.0.0-RC4</ldaptive.version>
- <javax.servlet.version>4.0.1</javax.servlet.version>
<maven.clean.version>3.1.0</maven.clean.version>
<nimbus.jwt.version>8.17</nimbus.jwt.version>
<asm.version>8.0</asm.version>
- <maven.model.version>3.2.5</maven.model.version>
- <apache.httpcore.version>4.4.12</apache.httpcore.version>
- <apache.httpclient.version>4.5.10</apache.httpclient.version>
<ez.vcard.version>0.10.6</ez.vcard.version>
- <maven.resources.version>3.1.0</maven.resources.version>
+ <maven.resources.version>3.3.1</maven.resources.version>
<embedded.ldap.unit>0.8.1</embedded.ldap.unit>
- <maven.exec.version>1.1.1</maven.exec.version>
<zmq.version>0.5.2</zmq.version>
<flyway.version>9.21.1</flyway.version>
+ <jacoco.version>0.8.11</jacoco.version>
</properties>
<dependencies>
@@ -169,7 +164,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.10</version>
+ <version>${jacoco.version}</version>
<executions>
<execution>
<id>jacoco-initialize</id>