Merge pull request #365 from xenit-eu/master

Add Alfresco 7.4
xenit-eu · Sep 20, 2023 · 37af851 · 37af851
2 parents fb6be4d + 929d929
commit 37af851
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 45 deletions.
diff --git 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
@@ -49,7 +47,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'
@@ -74,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') }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,12 @@ Version template:
  -->
 # Dynamic Extensions For Alfresco Changelog
 
+## [3.1.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
@@ -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
@@ -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
diff --git 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/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"
     ]
 }
diff --git a/integration-tests/alfresco-community-74/overload.gradle 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'
+}
diff --git 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'
 }
diff --git 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'
 }
diff --git 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'
 }
diff --git 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'
 }
diff --git 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'
 }
diff --git 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'
 }
diff --git a/integration-tests/alfresco-enterprise-74/overload.gradle 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'
+}
diff --git 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/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 {

diff --git 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',