From 77cb10d58ddc76cf6b1bd592243872eacd48abde Mon Sep 17 00:00:00 2001 From: brobrechts Date: Mon, 29 Jun 2026 16:08:28 +0200 Subject: [PATCH 1/2] [ALFREDAPI-586]: Add support for alfresco 25.3 --- .github/workflows/ci.yml | 2 +- alfred-api-docker/253/build.gradle | 10 ++++ .../253/debug-extension.docker-compose.yml | 15 ++++++ alfred-api-docker/253/docker-compose.yml | 47 +++++++++++++++++++ alfred-api-impl/253/.gitkeep | 0 .../alfresco/253/.gitkeep | 0 alfresco/251/overrides.gradle | 3 +- alfresco/253/overrides.gradle | 8 ++++ build.gradle | 2 +- settings.gradle | 2 +- 10 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 alfred-api-docker/253/build.gradle create mode 100644 alfred-api-docker/253/debug-extension.docker-compose.yml create mode 100644 alfred-api-docker/253/docker-compose.yml create mode 100644 alfred-api-impl/253/.gitkeep create mode 100644 alfred-api-integrationtests-client/alfresco/253/.gitkeep create mode 100644 alfresco/253/overrides.gradle diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3761b4c2..b31d81a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: test-impl: strategy: matrix: - alfresco_version: [ 231, 232, 233, 234, 251 ] + alfresco_version: [ 231, 232, 233, 234, 251, 253 ] fail-fast: false runs-on: ubuntu-latest steps: diff --git a/alfred-api-docker/253/build.gradle b/alfred-api-docker/253/build.gradle new file mode 100644 index 00000000..544bb85d --- /dev/null +++ b/alfred-api-docker/253/build.gradle @@ -0,0 +1,10 @@ +dependencies { + baseAlfrescoWar platform("org.alfresco:acs-packaging:25.3.0") + baseAlfrescoWar 'org.alfresco:content-services@war' + + testImplementation(alfrescoAmp('org.alfresco:alfresco-governance-services-enterprise-repo:25.1.2.3@amp')) +} + +dockerAlfresco { + baseImage = 'docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:25.3' +} diff --git a/alfred-api-docker/253/debug-extension.docker-compose.yml b/alfred-api-docker/253/debug-extension.docker-compose.yml new file mode 100644 index 00000000..3d9248c8 --- /dev/null +++ b/alfred-api-docker/253/debug-extension.docker-compose.yml @@ -0,0 +1,15 @@ +services: + alfresco-core: + ports: + - 8000:8000 + environment: + - DEBUG=true + - SHARE_HOST=alfresco-share + alfresco-share: + image: docker.io/xenit/alfresco-share-community:25.3.0 + ports: + - 8090:8080 + environment: + - DEBUG=true + - ALFRESCO_HOST=alfresco-core + - ALFRESCO_INTERNAL_HOST=alfresco-core diff --git a/alfred-api-docker/253/docker-compose.yml b/alfred-api-docker/253/docker-compose.yml new file mode 100644 index 00000000..6c585483 --- /dev/null +++ b/alfred-api-docker/253/docker-compose.yml @@ -0,0 +1,47 @@ +services: + alfresco-core: + image: ${DOCKER_IMAGE:-image_not_set} + ports: + - "${DOCKER_IP}:8080:8080" + - "4578:4578" # coderunner-server + volumes: + - alfresco:/opt/alfresco/alf_data + restart: unless-stopped + environment: + - SOLR_HOST=solr + - TERM=xterm + - TOMCAT_ALLOW_CASUAL_MULTIPART_PARSING=false + - GLOBAL_messaging.broker.url=failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true + - GLOBAL_localTransform.core-aio.url=http://transform-core-aio:8090/ + solr: + image: docker.xenit.eu/alfresco-enterprise/alfresco-solr6:2.0.9.1 + volumes: + - solr:/opt/alfresco/alf_data + restart: unless-stopped + environment: + - ALFRESCO_HOST=alfresco-core + + postgresql: + image: postgres:15 + volumes: + - postgres:/var/lib/postgresql/data + environment: + - POSTGRES_USER=alfresco + - POSTGRES_PASSWORD=admin + - POSTGRES_DB=alfresco + restart: unless-stopped + + activemq: + image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8 + mem_limit: 1g + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:5.1.0 + environment: + JAVA_OPTS: " -Xms256m -Xmx512m" + ACTIVEMQ_URL: "nio://activemq:61616" + +volumes: + alfresco: + solr: + postgres: diff --git a/alfred-api-impl/253/.gitkeep b/alfred-api-impl/253/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/alfred-api-integrationtests-client/alfresco/253/.gitkeep b/alfred-api-integrationtests-client/alfresco/253/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/alfresco/251/overrides.gradle b/alfresco/251/overrides.gradle index edbdc0b9..350d2e2c 100644 --- a/alfresco/251/overrides.gradle +++ b/alfresco/251/overrides.gradle @@ -3,6 +3,5 @@ description = "Xenit Alfred API implementation Alfresco 25.1" ext { alfresco_version = '25.1.0' alfresco_min_version = "25.1.0" - //Not setting alfresco_max_version here to make it easier to test on next Alfresco version (only for latest version) - alfresco_max_version = null // explicit null to overwrite properties from other projects + alfresco_max_version = "25.1.99" } \ No newline at end of file diff --git a/alfresco/253/overrides.gradle b/alfresco/253/overrides.gradle new file mode 100644 index 00000000..3bc6774b --- /dev/null +++ b/alfresco/253/overrides.gradle @@ -0,0 +1,8 @@ +description = "Xenit Alfred API implementation Alfresco 25.3" + +ext { + alfresco_version = '25.3.0' + alfresco_min_version = "25.3.0" + //Not setting alfresco_max_version here to make it easier to test on next Alfresco version (only for latest version) + alfresco_max_version = null // explicit null to overwrite properties from other projects +} diff --git a/build.gradle b/build.gradle index d40accb8..84ac946a 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ jreleaser { release { // Add an override for each artifact we want to publish, because we want to // disable requirements checking for each of them. - ['interface', '231', '232', '233', '234', '251'].each { suffix -> + ['interface', '231', '232', '233', '234', '251', '253'].each { suffix -> artifactOverride { // Match artifact by artifactId artifactId = "alfred-api-${suffix}" diff --git a/settings.gradle b/settings.gradle index e84b5d8b..f8f9ec5f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,7 +13,7 @@ include ':alfred-api-integrationtests-client:model-amp' include ':alfred-api-integrationtests-server' include ':docs' -for (String version : ['23.1', '23.2', '23.3', '23.4', '25.1']) { +for (String version : ['23.1', '23.2', '23.3', '23.4', '25.1', '25.3']) { def shortVersion = version.replaceAll('\\.', '') include ":alfred-api-impl:alfred-api-impl-$shortVersion" From 14a651f508d015b309cf5a2159eaad17116d74cf Mon Sep 17 00:00:00 2001 From: brobrechts Date: Mon, 29 Jun 2026 16:11:38 +0200 Subject: [PATCH 2/2] [ALFREDAPI-586]: updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50f4f8a7..780d1b65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,12 @@ ## 6.1.3 (unreleased) ### Added +* [ALFREDAPI-586](https://xenitsupport.jira.com/browse/ALFREDAPI-586): Support Alfresco V25.3 ### Fixed * [ALFREDAPI-587](https://xenitsupport.jira.com/browse/ALFREDAPI-587): Remove non-existant Swagger endpoints from documentation. + ## 6.1.2 (2025-11-06) ### Added