Simplified Tomcat SSL configuration

Author: Hakky54

instant-ssl-reloading-with-spring-tomcat/src/main/java/nl/altindag/server/config/SSLConnectorCustomizer.java

@@ -18,9 +18,11 @@
 import nl.altindag.ssl.SSLFactory;
 import org.apache.catalina.connector.Connector;
 import org.apache.coyote.http11.AbstractHttp11Protocol;
+import org.apache.tomcat.util.net.SSLContext;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
+import org.apache.tomcat.util.net.SSLUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
 import org.springframework.context.annotation.Configuration;
@@ -47,7 +49,13 @@ public void customize(Connector connector) {
 
         SSLHostConfig sslHostConfig = new SSLHostConfig();
         SSLHostConfigCertificate certificate = new SSLHostConfigCertificate(sslHostConfig, Type.UNDEFINED);
-        certificate.setSslContext(new TomcatSSLContext(sslFactory));
+        SSLContext sslContext = SSLUtil.createSSLContext(
+                sslFactory.getSslContext(),
+                sslFactory.getKeyManager().orElseThrow(),
+                sslFactory.getTrustManager().orElseThrow()
+        );
+
+        certificate.setSslContext(sslContext);
         sslHostConfig.addCertificate(certificate);
         protocol.addSslHostConfig(sslHostConfig);
     }

instant-ssl-reloading-with-spring-tomcat/src/main/java/nl/altindag/server/config/TomcatSSLContext.java

@@ -64,7 +64,7 @@
         <version.logcaptor>2.9.3</version.logcaptor>
         <version.spring>3.3.2</version.spring>
         <version.javafx>21.0.3</version.javafx>
-        <version-tomcat>10.1.26</version-tomcat>
+        <version-tomcat>10.1.40</version-tomcat>
         <version.aspectweaver>1.9.22.1</version.aspectweaver>
         <version.jackson>2.17.2</version.jackson>
         <version.slf4j>2.0.13</version.slf4j>