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

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2021-01-18 10:18:31 +01:00
parent 696b4c5bdc 14f829a8f5
commit c7fa690d90
9 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-11.mod
View File

@ -1,7 +0,0 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[description]
Provides support for ALPN based on JDK 9+ APIs.
[lib]
lib/jetty-alpn-java-server-${jetty.version}.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-12.mod
View File

@ -1,4 +0,0 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[depend]
alpn-impl/alpn-11

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-13.mod
View File

@ -1,4 +0,0 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[depend]
alpn-impl/alpn-11

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-14.mod
View File

@ -1,4 +0,0 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[depend]
alpn-impl/alpn-11

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-15.mod
View File

@ -1,4 +0,0 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[depend]
alpn-impl/alpn-11

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-16.mod
View File

@ -1,4 +0,0 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[depend]
alpn-impl/alpn-11

8
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-java.mod Normal file
View File

@ -0,0 +1,8 @@
[description]
Provides the ALPN implementation based on the Java APIs.
[provides]
alpn-impl|default
[lib]
lib/jetty-alpn-java-server-${jetty.version}.jar

3
jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
View File

@ -8,10 +8,9 @@ internal
[depend]
ssl
alpn-impl/alpn-${java.version.platform}
alpn-impl
[lib]
lib/jetty-alpn-client-${jetty.version}.jar
lib/jetty-alpn-server-${jetty.version}.jar
[xml]

5
jetty-home/src/main/resources/modules/conscrypt.mod
View File

@ -1,5 +1,3 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
[description]
Installs the Conscrypt JSSE provider.
@ -29,6 +27,5 @@ Conscrypt is distributed under the Apache Licence 2.0
https://github.com/google/conscrypt/blob/master/LICENSE
[ini]
conscrypt.version?=2.0.0
conscrypt.version?=2.5.1
jetty.sslContext.provider?=Conscrypt