diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b88886b..cf6551cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: env: DOCKER_USER: ${{ secrets.CLOUDSMITH_USER }} DOCKER_PASSWORD: ${{ secrets.CLOUDSMITH_APIKEY }} - run: echo "$DOCKER_PASSWORD" | docker login docker.xenit.eu --username "$DOCKER_USER" --password-stdin + run: echo "$DOCKER_PASSWORD" | docker login private.docker.xenit.eu --username "$DOCKER_USER" --password-stdin - name: Test run: ./gradlew integrationTest -P${{ matrix.flavour }} - name: 'Upload Artifact' diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cde4a51..843bfd88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,12 @@ Version template: --> # Dynamic Extensions For Alfresco Changelog +## [4.0.0] - 2023-07-18 + +### Added + +* [#363](https://github.com/xenit-eu/dynamic-extensions-for-alfresco/issues/363) Added Alfresco 7.4 compatibility + ## [3.0.0] - 2022-11-29 ### Added diff --git a/README.md b/README.md index 644001d0..1103a09c 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ the [Alfresco Docker Gradle Plugins](https://github.com/xenit-eu/alfresco-docker Dynamic Extensions is systematically integration-tested against: +* Alfresco Enterprise & Community 7.4 * Alfresco Enterprise & Community 7.3 * Alfresco Enterprise & Community 7.2 * Alfresco Enterprise & Community 7.1 diff --git a/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-74/module.properties b/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-74/module.properties new file mode 100644 index 00000000..b4352927 --- /dev/null +++ b/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-74/module.properties @@ -0,0 +1,7 @@ +module.id = ${project.parent.name} +module.version = ${project.version.replace('-SNAPSHOT','')} +module.title = Dynamic Extensions for Alfresco ${project.ext.simpleAlfrescoVersion} +module.description = Dynamic Extensions for Alfresco module package + +module.repo.version.min=7.4.0 +module.repo.version.max=7.4.99 \ No newline at end of file diff --git a/gradle/versions.gradle b/gradle/versions.gradle index d3200a21..43c8e80c 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -5,7 +5,8 @@ ext { "70": "7.0.0", "71": "7.1.1", "72": "7.2.0", - "73": "7.3.0" + "73": "7.3.0", + "74": "7.4.0" ] springVersions = [ @@ -14,7 +15,8 @@ ext { "70": "5.3.3.RELEASE", "71": "5.3.9.RELEASE", "72": "5.3.15.RELEASE", - "73": "5.3.23.RELEASE" + "73": "5.3.23.RELEASE", + "74": "5.3.27" ] geminiVersions = [ @@ -24,5 +26,6 @@ ext { "71": "3.0.0.M01", "72": "3.0.0.M01", "73": "3.0.0.M01", + "74": "3.0.0.M01" ] } \ No newline at end of file diff --git a/integration-tests/alfresco-community-74/overload.gradle b/integration-tests/alfresco-community-74/overload.gradle new file mode 100644 index 00000000..d3075a88 --- /dev/null +++ b/integration-tests/alfresco-community-74/overload.gradle @@ -0,0 +1,8 @@ +ext { + alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.4.0' + alfrescoBaseWar = 'org.alfresco:content-services-community@war' + + alfrescoBaseImage = 'xenit/alfresco-repository-community:7.4.0' + + postgresImage = 'postgres:13' +} \ No newline at end of file diff --git a/integration-tests/alfresco-enterprise-61/overload.gradle b/integration-tests/alfresco-enterprise-61/overload.gradle index 226f06bb..8158f1db 100644 --- a/integration-tests/alfresco-enterprise-61/overload.gradle +++ b/integration-tests/alfresco-enterprise-61/overload.gradle @@ -1,7 +1,7 @@ ext { alfrescoBaseWarBom = 'org.alfresco:acs-packaging:6.1.1.11' alfrescoBaseWar = 'org.alfresco:content-services@war' - alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:6.1.1' + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:6.1.1' postgresImage = 'postgres:10.1' } \ No newline at end of file diff --git a/integration-tests/alfresco-enterprise-62/overload.gradle b/integration-tests/alfresco-enterprise-62/overload.gradle index 6f199ee3..a5b50b80 100644 --- a/integration-tests/alfresco-enterprise-62/overload.gradle +++ b/integration-tests/alfresco-enterprise-62/overload.gradle @@ -1,7 +1,7 @@ ext { alfrescoBaseWarBom = 'org.alfresco:acs-packaging:6.2.2.19' alfrescoBaseWar = 'org.alfresco:content-services@war' - alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:6.2.2.19' + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:6.2.2.19' postgresImage = 'postgres:10.1' } \ No newline at end of file diff --git a/integration-tests/alfresco-enterprise-70/overload.gradle b/integration-tests/alfresco-enterprise-70/overload.gradle index 13e91353..5f383c2a 100644 --- a/integration-tests/alfresco-enterprise-70/overload.gradle +++ b/integration-tests/alfresco-enterprise-70/overload.gradle @@ -2,7 +2,7 @@ ext { alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.0.1.3' alfrescoBaseWar = 'org.alfresco:content-services@war' - alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.0.1.3' + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.0.1.3' postgresImage = 'postgres:13.1' } \ No newline at end of file diff --git a/integration-tests/alfresco-enterprise-71/overload.gradle b/integration-tests/alfresco-enterprise-71/overload.gradle index a469e65f..e107f0c6 100644 --- a/integration-tests/alfresco-enterprise-71/overload.gradle +++ b/integration-tests/alfresco-enterprise-71/overload.gradle @@ -2,7 +2,7 @@ ext { alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.1.0' alfrescoBaseWar = 'org.alfresco:content-services@war' - alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.1.0' + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.1.0' postgresImage = 'postgres:13' } \ No newline at end of file diff --git a/integration-tests/alfresco-enterprise-72/overload.gradle b/integration-tests/alfresco-enterprise-72/overload.gradle index be455343..c482b499 100644 --- a/integration-tests/alfresco-enterprise-72/overload.gradle +++ b/integration-tests/alfresco-enterprise-72/overload.gradle @@ -2,7 +2,7 @@ ext { alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.2.0' alfrescoBaseWar = 'org.alfresco:content-services@war' - alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.2.0' + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.2.0' postgresImage = 'postgres:13' } \ No newline at end of file diff --git a/integration-tests/alfresco-enterprise-73/overload.gradle b/integration-tests/alfresco-enterprise-73/overload.gradle index 7f9843c3..ceeaf78c 100644 --- a/integration-tests/alfresco-enterprise-73/overload.gradle +++ b/integration-tests/alfresco-enterprise-73/overload.gradle @@ -1,8 +1,8 @@ ext { - alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.3.0' + alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.3.0.1' alfrescoBaseWar = 'org.alfresco:content-services@war' - alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.3.0' + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.3.0.1' postgresImage = 'postgres:13' } \ No newline at end of file diff --git a/integration-tests/alfresco-enterprise-74/overload.gradle b/integration-tests/alfresco-enterprise-74/overload.gradle new file mode 100644 index 00000000..aec7aa8c --- /dev/null +++ b/integration-tests/alfresco-enterprise-74/overload.gradle @@ -0,0 +1,8 @@ +ext { + alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.4.0.1' + alfrescoBaseWar = 'org.alfresco:content-services@war' + + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.4.0.1' + + postgresImage = 'postgres:13' +} \ No newline at end of file diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle index e4bd1a72..2cd038a8 100644 --- a/integration-tests/build.gradle +++ b/integration-tests/build.gradle @@ -27,17 +27,6 @@ configure(subprojects.findAll { it.name.startsWith("alfresco-") }) { if (project.name.contains("enterprise") && !project.hasProperty("enterprise")) { return } - - repositories { - maven { - name 'release' - url "https://artifactory.xenit.eu/artifactory/libs-release" - credentials { - username project.hasProperty('eu.xenit.artifactory.username') ? property('eu.xenit.artifactory.username') : '' - password project.hasProperty('eu.xenit.artifactory.password') ? property('eu.xenit.artifactory.password') : '' - } - } - } def alfrescoVersion = project.name[-2..-1] diff --git a/settings.gradle b/settings.gradle index 04716bcb..4fa857d7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,7 +19,7 @@ include 'control-panel' include 'gradle-plugin' -def supportedAlfrescoVersions = [ "61", "62", "70", "71", "72", "73"] +def supportedAlfrescoVersions = [ "61", "62", "70", "71", "72", "73", "74"] def alfrescoDependentModules = [ 'alfresco-dynamic-extensions-repo',