From 2dd0694847d6fdd58904a0b364a527881713ea7b Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Tue, 3 Dec 2019 09:47:18 +0200 Subject: [PATCH 01/70] REPO-4751: Upgrade to Spring 5.2 - The addition of support for reactive transactions in TransactionInterceptor in Spring 5.2 changed the return type of some methods in TransactionAspectSupport --- pom.xml | 2 +- .../util/transaction/SpringAwareUserTransaction.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 40dcb76461..4aa35cfa41 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - 5.1.8.RELEASE + 5.2.1.RELEASE 7.9 11 diff --git a/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java b/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java index 6497901ff5..2e8d6c9c26 100644 --- a/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java +++ b/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java @@ -36,6 +36,7 @@ import org.springframework.transaction.CannotCreateTransactionException; import org.springframework.transaction.NoTransactionException; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.TransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAttribute; @@ -410,8 +411,15 @@ public class SpringAwareUserTransaction // begin a transaction try { + TransactionManager tm = getTransactionManager(); + + if (tm != null && !(tm instanceof PlatformTransactionManager)) + { + throw new IllegalStateException("Specified transaction manager is not a PlatformTransactionManager: " + tm); + } + internalTxnInfo = createTransactionIfNecessary( - getTransactionManager(), getTransactionAttribute(null, null), getName()); + (PlatformTransactionManager) tm, getTransactionAttribute(null, null), getName()); } catch (CannotCreateTransactionException e) { From a377905221f3492f432f81c79bc8962bedcf615d Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 3 Dec 2019 07:51:11 +0000 Subject: [PATCH 02/70] [maven-release-plugin][skip ci] prepare release 7.24 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4aa35cfa41..953cf163a2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 7.24-SNAPSHOT + 7.24 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 7.24 From 6e224af8a2b25cd635cd894f3f6716e38486e091 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 3 Dec 2019 07:51:16 +0000 Subject: [PATCH 03/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 953cf163a2..f3ec98c213 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 7.24 + 7.25-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 7.24 + HEAD From ad33610d4be61ea81ec267b41febab69f2ba8088 Mon Sep 17 00:00:00 2001 From: cturlica Date: Tue, 3 Dec 2019 17:02:12 +0200 Subject: [PATCH 04/70] Changed version to 8.0 and update surf version to 8.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f3ec98c213..a4c270a089 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 7.25-SNAPSHOT + 8.0-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -27,7 +27,7 @@ 5.2.1.RELEASE - 7.9 + 8.0 11 From df7a693005fbce8510ced22f6a7feb8597124cfd Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 3 Dec 2019 15:06:10 +0000 Subject: [PATCH 05/70] [maven-release-plugin][skip ci] prepare release 8.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a4c270a089..757a635bd2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.0-SNAPSHOT + 8.0 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.0 From 50f0333f041a673281368ffd1289529fa8efb013 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 3 Dec 2019 15:06:16 +0000 Subject: [PATCH 06/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 757a635bd2..9bc57396ec 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.0 + 8.1-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.0 + HEAD From c53f69fea1ab7758fbdf7e931b078ae81a0f5113 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2019 09:38:51 +0000 Subject: [PATCH 07/70] Bump dependency.spring.version from 5.2.1.RELEASE to 5.2.2.RELEASE (#97) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9bc57396ec..2ab26f3d48 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - 5.2.1.RELEASE + 5.2.2.RELEASE 8.0 11 From 7f2b26d730ee96ddfc5f657a0ca47dfc6b818574 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 4 Dec 2019 09:42:37 +0000 Subject: [PATCH 08/70] [maven-release-plugin][skip ci] prepare release 8.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2ab26f3d48..6caf60ccee 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.1-SNAPSHOT + 8.1 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.1 From 7e38c3bbc6cd2c292d159b6a1bd982fd4845c41e Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 4 Dec 2019 09:42:43 +0000 Subject: [PATCH 09/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6caf60ccee..76b3cf12b6 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.1 + 8.2-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.1 + HEAD From f9051c5b9aeb99b61147efe2650b991e8b9a7193 Mon Sep 17 00:00:00 2001 From: cturlica Date: Wed, 4 Dec 2019 11:46:57 +0200 Subject: [PATCH 10/70] REPO-4751: Upgrade to Spring 5.2 - update webscripts (spring 5.2.2) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76b3cf12b6..29e3b940a4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.2.2.RELEASE - 8.0 + 8.1 11 From afb6235b666b2f824d4f14751735cfb6e417e0ad Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 4 Dec 2019 09:50:23 +0000 Subject: [PATCH 11/70] [maven-release-plugin][skip ci] prepare release 8.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 29e3b940a4..cea52890f7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.2-SNAPSHOT + 8.2 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.2 From ff025e9ad2c68c355a825646d8d3b0769f8ad3b6 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 4 Dec 2019 09:50:29 +0000 Subject: [PATCH 12/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cea52890f7..35eb07fc74 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.2 + 8.3-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.2 + HEAD From 38e5284ccffed3a199cd86d08ab2d38086043bb1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 08:48:09 +0000 Subject: [PATCH 13/70] Bump quartz from 2.3.1 to 2.3.2 (#88) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 35eb07fc74..f08420e5d9 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ org.quartz-scheduler quartz - 2.3.1 + 2.3.2 From bd5d162d025566c25faf3799de784a46f841bef1 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 16 Dec 2019 08:51:23 +0000 Subject: [PATCH 14/70] [maven-release-plugin][skip ci] prepare release 8.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f08420e5d9..d8047ff199 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.3-SNAPSHOT + 8.3 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.3 From 6e13e02e5edeba22aee4d2ff76c8f205cb88fbdf Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 16 Dec 2019 08:51:29 +0000 Subject: [PATCH 15/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d8047ff199..88b5e333be 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.3 + 8.4-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.3 + HEAD From 5b8ce87f0d81cb2af4e1394d3dba436556b5677d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 08:51:49 +0000 Subject: [PATCH 16/70] Bump joda-time from 2.10.4 to 2.10.5 (#89) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88b5e333be..08eb08b879 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ joda-time joda-time - 2.10.4 + 2.10.5 org.apache.httpcomponents From 37e2e6500525570c7cc7ef9675ee11872b3f0000 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 16 Dec 2019 08:55:08 +0000 Subject: [PATCH 17/70] [maven-release-plugin][skip ci] prepare release 8.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 08eb08b879..6f624ccf0c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.4-SNAPSHOT + 8.4 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.4 From 118a9db6a3c9d7e3971cf09abdea9350dffbfd9d Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 16 Dec 2019 08:55:14 +0000 Subject: [PATCH 18/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6f624ccf0c..4041509418 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.4 + 8.5-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.4 + HEAD From a2325c62f0a47d509c82a706b9a9d35bd1c54f3c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 08:55:35 +0000 Subject: [PATCH 19/70] Bump slf4j-log4j12 from 1.7.28 to 1.7.29 (#90) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4041509418..18d957033f 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ org.slf4j slf4j-log4j12 - 1.7.28 + 1.7.29 test From bd8ef2a0f6cfc5ed1b2cbc6c1b031afe9c48b54e Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 16 Dec 2019 08:58:59 +0000 Subject: [PATCH 20/70] [maven-release-plugin][skip ci] prepare release 8.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 18d957033f..dffad0e8ad 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.5-SNAPSHOT + 8.5 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.5 From 027dcb8c83bf279712526d3da356959119dba8e9 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 16 Dec 2019 08:59:05 +0000 Subject: [PATCH 21/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dffad0e8ad..5e935cc2a3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.5 + 8.6-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.5 + HEAD From df16735b009cc458d7e43e2c4a96e750ea13e686 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 08:59:48 +0000 Subject: [PATCH 22/70] Bump maven-jar-plugin from 3.1.2 to 3.2.0 (#91) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e935cc2a3..8b41abc704 100644 --- a/pom.xml +++ b/pom.xml @@ -228,7 +228,7 @@ maven-jar-plugin - 3.1.2 + 3.2.0 From 163bfb7e7640d9efc7280caf63cb69c3f541e0a6 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 16 Dec 2019 09:03:18 +0000 Subject: [PATCH 23/70] [maven-release-plugin][skip ci] prepare release 8.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8b41abc704..974e7d4bb0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.6-SNAPSHOT + 8.6 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.6 From f217f6e5f46b94b0dadb580f1588499121b1c29c Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 16 Dec 2019 09:03:24 +0000 Subject: [PATCH 24/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 974e7d4bb0..8f3bf87a55 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.6 + 8.7-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.6 + HEAD From 26fd47f1b73f42d58c18dd6d42cfcda09dd3aebe Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2019 12:31:27 +0000 Subject: [PATCH 25/70] Bump slf4j-log4j12 from 1.7.29 to 1.7.30 (#106) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f3bf87a55..4ed3144185 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ org.slf4j slf4j-log4j12 - 1.7.29 + 1.7.30 test From 1ce04359965237e720405e7db39063077a0add6a Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 18 Dec 2019 12:35:00 +0000 Subject: [PATCH 26/70] [maven-release-plugin][skip ci] prepare release 8.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4ed3144185..e6c927f246 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.7-SNAPSHOT + 8.7 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.7 From 116bbf029579262f6d14752d961ca5ac9d217c15 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 18 Dec 2019 12:35:07 +0000 Subject: [PATCH 27/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e6c927f246..8ccdaa99dc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.7 + 8.8-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.7 + HEAD From c51b3c64ba9472761f63174fadbfaf21e66926b6 Mon Sep 17 00:00:00 2001 From: NITHIN NAMBIAR Date: Thu, 19 Dec 2019 11:21:11 +0000 Subject: [PATCH 28/70] repo-4061 mockito library update (#98) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8ccdaa99dc..11895aa8da 100644 --- a/pom.xml +++ b/pom.xml @@ -200,8 +200,8 @@ org.mockito - mockito-all - 1.10.19 + mockito-core + 3.0.0 test From 125c2ac4daa6918794c61bdd1b9e5326023d9e15 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Thu, 19 Dec 2019 11:24:34 +0000 Subject: [PATCH 29/70] [maven-release-plugin][skip ci] prepare release 8.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 11895aa8da..e3e0688de2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.8-SNAPSHOT + 8.8 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.8 From f7941d40ba5df918f0abe2799dde4118796b1a57 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Thu, 19 Dec 2019 11:24:40 +0000 Subject: [PATCH 30/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e3e0688de2..2511ec4ef5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.8 + 8.9-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.8 + HEAD From b6d8551f2ec845529369a9c0c2b34a415aa01bda Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 19 Dec 2019 16:59:50 +0000 Subject: [PATCH 31/70] Pick up new super pom with mysql and postgres versions. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2511ec4ef5..dd2b85baec 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-super-pom - 10 + 11 alfresco-core 8.9-SNAPSHOT From b22f2b9b4a4577c39cf2abf6f2d90af7d3a29dbd Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 19 Dec 2019 17:16:36 +0000 Subject: [PATCH 32/70] Revert, pick up new super pom with mysql and postgres versions. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dd2b85baec..2511ec4ef5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-super-pom - 11 + 10 alfresco-core 8.9-SNAPSHOT From 892c7ecebf17ed36ebf845f589aabef14972a21f Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Thu, 19 Dec 2019 17:20:09 +0000 Subject: [PATCH 33/70] [maven-release-plugin][skip ci] prepare release 8.9 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2511ec4ef5..8356359233 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.9-SNAPSHOT + 8.9 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.9 From 7bae1f171b3b2b7393abbf211906fcb7ae3386cc Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Thu, 19 Dec 2019 17:20:16 +0000 Subject: [PATCH 34/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8356359233..ea17aae76a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.9 + 8.10-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.9 + HEAD From 65dd6a7ba8a5022ccba10f4be8477416f720f458 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2019 08:12:39 +0000 Subject: [PATCH 35/70] Bump mockito-core from 3.0.0 to 3.2.4 (#107) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea17aae76a..e5201bf475 100644 --- a/pom.xml +++ b/pom.xml @@ -201,7 +201,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.4 test From 48adb2b1e21b8eef7cd90cdad2872fa1449f03c4 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 20 Dec 2019 08:15:44 +0000 Subject: [PATCH 36/70] [maven-release-plugin][skip ci] prepare release 8.10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e5201bf475..9f8aed6c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.10-SNAPSHOT + 8.10 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.10 From 431f310c1f631cc0394ca8d1bc45de318b3a4e63 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 20 Dec 2019 08:15:50 +0000 Subject: [PATCH 37/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9f8aed6c0f..0381ca2238 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.10 + 8.11-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.10 + HEAD From 293a2081d096bc9524a795d6029f83475d1c8b07 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2020 08:23:46 +0000 Subject: [PATCH 38/70] Bump junit from 4.12 to 4.13 (#109) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0381ca2238..32878bc80e 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ junit junit - 4.12 + 4.13 test From cc49e908e4b7122a9d8148e2182e7c6ca53e47eb Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 3 Jan 2020 08:27:01 +0000 Subject: [PATCH 39/70] [maven-release-plugin][skip ci] prepare release 8.11 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 32878bc80e..d553d6cf2a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.11-SNAPSHOT + 8.11 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.11 From 59ec7e05a735974736a428c419dea0b07faec823 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 3 Jan 2020 08:27:07 +0000 Subject: [PATCH 40/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d553d6cf2a..1068720e17 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.11 + 8.12-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.11 + HEAD From a0751ea020e9cf1e83bba936a40c11480a093496 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 12:03:04 +0000 Subject: [PATCH 41/70] Bump commons-codec from 1.13 to 1.14 (#111) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1068720e17..9e9e5bf93e 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ commons-codec commons-codec - 1.13 + 1.14 commons-collections From 137cdd49afd205ca583d237018c7e1f6e6f20a03 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 6 Jan 2020 12:06:17 +0000 Subject: [PATCH 42/70] [maven-release-plugin][skip ci] prepare release 8.12 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9e9e5bf93e..e4305b3c0d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.12-SNAPSHOT + 8.12 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.12 From b50955765c3658845b7d770c4b4cf5024f6fd33b Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 6 Jan 2020 12:06:23 +0000 Subject: [PATCH 43/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e4305b3c0d..51eb6c8031 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.12 + 8.13-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.12 + HEAD From 30412802467801727f90302d6fb7a2942d72efc8 Mon Sep 17 00:00:00 2001 From: antoniojfelix Date: Wed, 8 Jan 2020 13:03:17 +0000 Subject: [PATCH 44/70] REPO-4877 - Remove library commons-collections:commons-collections from alfresco-core project (#99) --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 51eb6c8031..0f21408837 100644 --- a/pom.xml +++ b/pom.xml @@ -37,11 +37,6 @@ commons-codec 1.14 - - commons-collections - commons-collections - 3.2.2 - commons-httpclient commons-httpclient From ef0a7d8decbe7e6d7a1ccc85c34d4df383dc333c Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:08:07 +0000 Subject: [PATCH 45/70] [maven-release-plugin][skip ci] prepare release 8.13 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0f21408837..28b74b7ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.13-SNAPSHOT + 8.13 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.13 From 985b04d6121d3edb6a1edf822dc7b8e55de6afed Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:08:12 +0000 Subject: [PATCH 46/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 28b74b7ac7..3fe41fe248 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.13 + 8.14-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.13 + HEAD From faa41688d6b0fbdfb465c4a6b215ff043eac94d3 Mon Sep 17 00:00:00 2001 From: antoniojfelix Date: Wed, 8 Jan 2020 13:12:08 +0000 Subject: [PATCH 47/70] REPO-4889 - Remove library org.springframework:spring-test from alfresco-core (#105) --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 3fe41fe248..0fc4fb50c2 100644 --- a/pom.xml +++ b/pom.xml @@ -181,12 +181,6 @@ 1.7.30 test - - org.springframework - spring-test - ${dependency.spring.version} - test - junit junit From c9adbfa0f413d596e942129d6afc7b77f4e16edb Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:23:54 +0000 Subject: [PATCH 48/70] [maven-release-plugin][skip ci] prepare release 8.14 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0fc4fb50c2..2219f0832b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.14-SNAPSHOT + 8.14 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.14 From 35624788295b65c6085930aac6296155254bc895 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:24:00 +0000 Subject: [PATCH 49/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2219f0832b..bc81ec85a8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.14 + 8.15-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.14 + HEAD From 9b072e85f2194d16b35cd6b1e9aa92197835ac84 Mon Sep 17 00:00:00 2001 From: antoniojfelix Date: Wed, 8 Jan 2020 13:25:42 +0000 Subject: [PATCH 50/70] REPO-4884 - Remove library org.apache.httpcomponents:httpclient from alfresco-core (#100) --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index bc81ec85a8..3b72b3cfe1 100644 --- a/pom.xml +++ b/pom.xml @@ -160,11 +160,6 @@ joda-time 2.10.5 - - org.apache.httpcomponents - httpclient - 4.5.10 - From 180a62f08d35324f25418a18385b5b08771d3c3b Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:39:40 +0000 Subject: [PATCH 51/70] [maven-release-plugin][skip ci] prepare release 8.15 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3b72b3cfe1..b78e46739e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.15-SNAPSHOT + 8.15 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.15 From 8e11ae64bb878b45728a3664a58b2f165dac1fbe Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:39:46 +0000 Subject: [PATCH 52/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b78e46739e..cf45abe689 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.15 + 8.16-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.15 + HEAD From 9556749473d1286b5457a1c2f87fe888ea968e01 Mon Sep 17 00:00:00 2001 From: antoniojfelix Date: Wed, 8 Jan 2020 13:41:26 +0000 Subject: [PATCH 53/70] REPO-4887 - Remove library org.springframework:spring-context-support from alfresco-core (#103) --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index cf45abe689..245fec2c19 100644 --- a/pom.xml +++ b/pom.xml @@ -107,11 +107,6 @@ spring-context ${dependency.spring.version} - - org.springframework - spring-context-support - ${dependency.spring.version} - org.quartz-scheduler quartz From e64cac7e6ccd544d13d4872c417e42a66974731f Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:45:13 +0000 Subject: [PATCH 54/70] [maven-release-plugin][skip ci] prepare release 8.16 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 245fec2c19..6d3fa65398 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.16-SNAPSHOT + 8.16 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.16 From 1b9b17f61f73d50c262d5c5f21b0a0dffb8c0dff Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:45:18 +0000 Subject: [PATCH 55/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6d3fa65398..de3acdd875 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.16 + 8.17-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.16 + HEAD From 7faeb5ab0a3aa8d0dcae49ad93ef9dd0126596be Mon Sep 17 00:00:00 2001 From: antoniojfelix Date: Wed, 8 Jan 2020 13:50:18 +0000 Subject: [PATCH 56/70] REPO-4886 - Remove library org.mybatis:mybatis from alfresco-core (#102) --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index de3acdd875..9dd17718ac 100644 --- a/pom.xml +++ b/pom.xml @@ -63,11 +63,6 @@ 2.0.0 asl - - org.mybatis - mybatis - 3.3.0 - org.mybatis mybatis-spring From 5a16c8fb2434c023e459aab9fec350e298bc2e98 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:53:28 +0000 Subject: [PATCH 57/70] [maven-release-plugin][skip ci] prepare release 8.17 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9dd17718ac..e523029813 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.17-SNAPSHOT + 8.17 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.17 From 19067f841a41edd29fd070a75a0a5c0895587dd4 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 13:53:34 +0000 Subject: [PATCH 58/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e523029813..1ce1a20234 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.17 + 8.18-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.17 + HEAD From 6997fe5d14ed8e048cc4262e2f702058595d614d Mon Sep 17 00:00:00 2001 From: antoniojfelix Date: Wed, 8 Jan 2020 15:57:16 +0000 Subject: [PATCH 59/70] REPO-4885 - Remove library org.mybatis:mybatis-spring from alfresco-core (#101) --- pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pom.xml b/pom.xml index 1ce1a20234..dc746682f9 100644 --- a/pom.xml +++ b/pom.xml @@ -63,17 +63,6 @@ 2.0.0 asl - - org.mybatis - mybatis-spring - 1.2.5 - - - org.mybatis - mybatis - - - log4j log4j From 316be53b00ce66b467606eb5c7be592a4c80902d Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 16:00:25 +0000 Subject: [PATCH 60/70] [maven-release-plugin][skip ci] prepare release 8.18 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dc746682f9..35bd7254b4 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.18-SNAPSHOT + 8.18 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.18 From 114ec490f1f188954368fa0fb3d30b027d2274e6 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Wed, 8 Jan 2020 16:00:30 +0000 Subject: [PATCH 61/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 35bd7254b4..89887e87e0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.18 + 8.19-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.18 + HEAD From 18b15879fa7147364a2051326eeb8bab66898ae8 Mon Sep 17 00:00:00 2001 From: Eliza Stan <54021458+elizastan@users.noreply.github.com> Date: Mon, 13 Jan 2020 16:28:38 +0200 Subject: [PATCH 62/70] REPO-4760 - [Veracode] Add Agent-Based Scan to the Travis build (#113) * REPO-4760 - [Veracode] Add Agent-Based Scan to the Travis build --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6746592975..a642a3eefa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,12 @@ jobs: - 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.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config + - name: "Source Clear Scan" + # only on SP branches or master and if it is not a PR + if: fork = false AND (branch = master OR branch =~ /support\/SP\/.*/) AND type != pull_request + script: skip + addons: + srcclr: true - stage: release name: "Push to Nexus" if: fork = false AND (branch = master OR branch =~ /support\/.*/) AND type != pull_request AND commit_message !~ /\[no-release\]/ From 05b29e8ac4c1808d4a06cc551fc06a377bedb9ca Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 13 Jan 2020 14:33:33 +0000 Subject: [PATCH 63/70] [maven-release-plugin][skip ci] prepare release 8.19 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 89887e87e0..ab44cf3e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.19-SNAPSHOT + 8.19 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.19 From 8898161890dc2e7cc60decec7d214ed810541a0a Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 13 Jan 2020 14:33:39 +0000 Subject: [PATCH 64/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ab44cf3e0a..05afffe731 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.19 + 8.20-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.19 + HEAD From b09bf2f2387e067c92a1630a9c3fd27521eae404 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2020 07:54:37 +0000 Subject: [PATCH 65/70] Bump dependency.spring.version from 5.2.2.RELEASE to 5.2.3.RELEASE (#114) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05afffe731..ffe72bd09a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - 5.2.2.RELEASE + 5.2.3.RELEASE 8.1 11 From 056cc0078775db827c8add2837bff3d461b6706a Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 17 Jan 2020 09:52:16 +0000 Subject: [PATCH 66/70] [maven-release-plugin][skip ci] prepare release 8.20 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ffe72bd09a..d6e4532852 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.20-SNAPSHOT + 8.20 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.20 From cb0050d8a5622dc1251f86df84dfe1a8784222f8 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Fri, 17 Jan 2020 09:52:21 +0000 Subject: [PATCH 67/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d6e4532852..69b4ba0a50 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.20 + 8.21-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.20 + HEAD From 2c93b2d72f7e00f0b37d5f1cf5b7d2fa08577222 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 20 Jan 2020 12:39:13 +0000 Subject: [PATCH 68/70] Feature/search 1785 exception in explicit sharding policy (#115) * SEARCH-1785 Add test cases and fix helper method so these fail. * SEARCH-1785 Throw exception when explicit sharding policy fails to create enough replicas. * SEARCH-1785 Update exception message to provide instructions to user. --- .../util/shard/ExplicitShardingPolicy.java | 9 +++++++++ .../shard/ExplicitShardingPolicyTest.java | 20 ++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/alfresco/util/shard/ExplicitShardingPolicy.java b/src/main/java/org/alfresco/util/shard/ExplicitShardingPolicy.java index 979d25471b..f5c421fef2 100644 --- a/src/main/java/org/alfresco/util/shard/ExplicitShardingPolicy.java +++ b/src/main/java/org/alfresco/util/shard/ExplicitShardingPolicy.java @@ -21,6 +21,8 @@ package org.alfresco.util.shard; import java.util.LinkedList; import java.util.List; +import org.alfresco.error.AlfrescoRuntimeException; + /** * Common ACL based index sharding behaviour for SOLR and the repository * @@ -67,6 +69,13 @@ public class ExplicitShardingPolicy { if (test % numNodes == nodeInstance - 1) { + // This algorithm fails for some sets of parameters. (See SEARCH-1785) + if (shardIds.contains(shard % numShards)) + { + throw new AlfrescoRuntimeException("Sharding configuration not supported - unable to create shard list for node " + nodeInstance + + " (shards:" + numShards + ", replication:" + replicationFactor + ", nodes:" + numNodes + ")." + + " Please set up the shards manually or use a different sharding configuration."); + } shardIds.add(shard % numShards); } test++; diff --git a/src/test/java/org/alfresco/util/shard/ExplicitShardingPolicyTest.java b/src/test/java/org/alfresco/util/shard/ExplicitShardingPolicyTest.java index 937c647225..ce188fb229 100644 --- a/src/test/java/org/alfresco/util/shard/ExplicitShardingPolicyTest.java +++ b/src/test/java/org/alfresco/util/shard/ExplicitShardingPolicyTest.java @@ -20,8 +20,11 @@ package org.alfresco.util.shard; import static org.junit.Assert.*; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import org.alfresco.error.AlfrescoRuntimeException; import org.junit.Test; /** @@ -116,6 +119,20 @@ public class ExplicitShardingPolicyTest { buildAndTest(10, 2, 4); } + + /** ExplicitShardingPolicy algorithm fails for 2 shards, 3 replicas, 3 nodes. (See SEARCH-1785) */ + @Test(expected = AlfrescoRuntimeException.class) + public void search1785_233() + { + buildAndTest(2, 3, 3); + } + + /** ExplicitShardingPolicy algorithm fails for 4 shards, 3 replicas, 6 nodes. (See SEARCH-1785) */ + @Test (expected = AlfrescoRuntimeException.class) + public void search1785_436() + { + buildAndTest(4, 3, 6); + } @Test public void check_10_2() @@ -163,7 +180,8 @@ public class ExplicitShardingPolicyTest int[] found = new int[numShards]; for (int i = 0; i < numNodes; i++) { - List shardIds = policy.getShardIdsForNode(i + 1); + // Convert to a set to remove any duplicates. + Set shardIds = new HashSet<>(policy.getShardIdsForNode(i + 1)); assertEquals(numShards * replicationFactor / numNodes, shardIds.size()); for (Integer shardId : shardIds) { From 4500dc2a19c3c33650ce9c9a034936d44bb9f777 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 20 Jan 2020 12:44:26 +0000 Subject: [PATCH 69/70] [maven-release-plugin][skip ci] prepare release 8.21 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 69b4ba0a50..f4befd0c90 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.21-SNAPSHOT + 8.21 Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - HEAD + 8.21 From 3199b7677620cdb31c76915c247919e8f70075d4 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Mon, 20 Jan 2020 12:44:32 +0000 Subject: [PATCH 70/70] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f4befd0c90..a53355f715 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 10 alfresco-core - 8.21 + 8.22-SNAPSHOT Alfresco Core Alfresco core libraries and utils @@ -15,7 +15,7 @@ scm:git:https://github.com/Alfresco/alfresco-core.git scm:git:https://github.com/Alfresco/alfresco-core.git https://github.com/Alfresco/alfresco-core - 8.21 + HEAD