From d1b10bf3067eec854cbc31cc7900f3d7fd296a64 Mon Sep 17 00:00:00 2001 From: brobrechts Date: Thu, 28 Nov 2024 13:37:39 +0100 Subject: [PATCH 1/2] [ALFREDOPS-856]: updated readme to exclude slf4j libraries that break logging --- alfred-telemetry-platform/README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alfred-telemetry-platform/README.md b/alfred-telemetry-platform/README.md index fc66ed9..9b05743 100644 --- a/alfred-telemetry-platform/README.md +++ b/alfred-telemetry-platform/README.md @@ -67,7 +67,10 @@ In the latter case, you need to add the dependencies yourself: ```groovy alfrescoSM "io.micrometer:micrometer-core:${micrometerVersion}" -alfrescoSM "io.github.mweirauch:micrometer-jvm-extras:${jvmExtrasVersion}" +alfrescoSM(group: 'io.github.mweirauch', name: 'micrometer-jvm-extras', version: "${jvmExtrasVersion}") +{ + exclude group: "org.slf4j", module: "*" +} ``` ### Manual download and install @@ -173,4 +176,4 @@ To only run the integration tests for a specific Alfresco version, execute the t ``` ./gradlew :integration-tests:alfresco-community-61:integrationTest -``` \ No newline at end of file +``` From 650db4cc7ac633ce0cb1f05f90af9598a448ec24 Mon Sep 17 00:00:00 2001 From: brobrechts Date: Fri, 29 Nov 2024 14:44:10 +0100 Subject: [PATCH 2/2] [ALFREDOPS-856]: changed alfresco dependencies due to no longer available on remote repo's. updated docker plugin --- build.gradle | 2 +- integration-tests/alfresco-community-62/overload.gradle | 2 +- integration-tests/alfresco-community-70/overload.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 820dd29..5dc5438 100644 --- a/build.gradle +++ b/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" } diff --git a/integration-tests/alfresco-community-62/overload.gradle b/integration-tests/alfresco-community-62/overload.gradle index 2e0735d..e5b3ad0 100644 --- a/integration-tests/alfresco-community-62/overload.gradle +++ b/integration-tests/alfresco-community-62/overload.gradle @@ -1,5 +1,5 @@ ext { - alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:6.2.1-A7' + alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:6.3.0-repo-4735-2-15' alfrescoBaseWar = 'org.alfresco:content-services-community:6.2.0-ga@war' alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:6.2' solrFlavor = 'solr6' diff --git a/integration-tests/alfresco-community-70/overload.gradle b/integration-tests/alfresco-community-70/overload.gradle index 0f26cec..2da50db 100644 --- a/integration-tests/alfresco-community-70/overload.gradle +++ b/integration-tests/alfresco-community-70/overload.gradle @@ -1,5 +1,5 @@ ext { - alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.0.1-A7' + alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.0.0' alfrescoBaseWar = 'org.alfresco:content-services-community@war' alfrescoBaseImage = 'xenit/alfresco-repository-skeleton:7.0' solrFlavor = 'solr6'