Merged with trunk
diff --git a/pom.xml b/pom.xml
index 35adcf6..e65f80f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,39 +53,38 @@
<skin.version>1.0.3</skin.version>
<!-- Set versions for depending jars -->
- <ant.version>1.10.11</ant.version>
- <bcprov.version>1.69</bcprov.version>
- <commons.cli.version>1.4</commons.cli.version>
+ <ant.version>1.10.12</ant.version>
+ <bcprov.version>1.70</bcprov.version>
+ <commons.cli.version>1.5.0</commons.cli.version>
<commons.codec.version>1.15</commons.codec.version>
<commons.collections.version>4.4</commons.collections.version>
- <commons.daemon.version>1.2.4</commons.daemon.version>
+ <commons.daemon.version>1.3.1</commons.daemon.version>
<commons.lang.version>3.12.0</commons.lang.version>
<commons.net.version>3.8.0</commons.net.version>
<commons.pool.version>2.11.1</commons.pool.version>
<dnsjava.version>2.1.9</dnsjava.version>
- <caffeine.version>2.7.0</caffeine.version>
+ <caffeine.version>2.9.2</caffeine.version>
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
<forbiddenapis.version>2.6</forbiddenapis.version>
<hamcrest.version>2.2</hamcrest.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+ <jetty.version>9.4.48.v20220622</jetty.version>
<!-- The Jetty bundle exports are using version 9.4.5, not 9.4.5.v20170502... -->
- <jetty.bundle.version>9.4.19</jetty.bundle.version>
+ <jetty.bundle.version>9.4.48</jetty.bundle.version>
<junit.jupiter.api.version>5.8.2</junit.jupiter.api.version>
- <kerby.version>2.0.1</kerby.version>
+ <kerby.version>2.0.2</kerby.version>
<ldapsdk.version>4.1</ldapsdk.version>
- <log4j.version>1.2.17</log4j.version>
- <logback.version>1.2.3</logback.version>
- <maven.version>3.8.1</maven.version>
+ <logback.version>1.2.11</logback.version>
+ <maven.version>3.8.6</maven.version>
<mina.core.version>2.2.1</mina.core.version>
- <org.apache.felix.version>7.0.3</org.apache.felix.version>
+ <org.apache.felix.version>7.0.5</org.apache.felix.version>
<pax-exam.version>4.13.4</pax-exam.version>
- <pax-url.version>2.6.2</pax-url.version>
- <plexus.utils.version>3.3.0</plexus.utils.version>
- <slf4j.api.version>1.7.32</slf4j.api.version>
+ <pax-url.version>2.6.11</pax-url.version>
+ <plexus.utils.version>3.4.2</plexus.utils.version>
+ <slf4j.api.version>1.7.36</slf4j.api.version>
<slf4j.api.bundleversion>"$«range;[==,=+)»"</slf4j.api.bundleversion>
- <slf4j.log4j12.version>1.7.32</slf4j.log4j12.version>
- <wagon.ssh.version>3.5.1</wagon.ssh.version>
- <wagon.ssh.external.version>3.5.1</wagon.ssh.external.version>
+ <slf4j.log4j12.version>${slf4j.api.version}</slf4j.log4j12.version>
+ <wagon.ssh.version>3.5.2</wagon.ssh.version>
+ <wagon.ssh.external.version>3.5.2</wagon.ssh.external.version>
<wrapper.version>3.2.3</wrapper.version>
</properties>
@@ -1184,12 +1183,6 @@
<version>${slf4j.log4j12.version}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
<!-- Other dependencies -->
<dependency>
diff --git a/server-integ/pom.xml b/server-integ/pom.xml
index 837c226..22ac8a0 100644
--- a/server-integ/pom.xml
+++ b/server-integ/pom.xml
@@ -100,11 +100,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-asn1-api</artifactId>
</dependency>
@@ -146,12 +141,6 @@
</dependency>
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<scope>test</scope>
