DOCKER-450 [Update] SSLConfiguration update FOR TomcaT v10 SUPPORT.

xenit-eu · Apr 29, 2024 · 7523658 · 7523658
1 parent 8a3d5ed
commit 7523658
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/tomcat-base/build.gradle b/tomcat-base/build.gradle
@@ -23,14 +23,19 @@ subprojects {
         withSourcesJar()
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
+//        Caused by: java.lang.UnsupportedClassVersionError: org/springframework/web/SpringServletContainerInitializer has been compiled by a more recent version of the Java Runtime (class file version 61.0), this version of the Java Runtime only recognizes class file versions up to 55.0 (unable to load class [org.springframework.web.SpringServletContainerInitializer])\
+//        if (tomcatVersion.contains("10")){
+//            sourceCompatibility = JavaVersion.VERSION_17
+//            targetCompatibility = JavaVersion.VERSION_17
+//        }
     }
     ext {
         jsonLoggingVersion = '0.0.7'
     }
     dependencies {
 
-        compileOnly "org.projectlombok:lombok:1.18.28"
-        annotationProcessor "org.projectlombok:lombok:1.18.28"
+        compileOnly "org.projectlombok:lombok:1.18.32"
+        annotationProcessor "org.projectlombok:lombok:1.18.32"
 
         implementation "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}"
         implementation "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"

diff --git a/...n/java/eu/xenit/alfresco/tomcat/embedded/alfresco/tomcat/AlfrescoTomcatFactoryHelper.java b/...n/java/eu/xenit/alfresco/tomcat/embedded/alfresco/tomcat/AlfrescoTomcatFactoryHelper.java
@@ -14,6 +14,7 @@
 import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.logging.Logger;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 
 public class AlfrescoTomcatFactoryHelper {
 
@@ -66,9 +67,16 @@ public static void createSSLConnector(Tomcat tomcat, AlfrescoConfiguration alfre
         );
 
         SSLHostConfig sslHostConfig = new SSLHostConfig();
-        sslHostConfig.setCertificateKeystoreFile(alfrescoConfiguration.getTomcatSSLKeystore());
-        sslHostConfig.setCertificateKeystorePassword(alfrescoConfiguration.getTomcatSSLKeystorePassword());
-        sslHostConfig.setCertificateKeystoreType("JCEKS");
+        // This is deprecated in Tomcat 9 and deleted from Tomcat V10.1!
+//            sslHostConfig.setCertificateKeystoreFile(alfrescoConfiguration.getTomcatSSLKeystore());
+//            sslHostConfig.setCertificateKeystorePassword(alfrescoConfiguration.getTomcatSSLKeystorePassword());
+//            sslHostConfig.setCertificateKeystoreType("JCEKS");
+        SSLHostConfigCertificate sslHostConfigCertificate = new SSLHostConfigCertificate(sslHostConfig, SSLHostConfigCertificate.Type.UNDEFINED);
+        sslHostConfigCertificate.setCertificateKeystoreFile(alfrescoConfiguration.getTomcatSSLKeystore());
+        sslHostConfigCertificate.setCertificateKeystorePassword(alfrescoConfiguration.getTomcatSSLKeystorePassword());
+        sslHostConfigCertificate.setCertificateKeystoreType("JCEKS");
+
+        sslHostConfig.addCertificate(sslHostConfigCertificate);
         sslHostConfig.setTruststoreFile(alfrescoConfiguration.getTomcatSSLTruststore());
         sslHostConfig.setTruststorePassword(alfrescoConfiguration.getTomcatSSLTruststorePassword());
         sslHostConfig.setTruststoreType("JCEKS");

diff --git a/tomcat-base/tomcat-embedded-10/overload.gradle b/tomcat-base/tomcat-embedded-10/overload.gradle
@@ -2,4 +2,10 @@ ext {
     tomcat = [
             version: '10.1.23'
     ]
+}
+
+sonarqube {
+    properties {
+        property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared/"
+    }
 }