From 535ed84072fd95d4888b285005c511440633d1ef Mon Sep 17 00:00:00 2001 From: cturlica Date: Tue, 22 Sep 2020 14:18:32 +0300 Subject: [PATCH 1/3] MNT-20250: Model updates not working for deployment in cluster - broadcast dictionary cache refresh events --- .travis.yml | 5 +++-- pom.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4920d6d065..ffd4858147 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ branches: only: - master - /support\/.*/ + - fix/MNT-20250 stages: - test @@ -110,7 +111,7 @@ jobs: script: travis_wait 20 mvn test -B -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver - stage: release name: "Push to Nexus" - if: fork = false AND (branch = master OR branch =~ /support\/.*/) AND type != pull_request AND commit_message !~ /\[no-release\]/ + if: fork = false AND (branch = master OR branch =~ /support\/.*/ OR branch = fix/MNT-20250) AND type != pull_request AND commit_message !~ /\[no-release\]/ before_install: - "cp .travis.settings.xml $HOME/.m2/settings.xml" script: @@ -119,4 +120,4 @@ jobs: # Add email to link commits to user - git config user.email "${GIT_EMAIL}" # Skip building of release commits - - mvn --batch-mode -q -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform + - mvn --batch-mode -q -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests -DreleaseVersion=MNT-20250 -DdevelopmentVersion=8.277-SNAPSHOT release:clean release:prepare release:perform diff --git a/pom.xml b/pom.xml index 022f5ced70..8cd343448f 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 11 - 8.152 + MNT-20250 8.49 6.2 From 7711a94ff3f8100f63226c9d8cd2d60f92edf1b7 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 22 Sep 2020 12:01:01 +0000 Subject: [PATCH 2/3] [maven-release-plugin][skip ci] prepare release alfresco-repository-MNT-20250 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8cd343448f..3bc268796a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - 8.277-SNAPSHOT + MNT-20250 jar org.alfresco @@ -14,7 +14,7 @@ scm:git:https://github.com/Alfresco/alfresco-repository.git scm:git:https://github.com/Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - HEAD + alfresco-repository-MNT-20250 From d2fc27ee743904a13f0da7345dfe6b30493d2eed Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 22 Sep 2020 12:01:10 +0000 Subject: [PATCH 3/3] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3bc268796a..8cd343448f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-repository Alfresco Repository - MNT-20250 + 8.277-SNAPSHOT jar org.alfresco @@ -14,7 +14,7 @@ scm:git:https://github.com/Alfresco/alfresco-repository.git scm:git:https://github.com/Alfresco/alfresco-repository.git https://github.com/Alfresco/alfresco-repository - alfresco-repository-MNT-20250 + HEAD