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

This commit is contained in:
Joakim Erdfelt 2020-10-08 09:49:40 -05:00
commit d3cb5d4b06
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 2 additions and 2 deletions

View File

@ -141,7 +141,7 @@
<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
<version>1.1.1</version>
<version>2.0.1</version>
<scope>test</scope>
</dependency>
<!-- transitive dependency defined as a range and we don't want that -->

View File

@ -36,7 +36,7 @@
<infinispan.version>9.4.8.Final</infinispan.version>
<hazelcast.version>4.0.1</hazelcast.version>
<conscrypt.version>2.4.0</conscrypt.version>
<asm.version>8.0.1</asm.version>
<asm.version>9.0</asm.version>
<jmh.version>1.25.2</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name>
<tycho-version>2.0.0</tycho-version>