Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
joakime committed Oct 8, 2020
2 parents 3454849 + 5e0e99d commit 95aba60
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion jetty-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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>
Expand Down

0 comments on commit 95aba60

Please sign in to comment.