Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #5882 - Simplify ALPN modules. #5886

Merged
merged 1 commit into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
5 changes: 1 addition & 4 deletions jetty-home/src/main/resources/modules/conscrypt.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html

[description]
Installs the Conscrypt JSSE provider.

Expand Down Expand Up @@ -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