Merge pull request #208 from xenit-eu/DOCKER-450

DOCKER-450 [Add] Support for Alfresco v23.1 && v23.2

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ "community-6.1.2-ga","community-6.2.0-ga","community-7.0.0", "community-7.1.1", "community-7.2.0", "community-7.3.0", "community-7.4.0", "enterprise-6.1.1","enterprise-6.2.2","enterprise-7.0.1", "enterprise-7.1.0", "enterprise-7.2.0", "enterprise-7.3.0", "enterprise-7.4.0" ]
+        version: [ "community-7.0.0", "community-7.1.1", "community-7.2.0", "community-7.3.0", "community-7.4.0", "community-23.1.0", "community-23.2.0", "enterprise-7.0.1", "enterprise-7.1.0", "enterprise-7.2.0", "enterprise-7.3.0", "enterprise-7.4.0", "enterprise-23.1.0", "enterprise-23.2.0" ]
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
       - name: Set up JDK 17
@@ -114,4 +114,4 @@ jobs:
         uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2
         with:
           cache-read-only: false
-          arguments: :tomcat-base:tomcat-embedded-8.5:publish :tomcat-base:tomcat-embedded-9:publish --info -PsigningKeyId=CDE3528F
+          arguments: :tomcat-base:tomcat-embedded-9:publish :tomcat-base:tomcat-embedded-10:publish --info -PsigningKeyId=CDE3528F

1alfresco-skeleton/23.1/overload.gradle

@@ -0,0 +1,11 @@
+ext {
+    alfresco = [
+            version: [
+                    major: 23,
+                    minor: 1,
+                    rev: 0
+            ],
+            flavor: 'skeleton'
+    ]
+}
+

1alfresco-skeleton/23.2/overload.gradle

@@ -0,0 +1,11 @@
+ext {
+    alfresco = [
+            version: [
+                    major: 23,
+                    minor: 2,
+                    rev: 0
+            ],
+            flavor: 'skeleton'
+    ]
+}
+

1share-skeleton/23.1/overload.gradle

@@ -0,0 +1,10 @@
+ext {
+    share = [
+            version: [
+                    major: 23,
+                    minor: 1,
+                    rev: 0
+            ],
+            flavor: 'skeleton'
+    ]
+}

1share-skeleton/23.2/overload.gradle

@@ -0,0 +1,10 @@
+ext {
+    share = [
+            version: [
+                    major: 23,
+                    minor: 2,
+                    rev: 0
+            ],
+            flavor: 'skeleton'
+    ]
+}

2repository/23.1/community-23.1.0/overload.gradle

@@ -0,0 +1,23 @@
+ext {
+    alfresco = [
+            version: [
+                    major: 23,
+                    minor: 1,
+                    rev  : 0,
+                    label: 1
+            ],
+            flavor : 'community'
+    ]
+    solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2'
+    shareimage = 'docker.io/xenit/alfresco-share-community:23.1.0'
+    psqlimage = 'postgres:15'
+    tests = true
+    alfrescoBomVersion='23.1.0'
+}
+
+dependencies {
+    alfrescoAmp platform("org.alfresco:acs-community-packaging:$alfrescoBomVersion")
+    alfrescoAmp 'org.alfresco:alfresco-share-services@amp'
+    baseAlfrescoWar platform("org.alfresco:acs-community-packaging:$alfrescoBomVersion")
+    baseAlfrescoWar 'org.alfresco:content-services-community@war'
+}

2repository/6.1/enterprise-6.1.1/overload.gradle → 2repository/23.1/enterprise-23.1.0/overload.gradle

@@ -1,18 +1,18 @@
 ext {
     alfresco = [
             version: [
-                    major: 6,
+                    major: 23,
                     minor: 1,
-                    rev  : 1,
-                    label: 11
+                    rev  : 0,
+                    label: 1
             ],
             flavor : 'enterprise'
     ]
-    solrimage = 'docker.io/xenit/alfresco-solr6:1.3.0.1'
-    shareimage = 'docker.io/xenit/alfresco-share-community:6.1.0.2'
-    psqlimage = 'docker.io/xenit/postgres:11'
+    solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2'
+    shareimage = 'docker.io/xenit/alfresco-share-community:23.1.0'
+    psqlimage = 'postgres:15'
     tests = true
-    alfrescoBomVersion = '6.1.1.11'
+    alfrescoBomVersion = '23.1.0'
 }
 
 dependencies {
@@ -21,4 +21,3 @@ dependencies {
     baseAlfrescoWar platform("org.alfresco:acs-packaging:$alfrescoBomVersion")
     baseAlfrescoWar 'org.alfresco:content-services@war'
 }
-

2repository/23.2/community-23.2.0/overload.gradle

@@ -0,0 +1,23 @@
+ext {
+    alfresco = [
+            version: [
+                    major: 23,
+                    minor: 2,
+                    rev  : 0,
+                    label: 1
+            ],
+            flavor : 'community'
+    ]
+    solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2'
+    shareimage = 'docker.io/xenit/alfresco-share-community:23.2.0'
+    psqlimage = 'postgres:15'
+    tests = true
+    alfrescoBomVersion='23.2.0'
+}
+
+dependencies {
+    alfrescoAmp platform("org.alfresco:acs-community-packaging:$alfrescoBomVersion")
+    alfrescoAmp 'org.alfresco:alfresco-share-services@amp'
+    baseAlfrescoWar platform("org.alfresco:acs-community-packaging:$alfrescoBomVersion")
+    baseAlfrescoWar 'org.alfresco:content-services-community@war'
+}

2repository/6.2/enterprise-6.2.2/overload.gradle → 2repository/23.2/enterprise-23.2.0/overload.gradle

@@ -1,23 +1,23 @@
 ext {
     alfresco = [
             version: [
-                    major: 6,
+                    major: 23,
                     minor: 2,
-                    rev  : 2,
-                    label: 25
+                    rev  : 0,
+                    label: 1
             ],
             flavor : 'enterprise'
     ]
-    solrimage = 'docker.io/xenit/alfresco-solr6:2.0.1'
-    shareimage = 'docker.io/xenit/alfresco-share-community:6.2.0'
-    psqlimage = 'docker.io/xenit/postgres:11.7'
+    solrimage = 'docker.io/xenit/alfresco-solr6:2.0.8.2'
+    shareimage = 'docker.io/xenit/alfresco-share-community:23.2.0'
+    psqlimage = 'postgres:15'
     tests = true
-    alfrescoBomVersion = '6.2.2.25'
+    alfrescoBomVersion = '23.2.0'
 }
 
 dependencies {
     alfrescoAmp platform("org.alfresco:acs-packaging:$alfrescoBomVersion")
     alfrescoAmp 'org.alfresco:alfresco-share-services@amp'
     baseAlfrescoWar platform("org.alfresco:acs-packaging:$alfrescoBomVersion")
     baseAlfrescoWar 'org.alfresco:content-services@war'
-}
+}

2share/6.1/community-6.1.0/overload.gradle → 2share/23.1/community-23.1.0/overload.gradle

@@ -1,16 +1,16 @@
 ext {
     share = [
             version: [
-                    major: 6,
+                    major: 23,
                     minor: 1,
-                    rev: '1',
-                    label: '4'
+                    rev: 0,
+                    label: 1
             ],
             flavor: 'community'
     ]
 }
 
 dependencies {
-    baseShareWar 'org.alfresco:share:6.1.1.4@war'
+    baseShareWar 'org.alfresco:share:23.1.1.2@war'
 }
 

2share/6.2/community-6.2.2/overload.gradle → 2share/23.2/community-23.2.0/overload.gradle

@@ -1,16 +1,16 @@
 ext {
     share = [
             version: [
-                    major: 6,
+                    major: 23,
                     minor: 2,
-                    rev: '2',
-                    label: '7'
+                    rev: 0,
+                    label: 1
             ],
             flavor: 'community'
     ]
 }
 
 dependencies {
-    baseShareWar 'org.alfresco:share:6.2.2.7@war'
+    baseShareWar 'org.alfresco:share:23.2.0.72@war'
 }
 

Changelog.md

@@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 * [PR #110](https://github.com/xenit-eu/docker-alfresco/pull/110) XM2C-81 fix alfresco environment and default system properties
 
 ### Added
-
+* [PR #208](https://xenitsupport.jira.com/browse/DOCKER-450) DOCKER-450 Add Alfresco V23.1 & V23.2 support
 * [PR #98](https://github.com/xenit-eu/docker-alfresco/pull/98) XM2C-43 Merge docker-share into docker-alfresco
 * [PR #88](https://github.com/xenit-eu/docker-alfresco/pull/88) DOCKER-415 Add a healthcheck for Alfresco
 * [PR #86](https://github.com/xenit-eu/docker-alfresco/pull/86) DOCKER-414 Fix alf_data content store permissions

build.gradle

@@ -55,16 +55,17 @@ def calcRepository(flavor, isAlfresco) {
 
 String getTomcatProject(majorVersion) {
     println "major version used : ${majorVersion}"
-    if (majorVersion == 6) {
-        println 'tomcat-embedded-8.5'
-        return ":tomcat-base:tomcat-embedded-8.5"
-    }
 
     if (majorVersion == 7) {
         println 'tomcat-embedded-9'
         return ":tomcat-base:tomcat-embedded-9"
     }
 
+    if (majorVersion == 23) {
+        println 'tomcat-embedded-10'
+        return ":tomcat-base:tomcat-embedded-10"
+    }
+
     return null
 }
 
@@ -100,3 +101,15 @@ subprojects {
         }
     }
 }
+
+// Remove when Alfresco V7.X support is dropped.
+project(":tomcat-base:tomcat-embedded-9") {
+    sonarqube {
+        skipProject = true
+    }
+}
+project(":tomcat-base:tomcat-embedded-10") {
+    sonarqube {
+        skipProject = true
+    }
+}