From 9b768b5988e6ca21769545f2412dd1dde18989a1 Mon Sep 17 00:00:00 2001 From: Alexandru-Eusebiu Epure Date: Sun, 12 Jan 2020 17:32:22 +0200 Subject: [PATCH 01/18] REPO-4920 : Release Development build 6.3.0-A5 (#539) * Bump cmis from 1.5 to 1.6 (#397) * Bump javax.json from 1.0.4 to 1.1.4 (#399) * Update travis config with develop branch * Bump fabric8-maven-plugin from 4.2.0 to 4.3.1 (#368) * Bump alfresco-messaging-repo from 1.2.13 to 1.2.15 (#312) * Bump httpcore from 4.4.11 to 4.4.12 (#298) * Bump json-path from 2.3.0 to 2.4.0 (#403) * Bump joda-time from 2.10.3 to 2.10.5 (#371) * Bump alfresco-data-model from 8.50.2 to 8.54 (#396) * Bump dependency.cxf.version from 3.3.2 to 3.3.4 (#374) * Bump dataprep from 2.2 to 2.3 (#402) * Bump dependency.jackson.version from 2.9.9 to 2.10.1 (#392) * Bump bcprov-jdk15on from 1.62 to 1.64 (#355) * Bump alfresco-repository from 7.134 to 8.21 (#394) * Add retries to cmis rendition test * Bump alfresco-remote-api from 7.107 to 8.27 (#395) * Bump quartz from 2.3.1 to 2.3.2 (#370) * Bump httpclient from 4.5.9 to 4.5.10 (#304) * Bump alfresco-data-model from 8.54 to 8.55 (#405) * Bump httpclient-cache from 4.5.9 to 4.5.10 (#303) * Bump postgresql from 42.2.6 to 42.2.8 (#313) * Bump groovy from 2.5.5 to 2.5.8 (#401) * Bump bcmail-jdk15on from 1.62 to 1.64 (#356) * Bump dependency.javax.mail.version from 1.5.1 to 1.6.2 (#398) * Additional fixed to CMIS Rendition test * Mark integration test with a bug * Mark REST API test with a bug * Bump dependency.alfresco-spring-webscripts.version from 7.8 to 7.10 (#354) * Bump alfresco-remote-api from 8.27 to 8.28 (#406) * Bump alfresco-repository from 8.21 to 8.22 (#407) * Bump alfresco-repository from 8.22 to 8.24 (#408) * Mark a test in NodeLockTests with a bug * Bump alfresco-repository from 8.24 to 8.25 (#410) * Bump alfresco-core from 7.22 to 7.23 (#412) * Bump alfresco-data-model from 8.55 to 8.57 (#413) * Bump alfresco-repository from 8.25 to 8.27 (#414) * Bump dependency.alfresco-spring-webscripts.version from 7.10 to 7.11 (#418) * Bump webdav from 1.0 to 1.1 (#419) * Bump alfresco-repository from 8.27 to 8.28 (#423) * Bump ftp from 1.0 to 1.1 (#422) * Exclude spring-jcl from spring-orm & spring-core to guard classpath collission with commons-logging module (#417) * Bump alfresco-repository from 8.28 to 8.31 (#428) * Bump ftp from 1.1 to 1.2 (#430) * Bump alfresco-remote-api from 8.28 to 8.37 (#426) * Bump webdav from 1.1 to 1.2 (#431) * Bump alfresco-data-model from 8.57 to 8.59 (#437) * Bump alfresco-remote-api from 8.37 to 8.40 (#438) * Remove demo tests * Bump alfresco-remote-api from 8.40 to 8.44 (#443) * Bump alfresco-data-model from 8.59 to 8.60 (#445) * Bump utility from 3.0.14 to 3.0.16 (#444) * Bump ftp from 1.2 to 1.3 (#447) * Bump alfresco-remote-api from 8.44 to 8.45 (#451) * Bump webdav from 1.2 to 1.3 (#449) * Bump alfresco-remote-api from 8.45 to 8.46 (#452) * REPO-4751: Upgrade to Spring 5.2 * Bump alfresco-repository from 8.38 to 8.39 (#453) * Bump postgresql from 42.2.8 to 42.2.9 (#454) * Bump alfresco-repository from 8.39 to 8.40 (#456) * Bump alfresco-remote-api from 8.46 to 8.47 (#457) * Bump alfresco-remote-api from 8.47 to 8.48 (#459) * upgrade mockito library (#455) * Bump alfresco-remote-api from 8.48 to 8.50 (#460) * Bump alfresco-data-model from 8.60 to 8.61 (#462) * Bump mockito-core from 3.0.0 to 3.2.0 (#464) * Bump alfresco-repository from 8.40 to 8.41 (#461) * Bump alfresco-remote-api to 8.51 and alfresco-repository to 8.42 * [maven-release-plugin] prepare release acs-community-packaging-6.3.0-A2 * [maven-release-plugin] prepare for next development iteration * REPO-4785 Performance improvements to REST API TAS tests (#466) * Mark test with a bug * Mark test with a bug * Mark test with a bug * Mark test with a bug * Bump restapi from 1.15 to 1.23 (#463) * Bump alfresco-data-model from 8.61 to 8.66 (#467) * Revert "Mark test with a bug" This reverts commit 7a80d9c5397422864a636e8404a1f5b3af0f3f0b. * Revert "Mark test with a bug" This reverts commit 5922f4a0fe31692f45126efba510f3761ede44dc. * Revert "Mark test with a bug" This reverts commit 5b6cf02b645e51da9fafedfccd03c2dd5151f868. * Revert "Mark test with a bug" This reverts commit 1b874fbccb3e5777b3090070752dc2c33e55e413. * REPO-4785 Remove reduced timeout config in tests Previous iteration of improving test performance introduced a few intermittent failures into tests. This PR removes those changes, but leaves the split in the REST API tests. * Bump alfresco-remote-api from 8.51 to 8.52 (#469) * Bump alfresco-data-model from 8.66 to 8.67 (#471) * Bump alfresco-core from 8.2 to 8.6 (#468) * Bump alfresco-repository from 8.42 to 8.43 (#470) * Bump dependencies (#472) Bump repository to 8.44 Bump data-model to 8.68 Bump remote-api to 8.55 * Bump mockito-core from 3.2.0 to 3.2.4 (#473) * Bump alfresco-repository from 8.44 to 8.46 (#474) * Bump utility from 3.0.16 to 3.0.17 (#475) * Bump restapi from 1.24 to 1.25 (#476) * Bump alfresco-remote-api from 8.55 to 8.57 (#477) * Bump jackson-databind 2.9.10 -> 2.10.1 (#479) * Bump alfresco-remote-api from 8.57 to 8.59 (#481) * Bump restapi from 1.25 to 1.26 (#483) * Bump ftp from 1.3 to 1.4 (#484) * Bump alfresco-core from 8.6 to 8.7 (#487) * Bump alfresco-repository from 8.46 to 8.48 (#488) * Bump webdav from 1.3 to 1.4 (#485) * Bump alfresco-data-model from 8.68 to 8.70 (#489) * Pickup upstream projects * REPO-4739 update dependencies of tas framework (#776) (#494) * Update all tas packages, now with Dependabot enabled dependency.tas-utility.version>3.0.17 dependency.tas-restapi.version>1.26 dependency.tas-cmis.version>1.12 dependency.tas-email.version>1.7 dependency.tas-webdav.version>1.4 dependency.tas-ftp.version>1.4 Cherry-picked from acs-packaging PR #776 * Bump alfresco-remote-api from 8.62 to 8.63 (#496) * Bump alfresco-core from 8.9 to 8.10 (#497) * Bump alfresco-remote-api from 8.63 to 8.64 (#499) * Bump alfresco-remote-api from 8.64 to 8.65 (#500) * Bump alfresco-remote-api from 8.65 to 8.66 (#502) * Bump alfresco-data-model from 8.72 to 8.73 (#503) * Bump alfresco-remote-api from 8.66 to 8.67 (#505) * Bump alfresco-remote-api from 8.67 to 8.68 (#506) * Bump junit from 4.12 to 4.13 (#507) * Bump alfresco-remote-api from 8.68 to 8.69 (#512) * Bump commons-codec from 1.13 to 1.14 (#511) * Bump alfresco-data-model from 8.73 to 8.74 (#513) * Bump alfresco-core from 8.10 to 8.11 (#514) * Bump dependency.jackson.version from 2.10.1 to 2.10.2 (#518) * Bump alfresco-remote-api from 8.69 to 8.73 (#519) * Bump webdav from 1.4 to 1.5 (#520) * Bump alfresco-data-model from 8.74 to 8.75 (#521) * Bump api-explorer from 6.2.0 to 6.2.1 (#524) * Bump alfresco-core from 8.11 to 8.12 (#523) * REPO-4917 : Update upstream projects (#517) * REPO-4917 : Update upsteam projects Bump remote-api to 8.73 Bump repository to 8.61 Bump data-model to 8.75 Bump core to 8.12 Bump api-explorer to 6.2.1 * Remove unsoported transformation PDF -> PDF LocalPassThroughTransform was added and supports same source/target mimetype * GOOGLEDOCS-463 : Release GoogleDocs 3.2.0-A1 (for 6.3.0-dev & next ACS Community release) (#526) (#527) (cherry picked from commit ba10839e391d83e18405715ef814eca63a386c97) * Bump alfresco-repository from 8.61 to 8.71 (#529) * Bump alfresco-remote-api from 8.73 to 8.77 (#530) * Bump alfresco-remote-api from 8.77 to 8.81 (#532) * Bump alfresco-data-model from 8.75 to 8.83 (#533) * Bump alfresco-repository from 8.71 to 8.81 (#534) * Update versions of referenced projects * Bump alfresco-repository from 8.81 to 8.83 (#535) * Bump alfresco-remote-api from 8.81 to 8.82 (#536) * Bump alfresco-data-model from 8.83 to 8.84 (#537) * Bump api-explorer from 6.2.1 to 6.3.0 (#538) Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Alex Mukha Co-authored-by: Abdul Mohammed Co-authored-by: Cristian Turlica Co-authored-by: NITHIN NAMBIAR Co-authored-by: alandavis Co-authored-by: alfresco-build Co-authored-by: David Edwards Co-authored-by: DenisGabriela Co-authored-by: antoniojfelix --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a8f0f6fdf..a003e0d58 100644 --- a/pom.xml +++ b/pom.xml @@ -68,10 +68,10 @@ Community latest - 8.73 - 8.61 - 8.75 - 8.12 + 8.82 + 8.83 + 8.84 + 8.18 1.0.12 8.1 @@ -81,7 +81,7 @@ 7.1 6.0.1 1.2.15 - 6.2.1 + 6.3.0 0.2 5.2.2.RELEASE From cd594b6fde8d5f691e1c29bcd2a10073abba6d50 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Sun, 12 Jan 2020 16:32:21 +0000 Subject: [PATCH 02/18] [maven-release-plugin] prepare release acs-community-packaging-6.3.0-A5 --- distribution/pom.xml | 2 +- docker-alfresco/pom.xml | 2 +- pom.xml | 4 ++-- public-javadoc/pom.xml | 2 +- war/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 6f4876f77..552f7e920 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.3.0-A5 ../pom.xml diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml index 25129d6df..e441dab46 100644 --- a/docker-alfresco/pom.xml +++ b/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.3.0-A5 ../pom.xml diff --git a/pom.xml b/pom.xml index a003e0d58..152f29431 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.3.0-SNAPSHOT + 6.3.0-A5 pom @@ -49,7 +49,7 @@ scm:git:git@github.com:Alfresco/acs-community-packaging.git scm:git:git@github.com:Alfresco/acs-community-packaging.git https://github.com/Alfresco/acs-community-packaging - HEAD + acs-community-packaging-6.3.0-A5 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 01fec31cb..c42055944 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.3.0-A5 ../pom.xml pom diff --git a/war/pom.xml b/war/pom.xml index 8ea198047..cff68bb5e 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.3.0-A5 ../pom.xml From 3cee335139ca7dae7eb134d64384666f3b8f728a Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Sun, 12 Jan 2020 16:32:29 +0000 Subject: [PATCH 03/18] [maven-release-plugin] prepare for next development iteration --- distribution/pom.xml | 2 +- docker-alfresco/pom.xml | 2 +- pom.xml | 4 ++-- public-javadoc/pom.xml | 2 +- war/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 552f7e920..6f4876f77 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-A5 + 6.3.0-SNAPSHOT ../pom.xml diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml index e441dab46..25129d6df 100644 --- a/docker-alfresco/pom.xml +++ b/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-A5 + 6.3.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 152f29431..a003e0d58 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.3.0-A5 + 6.3.0-SNAPSHOT pom @@ -49,7 +49,7 @@ scm:git:git@github.com:Alfresco/acs-community-packaging.git scm:git:git@github.com:Alfresco/acs-community-packaging.git https://github.com/Alfresco/acs-community-packaging - acs-community-packaging-6.3.0-A5 + HEAD diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index c42055944..01fec31cb 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco acs-community-packaging - 6.3.0-A5 + 6.3.0-SNAPSHOT ../pom.xml pom diff --git a/war/pom.xml b/war/pom.xml index cff68bb5e..8ea198047 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-A5 + 6.3.0-SNAPSHOT ../pom.xml From 4763baf43a3546ee7f65343d960d119edcef5d2a Mon Sep 17 00:00:00 2001 From: DenisGabriela Date: Mon, 13 Jan 2020 15:50:13 +0200 Subject: [PATCH 04/18] GOOGLEDOCS-463 : Release GoogleDocs 3.2.0-A2 (for 6.3.0-dev & next ACS Community release) (#540) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a003e0d58..3b7a5858a 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 6.2.0 - 3.2.0-A1 + 3.2.0-A2 1.3.0 From 7159d25c8301e06064f52508012302cdd1d92a47 Mon Sep 17 00:00:00 2001 From: DenisGabriela Date: Tue, 14 Jan 2020 15:22:54 +0200 Subject: [PATCH 05/18] GOOGLEDOCS-461 : Remove old commons-lang lib from Repo AMP dependencies (#528) - remove workaround - no longer needed --- distribution/src/main/resources/licenses/notice.txt | 3 +-- pom.xml | 5 ----- war/pom.xml | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/distribution/src/main/resources/licenses/notice.txt b/distribution/src/main/resources/licenses/notice.txt index b066847e1..f2b8580b2 100644 --- a/distribution/src/main/resources/licenses/notice.txt +++ b/distribution/src/main/resources/licenses/notice.txt @@ -37,8 +37,7 @@ commons-fileupload http://jakarta.apache.org/commons/ commons-httpclient http://jakarta.apache.org/commons/ commons-io http://jakarta.apache.org/commons/ commons-jxpath http://jakarta.apache.org/commons/ -commons-lang http://jakarta.apache.org/commons/ -commons-lang3 http://jakarta.apache.org/commons/ +commons-lang3 http://jakarta.apache.org/commons/ commons-logging http://jakarta.apache.org/commons/ commons-net http://jakarta.apache.org/commons/ commons-pool http://jakarta.apache.org/commons/ diff --git a/pom.xml b/pom.xml index 3b7a5858a..553d76a42 100644 --- a/pom.xml +++ b/pom.xml @@ -282,11 +282,6 @@ commons-digester 2.1 - - commons-lang - commons-lang - 2.6 - commons-fileupload commons-fileupload diff --git a/war/pom.xml b/war/pom.xml index 8ea198047..eaf9d4bfd 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -95,12 +95,6 @@ tests test - - - commons-lang - commons-lang - 2.6 - org.springframework spring-test From 05af6c8b52c62d2a6e7b5c6a3e004566ce4c20e7 Mon Sep 17 00:00:00 2001 From: Meenal Bhave Date: Tue, 14 Jan 2020 17:44:22 +0000 Subject: [PATCH 06/18] Search-1979: Updated SOLR6_TAG to 1.4.1 for the tests (#510) * Search-1979: Updated SOLR6_TAG to 1.4.1 for the tests * Search-1979: Updated SOLR6_TAG location to quay.io for testing (until released to dockerhub after company release) * Revert "Search-1979: Updated SOLR6_TAG location to quay.io for testing (until released to dockerhub after company release)" This reverts commit 2da33579747e0f919b7178996664c7cde3011aca. --- docker-alfresco/test/.env | 2 +- tests/environment/.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-alfresco/test/.env b/docker-alfresco/test/.env index b0df16a55..edf0d56fd 100644 --- a/docker-alfresco/test/.env +++ b/docker-alfresco/test/.env @@ -1,7 +1,7 @@ ALFRESCO_TAG=latest TRANSFORMERS_TAG=2.1.0 SHARE_TAG=6.2.0 -SOLR6_TAG=1.4.0 +SOLR6_TAG=1.4.1 POSTGRES_TAG=11.4 ACTIVEMQ_TAG=5.15.8 REGISTRY= diff --git a/tests/environment/.env b/tests/environment/.env index ef18cd66b..7cb29dba2 100644 --- a/tests/environment/.env +++ b/tests/environment/.env @@ -1,4 +1,4 @@ TRANSFORMERS_TAG=2.1.0 -SOLR6_TAG=1.4.0 +SOLR6_TAG=1.4.1 POSTGRES_TAG=11.4 ACTIVEMQ_TAG=5.15.8 From f04fcb7df82f5c62b33b813e1eef53aa39e4516a Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Mon, 3 Feb 2020 12:43:27 +0200 Subject: [PATCH 07/18] Fix develop branch usage instead of master --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d370cd26d..9b9a183f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ branches: matrix: include: - name: "WhiteSource scan" - # only on develop and if it is not a PR - if: fork = false AND branch = develop AND type != pull_request + # only on master and if it is not a PR + if: fork = false AND branch = master AND type != pull_request install: - travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml script: From de3620cf82cb668dab07c8ea17ef06882d94002b Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Fri, 20 Mar 2020 14:56:20 +0200 Subject: [PATCH 08/18] Updated the WhiteSource agent path (temporary solution) See REPO-4974 for details --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b9a183f8..79dda827b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,11 @@ matrix: - travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml script: # Download the latest version of WhiteSource Unified Agent - - curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss-unified-agent.jar + #- curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss-unified-agent.jar + # Use the latest released version of the agent available in github (temporary solution) + - curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/v20.1.2/standAlone/wss-unified-agent-20.1.2.jar # Run WhiteSource Unified Agent - - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war + - java -jar wss-unified-agent-20.1.2.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war - name: "REST API TAS tests part1" jdk: openjdk11 install: From 435ffc31f51705e07c4395630f3fb1bf0d86f935 Mon Sep 17 00:00:00 2001 From: Ayman Harake <42536841+aymanthefirst@users.noreply.github.com> Date: Mon, 23 Mar 2020 15:43:00 +0000 Subject: [PATCH 09/18] GOOGLEDOCS-482: Updated googledocs reference in pom.xml to 3.2.0-A4 (#678) * GOOGLEDOCS-482: Updated googledocs reference in pom.xml to 3.2.0-A3 * GOOGLEDOCS-482: Updated googledrive reference in pom.xml to 3.2.0-A4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 553d76a42..0688b291c 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 6.2.0 - 3.2.0-A2 + 3.2.0-A4 1.3.0 From 44c1063b8c8ea501c8e4d57bb5eaff8d08febf91 Mon Sep 17 00:00:00 2001 From: Ayman Harake <42536841+aymanthefirst@users.noreply.github.com> Date: Thu, 2 Apr 2020 08:29:29 +0100 Subject: [PATCH 10/18] GOOGLEDOCS-473-into-master: Cherry picked from master to update GoogleDrive version in pom.xml to 3.2.0-RC1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0688b291c..087322eba 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 6.2.0 - 3.2.0-A4 + 3.2.0-RC1 1.3.0 From 5a61d89af3679b1d7887f8ec1e6b80083e1e304b Mon Sep 17 00:00:00 2001 From: Ayman Harake <42536841+aymanthefirst@users.noreply.github.com> Date: Wed, 8 Apr 2020 22:33:10 +0100 Subject: [PATCH 11/18] GOOGLEDOCS-497: Updated pom.xml file to use 'GoogleDrive 3.2.0-RC3' (cherry-picked from develop) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 087322eba..0cda02d32 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 6.2.0 - 3.2.0-RC1 + 3.2.0-RC3 1.3.0 From 80b9744ab07588cbcaaa9ce5258e185a77f1552a Mon Sep 17 00:00:00 2001 From: Ayman Harake <42536841+aymanthefirst@users.noreply.github.com> Date: Fri, 1 May 2020 17:04:22 +0100 Subject: [PATCH 12/18] GOOGLEDOCS-490: Cherry picked from develop - Updated pom.xml file to use 'Google Docs-3.2.0' instead of 'Google Docs-3.2.0-RC3' --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cda02d32..45b2507f6 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 6.2.0 - 3.2.0-RC3 + 3.2.0 1.3.0 From d813d72828a7b49af6f75503b40064aea3f62735 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 12 May 2020 17:52:38 +0100 Subject: [PATCH 13/18] Revert all commits made since the 6.3.0-A5 tag, so that we can add the latest changes made for 6.2.1 enterprise. Revert "GOOGLEDOCS-490: Cherry picked from develop - Updated pom.xml file to use 'Google Docs-3.2.0' instead of 'Google Docs-3.2.0-RC3'" This reverts commit 80b9744ab07588cbcaaa9ce5258e185a77f1552a. Revert "GOOGLEDOCS-497: Updated pom.xml file to use 'GoogleDrive 3.2.0-RC3' (cherry-picked from develop) " This reverts commit 5a61d89af3679b1d7887f8ec1e6b80083e1e304b. Revert "GOOGLEDOCS-473-into-master: Cherry picked from master to update GoogleDrive version in pom.xml to 3.2.0-RC1" This reverts commit 44c1063b8c8ea501c8e4d57bb5eaff8d08febf91. Revert "GOOGLEDOCS-482: Updated googledocs reference in pom.xml to 3.2.0-A4 (#678)" This reverts commit 435ffc31f51705e07c4395630f3fb1bf0d86f935. Revert "Updated the WhiteSource agent path (temporary solution)" This reverts commit de3620cf82cb668dab07c8ea17ef06882d94002b. Revert "Fix develop branch usage instead of master" This reverts commit f04fcb7df82f5c62b33b813e1eef53aa39e4516a. Revert "Search-1979: Updated SOLR6_TAG to 1.4.1 for the tests (#510)" This reverts commit 05af6c8b52c62d2a6e7b5c6a3e004566ce4c20e7. Revert "GOOGLEDOCS-461 : Remove old commons-lang lib from Repo AMP dependencies (#528)" This reverts commit 7159d25c8301e06064f52508012302cdd1d92a47. Revert "GOOGLEDOCS-463 : Release GoogleDocs 3.2.0-A2 (for 6.3.0-dev & next ACS Community release) (#540)" This reverts commit 4763baf43a3546ee7f65343d960d119edcef5d2a. --- .travis.yml | 10 ++++------ distribution/src/main/resources/licenses/notice.txt | 3 ++- docker-alfresco/test/.env | 2 +- pom.xml | 7 ++++++- tests/environment/.env | 2 +- war/pom.xml | 6 ++++++ 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79dda827b..d370cd26d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,17 +23,15 @@ branches: matrix: include: - name: "WhiteSource scan" - # only on master and if it is not a PR - if: fork = false AND branch = master AND type != pull_request + # only on develop and if it is not a PR + if: fork = false AND branch = develop AND type != pull_request install: - travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml script: # Download the latest version of WhiteSource Unified Agent - #- curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss-unified-agent.jar - # Use the latest released version of the agent available in github (temporary solution) - - curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/v20.1.2/standAlone/wss-unified-agent-20.1.2.jar + - curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss-unified-agent.jar # Run WhiteSource Unified Agent - - java -jar wss-unified-agent-20.1.2.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war + - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war - name: "REST API TAS tests part1" jdk: openjdk11 install: diff --git a/distribution/src/main/resources/licenses/notice.txt b/distribution/src/main/resources/licenses/notice.txt index f2b8580b2..b066847e1 100644 --- a/distribution/src/main/resources/licenses/notice.txt +++ b/distribution/src/main/resources/licenses/notice.txt @@ -37,7 +37,8 @@ commons-fileupload http://jakarta.apache.org/commons/ commons-httpclient http://jakarta.apache.org/commons/ commons-io http://jakarta.apache.org/commons/ commons-jxpath http://jakarta.apache.org/commons/ -commons-lang3 http://jakarta.apache.org/commons/ +commons-lang http://jakarta.apache.org/commons/ +commons-lang3 http://jakarta.apache.org/commons/ commons-logging http://jakarta.apache.org/commons/ commons-net http://jakarta.apache.org/commons/ commons-pool http://jakarta.apache.org/commons/ diff --git a/docker-alfresco/test/.env b/docker-alfresco/test/.env index edf0d56fd..b0df16a55 100644 --- a/docker-alfresco/test/.env +++ b/docker-alfresco/test/.env @@ -1,7 +1,7 @@ ALFRESCO_TAG=latest TRANSFORMERS_TAG=2.1.0 SHARE_TAG=6.2.0 -SOLR6_TAG=1.4.1 +SOLR6_TAG=1.4.0 POSTGRES_TAG=11.4 ACTIVEMQ_TAG=5.15.8 REGISTRY= diff --git a/pom.xml b/pom.xml index 45b2507f6..a003e0d58 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 6.2.0 - 3.2.0 + 3.2.0-A1 1.3.0 @@ -282,6 +282,11 @@ commons-digester 2.1 + + commons-lang + commons-lang + 2.6 + commons-fileupload commons-fileupload diff --git a/tests/environment/.env b/tests/environment/.env index 7cb29dba2..ef18cd66b 100644 --- a/tests/environment/.env +++ b/tests/environment/.env @@ -1,4 +1,4 @@ TRANSFORMERS_TAG=2.1.0 -SOLR6_TAG=1.4.1 +SOLR6_TAG=1.4.0 POSTGRES_TAG=11.4 ACTIVEMQ_TAG=5.15.8 diff --git a/war/pom.xml b/war/pom.xml index eaf9d4bfd..8ea198047 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -95,6 +95,12 @@ tests test + + + commons-lang + commons-lang + 2.6 + org.springframework spring-test From 231c1718ac44ff8bc746925a671e986e42f94ef7 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 13 May 2020 07:39:33 +0100 Subject: [PATCH 14/18] Bring master up to the same state as develop and [release] 6.2.1-A8 There were minor changes required in addition to the following cherry picks. Most notably changes from 0b0ae21a3720f4ec0acf3f7fa8257eb00c0d2272 on the 21/04/2020 and the addition of the scripts/travis directory. [maven-release-plugin][skip ci]prepare release acs-community-packaging-6.2.1-A7 (cherry picked from commit 9a6769cf85ec3b64e920d32742cd26ca441207e5) [maven-release-plugin][skip ci]prepare for next development iteration (cherry picked from commit 8ccf987875074bcd64cf5197be10d3f7ce05fe7f) Pick up Share 6.2.1 and get ready for 6.2.1-A8 (cherry picked from commit b6ab0471ba8e375447670040f0fa6762afd1dd2e) --- .gitignore | 5 +- .travis.settings.xml | 49 ++++++ .travis.yml | 66 ++++++- distribution/pom.xml | 2 +- docker-alfresco/.dockerignore | 1 - docker-alfresco/Dockerfile | 6 +- docker-alfresco/pom.xml | 8 +- docker-alfresco/test/.env | 9 - docker-alfresco/test/docker-compose.yml | 132 -------------- pom.xml | 164 +++++++++--------- public-javadoc/pom.xml | 2 +- scripts/travis/copy_to_release_bucket.sh | 17 ++ scripts/travis/maven_release.sh | 31 ++++ scripts/travis/verify_release_tag.sh | 31 ++++ tests/environment/.env | 4 +- .../docker-compose-minimal+transforms.yml | 74 ++------ tests/pom.xml | 4 +- tests/tas-cmis/pom.xml | 4 +- tests/tas-email/pom.xml | 4 +- tests/tas-integration/pom.xml | 6 +- tests/tas-restapi/pom.xml | 4 +- .../alfresco/rest/nodes/NodesLockTests.java | 125 +++++++------ .../sharedLinks/SharedLinksSanityTests.java | 5 +- .../alfresco/rest/tags/UpdateTagTests.java | 20 ++- tests/tas-webdav/pom.xml | 4 +- war/pom.xml | 20 ++- war/src/main/resources/log4j.properties | 1 + 27 files changed, 415 insertions(+), 383 deletions(-) create mode 100644 .travis.settings.xml delete mode 100644 docker-alfresco/.dockerignore delete mode 100644 docker-alfresco/test/.env delete mode 100644 docker-alfresco/test/docker-compose.yml create mode 100755 scripts/travis/copy_to_release_bucket.sh create mode 100755 scripts/travis/maven_release.sh create mode 100755 scripts/travis/verify_release_tag.sh diff --git a/.gitignore b/.gitignore index 0ab642813..f9983e601 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ alf_data/ helm/alfresco-content-services-community/charts/* helm/alfresco-content-services-community/requirements.lock -helm/alfresco-content-services-community*.tgz \ No newline at end of file +helm/alfresco-content-services-community*.tgz + +# Travis deployment folder +deploy_dir \ No newline at end of file diff --git a/.travis.settings.xml b/.travis.settings.xml new file mode 100644 index 000000000..48b88983e --- /dev/null +++ b/.travis.settings.xml @@ -0,0 +1,49 @@ + + + + alfresco-internal + + true + + + + alfresco-internal + + true + + + true + + Alfresco Internal Repository + https://artifacts.alfresco.com/nexus/content/groups/internal + + + + + alfresco-internal + Alfresco Internal Repository + https://artifacts.alfresco.com/nexus/content/groups/public + + + + + + + + + alfresco-internal + ${env.MAVEN_USERNAME} + ${env.MAVEN_PASSWORD} + + + quay.io + ${env.QUAY_USERNAME} + ${env.QUAY_PASSWORD} + + + docker.io + ${env.DOCKERHUB_USERNAME} + ${env.DOCKERHUB_PASSWORD} + + + diff --git a/.travis.yml b/.travis.yml index d370cd26d..c65dfcc79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ dist: xenial -sudo: required +os: linux language: java jdk: - openjdk11 @@ -10,26 +10,40 @@ services: cache: directories: - $HOME/.m2 - +# the cache can grow constantly +before_cache: + - rm -rf $HOME/.m2/repository/org/alfresco/acs-community-packaging env: global: - VERSION_EDITION=Community - + # Must be in the format - ie. 6.3.0-repo-xxxx-x or 6.3.0-Ax + - RELEASE_VERSION=6.2.1-A8 + - DEVELOPMENT_VERSION=6.2.1.1-SNAPSHOT + - COMM_RELEASE_VERSION= branches: only: - master - develop -matrix: +stages: + - name: test + if: commit_message !~ /\[skip tests\]/ + - release + - publish + +before_install: "cp .travis.settings.xml $HOME/.m2/settings.xml" + +jobs: include: - - name: "WhiteSource scan" + - stage: test + name: "WhiteSource scan" # only on develop and if it is not a PR if: fork = false AND branch = develop AND type != pull_request install: - travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml script: # Download the latest version of WhiteSource Unified Agent - - curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss-unified-agent.jar + - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar # Run WhiteSource Unified Agent - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war - name: "REST API TAS tests part1" @@ -88,3 +102,43 @@ matrix: - ./tests/scripts/wait-for-alfresco-start.sh "http://localhost:8082/alfresco" script: - travis_wait 30 mvn install -q -f tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false + - stage: Release + name: "Maven release" + if: commit_message ~= /\[release\]/ AND fork = false AND branch =~ ^(master|develop)$ AND type != pull_request + install: travis_retry travis_wait 40 mvn clean install -DskipTests=true "-Dversion.edition=${VERSION_EDITION}" -Dmaven.javadoc.skip=true -B -V + # Fail the job if there is a docker image tag that matches the RELEASE_VERSION (or project version in the POM if not set) + before_script: ./scripts/travis/verify_release_tag.sh + script: travis_wait 40 ./scripts/travis/maven_release.sh ${RELEASE_VERSION} ${DEVELOPMENT_VERSION} + # Copy alfresco.war and the distribution zip to deploy_dir + before_deploy: + # Move the final artifacts to a single folder (deploy_dir) to be copied to S3 + - mkdir -p deploy_dir + - cp war/target/alfresco.war deploy_dir + - cp distribution/target/*-distribution*.zip deploy_dir + deploy: + - provider: s3 + access_key_id: ${AWS_STAGING_ACCESS_KEY} + secret_access_key: ${AWS_STAGING_SECRET_KEY} + bucket: "alfresco-artefacts-staging" + region: "eu-west-1" + skip_cleanup: true + acl: private + local_dir: deploy_dir + upload_dir: "alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}" + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^(master|develop)$ + - stage: "Publish" + name: "Copy to S3 Release" + if: commit_message ~= /\[publish\]/ AND fork = false AND branch = master AND type != pull_request + # Nothing to build/install as we are just copying from S3 buckets + install: skip + script: skip + before_deploy: pip install awscli + deploy: + - provider: script + script: ./scripts/travis/copy_to_release_bucket.sh ${TRAVIS_BUILD_NUMBER} ${TRAVIS_BRANCH} + on: + branch: master + + diff --git a/distribution/pom.xml b/distribution/pom.xml index 6f4876f77..3550f86a8 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml diff --git a/docker-alfresco/.dockerignore b/docker-alfresco/.dockerignore deleted file mode 100644 index 30d74d258..000000000 --- a/docker-alfresco/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file diff --git a/docker-alfresco/Dockerfile b/docker-alfresco/Dockerfile index bac4070bd..691b4356c 100644 --- a/docker-alfresco/Dockerfile +++ b/docker-alfresco/Dockerfile @@ -5,7 +5,7 @@ FROM alfresco/alfresco-base-tomcat:8.5.43-java-11-openjdk-centos-7 # Set default user information ARG GROUPNAME=Alfresco ARG GROUPID=1000 -ARG USERNAME=alfresco +ARG IMAGEUSERNAME=alfresco ARG USERID=33000 # Set default environment args @@ -73,7 +73,7 @@ RUN yum install -y fontconfig-2.13.0-4.3.el7 \ RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \ mkdir -p ${TOMCAT_DIR}/alf_data && \ groupadd -g ${GROUPID} ${GROUPNAME} && \ - useradd -u ${USERID} -G ${GROUPNAME} ${USERNAME} && \ + useradd -u ${USERID} -G ${GROUPNAME} ${IMAGEUSERNAME} && \ chgrp -R ${GROUPNAME} ${TOMCAT_DIR} && \ chmod g+w ${TOMCAT_DIR}/logs && \ chmod g+rx ${TOMCAT_DIR}/conf && \ @@ -94,4 +94,4 @@ RUN mkdir -p ${TOMCAT_DIR}/conf/Catalina/localhost && \ # Changes are also required to the docker-compose/docker-compose.yml file. # EXPOSE 8000 -USER ${USERNAME} \ No newline at end of file +USER ${IMAGEUSERNAME} \ No newline at end of file diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml index 25129d6df..1f18e1421 100644 --- a/docker-alfresco/pom.xml +++ b/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml @@ -106,7 +106,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.1.2 unpack-war-files @@ -340,6 +340,7 @@ + quay.io ${image.name}:${project.version} ${image.registry} @@ -347,6 +348,7 @@ + dockerhub ${image.name}:${project.version} ${project.basedir}/ @@ -369,6 +371,4 @@ - - \ No newline at end of file diff --git a/docker-alfresco/test/.env b/docker-alfresco/test/.env deleted file mode 100644 index b0df16a55..000000000 --- a/docker-alfresco/test/.env +++ /dev/null @@ -1,9 +0,0 @@ -ALFRESCO_TAG=latest -TRANSFORMERS_TAG=2.1.0 -SHARE_TAG=6.2.0 -SOLR6_TAG=1.4.0 -POSTGRES_TAG=11.4 -ACTIVEMQ_TAG=5.15.8 -REGISTRY= -LEGACY_TRANSFORM_SERVICE_ENABLED=true -LOCAL_TRANSFORM_SERVICE_ENABLED=true diff --git a/docker-alfresco/test/docker-compose.yml b/docker-alfresco/test/docker-compose.yml deleted file mode 100644 index 10fd5b5cd..000000000 --- a/docker-alfresco/test/docker-compose.yml +++ /dev/null @@ -1,132 +0,0 @@ -version: "3" - -# The acs-community-deployment project contains the product version of docker-compose. -# -# This version is for testing and development use. For testing and debug we need to have a more open version. -# For remote debug we need the CATALINA_OPTS and to expose port 8000. - -services: - alfresco: - image: ${REGISTRY}alfresco/alfresco-content-repository-community:${ALFRESCO_TAG} - environment: - CATALINA_OPTS : " - -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n - " - JAVA_OPTS : " - -Ddb.driver=org.postgresql.Driver - -Ddb.username=alfresco - -Ddb.password=alfresco - -Ddb.url=jdbc:postgresql://postgres:5432/alfresco - -Dsolr.host=solr6 - -Dsolr.port=8983 - -Dsolr.secureComms=none - -Dsolr.base.url=/solr - -Dindex.subsystem.name=solr6 - -Dalfresco.restApi.basicAuthScheme=true - -Dimap.server.enabled=true - -Dftp.enabled=true - -Dftp.dataPortFrom=30000 - -Dftp.dataPortTo=30099 - -Dshare.host=localhost - -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos - -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\" - - -Dlocal.transform.service.enabled=${LOCAL_TRANSFORM_SERVICE_ENABLED} - -DlocalTransform.pdfrenderer.url=http://alfresco-pdf-renderer:8090/ - -DlocalTransform.imagemagick.url=http://imagemagick:8090/ - -DlocalTransform.libreoffice.url=http://libreoffice:8090/ - -DlocalTransform.tika.url=http://tika:8090/ - -DlocalTransform.misc.url=http://transform-misc:8090/ - - -Dlegacy.transform.service.enabled=${LEGACY_TRANSFORM_SERVICE_ENABLED} - -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/ - -Djodconverter.url=http://libreoffice:8090/ - -Dimg.url=http://imagemagick:8090/ - -Dtika.url=http://tika:8090/ - -Dtransform.misc.url=http://transform-misc:8090/ - - -Dimap.server.port=1143 - -Dftp.port=1221 - -Dcors.enabled=true - -Dcors.allowed.origins=http://localhost:4200 - " - ports: - - 8082:8080 - - 8000:8000 - - 143:1143 - - 21:1221 - - 30000-30099:30000-30099 - - alfresco-pdf-renderer: - image: alfresco/alfresco-pdf-renderer:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8090:8090 - - imagemagick: - image: alfresco/alfresco-imagemagick:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8091:8090 - - libreoffice: - image: alfresco/alfresco-libreoffice:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8092:8090 - - tika: - image: alfresco/alfresco-tika:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8093:8090 - - transform-misc: - image: alfresco/alfresco-transform-misc:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ports: - - 8094:8090 - - share: - image: alfresco/alfresco-share:${SHARE_TAG} - environment: - - REPO_HOST=alfresco - - REPO_PORT=8080 - ports: - - 8080:8080 - - postgres: - image: library/postgres:${POSTGRES_TAG} - environment: - - POSTGRES_PASSWORD=alfresco - - POSTGRES_USER=alfresco - - POSTGRES_DB=alfresco - - solr6: - image: alfresco/alfresco-search-services:${SOLR6_TAG} - environment: - #Solr needs to know how to register itself with Alfresco - - SOLR_ALFRESCO_HOST=alfresco - - SOLR_ALFRESCO_PORT=8080 - #Alfresco needs to know how to call solr - - SOLR_SOLR_HOST=solr6 - - SOLR_SOLR_PORT=8983 - #Create the default alfresco and archive cores - - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive - #HTTP by default - - ALFRESCO_SECURE_COMMS=none - ports: - - 8083:8983 #Browser port - - activemq: - image: alfresco/alfresco-activemq:${ACTIVEMQ_TAG} - ports: - - 8161:8161 # Web Console - - 5672:5672 # AMQP - - 61616:61616 # OpenWire - - 61613:61613 # STOMP diff --git a/pom.xml b/pom.xml index a003e0d58..5373476db 100644 --- a/pom.xml +++ b/pom.xml @@ -2,15 +2,90 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT pom org.alfresco alfresco-super-pom - 10 + 12 + + scm:git:https://github.com/Alfresco/acs-community-packaging.git + scm:git:https://github.com/Alfresco/acs-community-packaging.git + https://github.com/Alfresco/acs-community-packaging + HEAD + + + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/repositories/releases + + + alfresco-internal-snapshots + https://artifacts.alfresco.com/nexus/content/repositories/snapshots + + + + + + Community + latest + + 7.133.0 + 7.183.0 + 8.50.14 + 7.33 + + 1.0.12 + + 7.14 + 6.0 + 1.1 + 2.3 + 7.1 + 6.0.1 + 6.2.1.1 + 1.2.15 + 0.2 + + 5.1.15.RELEASE + 4.4.0 + 2.10.2 + 2.10.1 + 3.3.6 + + + 6.2.1 + 6.2.1 + + + 3.2.0 + + + 1.3.1 + + ${project.version} + alfresco-community + ${alfresco.package.name}-distribution + + 42.2.12 + + 3.0.20 + 3.3.0 + 1.1.4 + 1.37 + 1.13 + 1.8 + 1.6 + 1.5 + 2.3 + + 11 + + community @@ -45,79 +120,6 @@ - - scm:git:git@github.com:Alfresco/acs-community-packaging.git - scm:git:git@github.com:Alfresco/acs-community-packaging.git - https://github.com/Alfresco/acs-community-packaging - HEAD - - - - - alfresco-internal - https://artifacts.alfresco.com/nexus/content/repositories/releases - - - alfresco-internal-snapshots - https://artifacts.alfresco.com/nexus/content/repositories/snapshots - - - - - - Community - latest - - 8.82 - 8.83 - 8.84 - 8.18 - - 1.0.12 - 8.1 - 6.0 - 1.1 - 2.3 - 7.1 - 6.0.1 - 1.2.15 - 6.3.0 - 0.2 - - 5.2.2.RELEASE - 4.3.1 - 2.10.2 - 2.10.1 - - 3.3.4 - - - 6.2.0 - 6.2.0 - - - 3.2.0-A1 - - - 1.3.0 - - ${project.version} - alfresco-community - ${alfresco.package.name}-distribution - - 42.2.9 - - 3.0.17 - 3.3.0 - 1.1.4 - 1.26 - 1.12 - 1.7 - 1.5 - 1.4 - 2.3 - - @@ -244,7 +246,7 @@ org.apache.httpcomponents httpcore - 4.4.12 + 4.4.13 joda-time @@ -300,12 +302,12 @@ org.apache.httpcomponents httpclient - 4.5.10 + 4.5.12 org.apache.httpcomponents httpclient-cache - 4.5.10 + 4.5.12 org.apache.xmlbeans @@ -527,12 +529,12 @@ org.bouncycastle bcprov-jdk15on - 1.64 + 1.65 org.bouncycastle bcmail-jdk15on - 1.64 + 1.65 @@ -544,7 +546,7 @@ org.jsoup jsoup - 1.12.1 + 1.13.1 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 01fec31cb..ad9189722 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml pom diff --git a/scripts/travis/copy_to_release_bucket.sh b/scripts/travis/copy_to_release_bucket.sh new file mode 100755 index 000000000..f04dc9516 --- /dev/null +++ b/scripts/travis/copy_to_release_bucket.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +set -ev + +if [ -z ${COMM_RELEASE_VERSION} ] || [ -z ${RELEASE_VERSION} ]; +then + echo "Please provide a COMM_RELEASE_VERSION and RELEASE_VERSION in the format - (6.3.0-EA or 6.3.0-SNAPSHOT)" + exit -1 +fi + +build_number=$1 +branch_name=$2 +build_stage=release +SOURCE=s3://alfresco-artefacts-staging/alfresco-content-services-community/$build_stage/$branch_name/$build_number +DESTINATION=s3://eu.dl.alfresco.com/release/community/$COMM_RELEASE_VERSION-build-$build_number + +aws s3 cp --acl private $SOURCE/alfresco.war $DESTINATION/alfresco.war +aws s3 cp --acl private $SOURCE/alfresco-content-services-community-distribution-$RELEASE_VERSION.zip $DESTINATION/alfresco-content-services-community-distribution-$RELEASE_VERSION.zip \ No newline at end of file diff --git a/scripts/travis/maven_release.sh b/scripts/travis/maven_release.sh new file mode 100755 index 000000000..b4e915564 --- /dev/null +++ b/scripts/travis/maven_release.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +set -e + +releaseVersion=$1 +developmentVersion=$2 +scm_path=$(mvn help:evaluate -Dexpression=project.scm.url -q -DforceStdout) + +# Use full history for release +git checkout -B "${TRAVIS_BRANCH}" +# Add email to link commits to user +git config user.email "${GIT_EMAIL}" + +if [ -z ${releaseVersion} ] || [ -z ${developmentVersion} ]; + then echo "Please provide a Release and Development verison in the format - (6.3.0-EA or 6.3.0-SNAPSHOT)" + exit -1 +else + mvn --batch-mode \ + -PfullBuild,all-tas-tests \ + -Dusername="${GIT_USERNAME}" \ + -Dpassword="${GIT_PASSWORD}" \ + -DreleaseVersion=${releaseVersion} \ + -DdevelopmentVersion=${developmentVersion} \ + -Dbuild-number=${TRAVIS_BUILD_NUMBER} \ + -Dbuild-name="${TRAVIS_BUILD_STAGE_NAME}" \ + -Dscm-path=${scm_path} \ + -DscmCommentPrefix="[maven-release-plugin][skip ci]" \ + -DskipTests \ + "-Darguments=-DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER} '-Dbuild-name=${TRAVIS_BUILD_STAGE_NAME}' -Dscm-path=${scm_path} -PfullBuild,all-tas-tests" \ + release:clean release:prepare release:perform \ + -Prelease +fi diff --git a/scripts/travis/verify_release_tag.sh b/scripts/travis/verify_release_tag.sh new file mode 100755 index 000000000..51086b8ec --- /dev/null +++ b/scripts/travis/verify_release_tag.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +set -e + +if [ -v ${RELEASE_VERSION} ]||[ -z ${RELEASE_VERSION} ]; then + echo "Please provide a RELEASE_VERSION in the format - (6.3.0-EA or 6.3.0-SNAPSHOT)" + exit -1 +fi +# get the image name from the pom file +alfresco_docker_image=$(mvn help:evaluate -f ./docker-alfresco/pom.xml -Dexpression=image.name -q -DforceStdout) +docker_image_full_name="$alfresco_docker_image:$RELEASE_VERSION" + +function docker_image_exists() { + local image_full_name="$1"; shift + local wait_time="${1:-5}" + local search_term='Pulling|is up to date|not found' + echo "Looking to see if $image_full_name already exists..." + local result="$((timeout --preserve-status "$wait_time" docker 2>&1 pull "$image_full_name" &) | grep -v 'Pulling repository' | egrep -o "$search_term")" + test "$result" || { echo "Timed out too soon. Try using a wait_time greater than $wait_time..."; return 1 ;} + if echo $result | grep -vq 'not found'; then + true + else + false + fi +} + +if docker_image_exists $docker_image_full_name; then + echo "Tag $RELEASE_VERSION already pushed, release process will interrupt." + exit -1 +else + echo "The $RELEASE_VERSION tag was not found" +fi diff --git a/tests/environment/.env b/tests/environment/.env index ef18cd66b..923c49723 100644 --- a/tests/environment/.env +++ b/tests/environment/.env @@ -1,4 +1,4 @@ -TRANSFORMERS_TAG=2.1.0 -SOLR6_TAG=1.4.0 +TRANSFORMERS_TAG=2.2.1 +SOLR6_TAG=1.4.2 POSTGRES_TAG=11.4 ACTIVEMQ_TAG=5.15.8 diff --git a/tests/environment/docker-compose-minimal+transforms.yml b/tests/environment/docker-compose-minimal+transforms.yml index 4f642eda4..d8f0a1f7e 100644 --- a/tests/environment/docker-compose-minimal+transforms.yml +++ b/tests/environment/docker-compose-minimal+transforms.yml @@ -31,24 +31,18 @@ services: -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\" - -Dlocal.transform.service.enabled=true - -DlocalTransform.pdfrenderer.url=http://alfresco-pdf-renderer:8090/ - -DlocalTransform.imagemagick.url=http://imagemagick:8090/ - -DlocalTransform.libreoffice.url=http://libreoffice:8090/ - -DlocalTransform.tika.url=http://tika:8090/ - -DlocalTransform.misc.url=http://transform-misc:8090/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ - -Dlegacy.transform.service.enabled=true - -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/ - -Djodconverter.url=http://libreoffice:8090/ - -Dimg.url=http://imagemagick:8090/ - -Dtika.url=http://tika:8090/ - -Dtransform.misc.url=http://transform-misc:8090/ + -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ + -Djodconverter.url=http://transform-core-aio:8090/ + -Dimg.url=http://transform-core-aio:8090/ + -Dtika.url=http://transform-core-aio:8090/ + -Dtransform.misc.url=http://transform-core-aio:8090/ -Dimap.server.port=1143 -Dftp.port=1221 -Dcors.enabled=true - -Dcors.allowed.origins=http://localhost:4200 + -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080 " ports: - 8082:8080 @@ -88,57 +82,9 @@ services: - 61616:61616 # OpenWire - 61613:61613 # STOMP - alfresco-pdf-renderer: - image: alfresco/alfresco-pdf-renderer:${TRANSFORMERS_TAG} + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG} environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ACTIVEMQ_URL: "nio://activemq:61616" - ACTIVEMQ_USER: "admin" - ACTIVEMQ_PASSWORD: "admin" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + JAVA_OPTS: " -Xms256m -Xmx512m" ports: - 8090:8090 - - imagemagick: - image: alfresco/alfresco-imagemagick:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ACTIVEMQ_URL: "nio://activemq:61616" - ACTIVEMQ_USER: "admin" - ACTIVEMQ_PASSWORD: "admin" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8091:8090 - - libreoffice: - image: alfresco/alfresco-libreoffice:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ACTIVEMQ_URL: "nio://activemq:61616" - ACTIVEMQ_USER: "admin" - ACTIVEMQ_PASSWORD: "admin" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8092:8090 - - tika: - image: alfresco/alfresco-tika:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ACTIVEMQ_USER: "admin" - ACTIVEMQ_PASSWORD: "admin" - ports: - - 8093:8090 - - transform-misc: - image: alfresco/alfresco-transform-misc:${TRANSFORMERS_TAG} - environment: - JAVA_OPTS: " -Xms256m -Xmx256m" - ACTIVEMQ_URL: "nio://activemq:61616" - ACTIVEMQ_USER: "admin" - ACTIVEMQ_PASSWORD: "admin" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8094:8090 diff --git a/tests/pom.xml b/tests/pom.xml index 80692a107..4a72c5b91 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -1,13 +1,13 @@ 4.0.0 content-repository-community-tas-tests-parent - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT pom org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml index 6b5f6175a..b26d8f7cc 100644 --- a/tests/tas-cmis/pom.xml +++ b/tests/tas-cmis/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-cmis-test content-repository-community-cmis-test - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml index b8734067a..bada77247 100644 --- a/tests/tas-email/pom.xml +++ b/tests/tas-email/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-email-test content-repository-community-email-test - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml index e0c4316a8..a63820fa4 100644 --- a/tests/tas-integration/pom.xml +++ b/tests/tas-integration/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-integration-test content-repository-community-integration-test - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml @@ -25,7 +25,7 @@ ${project.basedir}/src/test/resources/integration-suite.xml - 2.5.8 + 2.5.9 1.6.2 diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml index 14337f62a..54615072a 100644 --- a/tests/tas-restapi/pom.xml +++ b/tests/tas-restapi/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-restapi-test content-repository-community-restapi-test - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java b/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java index 37eb8c955..fd3fdb51a 100644 --- a/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java +++ b/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java @@ -199,11 +199,13 @@ public class NodesLockTests extends RestTest .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); STEP("6. Verify that the file is locked PERSISTENT only after EPHEMERAL lock has expired"); - try{Thread.sleep(2500);}finally{} - RestNodeModel file1Model4 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").getNode(); - file1Model4.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=PERSISTENT") - .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model4 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").getNode(); + file1Model4.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=PERSISTENT") + .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + }); } @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @@ -313,12 +315,14 @@ public class NodesLockTests extends RestTest lockBodyModel2.setLifetime("EPHEMERAL"); lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setType("FULL"); - try{Thread.sleep(1500);}finally{} - RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); - restClient.assertStatusCodeIs(HttpStatus.OK); - file1Model3.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=EPHEMERAL") - .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); + restClient.assertStatusCodeIs(HttpStatus.OK); + file1Model3.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=EPHEMERAL") + .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); + }); } // TODO: uncomment this: @Bug(id = "MNT-17612", status = Status.FIXED, description = "AccessDeniedException in AOS Edit Offline Upload New Version") @@ -354,12 +358,15 @@ public class NodesLockTests extends RestTest lockBodyModel2.setLifetime("PERSISTENT"); lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setType("ALLOW_OWNER_CHANGES"); - try{Thread.sleep(1500);}finally{} - RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); - restClient.assertStatusCodeIs(HttpStatus.OK); - file1Model3.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=PERSISTENT") - .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); + restClient.assertStatusCodeIs(HttpStatus.OK); + file1Model3.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=PERSISTENT") + .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + + }); } @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @@ -393,12 +400,14 @@ public class NodesLockTests extends RestTest lockBodyModel2.setLifetime("EPHEMERAL"); lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setType("FULL"); - try{Thread.sleep(1500);}finally{} - RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); - restClient.assertStatusCodeIs(HttpStatus.OK); - file1Model3.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=EPHEMERAL") - .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); + restClient.assertStatusCodeIs(HttpStatus.OK); + file1Model3.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=EPHEMERAL") + .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); + }); } @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @@ -432,12 +441,14 @@ public class NodesLockTests extends RestTest lockBodyModel2.setLifetime("PERSISTENT"); lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setType("ALLOW_OWNER_CHANGES"); - try{Thread.sleep(1500);}finally{} - RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); - restClient.assertStatusCodeIs(HttpStatus.OK); - file1Model3.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=PERSISTENT") - .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); + restClient.assertStatusCodeIs(HttpStatus.OK); + file1Model3.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=PERSISTENT") + .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + }); } @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @@ -471,12 +482,14 @@ public class NodesLockTests extends RestTest lockBodyModel2.setLifetime("EPHEMERAL"); lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setType("FULL"); - try{Thread.sleep(1500);}finally{} - RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); - restClient.assertStatusCodeIs(HttpStatus.OK); - file1Model3.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=EPHEMERAL") - .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); + restClient.assertStatusCodeIs(HttpStatus.OK); + file1Model3.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=EPHEMERAL") + .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); + }); } @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @@ -509,12 +522,14 @@ public class NodesLockTests extends RestTest lockBodyModel2.setLifetime("PERSISTENT"); lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setType("ALLOW_OWNER_CHANGES"); - try{Thread.sleep(1500);}finally{} - RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); - restClient.assertStatusCodeIs(HttpStatus.OK); - file1Model3.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=PERSISTENT") - .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); + restClient.assertStatusCodeIs(HttpStatus.OK); + file1Model3.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=PERSISTENT") + .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + }); } @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @@ -548,12 +563,14 @@ public class NodesLockTests extends RestTest lockBodyModel2.setLifetime("EPHEMERAL"); lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setType("FULL"); - try{Thread.sleep(1500);}finally{} - RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); - restClient.assertStatusCodeIs(HttpStatus.OK); - file1Model3.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=EPHEMERAL") - .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); + restClient.assertStatusCodeIs(HttpStatus.OK); + file1Model3.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=EPHEMERAL") + .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); + }); } // TODO: uncomment this: @Bug(id = "MNT-17612", status = Status.FIXED, description = "AccessDeniedException in AOS Edit Offline Upload New Version") @@ -590,12 +607,14 @@ public class NodesLockTests extends RestTest lockBodyModel2.setLifetime("PERSISTENT"); lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setType("ALLOW_OWNER_CHANGES"); - try{Thread.sleep(1500);}finally{} - RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); - restClient.assertStatusCodeIs(HttpStatus.OK); - file1Model3.assertThat().field("isLocked").is(true) - .assertThat().field("properties").contains("lockLifetime=PERSISTENT") - .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + Utility.sleep(500, 5000, () -> + { + RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); + restClient.assertStatusCodeIs(HttpStatus.OK); + file1Model3.assertThat().field("isLocked").is(true) + .assertThat().field("properties").contains("lockLifetime=PERSISTENT") + .assertThat().field("properties").contains("lockType=WRITE_LOCK"); + }); } @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java b/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java index f724c9840..2dc82acb6 100644 --- a/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java +++ b/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java @@ -212,8 +212,11 @@ public class SharedLinksSanityTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.OK); } + /** + * ATS does not support text -> img (doclib) + */ @TestRail(section = { TestGroup.REST_API, TestGroup.SHAREDLINKS }, executionType = ExecutionType.SANITY, description = "Sanity tests for GET /renditions, GET /renditions/{renditionId} and GET /renditions/{renditionId}/content endpoints") - @Test(groups = { TestGroup.REST_API, TestGroup.SHAREDLINKS, TestGroup.SANITY, TestGroup.RENDITIONS }) + @Test(groups = { TestGroup.REST_API, TestGroup.SHAREDLINKS, TestGroup.SANITY, TestGroup.RENDITIONS, TestGroup.NOT_SUPPORTED_BY_ATS }) public void testGetSharedLinkRendition() throws Exception { sharedLink7 = restClient.authenticateUser(testUser1).withCoreAPI().usingSharedLinks().createSharedLink(file7); diff --git a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java b/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java index aa7558c38..b450d3ee5 100644 --- a/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java +++ b/tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java @@ -142,10 +142,12 @@ public class UpdateTagTests extends TagsDataPrep { String invalidTagBody = "|.\"/<>*"; RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().usingResource(document).addTag(RandomData.getRandomName("tag")); - Utility.waitToLoopTime(20); - restClient.withCoreAPI().usingTag(tag).update(invalidTagBody); - restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) - .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody)); + Utility.sleep(500, 20000, () -> + { + restClient.withCoreAPI().usingTag(tag).update(invalidTagBody); + restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) + .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody)); + }); } @Bug(id="ACE-5629") @@ -156,10 +158,12 @@ public class UpdateTagTests extends TagsDataPrep { String invalidTagBody = ".\"/<>*"; RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().usingResource(document).addTag(RandomData.getRandomName("tag")); - Utility.waitToLoopTime(20); - restClient.withCoreAPI().usingTag(tag).update(invalidTagBody); - restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) - .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody)); + Utility.sleep(500, 20000, () -> + { + restClient.withCoreAPI().usingTag(tag).update(invalidTagBody); + restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) + .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody)); + }); } @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION, diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml index 9c96c2697..53f95619e 100644 --- a/tests/tas-webdav/pom.xml +++ b/tests/tas-webdav/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-webdav-test content-repository-community-webdav-test - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml diff --git a/war/pom.xml b/war/pom.xml index 8ea198047..9d5a744a8 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.3.0-SNAPSHOT + 6.2.1-SNAPSHOT ../pom.xml @@ -110,7 +110,7 @@ org.mockito mockito-core - 3.2.4 + 3.3.3 test @@ -178,7 +178,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.1.0 validate @@ -265,6 +265,20 @@ + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + ${maven.build.sourceVersion} + + + + + maven-release-plugin + 2.5.3 + org.codehaus.mojo license-maven-plugin diff --git a/war/src/main/resources/log4j.properties b/war/src/main/resources/log4j.properties index c74deb34d..e609c049e 100644 --- a/war/src/main/resources/log4j.properties +++ b/war/src/main/resources/log4j.properties @@ -225,6 +225,7 @@ log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info log4j.logger.org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl=off log4j.logger.org.alfresco.repo.domain.schema.script.ScriptExecutorImpl=info +log4j.logger.org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor=off log4j.logger.org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl=info From e3f8d83659f33f1c366dffc3d771d37361884c85 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 13 May 2020 07:55:02 +0100 Subject: [PATCH 15/18] Bring master up to the same state as develop and [release] 6.2.1-A8 Should run White Source on both master and develop (cherry picked from commit 9e911a65228a4bc995407ca54bd3428b904508d5) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c65dfcc79..e620ac36c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,8 @@ jobs: include: - stage: test name: "WhiteSource scan" - # only on develop and if it is not a PR - if: fork = false AND branch = develop AND type != pull_request + # only on master or develop and if it is not a PR + if: fork = false AND branch =~ ^(master|develop)$ AND type != pull_request install: - travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml script: From 531c54304b60ad2bf6ab1345f4e15d5456073752 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 13 May 2020 08:06:08 +0000 Subject: [PATCH 16/18] [maven-release-plugin][skip ci]prepare release acs-community-packaging-6.2.1-A8 --- distribution/pom.xml | 2 +- docker-alfresco/pom.xml | 2 +- pom.xml | 4 ++-- public-javadoc/pom.xml | 2 +- tests/pom.xml | 4 ++-- tests/tas-cmis/pom.xml | 4 ++-- tests/tas-email/pom.xml | 4 ++-- tests/tas-integration/pom.xml | 4 ++-- tests/tas-restapi/pom.xml | 4 ++-- tests/tas-webdav/pom.xml | 4 ++-- war/pom.xml | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 3550f86a8..a8d2b6d0e 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml index 1f18e1421..72ab5a39f 100644 --- a/docker-alfresco/pom.xml +++ b/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml diff --git a/pom.xml b/pom.xml index 5373476db..c19ed7891 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.2.1-SNAPSHOT + 6.2.1-A8 pom @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/acs-community-packaging.git scm:git:https://github.com/Alfresco/acs-community-packaging.git https://github.com/Alfresco/acs-community-packaging - HEAD + acs-community-packaging-6.2.1-A8 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index ad9189722..8bc54075e 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco acs-community-packaging - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml pom diff --git a/tests/pom.xml b/tests/pom.xml index 4a72c5b91..621f1a652 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -1,13 +1,13 @@ 4.0.0 content-repository-community-tas-tests-parent - 6.2.1-SNAPSHOT + 6.2.1-A8 pom org.alfresco acs-community-packaging - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml index b26d8f7cc..6ab08d9c2 100644 --- a/tests/tas-cmis/pom.xml +++ b/tests/tas-cmis/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-cmis-test content-repository-community-cmis-test - 6.2.1-SNAPSHOT + 6.2.1-A8 jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml index bada77247..758fec589 100644 --- a/tests/tas-email/pom.xml +++ b/tests/tas-email/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-email-test content-repository-community-email-test - 6.2.1-SNAPSHOT + 6.2.1-A8 jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml index a63820fa4..af9635016 100644 --- a/tests/tas-integration/pom.xml +++ b/tests/tas-integration/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-integration-test content-repository-community-integration-test - 6.2.1-SNAPSHOT + 6.2.1-A8 jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml index 54615072a..75dc70ca5 100644 --- a/tests/tas-restapi/pom.xml +++ b/tests/tas-restapi/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-restapi-test content-repository-community-restapi-test - 6.2.1-SNAPSHOT + 6.2.1-A8 jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml index 53f95619e..87444042b 100644 --- a/tests/tas-webdav/pom.xml +++ b/tests/tas-webdav/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-webdav-test content-repository-community-webdav-test - 6.2.1-SNAPSHOT + 6.2.1-A8 jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml diff --git a/war/pom.xml b/war/pom.xml index 9d5a744a8..8a20c2d04 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.2.1-SNAPSHOT + 6.2.1-A8 ../pom.xml From 41c5aa4ecaf0a7ede84e5199b5adffe779603227 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 13 May 2020 08:06:15 +0000 Subject: [PATCH 17/18] [maven-release-plugin][skip ci]prepare for next development iteration --- distribution/pom.xml | 2 +- docker-alfresco/pom.xml | 2 +- pom.xml | 4 ++-- public-javadoc/pom.xml | 2 +- tests/pom.xml | 4 ++-- tests/tas-cmis/pom.xml | 4 ++-- tests/tas-email/pom.xml | 4 ++-- tests/tas-integration/pom.xml | 4 ++-- tests/tas-restapi/pom.xml | 4 ++-- tests/tas-webdav/pom.xml | 4 ++-- war/pom.xml | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index a8d2b6d0e..74c116218 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml index 72ab5a39f..fe20853e0 100644 --- a/docker-alfresco/pom.xml +++ b/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index c19ed7891..6132db598 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.2.1-A8 + 6.2.1.1-SNAPSHOT pom @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/acs-community-packaging.git scm:git:https://github.com/Alfresco/acs-community-packaging.git https://github.com/Alfresco/acs-community-packaging - acs-community-packaging-6.2.1-A8 + HEAD diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 8bc54075e..4bfe95d98 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco acs-community-packaging - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml pom diff --git a/tests/pom.xml b/tests/pom.xml index 621f1a652..739b6b882 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -1,13 +1,13 @@ 4.0.0 content-repository-community-tas-tests-parent - 6.2.1-A8 + 6.2.1.1-SNAPSHOT pom org.alfresco acs-community-packaging - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml index 6ab08d9c2..248df6704 100644 --- a/tests/tas-cmis/pom.xml +++ b/tests/tas-cmis/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-cmis-test content-repository-community-cmis-test - 6.2.1-A8 + 6.2.1.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml index 758fec589..2948f9f8f 100644 --- a/tests/tas-email/pom.xml +++ b/tests/tas-email/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-email-test content-repository-community-email-test - 6.2.1-A8 + 6.2.1.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml index af9635016..e61fadf68 100644 --- a/tests/tas-integration/pom.xml +++ b/tests/tas-integration/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-integration-test content-repository-community-integration-test - 6.2.1-A8 + 6.2.1.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml index 75dc70ca5..839bc9394 100644 --- a/tests/tas-restapi/pom.xml +++ b/tests/tas-restapi/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-restapi-test content-repository-community-restapi-test - 6.2.1-A8 + 6.2.1.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml index 87444042b..ea423cbd2 100644 --- a/tests/tas-webdav/pom.xml +++ b/tests/tas-webdav/pom.xml @@ -4,13 +4,13 @@ org.alfresco.tas content-repository-community-webdav-test content-repository-community-webdav-test - 6.2.1-A8 + 6.2.1.1-SNAPSHOT jar org.alfresco content-repository-community-tas-tests-parent - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml diff --git a/war/pom.xml b/war/pom.xml index 8a20c2d04..0ac8b9964 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.2.1-A8 + 6.2.1.1-SNAPSHOT ../pom.xml From 726d3aa3e6d5ce3022850d4356edccadcf8df07f Mon Sep 17 00:00:00 2001 From: Ayman Harake <42536841+aymanthefirst@users.noreply.github.com> Date: Thu, 20 Aug 2020 12:11:14 +0100 Subject: [PATCH 18/18] ATS-817: Updated references to T-Engines and Postgres (#1003) * ATS-817: Updated reference to T-Engines * ATS-817: Updated postgres to 11.7 --- tests/environment/.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/environment/.env b/tests/environment/.env index 923c49723..389332f38 100644 --- a/tests/environment/.env +++ b/tests/environment/.env @@ -1,4 +1,4 @@ -TRANSFORMERS_TAG=2.2.1 +TRANSFORMERS_TAG=2.3.4 SOLR6_TAG=1.4.2 -POSTGRES_TAG=11.4 +POSTGRES_TAG=11.7 ACTIVEMQ_TAG=5.15.8