Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2022-06-01 12:59:58 +02:00
parent 8d06ffad1b 73362266bd
commit 0571be5cee
No known key found for this signature in database
GPG Key ID: 1677D141BCF3584D
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
documentation/jetty-asciidoctor-extensions/pom.xml
View File

@ -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
-->

6
documentation/jetty-documentation/pom.xml
View File

@ -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>

2
pom.xml
View File

@ -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>