From 4fb5fc6652aec5f27758e93a9f72721103bf98d6 Mon Sep 17 00:00:00 2001 From: kennethpi Date: Fri, 14 Jul 2023 14:07:41 +0200 Subject: [PATCH 1/9] DEVEM-535 Added Alfresco 7.4 build --- .../alfresco-dynamic-extensions-repo-74/module.properties | 7 +++++++ integration-tests/alfresco-community-74/overload.gradle | 8 ++++++++ integration-tests/alfresco-enterprise-74/overload.gradle | 8 ++++++++ settings.gradle | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-74/module.properties create mode 100644 integration-tests/alfresco-community-74/overload.gradle create mode 100644 integration-tests/alfresco-enterprise-74/overload.gradle 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/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-74/overload.gradle b/integration-tests/alfresco-enterprise-74/overload.gradle new file mode 100644 index 00000000..0f5e5d99 --- /dev/null +++ b/integration-tests/alfresco-enterprise-74/overload.gradle @@ -0,0 +1,8 @@ +ext { + alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.4.0' + alfrescoBaseWar = 'org.alfresco:content-services@war' + + alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.4.0' + + postgresImage = 'postgres:13' +} \ No newline at end of file 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', From a5bb9c42a4190ebc9fd823121d48c5a847377365 Mon Sep 17 00:00:00 2001 From: kennethpi Date: Mon, 17 Jul 2023 09:36:19 +0200 Subject: [PATCH 2/9] DEVEM-535 changed some old repositories --- .github/workflows/ci.yml | 2 +- .../alfresco-enterprise-61/overload.gradle | 2 +- .../alfresco-enterprise-62/overload.gradle | 2 +- .../alfresco-enterprise-70/overload.gradle | 2 +- .../alfresco-enterprise-71/overload.gradle | 2 +- .../alfresco-enterprise-72/overload.gradle | 2 +- .../alfresco-enterprise-73/overload.gradle | 2 +- .../alfresco-enterprise-74/overload.gradle | 2 +- integration-tests/build.gradle | 20 +++++++++---------- 9 files changed, 18 insertions(+), 18 deletions(-) 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/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..33c3cfb0 100644 --- a/integration-tests/alfresco-enterprise-73/overload.gradle +++ b/integration-tests/alfresco-enterprise-73/overload.gradle @@ -2,7 +2,7 @@ ext { alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.3.0' 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' 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 index 0f5e5d99..4c45eef5 100644 --- a/integration-tests/alfresco-enterprise-74/overload.gradle +++ b/integration-tests/alfresco-enterprise-74/overload.gradle @@ -2,7 +2,7 @@ ext { alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.4.0' alfrescoBaseWar = 'org.alfresco:content-services@war' - alfrescoBaseImage = 'docker.xenit.eu/private/alfresco-enterprise/alfresco-repository-enterprise:7.4.0' + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.4.0' postgresImage = 'postgres:13' } \ No newline at end of file diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle index e4bd1a72..886e9852 100644 --- a/integration-tests/build.gradle +++ b/integration-tests/build.gradle @@ -28,16 +28,16 @@ configure(subprojects.findAll { it.name.startsWith("alfresco-") }) { 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') : '' - } - } - } +// 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] From 7635666e6f900f1d9322b7404c3e2708b143c6d0 Mon Sep 17 00:00:00 2001 From: kennethpi Date: Mon, 17 Jul 2023 15:11:25 +0200 Subject: [PATCH 3/9] DEVEM-535 Fixed issues in integration tests --- integration-tests/alfresco-enterprise-73/overload.gradle | 4 ++-- integration-tests/alfresco-enterprise-74/overload.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/alfresco-enterprise-73/overload.gradle b/integration-tests/alfresco-enterprise-73/overload.gradle index 33c3cfb0..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 = 'private.docker.xenit.eu/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 index 4c45eef5..aec7aa8c 100644 --- a/integration-tests/alfresco-enterprise-74/overload.gradle +++ b/integration-tests/alfresco-enterprise-74/overload.gradle @@ -1,8 +1,8 @@ ext { - alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.4.0' + 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' + alfrescoBaseImage = 'private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.4.0.1' postgresImage = 'postgres:13' } \ No newline at end of file From 28695dafeb17e800a30590ce69406d1ec324b595 Mon Sep 17 00:00:00 2001 From: kennethpi Date: Tue, 18 Jul 2023 08:51:36 +0200 Subject: [PATCH 4/9] DEVEM-535 Clean-up of commented code --- integration-tests/build.gradle | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle index 886e9852..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] From b8f44b5a2444a6005265fd9d82f22a27e107f4a0 Mon Sep 17 00:00:00 2001 From: kennethpi Date: Tue, 18 Jul 2023 09:22:12 +0200 Subject: [PATCH 5/9] DEVEM-535 Updated README --- README.md | 1 + 1 file changed, 1 insertion(+) 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 From fca67e48db748626d175fcc7ff1a18acfcc56d4f Mon Sep 17 00:00:00 2001 From: kennethpi Date: Tue, 18 Jul 2023 09:23:08 +0200 Subject: [PATCH 6/9] DEVEM-535 Updated versions.gradle for Alfresco v7.4 --- gradle/versions.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 From 5a3428b78dfce40f72bb6707029dee79a341e314 Mon Sep 17 00:00:00 2001 From: kennethpi Date: Tue, 18 Jul 2023 13:12:20 +0200 Subject: [PATCH 7/9] DEVEM-535 Updated changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) 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 From 2fa479f6172247c174cc09e6646be96d377152cd Mon Sep 17 00:00:00 2001 From: Hechmi Dammak Date: Thu, 31 Aug 2023 09:27:10 +0100 Subject: [PATCH 8/9] DEVEM-535 replace gradle env and fix publishing url --- .github/workflows/ci.yml | 8 +++----- CHANGELOG.md | 2 +- build.gradle | 15 +-------------- publish.gradle | 4 ++-- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf6551cc..3d5aede4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,12 +3,10 @@ name: CI on: push: workflow_dispatch: - schedule: - - cron: '7 0 * * SUN' env: - ORG_GRADLE_PROJECT_alfresco_nexus_username: ${{ secrets.ALFRESCO_NEXUS_USERNAME }} - ORG_GRADLE_PROJECT_alfresco_nexus_password: ${{ secrets.ALFRESCO_NEXUS_PASSWORD }} - + GRADLE_OPTS: >- + -Dorg.gradle.project.org.alfresco.maven.nexus.username=${{ secrets.ALFRESCO_NEXUS_USERNAME }} + -Dorg.gradle.project.org.alfresco.maven.nexus.password=${{ secrets.ALFRESCO_NEXUS_PASSWORD }} jobs: test: runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index 843bfd88..95ba1192 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ Version template: --> # Dynamic Extensions For Alfresco Changelog -## [4.0.0] - 2023-07-18 +## [3.1.0] - 2023-07-18 ### Added diff --git a/build.gradle b/build.gradle index 9f8c83a4..0d2f0211 100644 --- a/build.gradle +++ b/build.gradle @@ -24,29 +24,16 @@ sonarqube { } } -def copyPropertyValueIfExists(sourcePropertyName, targetPropertyName) { - if (project.hasProperty(sourcePropertyName)) { - project.ext[targetPropertyName] = project.property(sourcePropertyName) - } -} allprojects { group = 'eu.xenit.de' - version = '3.0.0' + version = '3.1.0' boolean isRelease = ci.branch?.startsWith("release") if (!isRelease) { version += "-SNAPSHOT" } - // It is not possible to set properties with a dot via GitHub Actions env variables, therefore we introduce support - // for a non-dotted-equivalent - copyPropertyValueIfExists('alfresco_nexus_username', 'org.alfresco.maven.nexus.username') - copyPropertyValueIfExists('alfresco_nexus_password', 'org.alfresco.maven.nexus.password') - copyPropertyValueIfExists('xenit_docker_registry_url', 'eu.xenit.docker.registry.url') - copyPropertyValueIfExists('xenit_docker_registry_username', 'eu.xenit.docker.registry.username') - copyPropertyValueIfExists('xenit_docker_registry_password', 'eu.xenit.docker.registry.password') - project.pluginManager.withPlugin('java-base') { project.sourceCompatibility = 1.8 } diff --git a/publish.gradle b/publish.gradle index 7f089af8..9696b20a 100644 --- a/publish.gradle +++ b/publish.gradle @@ -34,8 +34,8 @@ publishing { repositories { maven { - def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" - def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" + def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" + def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/" url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl credentials { From 9f20486ed0a98d2057a2d1c2e23b5099176f2554 Mon Sep 17 00:00:00 2001 From: Zlatin Todorinski Date: Wed, 20 Sep 2023 13:33:40 +0200 Subject: [PATCH 9/9] Fix publishing credentials --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d5aede4..a5b332ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: env: GRADLE_OPTS: >- - -Dorg.gradle.project.org.alfresco.maven.nexus.username=${{ secrets.ALFRESCO_NEXUS_USERNAME }} + -Dorg.gradle.project.org.alfresco.maven.nexus.username=${{ secrets.ALFRESCO_NEXUS_USERNAME }} -Dorg.gradle.project.org.alfresco.maven.nexus.password=${{ secrets.ALFRESCO_NEXUS_PASSWORD }} jobs: test: @@ -72,8 +72,8 @@ jobs: env: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVEN_CENTRAL_GPG_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVEN_CENTRAL_GPG_PASSWORD }} - ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - ORG_GRADLE_PROJECT_sonatype_password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.SONATYPE_S01_USERNAME }} + ORG_GRADLE_PROJECT_sonatype_password: ${{ secrets.SONATYPE_S01_PASSWORD }} run: ./gradlew publish -PsigningKeyId=CDE3528F - name: Publish Gradle Plugin if: ${{ startswith(github.ref, 'refs/heads/release') }}