Alfresco · gionn · Mar 21, 2025 · Mar 21, 2025 · Mar 21, 2025
diff --git a/docs/overview.md b/docs/overview.md
@@ -90,24 +90,24 @@ distributions.
 The table below shows the version of the components deployed by the playbook for
 ACS 7.x onward.
 
-| Component           | 23.4 Enterprise (Community) | 7.4 Enterprise | 7.3 Enterprise |
-|---------------------|-----------------------------|----------------|----------------|
-| OpenJDK             | 17.0.14                     | 17.0.14        | 17.0.14        |
-| Apache Tomcat       | 10.1.34                     | 9.0.98         | 9.0.98         |
-| PostgreSQL          | 15.x                        | 14.x           | 14.x           |
-| Apache ActiveMQ     | 5.18.6                      | 5.17.6         | 5.17.6         |
-| Repository          | 23.4.1 (23.4.1)             | 7.4.2.4        | 7.3.2.3        |
-| Share               | 23.4.1 (23.4.1)             | 7.4.2.4        | 7.3.2.3        |
-| Search Services     | 2.0.14                      | 2.0.14         | 2.0.14         |
-| Search Enterprise   | 4.2.0 (n/a)                 | 3.3.3          | 3.2.1          |
-| All-In-One T-Engine | 5.1.6                       | 5.1.6          | 5.1.6          |
-| AOS                 | 3.2.0                       | 1.6.3          | 1.5.0          |
-| Google Docs         | 4.1.0                       | 3.4.2          | 3.4.2          |
-| Digital Workspace   | 5.3.0 (n/a)                 | 5.0.0          | 4.4.1          |
-| Control Center      | 9.3.0                       | 8.0.0          | n/a            |
-| Transform Router    | 4.1.6 (n/a)                 | 4.1.6          | 4.1.6          |
-| Shared File Store   | 4.1.6 (n/a)                 | 4.1.6          | 4.1.6          |
-| Sync Service        | 5.1.0 (n/a)                 | 3.11.3         | 3.11.3         |
+| Component           | 25.1 Enterprise (Community) | 23.4 Enterprise | 7.4 Enterprise | 7.3 Enterprise |
+| ------------------- | --------------------------- | --------------- | -------------- | -------------- |
+| OpenJDK             | 17.0.14                     | 17.0.14         | 17.0.14        | 17.0.14        |
+| Apache Tomcat       | 10.1.39                     | 10.1.39         | 9.0.102        | 9.0.102        |
+| PostgreSQL          | 16.x                        | 15.x            | 14.x           | 14.x           |
+| Apache ActiveMQ     | 5.18.6                      | 5.18.6          | 5.17.6         | 5.17.6         |
+| Repository          | 25.1.0                      | 23.4.1          | 7.4.2.4        | 7.3.2.3        |
+| Share               | 25.1.0                      | 23.4.1          | 7.4.2.4        | 7.3.2.3        |
+| Search Services     | 2.0.15                      | 2.0.15          | 2.0.15         | 2.0.15         |
+| Search Enterprise   | 5.0.0  (n/a)                | 4.2.0           | 3.3.3          | 3.2.1          |
+| All-In-One T-Engine | 5.1.7                       | 5.1.7           | 5.1.7          | 5.1.7          |
+| AOS                 | 3.2.0                       | 3.2.0           | 1.6.3          | 1.5.0          |
+| Google Docs         | 4.1.0                       | 4.1.0           | 3.4.2          | 3.4.2          |
+| Digital Workspace   | 6.0.0 (n/a)                 | 5.3.0           | 5.0.0          | 4.4.1          |
+| Control Center      | 9.4.0                       | 9.3.0           | 8.0.0          | n/a            |
+| Transform Router    | 4.1.7 (n/a)                 | 4.1.7           | 4.1.7          | 4.1.7          |
+| Shared File Store   | 4.1.7 (n/a)                 | 4.1.7           | 4.1.7          | 4.1.7          |
+| Sync Service        | 5.2.0 (n/a)                 | 5.1.0           | 3.11.3         | 3.11.3         |
 
 > Support for ACS 7.2 has been deprecated since February 2025, but you can still use the latest playbook that supported it ([v2.12.0](https://github.com/Alfresco/alfresco-ansible-deployment/releases/tag/v2.12.0))
 > Support for ACS 7.1 has been deprecated since November 2024, but you can still use the latest playbook that supported it ([v2.11.2](https://github.com/Alfresco/alfresco-ansible-deployment/releases/tag/v2.11.2))

diff --git a/docs/playbook-upgrade.md b/docs/playbook-upgrade.md
@@ -6,16 +6,18 @@ title: Upgrading the playbook
 
 ## Unreleased version
 
-### Making roles independent part 2 (to be done)
+### Making roles independent part 2 (future release)
 
 * The goal is to ensure that all roles are completely independent
 * The `common` role will be deprecated and removed
 
+## v4.0.0
+
 ### Making roles independent part 1
 
 * Playbook-managed variables now use the `acs_play_` prefix for consistency.
-* Inventory group variables have been transitioned to playbook group variables,
-  improving portability while slightly altering variable precedence.
+* Inventory group variables have been moved to playbook group variables,
+  improving usability while slightly altering variable precedence.
 * Version-specific variables (defined in `vars/acsXX.yml`) now have a uniform
   precedence level, regardless of the version.
 * Roles now define sensible default values for their arguments, allowing the

diff --git a/roles/tomcat/defaults/main.yml b/roles/tomcat/defaults/main.yml
@@ -2,6 +2,6 @@
 # defaults file for tomcat
 tomcat_home_prefix: /opt/apache-tomcat
 
-tomcat_version: 10.1.34
+tomcat_version: 10.1.39
 tomcat_artifact_url: https://archive.apache.org/dist/tomcat/tomcat-{{ tomcat_version.split('.')[0] }}/v{{ tomcat_version }}/bin/apache-tomcat-{{ tomcat_version }}.tar.gz
 tomcat_artifact_checksum: "sha512:{{ tomcat_artifact_url }}.sha512"
diff --git a/vars/acs23.yml b/vars/acs23.yml
@@ -26,7 +26,7 @@ acs_play_java_version: 17.0.14+7
 acs_play_search_enterprise_version: 4.2.0
 acs_play_sfs_version: 4.1.7
 acs_play_sync_version: 5.1.0
-acs_play_tomcat_version: 10.1.34
+acs_play_tomcat_version: 10.1.39
 acs_play_trouter_version: 4.1.7
 acs_play_transformers_libreoffice_version: 7.2.5.1
 acs_play_transformers_pdf_version: 1.1

diff --git a/vars/acs25.yml b/vars/acs25.yml
@@ -27,7 +27,7 @@ acs_play_java_version: 17.0.14+7
 acs_play_search_enterprise_version: 5.0.0
 acs_play_sfs_version: 4.1.7
 acs_play_sync_version: 5.2.0
-acs_play_tomcat_version: 10.1.34
+acs_play_tomcat_version: 10.1.39
 acs_play_trouter_version: 4.1.7
 acs_play_transformers_libreoffice_version: 7.2.5.1
 acs_play_transformers_pdf_version: 1.1

diff --git a/vars/acs73.yml b/vars/acs73.yml
@@ -16,7 +16,7 @@ acs_play_java_version: 17.0.14+7
 acs_play_search_enterprise_version: 3.2.1
 acs_play_sfs_version: 4.1.7
 acs_play_sync_version: 3.11.3
-acs_play_tomcat_version: 9.0.98
+acs_play_tomcat_version: 9.0.102
 acs_play_trouter_version: 4.1.7
 acs_play_transformers_libreoffice_version: 7.2.5.1
 acs_play_transformers_pdf_version: 1.1

diff --git a/vars/acs74.yml b/vars/acs74.yml
@@ -25,7 +25,7 @@ acs_play_java_version: 17.0.14+7
 acs_play_search_enterprise_version: 3.3.3
 acs_play_sfs_version: 4.1.7
 acs_play_sync_version: 3.11.3
-acs_play_tomcat_version: 9.0.98
+acs_play_tomcat_version: 9.0.102
 acs_play_trouter_version: 4.1.7
 acs_play_transformers_libreoffice_version: 7.2.5.1
 acs_play_transformers_pdf_version: 1.1