Skip to content

Commit

Permalink
Merge branch 'master' into feature/ACS-9069-durable-subscription-fail…
Browse files Browse the repository at this point in the history
…ing-tests
  • Loading branch information
cezary-witkowski committed Dec 13, 2024
2 parents db6a055 + 8359dfb commit 6b5224c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-enterprise-repo</artifactId>
<relativePath>../alfresco-enterprise-repo/pom.xml</relativePath>
<version>25.1.0.11</version>
<version>25.1.0.13</version>
</parent>

<properties>
<dependency.alfresco-enterprise-repo.version>25.1.0.11</dependency.alfresco-enterprise-repo.version>
<dependency.alfresco-enterprise-share.version>25.1.0.10</dependency.alfresco-enterprise-share.version>
<dependency.alfresco-enterprise-repo.version>25.1.0.13</dependency.alfresco-enterprise-repo.version>
<dependency.alfresco-enterprise-share.version>25.1.0.13</dependency.alfresco-enterprise-share.version>

<alfresco.rm-enterprise-rest-api-explorer.version>3.0.2</alfresco.rm-enterprise-rest-api-explorer.version>

<alfresco.s3connector.version>6.1.1</alfresco.s3connector.version>
<alfresco.azure-connector.version>5.0.3</alfresco.azure-connector.version>
<alfresco.salesforce-connector.version>3.2.0</alfresco.salesforce-connector.version>
<alfresco.outlook.version>2.9.0</alfresco.outlook.version>
<alfresco.desktop-sync.version>5.1.0</alfresco.desktop-sync.version>
<alfresco.desktop-sync.version>5.2.0-A1</alfresco.desktop-sync.version>
<alfresco.ais.version>3.1.7</alfresco.ais.version>
<alfresco.hxinsight-connector.version>1.0.1</alfresco.hxinsight-connector.version>

Expand Down
2 changes: 1 addition & 1 deletion tests/environment/.env
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MSSQL_TAG=2019-CU28-ubuntu-20.04
ORACLE_TAG=19.3.0-ee
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
KEYCLOAK_TAG=25.0.6
SYNC_SERVICE_TAG=5.1.0
SYNC_SERVICE_TAG=5.2.0-A1
TRANSFORM_ROUTER_TAG=4.1.5
TRANSFORM_CORE_AIO_TAG=5.1.5
SHARED_FILE_STORE_TAG=4.1.5
Expand Down
2 changes: 1 addition & 1 deletion tests/environment/docker-compose-pipeline-all-amps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ services:
- share

sync-service:
image: quay.io/alfresco/service-sync:5.1.0
image: quay.io/alfresco/service-sync:5.2.0-A1
mem_limit: 1g
environment:
JAVA_OPTS : "
Expand Down

0 comments on commit 6b5224c

Please sign in to comment.