Merge pull request #8083 from eclipse/dependabot/maven/jetty-10.0.x/o…

…rg.asciidoctor-asciidoctorj-2.5.4
jetty · Jun 1, 2022 · 7336226 · 7336226
2 parents 7a1c165 + 40ba7ba
commit 7336226
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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>

diff --git 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>