Merge pull request #347 from xenit-eu/alfresco-7.2

Alfresco 7.2 compatibility
xenit-eu · Apr 4, 2022 · 28a8886 · 28a8886
2 parents 8f163f4 + f4cdaef
commit 28a8886
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 5 deletions.
diff --git a/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-72/module.properties b/alfresco-dynamic-extensions-repo/alfresco-dynamic-extensions-repo-72/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.2.0
+module.repo.version.max=7.2.99
diff --git a/alfresco-dynamic-extensions-repo/build.gradle b/alfresco-dynamic-extensions-repo/build.gradle
@@ -47,7 +47,9 @@ subprojects {
             blueprint(project(":blueprint-integration:blueprint-integration-spring-5"))
         }
 
-        if (project.name.endsWith('-70') || project.name.endsWith('-71')) {
+        PrintWriter writer = null;
+        writer.println("project name: "+project.name);
+        if (project.name.matches("alfresco-dynamic-extensions-repo-7\\d*")) {
             ampLib project(':webscripts:webscripts-70')
         } else {
             ampLib project(':webscripts:webscripts-50')

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -7,7 +7,8 @@ ext {
             "61": "6.1.2-ga",
             "62": "6.2.0-ga",
             "70": "7.0.0",
-            "71": "7.1.1"
+            "71": "7.1.1",
+            "72": "7.2.0"
     ]
 
     springVersions = [
@@ -18,7 +19,8 @@ ext {
             "61": "5.1.3.RELEASE",
             "62": "5.1.8.RELEASE",
             "70": "5.3.3.RELEASE",
-            "71": "5.3.9.RELEASE"
+            "71": "5.3.9.RELEASE",
+            "72": "5.3.15.RELEASE"
     ]
 
     geminiVersions = [
@@ -29,6 +31,7 @@ ext {
             "61": "3.0.0.M01",
             "62": "3.0.0.M01",
             "70": "3.0.0.M01",
-            "71": "3.0.0.M01"
+            "71": "3.0.0.M01",
+            "72": "3.0.0.M01"
     ]
 }
diff --git a/integration-tests/alfresco-community-72/overload.gradle b/integration-tests/alfresco-community-72/overload.gradle
@@ -0,0 +1,8 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-community-packaging:7.2.0'
+    alfrescoBaseWar = 'org.alfresco:content-services-community@war'
+
+    alfrescoBaseImage = 'xenit/alfresco-repository-community:7.2.0'
+
+    postgresImage = 'postgres:13'
+}
diff --git a/integration-tests/alfresco-enterprise-72/overload.gradle b/integration-tests/alfresco-enterprise-72/overload.gradle
@@ -0,0 +1,8 @@
+ext {
+    alfrescoBaseWarBom = 'org.alfresco:acs-packaging:7.2.0'
+    alfrescoBaseWar = 'org.alfresco:content-services@war'
+
+    alfrescoBaseImage = 'hub.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:7.2.0'
+
+    postgresImage = 'postgres:13'
+}
diff --git a/settings.gradle b/settings.gradle
@@ -23,7 +23,7 @@ include 'gradle-plugin'
 
 include 'polyfill:polyfill-alfresco-50'
 
-def supportedAlfrescoVersions = ["50", "51", "52", "60", "61", "62", "70", "71"]
+def supportedAlfrescoVersions = ["50", "51", "52", "60", "61", "62", "70", "71", "72"]
 def alfrescoDependentModules =
         [
                 'alfresco-dynamic-extensions-repo',