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

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2022-10-05 09:24:16 -05:00
parent 76b6f9cfe7 9b94bcd340
commit 7497f9ec05
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-maven-plugin/src/it/it-parent-pom/pom.xml
View File

@ -38,7 +38,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>@jackson.databind.version@</version>
<version>@jackson.version@</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

22
pom.xml
View File

@ -53,9 +53,7 @@
<hazelcast.version>4.2.5</hazelcast.version>
<infinispan.protostream.version>4.5.0.Final</infinispan.protostream.version>
<infinispan.version>11.0.16.Final</infinispan.version>
<jackson.annotations.version>2.13.4</jackson.annotations.version>
<jackson.core.version>2.13.4</jackson.core.version>
<jackson.databind.version>2.13.4</jackson.databind.version>
<jackson.version>2.13.4</jackson.version>
<jakarta.activation.api.version>2.0.1</jakarta.activation.api.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
<jakarta.authentication.api.version>2.0.0</jakarta.authentication.api.version>
@ -1904,19 +1902,11 @@
<version>${commons.compress.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.core.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.annotations.version}</version>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.wildfly.common</groupId>