Rollup of version changes for 9.4.x (#6796)

* Bump testcontainers.version from 1.15.1 to 1.16.0

Bumps `testcontainers.version` from 1.15.1 to 1.16.0.

Updates `testcontainers` from 1.15.1 to 1.16.0
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.15.1...1.16.0)

Updates `junit-jupiter` from 1.15.1 to 1.16.0
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.15.1...1.16.0)

Updates `mariadb` from 1.15.1 to 1.16.0
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.15.1...1.16.0)

Updates `gcloud` from 1.15.1 to 1.16.0
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.15.1...1.16.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.testcontainers:mariadb
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.testcontainers:gcloud
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update Junit to 5.8.0
* Update maven-war-plugin to 3.3.2
* Bump jna to version 5.8.0
* Update maven.resolver.version to 1.7.2
* Update maven-javadoc-plugin to 3.3.1
* Update maven-jxr-plugin to 3.1.1
* Fixing jetty-runner use of maven-dependency-plugin
+ Don't exclude by "test" (that means exclude all)
  Include by "compile" instead.
* Bump jnr-unixsocket to 0.38.10
* Bump maven.version to 3.8.2
* Bump jna to 5.9.0
* Bump slf4j to 1.7.32
* Bump maven.plugin-tools.version to 3.6.1
* Bump plexus-utils to 3.4.1
* Bump jetty.perf-helper.version to 1.0.7
* Bump jboss.logging.version to 3.4.2.Final
* Bump grpc.version to 1.40.1
* Adding versions-maven-plugin config
* Bump bnd.version to 5.3.0
* Bump gson.version to 2.8.8
* Bump xmemcached to 2.4.7
* Bump osgi-services-version to 3.10.100
* Bump osgi-util-version to 3.6.0
* Bump conscrypt.version to 2.5.2
* Bump openwebbeans.version to 2.0.23
* Bump maven-artifact-transfer to 0.13.1
* Fix mongo testcontainers setup
* Bump maven-checkstyle-plugin to 3.1.2
* Bump jacoco-maven-plugin to 0.8.7
* Fix memcached testcontainer usage
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

jetty-maven-plugin/pom.xml

@@ -106,7 +106,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-artifact-transfer</artifactId>
-      <version>0.12.0</version>
+      <version>0.13.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

jetty-memcached/jetty-memcached-sessions/pom.xml

@@ -19,7 +19,7 @@
     <dependency>
       <groupId>com.googlecode.xmemcached</groupId>
       <artifactId>xmemcached</artifactId>
-      <version>2.4.6</version>
+      <version>2.4.7</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

jetty-osgi/pom.xml

@@ -13,8 +13,8 @@
 
   <properties>
     <osgi-version>3.16.300</osgi-version>
-    <osgi-services-version>3.9.0</osgi-services-version>
+    <osgi-services-version>3.10.100</osgi-services-version>
-    <osgi-util-version>3.5.300</osgi-util-version>
+    <osgi-util-version>3.6.0</osgi-util-version>
     <equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
   </properties>
 

jetty-osgi/test-jetty-osgi/pom.xml

@@ -15,7 +15,7 @@
     <assembly-directory>target/distribution</assembly-directory>
     <exam.version>4.13.1</exam.version>
     <url.version>2.6.2</url.version>
-    <bnd.version>5.2.0</bnd.version>
+    <bnd.version>5.3.0</bnd.version>
     <swissbox.version>1.8.3</swissbox.version>
     <tinybundles.version>3.0.0</tinybundles.version>
     <injection.bundle.version>1.2</injection.bundle.version>

jetty-runner/pom.xml

@@ -33,6 +33,7 @@
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
+              <includeScope>compile</includeScope>
             </configuration>
           </execution>
         </executions>

pom.xml

@@ -18,7 +18,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build-support.version>1.5</build-support.version>
     <checkstyle.version>8.37</checkstyle.version>
-    <slf4j.version>1.7.30</slf4j.version>
+    <slf4j.version>1.7.32</slf4j.version>
     <log4j2.version>2.14.0</log4j2.version>
     <disruptor.version>3.4.2</disruptor.version>
     <logback.version>1.2.3</logback.version>
@@ -27,21 +27,22 @@
     <jsp.version>8.5.70</jsp.version>
     <infinispan.version>9.4.8.Final</infinispan.version>
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
-    <gson.version>2.8.6</gson.version>
+    <gson.version>2.8.8</gson.version>
+    <grpc.version>1.40.1</grpc.version>
     <alpn.agent.version>2.0.10</alpn.agent.version>
-    <conscrypt.version>2.5.1</conscrypt.version>
+    <conscrypt.version>2.5.2</conscrypt.version>
     <asm.version>9.2</asm.version>
     <jmh.version>1.33</jmh.version>
     <jmhjar.name>benchmarks</jmhjar.name>
     <tycho-version>2.1.0</tycho-version>
-    <junit.version>5.7.0</junit.version>
+    <junit.version>5.8.0</junit.version>
-    <maven.version>3.6.3</maven.version>
+    <maven.version>3.8.2</maven.version>
-    <maven.resolver.version>1.7.1</maven.resolver.version>
+    <maven.resolver.version>1.7.2</maven.resolver.version>
     <javax.servlet.api.version>3.1.0</javax.servlet.api.version>
     <weld.version>3.1.5.Final</weld.version>
     <hazelcast.version>3.12.12</hazelcast.version>
-    <jboss.logging.version>3.4.1.Final</jboss.logging.version>
+    <jboss.logging.version>3.4.2.Final</jboss.logging.version>
-    <jetty.perf-helper.version>1.0.6</jetty.perf-helper.version>
+    <jetty.perf-helper.version>1.0.7</jetty.perf-helper.version>
     <ant.version>1.10.11</ant.version>
     <unix.socket.tmp></unix.socket.tmp>
     <!-- enable or not TestTracker junit5 extension i.e log message when test method is starting -->
@@ -54,21 +55,21 @@
     <maven.dependency.plugin.version>3.1.2</maven.dependency.plugin.version>
     <maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
     <maven.source.plugin.version>3.2.1</maven.source.plugin.version>
-    <maven.war.plugin.version>3.3.1</maven.war.plugin.version>
+    <maven.war.plugin.version>3.3.2</maven.war.plugin.version>
-    <maven.plugin-tools.version>3.6.0</maven.plugin-tools.version>
+    <maven.plugin-tools.version>3.6.1</maven.plugin-tools.version>
     <maven.install.plugin.version>3.0.0-M1</maven.install.plugin.version>
     <maven.deploy.plugin.version>3.0.0-M1</maven.deploy.plugin.version>
 
     <!-- testing -->
     <it.debug>false</it.debug>
-    <jetty.test.version>5.5</jetty.test.version>
+    <jetty.test.version>5.8</jetty.test.version>
     <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
     <jsr250-api.version>1.0</jsr250-api.version>
     <javax.annotation-api>1.3.2</javax.annotation-api>
     <localRepoPath>${project.build.directory}/local-repo</localRepoPath>
     <settingsPath>src/it/settings.xml</settingsPath>
     <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
-    <testcontainers.version>1.15.1</testcontainers.version>
+    <testcontainers.version>1.16.0</testcontainers.version>
     <maria.version>2.7.0</maria.version>
   </properties>
 
@@ -395,7 +396,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
         <configuration>
           <configLocation>jetty-checkstyle.xml</configLocation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
@@ -562,7 +563,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.1</version>
           <configuration>
             <source>8</source>
             <charset>UTF-8</charset>
@@ -579,7 +580,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.3.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -673,7 +674,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.6</version>
+          <version>0.8.7</version>
         </plugin>
         <plugin>
           <groupId>com.agilejava.docbkx</groupId>
@@ -899,6 +900,17 @@
           <artifactId>h2spec-maven-plugin</artifactId>
           <version>1.0.7</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>versions-maven-plugin</artifactId>
+          <version>2.8.1</version>
+          <configuration>
+            <processDependencies>true</processDependencies>
+            <processDependencyManagement>true</processDependencyManagement>
+            <processPluginDependencies>true</processPluginDependencies>
+            <processPluginDependenciesInPluginManagement>true</processPluginDependenciesInPluginManagement>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -1012,7 +1024,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -1029,6 +1041,11 @@
         <artifactId>maven-core</artifactId>
         <version>${maven.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-settings</artifactId>
+        <version>${maven.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
@@ -1045,6 +1062,13 @@
         <artifactId>junit-jupiter</artifactId>
         <version>${junit.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junit.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>
@@ -1065,7 +1089,7 @@
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
-        <version>5.6.0</version>
+        <version>5.9.0</version>
       </dependency>
       <!-- Old Deps -->
       <dependency>
@@ -1106,13 +1130,13 @@
       <dependency>
         <groupId>com.github.jnr</groupId>
         <artifactId>jnr-unixsocket</artifactId>
-        <version>0.38.3</version>
+        <version>0.38.10</version>
       </dependency>
       <!-- avoid depending on a range dependency from a transitive dependency -->
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-core</artifactId>
-        <version>1.33.1</version>
+        <version>${grpc.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.ant</groupId>

tests/test-sessions/test-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java

@@ -142,8 +142,10 @@ public class MemcachedTestHelper
 
     private static final Logger MEMCACHED_LOG = LoggerFactory.getLogger("org.eclipse.jetty.memcached.sessions.MemcachedLogs");
 
+    @SuppressWarnings({"unchecked", "rawtypes"})
     static GenericContainer memcached =
         new GenericContainer("memcached:" + System.getProperty("memcached.docker.version", "1.6.6"))
+            .withExposedPorts(11211)
             .withLogConsumer(new Slf4jLogConsumer(MEMCACHED_LOG));
 
     static

tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestHelper.java

@@ -52,11 +52,14 @@ public class MongoTestHelper
     public static final String DB_NAME = "HttpSessions";
     public static final String COLLECTION_NAME = "testsessions";
 
+    private static final int MONGO_PORT = 27017;
+
     static GenericContainer mongo =
         new GenericContainer("mongo:" + System.getProperty("mongo.docker.version", "2.2.7"))
             .withLogConsumer(new Slf4jLogConsumer(MONGO_LOG))
             .waitingFor(new LogMessageWaitStrategy()
-                            .withRegEx(".*waiting for connections.*"));
+                .withRegEx(".*waiting for connections.*"))
+            .withExposedPorts(MONGO_PORT);
 
     static MongoClient mongoClient;
 
@@ -70,7 +73,7 @@ public class MongoTestHelper
             long start = System.currentTimeMillis();
             mongo.start();
             mongoHost = mongo.getHost();
-            mongoPort = mongo.getMappedPort(27017);
+            mongoPort = mongo.getMappedPort(MONGO_PORT);
             LOG.info("Mongo container started for {}:{} - {}ms", mongoHost, mongoPort,
                 System.currentTimeMillis() - start);
             mongoClient = new MongoClient(mongoHost, mongoPort);

tests/test-webapps/test-owb-cdi-webapp/pom.xml

@@ -13,7 +13,7 @@
 
   <properties>
     <bundle-symbolic-name>${project.groupId}.cdi.owb</bundle-symbolic-name>
-    <openwebbeans.version>2.0.20</openwebbeans.version>
+    <openwebbeans.version>2.0.23</openwebbeans.version>
   </properties>
 
   <build>