From 3cf9ce19b9089db0543a9e8e644b31f2df6d229d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 13:20:47 +0000
Subject: [PATCH 1/2] Bump asciidoctorj from 2.5.3 to 2.5.4

Bumps [asciidoctorj](https://github.com/asciidoctor/asciidoctorj) from 2.5.3 to 2.5.4.
- [Release notes](https://github.com/asciidoctor/asciidoctorj/releases)
- [Changelog](https://github.com/asciidoctor/asciidoctorj/blob/main/CHANGELOG.adoc)
- [Commits](https://github.com/asciidoctor/asciidoctorj/compare/v2.5.3...v2.5.4)

---
updated-dependencies:
- dependency-name: org.asciidoctor:asciidoctorj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4489440ad991..baf0ec63e205 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <apache.httpclient.version>4.5.13</apache.httpclient.version>
     <apache.httpcore.version>4.4.15</apache.httpcore.version>
     <asciidoctorj-diagram.version>2.2.3</asciidoctorj-diagram.version>
-    <asciidoctorj.version>2.5.3</asciidoctorj.version>
+    <asciidoctorj.version>2.5.4</asciidoctorj.version>
     <asm.version>9.3</asm.version>
     <awaitility.version>4.2.0</awaitility.version>
     <bndlib.version>6.2.0</bndlib.version>

From 40ba7bae6e5c82d75534d4155e96c9e5882d6f65 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 31 May 2022 14:18:04 -0500
Subject: [PATCH 2/2] Fixing upper bounds issue

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

diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml
index a042111de434..c40a75edd4b6 100644
--- a/documentation/jetty-asciidoctor-extensions/pom.xml
+++ b/documentation/jetty-asciidoctor-extensions/pom.xml
@@ -17,11 +17,11 @@
       <artifactId>asciidoctorj</artifactId>
       <exclusions>
         <exclusion>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
+          <groupId>jakarta.annotation</groupId>
+          <artifactId>jakarta.annotation-api</artifactId>
         </exclusion>
         <!--
-        the pom of this dependencies has an unknow repository protocol
+        the pom of this dependencies has an unknown repository protocol
         https://issues.apache.org/jira/browse/MENFORCER-393
         it fail enforcer plugin
         -->
diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml
index 590d47c5e562..0cfee54e1893 100644
--- a/documentation/jetty-documentation/pom.xml
+++ b/documentation/jetty-documentation/pom.xml
@@ -26,6 +26,12 @@
             <groupId>org.eclipse.jetty.documentation</groupId>
             <artifactId>jetty-asciidoctor-extensions</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+              </exclusion>
+            </exclusions>
           </dependency>
           <dependency>
             <groupId>org.apache.httpcomponents</groupId>