[directory-server] 03/03: Merged with trunk

[el...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git

commit 8d67511c0b8e5d34ea75f312f7ac2e4bf40ace7e
Merge: d86f03e1b5 f09fa5106d
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Mon Jul 25 14:02:17 2022 +0200

    Merged with trunk

 pom.xml              | 41 +++++++++++++++++------------------------
 server-integ/pom.xml | 11 -----------
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --cc pom.xml
index 35adcf6bbf,b77ad3652a..e65f80fed9
--- a/pom.xml
+++ b/pom.xml
@@@ -67,25 -67,24 +67,24 @@@
      <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.1.6</mina.core.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>