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

Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.

This commit is contained in:
Simone Bordet 2018-11-22 12:56:25 +01:00
parent 5f972b451c 14c2431b1d
commit f0fbd63a55
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java
View File

@ -24,7 +24,7 @@ module org.eclipse.jetty.alpn.conscrypt.client
requires org.eclipse.jetty.util; requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io; requires org.eclipse.jetty.io;
requires org.eclipse.jetty.alpn.client; requires org.eclipse.jetty.alpn.client;
requires conscrypt.openjdk.uber; requires org.conscrypt;
provides ALPNProcessor.Client with ConscryptClientALPNProcessor; provides ALPNProcessor.Client with ConscryptClientALPNProcessor;
} }

2
jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java
View File

@ -24,7 +24,7 @@ module org.eclipse.jetty.alpn.conscrypt.server
requires org.eclipse.jetty.util; requires org.eclipse.jetty.util;
requires org.eclipse.jetty.io; requires org.eclipse.jetty.io;
requires org.eclipse.jetty.alpn.server; requires org.eclipse.jetty.alpn.server;
requires conscrypt.openjdk.uber; requires org.conscrypt;
provides ALPNProcessor.Server with ConscryptServerALPNProcessor; provides ALPNProcessor.Server with ConscryptServerALPNProcessor;
} }

2
pom.xml
View File

@ -53,7 +53,7 @@
<jsp.version>8.5.33</jsp.version> <jsp.version>8.5.33</jsp.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons --> <!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version> <alpn.version>undefined</alpn.version>
<conscrypt.version>1.1.4</conscrypt.version> <conscrypt.version>1.4.1</conscrypt.version>
<asm.version>7.0</asm.version> <asm.version>7.0</asm.version>
<jmh.version>1.21</jmh.version> <jmh.version>1.21</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name> <jmhjar.name>benchmarks</jmhjar.name>