Commit Graph

6034 Commits

Author SHA1 Message Date
Eva Vasques
df8d4c23bb Merge remote-tracking branch 'origin/release/V3.1' into merge-3.2/MNT-21585 2020-06-17 15:39:13 +01:00
evasques
e9666adf38 Merge pull request #1150 from Alfresco/merge-3.1/MNT-21585
MNT-21585 - Merge release/V3.0 into release/V3.1
2020-06-17 14:51:50 +01:00
Eva Vasques
e766cb5ff9 Merge remote-tracking branch 'origin/release/V3.0' into merge-3.1/MNT-21585 2020-06-16 14:31:37 +01:00
evasques
bba7f1e704 Merge pull request #1149 from Alfresco/merge-3.0/MNT-21585
MNT-21585 - Merge release/V2.7 into release/V3.0
2020-06-16 14:24:00 +01:00
Tom Page
0aa5fd9d0a Merge pull request #1119 from Alfresco/feature/FallbackToDeleteAllImages
If deleting specified images fails then try deleting all images instead.

(cherry picked from commit 5e41d17941976f23ee9753b2b9f93d8ee0a874b1)
2020-06-10 08:37:39 +01:00
Tom Page
23abe311a5 Record-only merge release/V2.7 into merge-3.0/MNT-21585. 2020-06-10 08:33:20 +01:00
Tom Page
0d4283aeb7 Record-only merge release/V2.7.0.x into release/V2.7. 2020-06-10 08:31:35 +01:00
Eva Vasques
dad6782b1d Merge remote-tracking branch 'origin/release/V2.7' into merge-3.0/MNT-21585 2020-06-09 17:20:15 +01:00
evasques
109f416d0f Merge release/V2.7.0.x into release/V2.7 (#1146)
* Update copyright header for 2020.

* MNT-21585 - Having EVERYONE in original ACL causes IPR duplication (#1144)

* MNT-21585 - Having EVERYONE in original authorities causes IPR duplication

* Update License Headers

* prevent NPE when authorities is null and refactored findIPRGroup method

* RM-7131 Update old gitlab repo links with the new one from github

(cherry picked from commit 50cced2cb6)

* Change SCM URLs in order to switch to SSH authentication with 2FA for Github

(cherry picked from commit 7541e46ac4)

* [maven-release-plugin] prepare release V2.7.0.2

* [maven-release-plugin] prepare for next development iteration

Co-authored-by: Tom Page <thomas.page@alfresco.com>
Co-authored-by: Claudia Agache <claudia.agache@ness.com>
Co-authored-by: alfresco-build <info@alfresco.com>
2020-06-09 17:17:49 +01:00
alfresco-build
7d2a279188 [maven-release-plugin] prepare for next development iteration 2020-06-09 09:15:51 +01:00
alfresco-build
152b10c328 [maven-release-plugin] prepare release V2.7.0.2 2020-06-09 09:15:40 +01:00
Tom Page
6f4446142e Merge release/V3.1 into release/V3.2. 2020-06-09 08:53:38 +01:00
Tom Page
145e0e5192 Merge release/V3.2.0.x into release/V3.2. 2020-06-09 08:53:38 +01:00
Claudia Agache
934eeb14e4 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:33 +01:00
Tom Page
464172e341 Merge release/V3.0 into release/V3.1. 2020-06-09 08:53:27 +01:00
Tom Page
d11500f644 Merge release/V3.1.0.x into release/V3.1. 2020-06-09 08:53:27 +01:00
Claudia Agache
3cc75bfe61 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:22 +01:00
Tom Page
589b987f79 Merge release/V2.7 into release/V3.0. 2020-06-09 08:53:16 +01:00
Tom Page
4f26d592ef Merge release/V3.0.2.x into release/V3.0. 2020-06-09 08:53:16 +01:00
Tom Page
5f2d90bbc1 Merge release/V3.0.1.x into release/V3.0. 2020-06-09 08:53:15 +01:00
Tom Page
4730ca34a9 Merge release/V3.0.0.x into release/V3.0. 2020-06-09 08:53:15 +01:00
Claudia Agache
e57bb125d6 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:10 +01:00
Claudia Agache
10944032cd Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:53:05 +01:00
Claudia Agache
06b3fb165c Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:59 +01:00
Tom Page
6fb066b05a Merge release/V2.6 into release/V2.7. 2020-06-09 08:52:54 +01:00
Tom Page
aa896a3ad8 Merge release/V2.7.2.x into release/V2.7. 2020-06-09 08:52:53 +01:00
Tom Page
4490346bad Merge release/V2.7.1.x into release/V2.7. 2020-06-09 08:52:53 +01:00
Claudia Agache
4a55b6659a Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:48 +01:00
Claudia Agache
467e9d1ca1 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:42 +01:00
Claudia Agache
e2e32c151e Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:36 +01:00
Tom Page
8f59c3f418 Merge release/V2.5 into release/V2.6. 2020-06-09 08:52:31 +01:00
Tom Page
983276837e Merge release/V2.6.3.x into release/V2.6. 2020-06-09 08:52:31 +01:00
Tom Page
b78a74a8b7 Merge release/V2.6.2.x into release/V2.6. 2020-06-09 08:52:31 +01:00
Tom Page
16d5530902 Merge release/V2.6.0.x into release/V2.6. 2020-06-09 08:52:30 +01:00
Claudia Agache
5087994d70 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:25 +01:00
Claudia Agache
363e1a3ba8 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:20 +01:00
Claudia Agache
b8a08e0e52 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:52:12 +01:00
Tom Page
527ba46278 Merge release/V2.4 into release/V2.5. 2020-06-09 08:51:13 +01:00
Tom Page
37f3ad653d Merge release/V2.5.4.x into release/V2.5. 2020-06-09 08:51:13 +01:00
Tom Page
c53a501faf Merge release/V2.5.3.x into release/V2.5. 2020-06-09 08:51:13 +01:00
Tom Page
09c2c677f5 Merge release/V2.5.2.x into release/V2.5. 2020-06-09 08:51:13 +01:00
Tom Page
8f2b9950c8 Merge release/V2.5.1.x into release/V2.5. 2020-06-09 08:51:13 +01:00
Tom Page
8c87af2bd7 Merge release/V2.5.0.x into release/V2.5. 2020-06-09 08:51:12 +01:00
Claudia Agache
d99ed78ab8 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:51:07 +01:00
Claudia Agache
47887a4383 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:51:02 +01:00
Claudia Agache
703aa755da Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:50:55 +01:00
Claudia Agache
eb90dfa59b Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:50:50 +01:00
Claudia Agache
9ac5b2b7e6 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:50:45 +01:00
Tom Page
6578159ed0 Merge release/V2.4.0.x into release/V2.4. 2020-06-09 08:50:39 +01:00
Claudia Agache
e1f8042492 Change SCM URLs in order to switch to SSH authentication with 2FA for Github
(cherry picked from commit 7541e46ac4)
2020-06-09 08:36:32 +01:00