From 228758ab29192dd977089a419457a299cf41f45d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 06:23:43 +0000
Subject: [PATCH 1/3] Bump conscrypt-openjdk-uber from 2.4.0 to 2.5.1

Bumps [conscrypt-openjdk-uber](https://github.com/google/conscrypt) from 2.4.0 to 2.5.1.
- [Release notes](https://github.com/google/conscrypt/releases)
- [Commits](https://github.com/google/conscrypt/compare/2.4.0...2.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e2aca3a6b56..631b20ca8e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <jsp.version>8.5.54</jsp.version>
     <infinispan.version>9.4.8.Final</infinispan.version>
     <alpn.agent.version>2.0.10</alpn.agent.version>
-    <conscrypt.version>2.4.0</conscrypt.version>
+    <conscrypt.version>2.5.1</conscrypt.version>
     <asm.version>9.0</asm.version>
     <jmh.version>1.21</jmh.version>
     <jmhjar.name>benchmarks</jmhjar.name>

From 4a4257d4d1a89a1a3010ba99493f4a6b9ebf9640 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 12 Oct 2020 06:43:53 -0500
Subject: [PATCH 2/3] Minimal change to setDefaultHostnameVerifier to allow
 compilation of tests

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../jetty/alpn/java/client/ConscryptHTTP2ClientTest.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java b/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java
index 1c57340be4f..d383f3ff2e8 100644
--- a/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java
+++ b/jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java
@@ -60,7 +60,7 @@ public class ConscryptHTTP2ClientTest
         Security.insertProviderAt(new OpenSSLProvider(), 1);
         SslContextFactory sslContextFactory = new SslContextFactory.Client();
         sslContextFactory.setProvider("Conscrypt");
-        Conscrypt.setDefaultHostnameVerifier((hostname, session) -> true);
+        Conscrypt.setDefaultHostnameVerifier((certs, hostname, session) -> true);
 
         HTTP2Client client = new HTTP2Client();
         try

From f6c1146428f5817cb4b5aa8a74a174fe3eff6594 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 12 Oct 2020 07:04:14 -0500
Subject: [PATCH 3/3] Bump checkstyle from 8.29 to 8.36.2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 994e6a5712c..d00b7e0d82e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <jetty.url>https://eclipse.org/jetty</jetty.url>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build-support.version>1.4</build-support.version>
-    <checkstyle.version>8.29</checkstyle.version>
+    <checkstyle.version>8.36.2</checkstyle.version>
     <slf4j.version>1.7.30</slf4j.version>
     <log4j2.version>2.11.2</log4j2.version>
     <disruptor.version>3.4.2</disruptor.version>
@@ -421,7 +421,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <configuration>
           <configLocation>jetty-checkstyle.xml</configLocation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>