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-9.4.x' into jetty-10.0.x

This commit is contained in:
Joakim Erdfelt 2020-10-12 08:50:32 -05:00
parent 1cd15e8d85 e020fd50d4
commit ea60815dfd
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-alpn/jetty-alpn-conscrypt-client/src/test/java/org/eclipse/jetty/alpn/java/client/ConscryptHTTP2ClientTest.java
View File

@ -62,7 +62,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

6
pom.xml
View File

@ -18,7 +18,7 @@
<jetty.url>https://www.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>2.0.0-alpha1</slf4j.version>
<log4j2.version>2.13.0</log4j2.version>
<logback.version>1.3.0-alpha5</logback.version>
@ -29,7 +29,7 @@
<jsp.version>9.0.29</jsp.version>
<infinispan.version>9.4.8.Final</infinispan.version>
<hazelcast.version>4.0.1</hazelcast.version>
<conscrypt.version>2.4.0</conscrypt.version>
<conscrypt.version>2.5.1</conscrypt.version>
<asm.version>8.0.1</asm.version>
<jmh.version>1.25.2</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name>
@ -407,7 +407,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>