From ea15b40913ad2dee11f5e92e78f72a426893bcd4 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:20:31 -0500
Subject: [PATCH 01/22] Ignore jakarta.servlet.jsp.jstl by version

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a48db1bac10..7ccf8492bd7 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -39,6 +39,8 @@ updates:
         versions: [ ">=2.0.0" ]
       - dependency-name: "jakarta.websocket:*"
         versions: [ ">=2.0.0" ]
+      - dependency-name: "jakarta.servlet.jsp.jstl:*"
+        versions: [ ">=2.0.0" ]
 
   - package-ecosystem: "maven"
     directory: "/"
@@ -59,3 +61,5 @@ updates:
         versions: [ ">=3.0.0" ]
       - dependency-name: "jakarta.websocket:*"
         versions: [ ">=3.0.0" ]
+      - dependency-name: "jakarta.servlet.jsp.jstl:*"
+        versions: [ ">=3.0.0" ]

From 2fb01340c21144b46168ae74639cec1a960a860e Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:22:43 -0500
Subject: [PATCH 02/22] Bump maven-war-plugin to 3.3.2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4856135e917..b28af19003d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <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.install.plugin.version>3.0.0-M1</maven.install.plugin.version>
     <maven.deploy.plugin.version>3.0.0-M1</maven.deploy.plugin.version>

From d8ce03be9c124834da3125aa7f1acc14aae791e7 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:23:19 -0500
Subject: [PATCH 03/22] Bump maven.resolver.version to 1.7.2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b28af19003d..f4324fa6ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     <tycho-version>2.1.0</tycho-version>
     <junit.version>5.7.2</junit.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>
     <weld.version>3.1.8.Final</weld.version>
     <jboss.logging.version>3.4.2.Final</jboss.logging.version>
     <jetty.perf-helper.version>1.0.6</jetty.perf-helper.version>

From a6bb4e98abc8084049a4b036b7e8a8ecfdfb2aef Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:23:56 -0500
Subject: [PATCH 04/22] Bump maven-javadoc-plugin to 3.3.1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f4324fa6ccb..853be6b9c8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -590,7 +590,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.1</version>
           <configuration>
             <verbose>true</verbose>
             <debug>true</debug>

From cbc5988fe1e6412077d70fac4817cd3702e0c90b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:24:27 -0500
Subject: [PATCH 05/22] Bump maven-dependency-plugin to 3.2.0

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 853be6b9c8c..24423d54bdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
     <!-- some maven plugins versions -->
     <maven.surefire.version>3.0.0-M5</maven.surefire.version>
     <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
-    <maven.dependency.plugin.version>3.1.2</maven.dependency.plugin.version>
+    <maven.dependency.plugin.version>3.2.0</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.2</maven.war.plugin.version>

From d619a01cc4d9743ecfc71dbeb7d24d210926fc3c Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:24:55 -0500
Subject: [PATCH 06/22] Bump maven-gpg-plugin to 3.0.1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 24423d54bdb..ff4d163f8f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1415,7 +1415,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>

From 237f34021cd57baf7ddfa480dd2834e9f740a9c3 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:25:23 -0500
Subject: [PATCH 07/22] Bump maven-jxr-plugin to 3.3.1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ff4d163f8f9..a41f4421611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -612,7 +612,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

From 2ad4496a0a6a8f3106f964ca4f4bebd3a4269d4f Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:27:12 -0500
Subject: [PATCH 08/22] Bump junit5 to 5.8.0

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a41f4421611..bf99a2668c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <jmh.version>1.33</jmh.version>
     <jmhjar.name>benchmarks</jmhjar.name>
     <tycho-version>2.1.0</tycho-version>
-    <junit.version>5.7.2</junit.version>
+    <junit.version>5.8.0</junit.version>
     <maven.version>3.8.2</maven.version>
     <maven.resolver.version>1.7.2</maven.resolver.version>
     <weld.version>3.1.8.Final</weld.version>

From 3da669c2f0e69e0b8d6da30d1bac21d201b92bb1 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:32:56 -0500
Subject: [PATCH 09/22] Fixing jetty-runner use of maven-dependency-plugin

+ Don't exclude by "test" (that means exclude all)
  Include by "compile" instead.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-runner/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index 1096cb1e33d..5093812b336 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -44,8 +44,7 @@
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
-              <excludeScope>test</excludeScope>
-              <includeScope>runtime</includeScope>
+              <includeScope>compile</includeScope>
             </configuration>
           </execution>
         </executions>

From ef1b29c48fd76d46298de58201f93cc04eef5666 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:42:14 -0500
Subject: [PATCH 10/22] Bump httpcore to 4.4.14

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 documentation/jetty-documentation/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml
index 397db91c634..7f00b2ffdc2 100644
--- a/documentation/jetty-documentation/pom.xml
+++ b/documentation/jetty-documentation/pom.xml
@@ -30,7 +30,7 @@
           <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.4.13</version>
+            <version>4.4.14</version>
           </dependency>
           <dependency>
             <groupId>org.apache.httpcomponents</groupId>

From c46875de953eb9316b34b6a47161f6d9c68a7ad6 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 11:53:15 -0500
Subject: [PATCH 11/22] Add milestone hints to created PRs

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7ccf8492bd7..02b2e72b5c0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,6 +5,8 @@ updates:
     target-branch: "jetty-9.4.x"
     schedule:
       interval: "daily"
+    # Associate with milestone 9.4.x
+    milestone: 3
     ignore:
       # Restrict updates in this branch to jetty in the 9.4.x space
       - dependency-name: "javax.servlet:*"
@@ -25,6 +27,8 @@ updates:
     target-branch: "jetty-10.0.x"
     schedule:
       interval: "daily"
+    # Associate with milestone 10.0.x
+    milestone: 6
     ignore:
       # Restrict updates in this branch to jetty in the 10.x.x space
       - dependency-name: "jakarta.servlet:*"
@@ -47,6 +51,8 @@ updates:
     target-branch: "jetty-11.0.x"
     schedule:
       interval: "weekly"
+    # Associate with milestone 11.0.x
+    milestone: 7
     ignore:
       # Restrict updates in this branch to jetty in the 11.x.x space
       - dependency-name: "jakarta.servlet:*"

From bba44f450d974a8bc59a95048b3e672036ebebe9 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 12:39:00 -0500
Subject: [PATCH 12/22] Bump jna to 5.9.0

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bf99a2668c8..399b777d44e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <invoker.mergeUserSettings>false</invoker.mergeUserSettings>
     <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
     <testcontainers.version>1.16.0</testcontainers.version>
-    <jna.version>5.8.0</jna.version>
+    <jna.version>5.9.0</jna.version>
     <mariadb.version>2.7.0</mariadb.version>
   </properties>
 

From 766edc9e17f8e717b5be954dd1b7b3a311033bc1 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 12:49:01 -0500
Subject: [PATCH 13/22] Bump maven.plugin-tools.version to 3.6.1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 399b777d44e..0f9fc940c8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
     <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.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>
     <maven.exec.plugin.version>3.0.0</maven.exec.plugin.version>

From 02692d62c93975c47d4ebd9712244d2b0c4e2c7d Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 12:49:29 -0500
Subject: [PATCH 14/22] Bump plexus-utils to 3.4.1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0f9fc940c8b..55fd2c9dd72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1091,7 +1091,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>

From b7ad13686133fc507c650034cd5372f9eec9a03b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 12:50:37 -0500
Subject: [PATCH 15/22] Bump jetty.perf-helper.version to 1.0.7

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 55fd2c9dd72..2e0bb1c9b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     <maven.resolver.version>1.7.2</maven.resolver.version>
     <weld.version>3.1.8.Final</weld.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>
     <!-- OSGI import-package -->
     <osgi.slf4j.import.packages>org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)"</osgi.slf4j.import.packages>

From dafbf732efd699dce4bc7941d33a16bfdd27f44d Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 12:53:42 -0500
Subject: [PATCH 16/22] Bump grpc.version to 1.40.1

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2e0bb1c9b63..d67ed0b64ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
     <infinispan.version>9.4.8.Final</infinispan.version>
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
     <gson.version>2.8.8</gson.version>
+    <grpc.version>1.40.1</grpc.version>
     <alpn.agent.version>2.0.10</alpn.agent.version>
     <hazelcast.version>4.2.2</hazelcast.version>
     <conscrypt.version>2.5.1</conscrypt.version>
@@ -1230,7 +1231,7 @@
       <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>

From be4f2fb4b3bbf197380cecd064b981e4077933b3 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 13:19:06 -0500
Subject: [PATCH 17/22] Adding versions-maven-plugin config

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pom.xml b/pom.xml
index d67ed0b64ca..fe7603d5c13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -985,6 +985,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>
@@ -1109,6 +1120,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>

From 903b2cdaf6b06adc9a6b1da5e519b873b9207c9d Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 13:26:43 -0500
Subject: [PATCH 18/22] Bump conscrypt.version to 2.5.2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fe7603d5c13..300663b81f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
     <grpc.version>1.40.1</grpc.version>
     <alpn.agent.version>2.0.10</alpn.agent.version>
     <hazelcast.version>4.2.2</hazelcast.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>

From 976ce25b89b2a96725cd7de9f87cfc129449f469 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 13:27:16 -0500
Subject: [PATCH 19/22] Bump openwebbeans.version to 2.0.23

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 tests/test-webapps/test-owb-cdi-webapp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-webapps/test-owb-cdi-webapp/pom.xml b/tests/test-webapps/test-owb-cdi-webapp/pom.xml
index 070dd1cd4d4..9547527030d 100644
--- a/tests/test-webapps/test-owb-cdi-webapp/pom.xml
+++ b/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>

From 4c4daf9b4d0bf08651d4b48b3f0f9de0e4d7032c Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 13:27:49 -0500
Subject: [PATCH 20/22] Cleanup plexus-utils versioning

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-maven-plugin/pom.xml | 5 -----
 pom.xml                    | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index df574f5ed2a..56aeb443e9b 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -125,11 +125,6 @@
       <artifactId>maven-artifact-transfer</artifactId>
       <version>0.13.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.4.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 300663b81f4..eb44488b6a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
     <maven.version>3.8.2</maven.version>
     <maven.resolver.version>1.7.2</maven.resolver.version>
     <weld.version>3.1.8.Final</weld.version>
+    <plexus-utils.version>3.4.1</plexus-utils.version>
     <jboss.logging.version>3.4.2.Final</jboss.logging.version>
     <jetty.perf-helper.version>1.0.7</jetty.perf-helper.version>
     <ant.version>1.10.11</ant.version>
@@ -1103,7 +1104,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.4.1</version>
+        <version>${plexus-utils.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>

From 7ee5daed26f1fffcb72c5f9ba1f751abb4dfe61b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 16:16:05 -0500
Subject: [PATCH 21/22] Bump maven-checkstyle-plugin to 3.1.2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eb44488b6a9..086de9057ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,7 +425,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>

From 40150a9becf93c2561305b90f58526476422d6f3 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 13 Sep 2021 16:16:28 -0500
Subject: [PATCH 22/22] Bump jacoco-maven-plugin to 0.8.7

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 086de9057ee..c7222d60b14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -719,7 +719,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>