From 9de79cfc69d14086e5e6f6835f4c51cb5cb4c751 Mon Sep 17 00:00:00 2001 From: mpichura Date: Wed, 9 Aug 2023 13:19:11 +0200 Subject: [PATCH] Update ServicePack branch to 7.4.2 [skip ci] --- .github/workflows/master_release.yml | 6 +++--- dev/dev-acs-amps-overlay/pom.xml | 2 +- dev/dev-repo-amps-overlay/pom.xml | 2 +- dev/dev-share-amps-overlay/pom.xml | 2 +- dev/dev-tomcat/pom.xml | 2 +- dev/pom.xml | 2 +- distribution-ags/pom.xml | 2 +- distribution-share/pom.xml | 2 +- distribution/pom.xml | 2 +- docker-alfresco/ags/pom.xml | 2 +- docker-alfresco/aws/pom.xml | 2 +- docker-alfresco/pom.xml | 2 +- docker-share/ags/pom.xml | 2 +- docker-share/aws/pom.xml | 2 +- docker-share/pom.xml | 2 +- pom.xml | 2 +- tests/pipeline-all-amps/pom.xml | 2 +- tests/pipeline-all-amps/repo/pom.xml | 2 +- tests/pipeline-all-amps/share/pom.xml | 2 +- tests/pom.xml | 2 +- tests/tas-all-amps/pom.xml | 2 +- tests/tas-cmis/pom.xml | 2 +- tests/tas-distribution-zip/pom.xml | 2 +- tests/tas-elasticsearch/pom.xml | 2 +- tests/tas-email/pom.xml | 2 +- tests/tas-integration/pom.xml | 2 +- tests/tas-mtls/pom.xml | 2 +- tests/tas-restapi/pom.xml | 2 +- tests/tas-sync-service/pom.xml | 2 +- tests/tas-webdav/pom.xml | 2 +- tests/testcontainers-env/pom.xml | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/master_release.yml b/.github/workflows/master_release.yml index 935a377b18..3008be20d9 100644 --- a/.github/workflows/master_release.yml +++ b/.github/workflows/master_release.yml @@ -21,9 +21,9 @@ env: QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} GITHUB_ACTIONS_DEPLOY_TIMEOUT: 60 BASE_BUILD_NUMBER: 10000 - # Release version has to start with real version (7.4.1-....) for the docker image to build successfully. - RELEASE_VERSION: 7.4.1 - DEVELOPMENT_VERSION: 7.4.2-A1-SNAPSHOT + # Release version has to start with real version (7.4.2-....) for the docker image to build successfully. + RELEASE_VERSION: 7.4.2-A1 + DEVELOPMENT_VERSION: 7.4.2-SNAPSHOT jobs: run_ci: diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml index cbf11c8455..e2d03953cd 100644 --- a/dev/dev-acs-amps-overlay/pom.xml +++ b/dev/dev-acs-amps-overlay/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-dev-tomcat-env - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/dev/dev-repo-amps-overlay/pom.xml b/dev/dev-repo-amps-overlay/pom.xml index 505472995e..d7eec5db3c 100644 --- a/dev/dev-repo-amps-overlay/pom.xml +++ b/dev/dev-repo-amps-overlay/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-dev-tomcat-env - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/dev/dev-share-amps-overlay/pom.xml b/dev/dev-share-amps-overlay/pom.xml index f265e645b7..a2f1d9d94a 100644 --- a/dev/dev-share-amps-overlay/pom.xml +++ b/dev/dev-share-amps-overlay/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-dev-tomcat-env - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/dev/dev-tomcat/pom.xml b/dev/dev-tomcat/pom.xml index 31b5e95f8a..3cc4c955d2 100644 --- a/dev/dev-tomcat/pom.xml +++ b/dev/dev-tomcat/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-dev-tomcat-env - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/dev/pom.xml b/dev/pom.xml index 1449e090a9..3d38fb17eb 100644 --- a/dev/pom.xml +++ b/dev/pom.xml @@ -9,7 +9,7 @@ org.alfresco acs-packaging - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/distribution-ags/pom.xml b/distribution-ags/pom.xml index 8236b3b714..1e97425823 100644 --- a/distribution-ags/pom.xml +++ b/distribution-ags/pom.xml @@ -8,7 +8,7 @@ org.alfresco acs-packaging - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/distribution-share/pom.xml b/distribution-share/pom.xml index fb56ed040b..f80a69d9e6 100644 --- a/distribution-share/pom.xml +++ b/distribution-share/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-packaging - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/distribution/pom.xml b/distribution/pom.xml index 06029dd07e..8be8944741 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -8,7 +8,7 @@ org.alfresco acs-packaging - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/docker-alfresco/ags/pom.xml b/docker-alfresco/ags/pom.xml index 32807f3566..90b6945725 100644 --- a/docker-alfresco/ags/pom.xml +++ b/docker-alfresco/ags/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-services-docker - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT alfresco/alfresco-governance-repository-enterprise diff --git a/docker-alfresco/aws/pom.xml b/docker-alfresco/aws/pom.xml index f89dc04824..6c590560d4 100644 --- a/docker-alfresco/aws/pom.xml +++ b/docker-alfresco/aws/pom.xml @@ -8,7 +8,7 @@ org.alfresco content-services-docker - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml index c29e2a0ff0..8ff3bd8712 100644 --- a/docker-alfresco/pom.xml +++ b/docker-alfresco/pom.xml @@ -8,7 +8,7 @@ org.alfresco acs-packaging - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml index be1c8b7e4d..1e208bf78b 100644 --- a/docker-share/ags/pom.xml +++ b/docker-share/ags/pom.xml @@ -8,7 +8,7 @@ org.alfresco share-docker - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/docker-share/aws/pom.xml b/docker-share/aws/pom.xml index fc99b23375..40a0a2454e 100644 --- a/docker-share/aws/pom.xml +++ b/docker-share/aws/pom.xml @@ -7,7 +7,7 @@ org.alfresco share-docker - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/docker-share/pom.xml b/docker-share/pom.xml index 39711f6dc2..d28720fff3 100644 --- a/docker-share/pom.xml +++ b/docker-share/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-packaging - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index 60c0b28576..6cdbdb2d13 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ acs-packaging pom Alfresco Content Services Packaging - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT org.alfresco diff --git a/tests/pipeline-all-amps/pom.xml b/tests/pipeline-all-amps/pom.xml index b6ddb2568d..4bd12870cb 100644 --- a/tests/pipeline-all-amps/pom.xml +++ b/tests/pipeline-all-amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT ../pom.xml diff --git a/tests/pipeline-all-amps/repo/pom.xml b/tests/pipeline-all-amps/repo/pom.xml index de9e0f0b81..bf41b7c05d 100644 --- a/tests/pipeline-all-amps/repo/pom.xml +++ b/tests/pipeline-all-amps/repo/pom.xml @@ -5,7 +5,7 @@ org.alfresco pipeline-all-amps - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT alfresco-pipeline-all-amps-repo diff --git a/tests/pipeline-all-amps/share/pom.xml b/tests/pipeline-all-amps/share/pom.xml index d9db51f451..6a6b90af04 100644 --- a/tests/pipeline-all-amps/share/pom.xml +++ b/tests/pipeline-all-amps/share/pom.xml @@ -5,7 +5,7 @@ org.alfresco pipeline-all-amps - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT alfresco-pipeline-all-amps-share diff --git a/tests/pom.xml b/tests/pom.xml index fa2a520649..bc108a0e0d 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-packaging - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-all-amps/pom.xml b/tests/tas-all-amps/pom.xml index 8888eea2a8..00d39a05a8 100644 --- a/tests/tas-all-amps/pom.xml +++ b/tests/tas-all-amps/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml index 093eebc24b..a91e7bee7e 100644 --- a/tests/tas-cmis/pom.xml +++ b/tests/tas-cmis/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-distribution-zip/pom.xml b/tests/tas-distribution-zip/pom.xml index fd901192e6..2eaa8351a3 100644 --- a/tests/tas-distribution-zip/pom.xml +++ b/tests/tas-distribution-zip/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-elasticsearch/pom.xml b/tests/tas-elasticsearch/pom.xml index e82e58100d..789dbd764c 100644 --- a/tests/tas-elasticsearch/pom.xml +++ b/tests/tas-elasticsearch/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml index dc57115eff..f9a2a8ba1b 100644 --- a/tests/tas-email/pom.xml +++ b/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml index 4c6a28ba8c..9afae61a5c 100644 --- a/tests/tas-integration/pom.xml +++ b/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-mtls/pom.xml b/tests/tas-mtls/pom.xml index ff237d309e..cb2c00cb85 100644 --- a/tests/tas-mtls/pom.xml +++ b/tests/tas-mtls/pom.xml @@ -8,7 +8,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml index 36d34c829c..63d9a705cc 100644 --- a/tests/tas-restapi/pom.xml +++ b/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-sync-service/pom.xml b/tests/tas-sync-service/pom.xml index 41a2db2f4b..939109b492 100644 --- a/tests/tas-sync-service/pom.xml +++ b/tests/tas-sync-service/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml index c7f238ce02..fcb2111b39 100644 --- a/tests/tas-webdav/pom.xml +++ b/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT diff --git a/tests/testcontainers-env/pom.xml b/tests/testcontainers-env/pom.xml index 27af957556..3ae6ad60ba 100644 --- a/tests/testcontainers-env/pom.xml +++ b/tests/testcontainers-env/pom.xml @@ -9,7 +9,7 @@ org.alfresco content-repository-tests - 7.4.2-A1-SNAPSHOT + 7.4.2-SNAPSHOT