From 82ec8680d7f4aad40088787fa84cf84156a1d75d Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Mon, 1 Feb 2021 12:15:09 +0200 Subject: [PATCH 1/7] change notificationFrequency to Transaction_Commit (TRANSACTION_COMMIT: The event handler is queued and invoked at the end of the transaction after it has been committed. A proxy around the event handler manages the queuing.) --- .../audit/event/UpdateObjectAuditEvent.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java index 2f6457dabe..569818e58a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java @@ -2,7 +2,7 @@ * #%L * Alfresco Records Management Module * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2020 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -37,6 +37,9 @@ import org.alfresco.repo.policy.annotation.BehaviourKind; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; +import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.TRANSACTION_COMMIT; + + /** * Audits file plan component property updates * @@ -53,7 +56,8 @@ public class UpdateObjectAuditEvent extends AuditEvent implements OnUpdateProper @Behaviour ( kind = BehaviourKind.CLASS, - type = "rma:filePlanComponent" + type = "rma:filePlanComponent", + notificationFrequency = TRANSACTION_COMMIT ) public void onUpdateProperties(NodeRef nodeRef, Map before, Map after) { From a48a5bb8cd3c6f8c949323f4bb4a74540b8d2cb6 Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Mon, 1 Feb 2021 13:39:34 +0200 Subject: [PATCH 2/7] Fix copyright --- .../audit/event/UpdateObjectAuditEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java index 569818e58a..f6eb0d5ef0 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/UpdateObjectAuditEvent.java @@ -2,7 +2,7 @@ * #%L * Alfresco Records Management Module * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - From ec4ce2b513d8a390ddf650e202e6394b3238f609 Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Tue, 2 Feb 2021 12:12:09 +0200 Subject: [PATCH 3/7] added install phase --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 887038834c..712efe379a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_install: - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io -install: skip +install: mvn -B -q clean ${MAVEN_PHASE} stages: - name: Build AGS From 4e694ef4f4b8d9f74ae77125963ae75e10e6b8d0 Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Tue, 2 Feb 2021 12:17:42 +0200 Subject: [PATCH 4/7] travis: remove cache --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 712efe379a..b7619b9fea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,13 +24,6 @@ branches: - /merge\/.*/ - /hotfix\/.*/ -cache: - directories: - - ${HOME}/.m2/repository - -# the cache can grow constantly -before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* - before_install: - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf From 2be18ccfaf681085b737f62e2de6408fa3e87850 Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Tue, 2 Feb 2021 12:34:40 +0200 Subject: [PATCH 5/7] added retry --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b7619b9fea..a942e8b7f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ before_install: - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io -install: mvn -B -q clean ${MAVEN_PHASE} +install: travis_retry travis_wait 40 mvn -B -q clean ${MAVEN_PHASE} stages: - name: Build AGS From b5e79894be736c5ff0d73098d356512d03b1f629 Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Tue, 2 Feb 2021 12:46:25 +0200 Subject: [PATCH 6/7] Added install Phase. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a942e8b7f1..90c481259f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ before_install: - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io -install: travis_retry travis_wait 40 mvn -B -q clean ${MAVEN_PHASE} stages: - name: Build AGS @@ -45,6 +44,8 @@ jobs: include: - name: "Build AGS Community" stage: Build AGS + install: + - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn From bb1fa9e811aa1a7594cc0079a866df062b030c2c Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Wed, 3 Feb 2021 09:10:28 +0200 Subject: [PATCH 7/7] revert cache-remove --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90c481259f..887038834c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,11 +24,19 @@ branches: - /merge\/.*/ - /hotfix\/.*/ +cache: + directories: + - ${HOME}/.m2/repository + +# the cache can grow constantly +before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* + before_install: - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io +install: skip stages: - name: Build AGS @@ -44,8 +52,6 @@ jobs: include: - name: "Build AGS Community" stage: Build AGS - install: - - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn before_script: source scripts/setUpMavenPhase.sh script: - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn