Skip to content

Commit

Permalink
Merge pull request #17257 from cescoffier/update-vertx-4.1.0.Beta1
Browse files Browse the repository at this point in the history
  • Loading branch information
cescoffier committed May 18, 2021
2 parents 05126ae + f230fa9 commit 4ba1742
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<wildfly-elytron.version>1.15.3.Final</wildfly-elytron.version>
<jboss-modules.version>1.8.7.Final</jboss-modules.version>
<jboss-threads.version>3.2.0.Final</jboss-threads.version>
<vertx.version>4.0.3</vertx.version>
<vertx.version>4.1.0.Beta1</vertx.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.14</httpcore.version>
<httpasync.version>4.1.4</httpasync.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,6 @@ final class Target_io_vertx_core_net_impl_SSLHelper {
@Alias
private boolean openSsl;

@Alias
private boolean useAlpn;

@Alias
private List<String> applicationProtocols;

Expand All @@ -164,7 +161,8 @@ private KeyManagerFactory getKeyMgrFactory(VertxInternal vertx) throws Exception
}

@Substitute
private SslContext createContext(VertxInternal vertx, X509KeyManager mgr, TrustManagerFactory trustMgrFactory) {
private SslContext createContext(VertxInternal vertx, boolean useAlpn, X509KeyManager mgr,
TrustManagerFactory trustMgrFactory) {
try {
SslContextBuilder builder;
if (client) {
Expand Down

0 comments on commit 4ba1742

Please sign in to comment.