DOCKER-450 [Test] build 2repository:community-7.2.0

xenit-eu · May 24, 2024 · ccfdbc3 · ccfdbc3
1 parent bf6e2ad
commit ccfdbc3
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/tomcat-base/build.gradle b/tomcat-base/build.gradle
@@ -16,16 +16,30 @@ subprojects {
     configurations {
         sharedLibs
     }
+    // This can be deleted when support for Alfresco V7.X is dropped.
+    if (!tomcatVersion.contains("10")) {
+        java {
+            withJavadocJar()
+            withSourcesJar()
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
+
+        }
+    }else{
+        java {
+            withJavadocJar()
+            withSourcesJar()
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+
+        }
+    }
     java {
         withJavadocJar()
         withSourcesJar()
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
-        // This can be deleted when support for Alfresco V7.X is dropped.
-        if (!tomcatVersion.contains("10")) {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
-        }
+
     }
     ext {
         jsonLoggingVersion = '0.0.8'
@@ -87,7 +101,11 @@ subprojects {
     }
 
     createDockerFile {
-        from 'docker.io/eclipse-temurin:17-jre'
+        if (!tomcatVersion.contains("10")) {
+            from 'docker.io/eclipse-temurin:11'
+        } else {
+            from 'docker.io/eclipse-temurin:17-jre'
+        }
         smartCopy configurations.sharedLibs, '/usr/local/tomcat/shared/lib/'
         smartCopy "${project.parent.projectDir}/src/shared/main/resources/keystore", '/keystore'
         smartCopy configurations.runtimeClasspath, '/app/tomcat-embedded/lib'