Alfresco · gionn · Jan 3, 2025 · Jan 2, 2025 · Jan 2, 2025 · Jan 2, 2025
diff --git a/.github/updatecli.tpl b/.github/updatecli.tpl
@@ -1,8 +1,8 @@
-name: Update Artifacts for {{ .updatecli_matrix_version }} version using reusable matrix
+name: Update Artifacts for version {{ .updatecli_matrix_version }} in {{ .updatecli_self }}
 
 sources:
 {{- range $key, $artifact := .artifacts }}
-  {{- if $artifact.updatecli_matrix_component_key }}
+  {{- if all $artifact.updatecli_matrix_component_key $artifact.group $artifact.name }}
   src_{{ $key }}:
     name: {{ $artifact.name }}
     kind: maven
@@ -12,17 +12,23 @@ sources:
       artifactid: {{ $artifact.name}}
       {{- $matrix_filter := index $ "matrix" $.updatecli_matrix_version $artifact.updatecli_matrix_component_key }}
       {{- if $matrix_filter }}
+      {{- $pattern := index $matrix_filter "pattern" }}
+      {{- $version := index $matrix_filter "version" }}
       versionFilter:
-        kind: regex
+        kind: {{ if $pattern }}regex{{ else }}semver{{ end }}
         pattern: >-
-          ^{{ index $matrix_filter "version" }}{{ index $matrix_filter "pattern" }}$
+          {{- if $pattern }}
+          ^{{ $version }}{{ $pattern }}$
+          {{- else }}
+          {{ $version }}
+          {{- end }}
       {{- end }}
   {{- end }}
 {{- end }}
 
 targets:
 {{- range $key, $artifact := .artifacts }}
-  {{- if $artifact.updatecli_matrix_component_key }}
+  {{- if all $artifact.updatecli_matrix_component_key $artifact.group $artifact.name }}
   yml_{{ $key }}:
     name: {{ $artifact.name }} yml
     kind: yaml

diff --git a/.github/updatecli_amps.tpl b/.github/updatecli_amps.tpl
@@ -1,34 +1,34 @@
-name: Update AMPs artifacts for {{ .updatecli_matrix_version }} version using acs-packaging repository
+name: Update AMPs artifacts for version {{ .updatecli_matrix_version }} in {{ .updatecli_self }}
 
 scms:
   acsPackaging:
     kind: github
     spec:
       owner: Alfresco
       repository: acs-packaging
-      branch: {{ .updatecli_release_branch }}
+      branch: {{ .updatecli_amps_release_branch }}
       token: {{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }}
       username: {{ requiredEnv "UPDATECLI_GITHUB_USERNAME" }}
   acsEntRepo:
     kind: github
     spec:
       owner: Alfresco
       repository: alfresco-enterprise-repo
-      branch: {{ .updatecli_release_branch }}
+      branch: {{ .updatecli_amps_release_branch }}
       token: {{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }}
       username: {{ requiredEnv "UPDATECLI_GITHUB_USERNAME" }}
   acsComRepo:
     kind: github
     spec:
       owner: Alfresco
       repository: alfresco-community-repo
-      branch: {{ .updatecli_release_branch }}
+      branch: {{ .updatecli_amps_release_branch }}
       token: {{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }}
       username: {{ requiredEnv "UPDATECLI_GITHUB_USERNAME" }}
 
 sources:
 {{- range $key, $artifact := .artifacts }}
-  {{- if $artifact.updatecli_xml_target }}
+  {{- if all $artifact.updatecli_xml_target $artifact.updatecli_scm_id $artifact.name }}
   src_{{ $key }}:
     name: {{ $artifact.name }}
     scmid: {{ $artifact.updatecli_scm_id }}
@@ -41,7 +41,7 @@ sources:
 
 targets:
 {{- range $key, $artifact := .artifacts }}
-  {{- if $artifact.updatecli_xml_target }}
+  {{- if all $artifact.updatecli_xml_target $artifact.updatecli_scm_id $artifact.name }}
   yml_{{ $key }}:
     name: {{ $artifact.name }} yml
     kind: yaml

diff --git a/.github/updatecli_amps_values.yaml b/.github/updatecli_amps_values.yaml
@@ -12,3 +12,6 @@ artifacts:
   alfresco-googledrive-repo-enterprise:
     updatecli_scm_id: acsComRepo
     updatecli_xml_target: "/project/properties/alfresco.googledrive.version"
+  alfresco-googledrive-share:
+    updatecli_scm_id: acsComRepo
+    updatecli_xml_target: "/project/properties/alfresco.googledrive.version"
diff --git a/.github/updatecli_values.yaml b/.github/updatecli_values.yaml
@@ -0,0 +1,48 @@
+---
+artifacts:
+  alfresco-content-services-distribution:
+    updatecli_matrix_component_key: acs
+  alfresco-content-services-community-distribution:
+    updatecli_matrix_component_key: acs
+  alfresco-content-services-share-distribution:
+    updatecli_matrix_component_key: share
+  alfresco-control-center:
+    updatecli_matrix_component_key: adminApp
+  alfresco-digital-workspace:
+    updatecli_matrix_component_key: adw
+  alfresco-shared-file-store-controller:
+    updatecli_matrix_component_key: sfs
+  alfresco-transform-router:
+    updatecli_matrix_component_key: trouter
+  alfresco-ms-teams-springboot:
+    updatecli_matrix_component_key: msteams
+  onedrive-springboot:
+    updatecli_matrix_component_key: onedrive
+  alfresco-elasticsearch-live-indexing:
+    updatecli_matrix_component_key: search-enterprise
+  alfresco-elasticsearch-live-indexing-mediation:
+    updatecli_matrix_component_key: search-enterprise
+  alfresco-elasticsearch-live-indexing-metadata:
+    updatecli_matrix_component_key: search-enterprise
+  alfresco-elasticsearch-live-indexing-path:
+    updatecli_matrix_component_key: search-enterprise
+  alfresco-elasticsearch-live-indexing-content:
+    updatecli_matrix_component_key: search-enterprise
+  alfresco-elasticsearch-reindexing:
+    updatecli_matrix_component_key: search-enterprise
+  alfresco-search-services:
+    updatecli_matrix_component_key: search
+  sync-distribution:
+    updatecli_matrix_component_key: sync
+  alfresco-transform-core-aio:
+    updatecli_matrix_component_key: tengine-aio
+  alfresco-transform-imagemagick:
+    updatecli_matrix_component_key: tengine-im
+  alfresco-transform-libreoffice:
+    updatecli_matrix_component_key: tengine-lo
+  alfresco-transform-misc:
+    updatecli_matrix_component_key: tengine-misc
+  alfresco-pdf-renderer-jar:
+    updatecli_matrix_component_key: tengine-pdf
+  alfresco-transform-tika:
+    updatecli_matrix_component_key: tengine-tika
diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml
@@ -7,6 +7,7 @@ on:
     paths:
       - .github/workflows/bumpVersions.yml
       - .github/updatecli.tpl
+      - .github/updatecli_values.yaml
       - .github/updatecli_amps.tpl
       - .github/updatecli_amps_values.yaml
   workflow_dispatch:
@@ -35,7 +36,7 @@ jobs:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
       - name: Install Updatecli
-        uses: updatecli/updatecli-action@11d8c3e7c4dbb188d9534e599db759e418911828 # v2.73.0
+        uses: updatecli/updatecli-action@4aca518a70708e38063453d8de9c551af7f48ac3 # v2.75.0
 
       - name: Checkout updatecli configs
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -47,9 +48,13 @@ jobs:
       - name: Updatecli apply
         shell: bash
         run: |
-          for i in */artifacts-*.yaml; do
-             updatecli apply -c .github/updatecli.tpl -v ${i} -v alfresco-updatecli/deployments/values/supported-matrix.yaml
-             updatecli apply -c .github/updatecli_amps.tpl -v ${i} -v .github/updatecli_amps_values.yaml
+          set -x
+          find . -type f -name 'artifacts-*.yaml' | while read -r i; do
+             updatecli apply -c .github/updatecli.tpl      -v ${i} -v .github/updatecli_values.yaml -v alfresco-updatecli/deployments/values/supported-matrix.yaml
+
+            if yq -e '.updatecli_amps_release_branch' ${i} > /dev/null; then
+              updatecli apply -c .github/updatecli_amps.tpl -v ${i} -v .github/updatecli_amps_values.yaml
+            fi
           done
         env:
           NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}

diff --git a/adf-apps/acc/artifacts-23.yaml b/adf-apps/acc/artifacts-23.yaml
@@ -1,4 +1,6 @@
 ---
+updatecli_self: adf-apps/acc/artifacts-23.yaml
+updatecli_matrix_version: current
 artifacts:
   alfresco-control-center:
     name: alfresco-control-center

diff --git a/adf-apps/acc/artifacts-73.yaml b/adf-apps/acc/artifacts-73.yaml
@@ -1,4 +1,6 @@
 ---
+updatecli_self: adf-apps/acc/artifacts-73.yaml
+updatecli_matrix_version: 7.3.N
 artifacts:
   alfresco-control-center:
     name: alfresco-control-center

diff --git a/adf-apps/acc/artifacts-74.yaml b/adf-apps/acc/artifacts-74.yaml
@@ -1,4 +1,6 @@
 ---
+updatecli_self: adf-apps/acc/artifacts-74.yaml
+updatecli_matrix_version: 7.4.N
 artifacts:
   alfresco-control-center:
     name: alfresco-control-center

diff --git a/adf-apps/adw/artifacts-23.yaml b/adf-apps/adw/artifacts-23.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: adf-apps/adw/artifacts-23.yaml
+updatecli_matrix_version: current
 artifacts:
   alfresco-digital-workspace:
     name: alfresco-digital-workspace
-    version: 5.1.0
+    version: 5.2.0
     classifier: ".zip"
     group: org.alfresco
     repository: enterprise-releases

diff --git a/adf-apps/adw/artifacts-73.yaml b/adf-apps/adw/artifacts-73.yaml
@@ -1,4 +1,6 @@
 ---
+updatecli_self: adf-apps/adw/artifacts-73.yaml
+updatecli_matrix_version: 7.3.N
 artifacts:
   alfresco-digital-workspace:
     name: alfresco-digital-workspace

diff --git a/adf-apps/adw/artifacts-74.yaml b/adf-apps/adw/artifacts-74.yaml
@@ -1,4 +1,6 @@
 ---
+updatecli_self: adf-apps/adw/artifacts-74.yaml
+updatecli_matrix_version: 7.4.N
 artifacts:
   alfresco-digital-workspace:
     name: alfresco-digital-workspace

diff --git a/ats/sfs/artifacts-23.yaml b/ats/sfs/artifacts-23.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: ats/sfs/artifacts-23.yaml
+updatecli_matrix_version: current
 artifacts:
   alfresco-shared-file-store-controller:
     name: alfresco-shared-file-store-controller
-    version: 4.1.4
+    version: 4.1.5
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/ats/sfs/artifacts-73.yaml b/ats/sfs/artifacts-73.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: ats/sfs/artifacts-73.yaml
+updatecli_matrix_version: 7.3.N
 artifacts:
   alfresco-shared-file-store-controller:
     name: alfresco-shared-file-store-controller
-    version: 2.1.2
+    version: 4.1.5
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/ats/sfs/artifacts-74.yaml b/ats/sfs/artifacts-74.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: ats/sfs/artifacts-74.yaml
+updatecli_matrix_version: 7.4.N
 artifacts:
   alfresco-shared-file-store-controller:
     name: alfresco-shared-file-store-controller
-    version: 4.1.4
+    version: 4.1.5
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/ats/trouter/artifacts-23.yaml b/ats/trouter/artifacts-23.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: ats/trouter/artifacts-23.yaml
+updatecli_matrix_version: current
 artifacts:
   alfresco-transform-router:
     name: alfresco-transform-router
-    version: 4.1.4
+    version: 4.1.5
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/ats/trouter/artifacts-73.yaml b/ats/trouter/artifacts-73.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: ats/trouter/artifacts-73.yaml
+updatecli_matrix_version: 7.3.N
 artifacts:
   alfresco-transform-router:
     name: alfresco-transform-router
-    version: 2.1.2
+    version: 4.1.5
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/ats/trouter/artifacts-74.yaml b/ats/trouter/artifacts-74.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: ats/trouter/artifacts-74.yaml
+updatecli_matrix_version: 7.4.N
 artifacts:
   alfresco-transform-router:
     name: alfresco-transform-router
-    version: 4.1.4
+    version: 4.1.5
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/connector/ms365/artifacts-23.yaml b/connector/ms365/artifacts-23.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: connector/ms365/artifacts-23.yaml
+updatecli_matrix_version: current
 artifacts:
   onedrive-springboot:
     name: onedrive-springboot
-    version: 2.0.3
+    version: 2.0.4
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/connector/ms365/artifacts-73.yaml b/connector/ms365/artifacts-73.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: connector/ms365/artifacts-73.yaml
+updatecli_matrix_version: 7.3.N
 artifacts:
   onedrive-springboot:
     name: onedrive-springboot
-    version: 1.1.3.2
+    version: 2.0.4
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/connector/ms365/artifacts-74.yaml b/connector/ms365/artifacts-74.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: connector/ms365/artifacts-74.yaml
+updatecli_matrix_version: 7.4.N
 artifacts:
   onedrive-springboot:
     name: onedrive-springboot
-    version: 2.0.3
+    version: 2.0.4
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/connector/msteams/artifacts-23.yaml b/connector/msteams/artifacts-23.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: connector/msteams/artifacts-23.yaml
+updatecli_matrix_version: current
 artifacts:
   alfresco-ms-teams-springboot:
     name: alfresco-ms-teams-springboot
-    version: 2.0.3
+    version: 2.0.4
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/connector/msteams/artifacts-73.yaml b/connector/msteams/artifacts-73.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: connector/msteams/artifacts-73.yaml
+updatecli_matrix_version: 7.3.N
 artifacts:
   alfresco-ms-teams-springboot:
     name: alfresco-ms-teams-springboot
-    version: 1.1.0
+    version: 2.0.4
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco

diff --git a/connector/msteams/artifacts-74.yaml b/connector/msteams/artifacts-74.yaml
@@ -1,8 +1,10 @@
 ---
+updatecli_self: connector/msteams/artifacts-74.yaml
+updatecli_matrix_version: 7.4.N
 artifacts:
   alfresco-ms-teams-springboot:
     name: alfresco-ms-teams-springboot
-    version: 2.0.3
+    version: 2.0.4
     classifier: ".jar"
     repository: enterprise-releases
     group: org.alfresco