Commit Graph

7854 Commits

Author SHA1 Message Date
ehardon
74fba1255f [enterprise release 3.4.1 3.4.2-SNAPSHOT][publish] [skip tests] 2020-12-08 12:44:02 +02:00
ehardon
c7bf66fd2c Merge branch 'release/V3.4' 2020-12-08 12:07:30 +02:00
ehardon
e7b3724d44 Revert "Merge pull request #1291 from Alfresco/hotfix-3.2.0.11/MNT-22062_diplay_cat_retention_poor_performance"
This reverts commit 2f0b1c997f, reversing
changes made to ea7b125fda.
2020-12-08 12:06:01 +02:00
Claudia Agache
9da91c7f7d Merge remote-tracking branch 'origin/release/V3.4' into feature-3.4/APPS-594_Intermittent_openPage_no 2020-12-08 10:14:06 +02:00
ehardon
ba44d5b83e Merge branch 'release/V3.4' 2020-12-08 09:16:17 +02:00
ehardon
f793f0ae7f Record only merge 2020-12-08 09:15:07 +02:00
ehardon
6d49098ef3 Updated regex for release version 2020-12-08 09:13:11 +02:00
ehardon
10b9c81194 Merge branch 'release/V2.7' into release/V3.0 2020-12-08 09:13:04 +02:00
ehardon
0de6bcf820 Merge branch 'release/V3.3' into release/V3.4 2020-12-08 09:12:16 +02:00
ehardon
9185b06dbd Record only merge 2020-12-08 09:11:05 +02:00
ehardon
a9006d7924 Record only merge 2020-12-08 09:10:59 +02:00
ehardon
7505b0ac9e Updated regex for release version 2020-12-08 09:10:18 +02:00
ehardon
bd235385b8 Merge branch 'release/V2.7' into release/V3.0 2020-12-08 09:10:14 +02:00
ehardon
c1dc894802 Updated regex for release version 2020-12-08 09:08:36 +02:00
ehardon
b45bc1b6ef Merge branch 'release/V2.7' into release/V3.0 2020-12-08 09:08:18 +02:00
ehardon
e087975349 Merge branch 'release/V3.2' into release/V3.3 2020-12-08 09:05:35 +02:00
ehardon
e591ce755e Merge remote-tracking branch 'origin/release/V3.2.0.x' into release/V3.2
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-automation/rm-automation-community-rest-api/pom.xml
#	rm-automation/rm-automation-enterprise-rest-api/pom.xml
#	rm-automation/rm-automation-ui/pom.xml
#	rm-benchmark/pom.xml
#	rm-community/pom.xml
#	rm-community/rm-community-repo/pom.xml
#	rm-community/rm-community-rest-api-explorer/pom.xml
#	rm-community/rm-community-share/pom.xml
#	rm-enterprise/pom.xml
#	rm-enterprise/rm-enterprise-repo/pom.xml
#	rm-enterprise/rm-enterprise-rest-api-explorer/pom.xml
#	rm-enterprise/rm-enterprise-share/pom.xml
2020-12-08 09:02:16 +02:00
ehardon
ec644c9521 Merge remote-tracking branch 'origin/release/V3.2.0.x' into release/V3.2.0.x
# Conflicts:
#	travis/.travis.publish-stage.yml
2020-12-08 08:58:36 +02:00
ehardon
d5478eb85e Merge branch 'release/V3.1' into release/V3.2
# Conflicts:
#	scripts/set-release-variables.sh
2020-12-08 08:57:39 +02:00
ehardon
18426a6b89 Merge branch 'release/V3.1' into release/V3.2 2020-12-07 17:53:42 +02:00
ehardon
94b76bdcd5 Record only merge 2020-12-07 17:51:27 +02:00
ehardon
c4a7f1a7f9 Merge branch 'release/V3.0' into release/V3.1 2020-12-07 17:50:03 +02:00
ehardon
7602a1ce03 Merge branch 'release/V3.0' into release/V3.1 2020-12-07 17:45:22 +02:00
ehardon
d48365b3c6 Record only merge 2020-12-07 17:42:11 +02:00
ehardon
40e884e6f2 Record only merge 2020-12-07 17:42:06 +02:00
ehardon
d50b47e8c4 Record only merge 2020-12-07 17:42:00 +02:00
ehardon
81180d899d Updated regex for release version 2020-12-07 17:39:23 +02:00
ehardon
194cbae1f9 Merge branch 'release/V2.7' into release/V3.0 2020-12-07 17:39:19 +02:00
ehardon
ef68c92eab Updated regex for release version 2020-12-07 17:38:01 +02:00
ehardon
4f41566bb2 Merge branch 'release/V2.7' into release/V3.0 2020-12-07 17:37:53 +02:00
ehardon
3a15936112 Updated regex for release version 2020-12-07 17:35:30 +02:00
ehardon
96ea0338a1 Merge branch 'release/V2.7' into release/V3.0 2020-12-07 17:35:15 +02:00
ehardon
9014638210 Updated regex for release version 2020-12-07 17:30:57 +02:00
Travis CI User
662d57031b [maven-release-plugin][skip ci] prepare for next development iteration 2020-12-07 15:25:11 +00:00
Travis CI User
5c77638f6c [maven-release-plugin][skip ci] prepare release V3.5.0-A1 ags-3.5.0-A1 2020-12-07 15:25:02 +00:00
ehardon
8fceeccc11 Merge branch 'release/V2.7' into release/V3.0 2020-12-07 16:59:00 +02:00
ehardon
92671d23d7 Record only merge 2020-12-07 16:48:32 +02:00
ehardon
998bec08cd Record only merge 2020-12-07 16:48:25 +02:00
ehardon
cc81ea2d2f Record only merge 2020-12-07 16:48:19 +02:00
ehardon
ccc38eaba9 Merge remote-tracking branch 'origin/release/V2.7.2.x' into release/V2.7.2.x 2020-12-07 16:45:03 +02:00
ehardon
698ad95022 Fix publish stage credentials and release script regex 2020-12-07 16:44:28 +02:00
ehardon
27f7d4b7c7 Fix publish stage credentials and release script regex 2020-12-07 16:37:24 +02:00
ehardon
b0c205a73a Fix publish stage credentials and release script regex 2020-12-07 16:35:38 +02:00
ehardon
0917cf9c46 Fix publish stage credentials and release script regex 2020-12-07 16:27:44 +02:00
Claudia Agache
4784bc74e4 [enterprise release 3.5.0-A1 3.5.0-SNAPSHOT] [skip tests] 2020-12-07 16:01:59 +02:00
ehardon
cbe9c5149b Merge remote-tracking branch 'origin/release/V3.4' 2020-12-07 15:42:28 +02:00
Elias Ricken de Medeiros
6a39df48ad Make sure artifacts look up is done first on Maven Central
While looking up for artifacts to download, Maven will use first the repositories defined in the settings and if it's not found it will default to Maven Central. Considering that most of the dependencies are coming from Central it's better to put Maven Central in the first place in the repository list to reduce the amount of time spent looking for the artifact in the wrong repository.
2020-12-07 14:33:34 +01:00
ehardon
97efd390b3 Fix publish stage in travis 2020-12-07 14:43:22 +02:00
rodicasutu
4579c66368 additional logging to figure out why enterprise rest api tests don't run with success 2020-12-07 11:55:57 +00:00
Travis CI User
429857e855 [maven-release-plugin][skip ci] prepare for next development iteration 2020-12-07 11:55:40 +00:00