From b6562142d1beb574e8dd7ff8c7eb532077f4e45a Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Thu, 26 Jul 2018 11:13:26 +0300 Subject: [PATCH 01/13] compare the new version of module currently being installed with the one installed --- .../compatibility/ModulePatchComponent.java | 94 +++++++++++-------- 1 file changed, 57 insertions(+), 37 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java index 92524b0bf2..de5c99fadf 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java @@ -27,6 +27,8 @@ package org.alfresco.module.org_alfresco_module_rm.patch.compatibility; +import static org.alfresco.repo.module.ModuleVersionNumber.VERSION_ZERO; + import java.io.Serializable; import org.alfresco.module.org_alfresco_module_rm.patch.ModulePatchExecuterImpl; @@ -117,49 +119,63 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent @Override protected void executeInternal() { - ModuleVersionNumber moduleInstalledVersionNumber = getModuleVersionNumber(REGISTRY_PROPERTY_INSTALLED_VERSION); - ModuleVersionNumber moduleCurrentVersionNumber = getModuleVersionNumber(REGISTRY_PROPERTY_CURRENT_VERSION); - - String moduleName = getName(); + //Get the new module version + String moduleId = modulePatchExecuter.getModuleId(); + ModuleVersionNumber moduleNewVersionNumber = moduleService.getModule(moduleId).getModuleVersionNumber(); - if (isVersionLaterThan(moduleInstalledVersionNumber, moduleCurrentVersionNumber)) + // Get the module details from the registry + ModuleVersionNumber moduleCurrentVersionNumber = getModuleVersionNumber(REGISTRY_PROPERTY_CURRENT_VERSION, + moduleId); + // Get the module patch component name + String moduleName = getName(); + if (moduleCurrentVersionNumber.equals(VERSION_ZERO) || + moduleCurrentVersionNumber.equals(moduleNewVersionNumber)) // No previous record of it { - LOGGER.info("Module patch component '{}' is skipped for upgrade from version {} to version {}", - moduleName, moduleInstalledVersionNumber, moduleCurrentVersionNumber); + LOGGER.info("Module patch component '{}' is skipped, no previous version found.", moduleName); } else { - try + if (isVersionLaterThan(moduleCurrentVersionNumber, moduleNewVersionNumber)) { - LOGGER.info("Module patch component '{}' is executing ...", moduleName); - - // execute path within an isolated transaction - retryingTransactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback() + LOGGER.info("Module patch component '{}' is skipped for upgrade from version {} to version {}", + moduleName, moduleCurrentVersionNumber, moduleNewVersionNumber); + } + else + { + try { - @Override - public Void execute() + LOGGER.info("Module patch component '{}' is executing ...", moduleName); + + // execute path within an isolated transaction + retryingTransactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback() + { - behaviourFilter.disableBehaviour(); - try + @Override + public Void execute() { - executePatch(); + behaviourFilter.disableBehaviour(); + try + { + executePatch(); + } + finally + { + behaviourFilter.enableBehaviour(); + } + return null; } - finally - { - behaviourFilter.enableBehaviour(); - } - return null; - } - }, false, true); + }, false, true); - LOGGER.info(" ... completed module patch '{}'", moduleName); - - } catch (Exception exception) - { - // record the exception otherwise it gets swallowed - LOGGER.info(" ... error encountered. {}", exception.getMessage(), exception); - throw exception; + LOGGER.info(" ... completed module patch '{}'", moduleName); + + } + catch (Exception exception) + { + // record the exception otherwise it gets swallowed + LOGGER.info(" ... error encountered. {}", exception.getMessage(), exception); + throw exception; + } } } } @@ -167,9 +183,8 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent /** * Helper method to get the ModuleVersionNumber. */ - private ModuleVersionNumber getModuleVersionNumber(String registryProperty) + private ModuleVersionNumber getModuleVersionNumber(String registryProperty, String moduleId) { - String moduleId = modulePatchExecuter.getModuleId(); RegistryKey moduleKeyVersion = new RegistryKey(ModuleComponentHelper.URI_MODULES_1_0, new String[]{REGISTRY_PATH_MODULES, moduleId, registryProperty}); Serializable moduleVersion = this.registryService.getProperty(moduleKeyVersion); @@ -182,22 +197,27 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent * patches. * */ - private boolean isVersionLaterThan(ModuleVersionNumber installedModuleVersionNumber, - ModuleVersionNumber currentModuleVersionNumber) + private boolean isVersionLaterThan(ModuleVersionNumber moduleCurrentVersionNumber, + ModuleVersionNumber moduleNewVersionNumber) { // assume that the v2.0 and v2.1 patches should be run boolean versionLaterThan = false; // if this is an upgrade as opposed to a fresh install - if (installedModuleVersionNumber.compareTo(currentModuleVersionNumber) != 0) + if (moduleCurrentVersionNumber.compareTo(moduleNewVersionNumber) < 0) { // if the installed version is later than the minimum version number of this patch ModuleVersionNumber minVersion = this.getAppliesFromVersionNumber(); - if (installedModuleVersionNumber.compareTo(minVersion) >= 0) + if (moduleCurrentVersionNumber.compareTo(minVersion) >= 0) { versionLaterThan = true; } } + // v2.0 and v2.1 patches should not be run when both the current and the new version numbers are equals + else + { + versionLaterThan =true; + } return versionLaterThan; } From d03e2e2b23179de89951bbdf830f919eb6d4bc2b Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 16 Jul 2018 15:49:36 +0100 Subject: [PATCH 02/13] RM-6428 Add script to handle tagging with the image digest. --- scripts/pushDockerDigestTag.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 scripts/pushDockerDigestTag.sh diff --git a/scripts/pushDockerDigestTag.sh b/scripts/pushDockerDigestTag.sh new file mode 100644 index 0000000000..a705eb9e0e --- /dev/null +++ b/scripts/pushDockerDigestTag.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +scriptName=`basename "$0"` + +if [ "$#" -ne 2 ]; then + echo "Usage: ${scriptName} " + exit 1 +fi + +echo "${scriptName} called with:" +image=$1 +echo " image: $image" +existingTag=$2 +echo " existingTag: $existingTag" + +DIGEST_LENGTH=12 + +# Note that this command should work even if the image is already present locally. +digest=`docker pull ${image}:${existingTag} | grep "Digest:" | awk -F':' '{print $3}' | cut -c 1-$DIGEST_LENGTH` + +if [ ${#digest} != $DIGEST_LENGTH ] +then + echo "Unexpected length for digest: '$digest'" + exit 1 +fi + +newTag=${existingTag}_${digest} +docker tag ${image}:${existingTag} ${image}:${newTag} +docker push ${image}:${newTag} + +echo "Pushed ${image}:${existingTag} to ${image}:${newTag}" From 016658cbb35aecf544a4c0252c693e062c2b8ee3 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 17 Jul 2018 14:50:52 +0100 Subject: [PATCH 03/13] RM-6428 Handle multiple source images and multiple destinations. Also update the scripts to be executable. --- scripts/cleanImages.sh | 0 scripts/pushDockerDigestTag.sh | 84 ++++++++++++++++++++++++------- scripts/waitForAlfrescoToStart.sh | 0 3 files changed, 65 insertions(+), 19 deletions(-) mode change 100644 => 100755 scripts/cleanImages.sh mode change 100644 => 100755 scripts/pushDockerDigestTag.sh mode change 100644 => 100755 scripts/waitForAlfrescoToStart.sh diff --git a/scripts/cleanImages.sh b/scripts/cleanImages.sh old mode 100644 new mode 100755 diff --git a/scripts/pushDockerDigestTag.sh b/scripts/pushDockerDigestTag.sh old mode 100644 new mode 100755 index a705eb9e0e..9fa2ee353e --- a/scripts/pushDockerDigestTag.sh +++ b/scripts/pushDockerDigestTag.sh @@ -2,30 +2,76 @@ scriptName=`basename "$0"` -if [ "$#" -ne 2 ]; then - echo "Usage: ${scriptName} " +usage="Usage: $scriptName [options] + + -h , --help show this help text + -i a source image to use + (e.g. quay.io/alfresco/ags-share-community) + -r a repository to push new tags to + (e.g. registry.hub.docker.com) + -t the existing tag for the images (mandatory) + -d the length of digest to output (default 12 chars)" + +digestLength=12 + +while getopts ':hi:r:t:d:' option; do + case "$option" in + h) echo -e "Tag one or more images to include the digest and push this to some repositories.\n\n${usage}" + exit + ;; + i) sourceImages+=("$OPTARG") + ;; + r) repositories+=("$OPTARG") + ;; + t) existingTag=$OPTARG + ;; + d) digestLength=$OPTARG + ;; + :) echo -e "Missing argument for -${OPTARG}\n\n${usage}" >&2 + exit 1 + ;; + \?) echo -e "Illegal option: -${OPTARG}\n\n${usage}" >&2 + exit 1 + ;; + esac +done +shift $((OPTIND - 1)) + +if [ "#$existingTag" == "#" ]; then + echo -e "Please supply a tag with the -t option.\n\n${usage}" >&2 exit 1 fi -echo "${scriptName} called with:" -image=$1 -echo " image: $image" -existingTag=$2 -echo " existingTag: $existingTag" +for sourceImage in ${sourceImages[@]} +do + echo "Processing $sourceImage" -DIGEST_LENGTH=12 + # Note that this command should work even if the image is already present locally. + digest=`docker pull ${sourceImage}:${existingTag} | grep "Digest:" | awk -F':' '{print $3}' | cut -c 1-$digestLength` -# Note that this command should work even if the image is already present locally. -digest=`docker pull ${image}:${existingTag} | grep "Digest:" | awk -F':' '{print $3}' | cut -c 1-$DIGEST_LENGTH` + if [ ${#digest} != $digestLength ] + then + echo "Unexpected length for digest of ${sourceImage}: '${digest}'" >&2 + exit 1 + fi -if [ ${#digest} != $DIGEST_LENGTH ] -then - echo "Unexpected length for digest: '$digest'" - exit 1 -fi + newTag=${existingTag}_${digest} -newTag=${existingTag}_${digest} -docker tag ${image}:${existingTag} ${image}:${newTag} -docker push ${image}:${newTag} + # Remove the source repository name if it contains one. + slashes=`echo $sourceImage | sed "s|[^/]||g"` + if [ ${#slashes} == 2 ] + then + # The repository name is everything up to the first slash. + image=`echo $sourceImage | sed "s|[^/]*/||"` + else + # Assume the source image doesn't reference the repository name. + image=$sourceImage + fi -echo "Pushed ${image}:${existingTag} to ${image}:${newTag}" + for repository in ${repositories[@]} + do + docker tag ${sourceImage}:${existingTag} ${repository}:${image}:${newTag} + docker push ${repository}:${image}:${newTag} + echo "Pushed ${sourceImage}:${existingTag} to ${repository}:${image}:${newTag}" + done +done diff --git a/scripts/waitForAlfrescoToStart.sh b/scripts/waitForAlfrescoToStart.sh old mode 100644 new mode 100755 From e4f81f4a6c0c6705dbcac1a97fb997935bc2b00f Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 23 Jul 2018 13:12:34 +0100 Subject: [PATCH 04/13] RM-6428 Fix typo in tag name. The digest is meant to be appended with a minus, rather than an underscore. --- scripts/pushDockerDigestTag.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pushDockerDigestTag.sh b/scripts/pushDockerDigestTag.sh index 9fa2ee353e..57eeda9f17 100755 --- a/scripts/pushDockerDigestTag.sh +++ b/scripts/pushDockerDigestTag.sh @@ -55,7 +55,7 @@ do exit 1 fi - newTag=${existingTag}_${digest} + newTag=${existingTag}-${digest} # Remove the source repository name if it contains one. slashes=`echo $sourceImage | sed "s|[^/]||g"` From a886717aaf744449b99e49fa535bf8cecc002c3a Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 23 Jul 2018 15:04:34 +0100 Subject: [PATCH 05/13] RM-6428 Add debug logging. --- scripts/pushDockerDigestTag.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/pushDockerDigestTag.sh b/scripts/pushDockerDigestTag.sh index 57eeda9f17..43f8f1c969 100755 --- a/scripts/pushDockerDigestTag.sh +++ b/scripts/pushDockerDigestTag.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -x scriptName=`basename "$0"` From e295a78d01b6b9b9c00383f6234a6cb3fbad24cf Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 25 Jul 2018 08:52:42 +0100 Subject: [PATCH 06/13] RM-6428 Fix repo for newly created tag. --- scripts/pushDockerDigestTag.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pushDockerDigestTag.sh b/scripts/pushDockerDigestTag.sh index 43f8f1c969..876d92dfda 100755 --- a/scripts/pushDockerDigestTag.sh +++ b/scripts/pushDockerDigestTag.sh @@ -71,8 +71,8 @@ do for repository in ${repositories[@]} do - docker tag ${sourceImage}:${existingTag} ${repository}:${image}:${newTag} - docker push ${repository}:${image}:${newTag} - echo "Pushed ${sourceImage}:${existingTag} to ${repository}:${image}:${newTag}" + docker tag ${sourceImage}:${existingTag} ${repository}/${image}:${newTag} + docker push ${repository}/${image}:${newTag} + echo "Pushed ${sourceImage}:${existingTag} to ${repository}/${image}:${newTag}" done done From 8fba7aa3f91f36ff6288802d07de4e63dd01a703 Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Tue, 24 Jul 2018 10:54:24 +0100 Subject: [PATCH 07/13] RM-6355 Fix null pointer (cherry picked from commit d22fc1f6ad7d0761e47931056328570e17a46f54) --- .../patch/compatibility/ModulePatchComponent.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java index de5c99fadf..d9376a9fb6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java @@ -188,8 +188,16 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent RegistryKey moduleKeyVersion = new RegistryKey(ModuleComponentHelper.URI_MODULES_1_0, new String[]{REGISTRY_PATH_MODULES, moduleId, registryProperty}); Serializable moduleVersion = this.registryService.getProperty(moduleKeyVersion); - - return new ModuleVersionNumber(moduleVersion.toString()); + + if (moduleVersion == null) + { + return VERSION_ZERO; + } + else + { + return new ModuleVersionNumber(moduleVersion.toString()); + } + } /** From c409c7b9a292be1a0a6dbc48d8b62065baadbbe2 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 30 Jul 2018 08:23:35 +0100 Subject: [PATCH 08/13] [maven-release-plugin] prepare release V3.0.a --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index f3c2e61eec..9a0b38af94 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.0-SNAPSHOT + 3.0.a Alfresco Records Management http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - HEAD + V3.0.a diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1033c353a4..0cb9b366eb 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0-SNAPSHOT + 3.0.a diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 36080c3d8e..39004d0be7 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.0-SNAPSHOT + 3.0.a diff --git a/rm-community/pom.xml b/rm-community/pom.xml index d20b147c15..bdea9c8a52 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0-SNAPSHOT + 3.0.a diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3449019d98..0fb21939fd 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.0-SNAPSHOT + 3.0.a diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 3dad123d3c..ad7599112c 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.0-SNAPSHOT + 3.0.a From 41800697f6c088a8362a07db4777aa784bb4e78a Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 30 Jul 2018 08:23:37 +0100 Subject: [PATCH 09/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 9a0b38af94..f3c2e61eec 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.a + 3.0.0-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - V3.0.a + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 0cb9b366eb..1033c353a4 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.a + 3.0.0-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 39004d0be7..36080c3d8e 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.a + 3.0.0-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index bdea9c8a52..d20b147c15 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.a + 3.0.0-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 0fb21939fd..3449019d98 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.a + 3.0.0-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index ad7599112c..3dad123d3c 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.a + 3.0.0-SNAPSHOT From cdb85d5d3477996aa73cb3a16ce7fd46f677df64 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 30 Jul 2018 14:01:38 +0100 Subject: [PATCH 10/13] [maven-release-plugin] prepare release V3.0.0 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index f3c2e61eec..830e77bc93 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.0-SNAPSHOT + 3.0.0 Alfresco Records Management http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - HEAD + V3.0.0 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1033c353a4..a625a78f92 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0-SNAPSHOT + 3.0.0 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 36080c3d8e..b334e7248e 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.0-SNAPSHOT + 3.0.0 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index d20b147c15..c280f21541 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0-SNAPSHOT + 3.0.0 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3449019d98..bb537e7378 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.0-SNAPSHOT + 3.0.0 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 3dad123d3c..f6e8b07516 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.0-SNAPSHOT + 3.0.0 From f51fac42c40064ce11df34889f25abe8502741fc Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 30 Jul 2018 14:01:41 +0100 Subject: [PATCH 11/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 830e77bc93..f0176f8b50 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.0 + 3.1.0-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - V3.0.0 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index a625a78f92..b4d9b7d2a7 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0 + 3.1.0-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index b334e7248e..e30c8556d0 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.0 + 3.1.0-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index c280f21541..ef69cfc74c 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0 + 3.1.0-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index bb537e7378..cb2cfec855 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.0 + 3.1.0-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index f6e8b07516..46b32f4100 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.0 + 3.1.0-SNAPSHOT From 7358fc5d3fd2e11b8364649ae256c8281cc332c3 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 30 Jul 2018 16:16:29 +0100 Subject: [PATCH 12/13] Update version to 3.0.1-SNAPSHOT. --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 830e77bc93..b33358642a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.0 + 3.0.1-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index a625a78f92..cb31a8d65c 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0 + 3.0.1-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index b334e7248e..3d41833de5 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.0 + 3.0.1-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index c280f21541..64a6d2fcc7 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0 + 3.0.1-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index bb537e7378..3baff3828d 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.0 + 3.0.1-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index f6e8b07516..df887493cf 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.0 + 3.0.1-SNAPSHOT From 3f175218cc8de5931ead1d3defb4a657f546e154 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 30 Jul 2018 16:18:56 +0100 Subject: [PATCH 13/13] Update version to 3.0.0.1-SNAPSHOT. --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 830e77bc93..58f1edfd16 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.0 + 3.0.0.1-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index a625a78f92..570d08502f 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0 + 3.0.0.1-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index b334e7248e..958b1f71fb 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.0 + 3.0.0.1-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index c280f21541..a1582bdd56 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.0 + 3.0.0.1-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index bb537e7378..1f849cc65f 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.0 + 3.0.0.1-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index f6e8b07516..f6c7c10e57 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.0 + 3.0.0.1-SNAPSHOT