[ALFREDOPS-860] got integration tests working for ACS 23.1

alfred-telemetry-platform/build.gradle

@@ -17,6 +17,13 @@ java {
     withSourcesJar()
 }
 
+compileJava {
+    options.release = 17
+}
+compileTestJava {
+    options.release = 17
+}
+
 ext {
     alfrescoVersion = '23.1.0'
 }

alfred-telemetry-solr/alfred-telemetry-solr-common/build.gradle

@@ -6,11 +6,18 @@ plugins {
 description = "Alfred Telemetry Common module which enables exposure of Metrics using Micrometer"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_11
     withJavadocJar()
     withSourcesJar()
 }
 
+compileJava {
+    options.release = 11
+}
+compileTestJava {
+    options.release = 11
+}
+
 dependencies {
     // Micrometer libraries.
     // API dependencies implementations are used by alfred-telemetry-solr4 and alfred-telemetry-solr6

alfred-telemetry-solr/alfred-telemetry-solr4/build.gradle

@@ -8,7 +8,7 @@ plugins {
 description = "Alfred Telemetry Solr4 module which enables exposure of Metrics using Micrometer"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_11
 }
 
 

alfred-telemetry-solr/alfred-telemetry-solr6/build.gradle

@@ -8,7 +8,7 @@ plugins {
 description = "Alfred Telemetry Solr6 module which enables exposure of Metrics using Micrometer"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_11
 }
 
 apply from: './overload.gradle'

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'eu.xenit.docker-compose' version '5.3.2' apply false
+    id 'eu.xenit.docker-compose' version '5.5.0' apply false
     id "be.vbgn.ci-detect" version "0.5.0"
     id "org.sonarqube" version "3.5.0.2730"
 }
@@ -20,13 +20,6 @@ allprojects {
     apply plugin: 'java'
     apply plugin: 'jacoco'
 
-    compileJava {
-        options.release = 17
-    }
-    compileTestJava {
-        options.release = 17
-    }
-
     jacocoTestReport {
         reports {
             xml.enabled true

integration-tests/alfresco-community-231/overload.gradle

@@ -0,0 +1,17 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:23.1.0'
+    alfrescoBaseWar = 'org.alfresco:content-services-community@war'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:23.1.0'
+    solrFlavor = 'solr6'
+
+//    postgresImage = 'postgres:13'
+
+    extraDependencies = [
+            "io.micrometer:micrometer-core:${micrometerVersion}",
+            "io.github.mweirauch:micrometer-jvm-extras:${jvmExtrasVersion}",
+
+            "io.micrometer:micrometer-registry-graphite:${micrometerVersion}",
+            "io.micrometer:micrometer-registry-jmx:${micrometerVersion}",
+            "io.micrometer:micrometer-registry-prometheus:${micrometerVersion}"
+    ]
+}

integration-tests/alfresco-enterprise-231/overload.gradle

@@ -0,0 +1,7 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:23.1.0'
+    alfrescoBaseWar = 'org.alfresco:content-services@war'
+    alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:23.1'
+
+    solrFlavor = 'solr6'
+}

settings.gradle

@@ -14,7 +14,7 @@ include ':alfred-telemetry-solr'
 
 include ':integration-tests'
 
-def integrationTestVersions = [];
+def integrationTestVersions = ['231'];
 
 if (!hasProperty("community")) {
     integrationTestVersions.each { version ->