Skip to content

Commit

Permalink
OPSEXP-2777 Bump components for Indus release (#930)
Browse files Browse the repository at this point in the history
  • Loading branch information
gionn authored Aug 30, 2024
1 parent cabb040 commit a07c832
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 81 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/enteprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
workflow_dispatch:

env:
DTAS_VERSION: v1.5.4
DTAS_VERSION: v1.5.5
BUILD_NUMBER: ${{ github.run_id }}
PY_COLORS: 1
PYTHONUNBUFFERED: 1
Expand Down
2 changes: 1 addition & 1 deletion 7.2.N-extra-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ acs:
artifact_name: alfresco-content-services-distribution
edition: Enterprise
repository: "{{ nexus_repository.enterprise_releases }}"
version: 7.2.2.2
version: 7.2.2.4
amps:
aos_module:
repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
Expand Down
6 changes: 3 additions & 3 deletions 7.4.N-extra-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ search:
transform:
artifact_name: alfresco-transform-core-aio
repository: "{{ nexus_repository.releases }}"
version: 5.1.3
version: 5.1.4
trouter:
artifact_name: alfresco-transform-router
repository: "{{ nexus_repository.enterprise_releases }}"
version: 4.1.3
version: 4.1.4
sfs:
artifact_name: alfresco-shared-file-store-controller
repository: "{{ nexus_repository.enterprise_releases }}"
version: 4.1.3
version: 4.1.4
adw:
artifact_name: alfresco-digital-workspace
repository: "{{ nexus_repository.enterprise_releases }}"
Expand Down
10 changes: 5 additions & 5 deletions community-extra-vars.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
acs:
artifact_name: alfresco-content-services-community-distribution
repository: "{{ nexus_repository.releases }}"
version: 23.2.1
version: 23.3.0
edition: Community
api_explorer:
artifact_name: api-explorer
repository: "{{ nexus_repository.releases }}"
version: 23.2.0
version: 23.3.0
transform:
artifact_name: alfresco-transform-core-aio
repository: "{{ nexus_repository.releases }}"
version: 5.1.3
version: 5.1.4
acc:
artifact_name: alfresco-control-center
repository: "{{ nexus_repository.releases }}"
version: 8.4.1
version: 9.0.0
search:
artifact_name: alfresco-search-services
repository: "{{ nexus_repository.releases }}"
version: 2.0.11
amps:
aos_module:
repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
version: 3.0.0
version: 3.1.0
googledrive_repo:
repository: "{{ nexus_repository.releases }}/integrations/alfresco-googledrive-repo-community"
version: 4.1.0
Expand Down
22 changes: 11 additions & 11 deletions docs/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,23 @@ distributions.
The table below shows the version of the components deployed by the playbook for ACS 7.x onward.

| Component | 23.2 Enterprise (Community) | 7.4 Enterprise | 7.3 Enterprise | 7.2 Enterprise | 7.1 Enterprise |
| Component | 23.3 Enterprise (Community) | 7.4 Enterprise | 7.3 Enterprise | 7.2 Enterprise | 7.1 Enterprise |
|---------------------|-----------------------------|----------------|----------------|----------------|----------------|
| OpenJDK | 17.0.11 | 17.0.11 | 11.0.23 | 11.0.23 | 11.0.23 |
| Apache Tomcat | 10.1.25 | 9.0.91 | 9.0.91 | 9.0.91 | 9.0.91 |
| PostgreSQL | 15.x | 14.x | 14.x | 13.x | 13.x |
| Apache ActiveMQ | 5.18.4 | 5.17.6 | 5.17.6 | 5.16.7 | 5.16.7 |
| Repository | 23.2.2 (23.2.1) | 7.4.2.1 | 7.3.2.1 | 7.2.2.1 | 7.1.1.10 |
| Share | 23.2.2 (23.2.1) | 7.4.2.1 | 7.3.2.1 | 7.2.2.1 | 7.1.1.10 |
| Apache ActiveMQ | 5.18.5 | 5.17.6 | 5.17.6 | 5.16.7 | 5.16.7 |
| Repository | 23.3.0 (23.3.0) | 7.4.2.1 | 7.3.2.1 | 7.2.2.1 | 7.1.1.10 |
| Share | 23.3.0 (23.3.0) | 7.4.2.1 | 7.3.2.1 | 7.2.2.1 | 7.1.1.10 |
| Search Services | 2.0.11 | 2.0.11 | 2.0.11 | 2.0.11 | 2.0.2.2 |
| Search Enterprise | 4.0.1 (n/a) | 3.3.3 | 3.2.1 | 3.1.1.1 | 3.1.1.1 |
| All-In-One T-Engine | 5.1.3 | 5.1.3 | 3.1.2 | 3.1.2 | 3.1.2 |
| AOS | 3.0.0 | 1.6.2 | 1.5.0 | 1.4.1 | 1.4.1 |
| Search Enterprise | 4.1.0 (n/a) | 3.3.3 | 3.2.1 | 3.1.1.1 | 3.1.1.1 |
| All-In-One T-Engine | 5.1.4 | 5.1.4 | 3.1.2 | 3.1.2 | 3.1.2 |
| AOS | 3.1.0 | 1.6.2 | 1.5.0 | 1.4.1 | 1.4.1 |
| Google Docs | 4.0.0 | 3.4.2 | 3.3.1 | 3.2.2 | 3.2.1 |
| Digital Workspace | 4.4.1 (n/a) | 4.0.0 | 3.1.0 | 3.0.0 | 2.6.1 |
| Control Center | 8.4.1 | 8.0.0 | n/a | n/a | n/a |
| Transform Router | 4.1.3 (n/a) | 4.1.2 | 2.1.2 | 2.1.2 | 2.1.2 |
| Shared File Store | 4.1.3 (n/a) | 4.1.2 | 2.1.2 | 2.1.2 | 2.1.2 |
| Digital Workspace | 5.0.0 (n/a) | 4.0.0 | 3.1.0 | 3.0.0 | 2.6.1 |
| Control Center | 9.0.0 | 8.0.0 | n/a | n/a | n/a |
| Transform Router | 4.1.4 (n/a) | 4.1.4 | 2.1.2 | 2.1.2 | 2.1.2 |
| Shared File Store | 4.1.4 (n/a) | 4.1.4 | 2.1.2 | 2.1.2 | 2.1.2 |
| Sync Service | 5.0.0 (n/a) | 3.11.3 | 3.11.3 | 3.11.3 | 3.11.3 |

> Support for ACS 7.0 has been deprecated since April 2024, but you can still use the latest playbook that supported it ([v2.6.0](https://github.com/Alfresco/alfresco-ansible-deployment/releases/tag/v2.6.0))
Expand Down
33 changes: 0 additions & 33 deletions galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
### REQUIRED

# The namespace of the collection. This can be a company/ brand/ organization or product namespace under which all
# content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with
# underscores or numbers and cannot contain consecutive underscores
namespace: alfresco

# The name of the collection. Has the same character restrictions as 'namespace'
name: acs

# The version of the collection. Must be compatible with semantic versioning
version: 1.0.0

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md

# A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
# @nicks:irc/im.site#channel'
authors:
- Sergiu Vidrascu
- Lucian Suciu
Expand All @@ -24,38 +11,18 @@ authors:
- Giovanni Toraldo
- Saurabh Lohe

### OPTIONAL but strongly recommended

# A short summary description of the collection
description: A collection that installs Alfresco Content Services.

# Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
# accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
license:
- Apache-2.0

# The path to the license file for the collection. This path is relative to the root of the collection. This key is
# mutually exclusive with 'license'
license_file: LICENSE

# A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
# requirements as 'namespace' and 'name'
tags: ['alfresco']

# Collections that this collection requires to be installed for it to be usable. The key of the dict is the
# collection label 'namespace.name'. The value is a version range
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
# range specifiers can be set and are separated by ','
dependencies: {}

# The URL of the originating SCM repository
repository: https://github.com/Alfresco/alfresco-ansible-deployment

# The URL to any online docs
documentation: https://github.com/Alfresco/alfresco-ansible-deployment/blob/master/docs/README.md

# The URL to the homepage of the collection/project
homepage: https://alfresco.com

# The URL to the collection issue tracker
issues: https://github.com/Alfresco/alfresco-ansible-deployment/issues
20 changes: 10 additions & 10 deletions group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ acs:
artifact_name: alfresco-content-services-distribution
edition: Enterprise
repository: "{{ nexus_repository.enterprise_releases }}"
version: 23.2.2
version: 23.3.0
amps:
aos_module:
repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
version: 3.0.0
version: 3.1.0
device_sync:
repository: >-
{{ nexus_repository.enterprise_releases }}/services/sync/alfresco-device-sync-repo
Expand All @@ -45,39 +45,39 @@ amps:
api_explorer:
artifact_name: api-explorer
repository: "{{ nexus_repository.releases }}"
version: 23.2.0
version: 23.3.0
search_enterprise:
artifact_name: alfresco-elasticsearch-connector-distribution
repository: "{{ nexus_repository.enterprise_releases }}"
version: 4.0.1
version: 4.1.0
search:
artifact_name: alfresco-search-services
repository: "{{ nexus_repository.releases }}"
version: 2.0.11
transform:
artifact_name: alfresco-transform-core-aio
repository: "{{ nexus_repository.releases }}"
version: 5.1.3
version: 5.1.4
trouter:
artifact_name: alfresco-transform-router
repository: "{{ nexus_repository.enterprise_releases }}"
version: 4.1.3
version: 4.1.4
sfs:
artifact_name: alfresco-shared-file-store-controller
repository: "{{ nexus_repository.enterprise_releases }}"
version: 4.1.3
version: 4.1.4
adw:
artifact_name: alfresco-digital-workspace
repository: "{{ nexus_repository.enterprise_releases }}"
version: 4.4.1
version: 5.0.0
sync:
repository: >-
{{ nexus_repository.enterprise_releases }}/services/sync/sync-dist-6.x
version: 5.0.0
acc:
artifact_name: alfresco-control-center
repository: "{{ nexus_repository.releases }}"
version: 8.4.1
version: 9.0.0
supported_os:
RedHat:
versions:
Expand Down Expand Up @@ -183,7 +183,7 @@ use_custom_keystores: false
dependencies_version:
postgresql_connector: 42.6.1
postgres_major_version: 15
activemq: 5.18.4
activemq: 5.18.5
java: 17.0.11
java_build: 9
tomcat: 10.1.25
Expand Down
2 changes: 1 addition & 1 deletion roles/activemq/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ activemq_environment:
- -Xms128m
- -Xmx1g
- $ACTIVEMQ_OPTS
activemq_version: 5.18.4
activemq_version: 5.18.5
12 changes: 6 additions & 6 deletions scripts/updatecli/updatecli_acs23.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
acs:
version: "23.2"
version: "23.3"

adw:
version: "4.4"
version: "5.0"

acc:
version: "8.4"
version: "9.0"

aos:
version: "3.0"
version: "3.1"

apiExplorer:
version: "23.2"
version: "23.3"

dsync:
version: "5.0"
Expand All @@ -23,7 +23,7 @@ search:
version: "2.0"

searchEnterprise:
version: "4.0"
version: "4.1"

transform:
version: "5.1"
Expand Down
8 changes: 4 additions & 4 deletions scripts/updatecli/updatecli_community.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
acs:
version: "23.2"
version: "23.3"
edition: community

acc:
version: "8.4"
version: "9.0"

aos:
version: "3.0"
version: "3.1"

apiExplorer:
version: "23.2"
version: "23.3"

googleDrive:
version: "4.1"
Expand Down
4 changes: 2 additions & 2 deletions tests/test-config-community.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"assertions": {
"acs": {
"edition": "Community",
"version": "23.2.0",
"version": "23.3.0",
"identity": false,
"modules": [
{
Expand All @@ -18,7 +18,7 @@
},
{
"id": "alfresco-aos-module",
"version": "3.0.0",
"version": "3.1.0",
"installed": true
}
]
Expand Down
4 changes: 2 additions & 2 deletions tests/test-config-latest-nosync.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"assertions": {
"acs": {
"edition": "Enterprise",
"version": "23.2.2",
"version": "23.3.0",
"identity": false,
"modules": [
{
Expand All @@ -18,7 +18,7 @@
},
{
"id": "alfresco-aos-module",
"version": "3.0.0",
"version": "3.1.0",
"installed": true
}
]
Expand Down
4 changes: 2 additions & 2 deletions tests/test-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"assertions": {
"acs": {
"edition": "Enterprise",
"version": "23.2.2",
"version": "23.3.0",
"identity": false,
"modules": [
{
Expand All @@ -18,7 +18,7 @@
},
{
"id": "alfresco-aos-module",
"version": "3.0.0",
"version": "3.1.0",
"installed": true
},
{
Expand Down

0 comments on commit a07c832

Please sign in to comment.