Commit Graph

5254 Commits

Author SHA1 Message Date
cagache
bb558e3ac4 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-18558_PermissionIssue 2018-06-12 16:03:42 +03:00
Elena Hardon
5fa0e9966e RM-6349 Set up the correct PostgreSql dialect in community repo 2018-06-12 12:48:49 +03:00
Elena Hardon
f9e2425e21 RM-6349 Small fixes over the fabric8 plugin 2018-06-12 11:09:47 +03:00
Elena Hardon
ebe9e9b6f2 RM-6349 Updated postgres port 2018-06-11 18:18:58 +03:00
Elena Hardon
b5986aaa0f Changed postgres port 2018-06-11 17:29:10 +03:00
Elena Hardon
7047acc7f8 Corrected exposed port for postgtres 2018-06-11 17:22:02 +03:00
Elena Hardon
3607edc0d1 RM-6349 Removed duplicate version 2018-06-11 17:16:10 +03:00
Elena Hardon
856048da5c RM-6349 Changed postgres port 2018-06-11 17:11:22 +03:00
Elena Hardon
825691cf15 RM-6349 Updates on postgres port 2018-06-11 15:14:32 +03:00
cagache
155d118672 Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/MNT-18558_PermissionIssue
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/record/DeclareInPlaceRecords.java
2018-06-11 14:49:24 +03:00
Elena Hardon
9b8bcc173e RM-6349 Minor changes over properties in parent pom and in community pom 2018-06-11 14:28:21 +03:00
Elena Hardon
750235364c RM-6349 Removed jackson and spring version properties from parent pom 2018-06-11 13:40:58 +03:00
Elena Hardon
15d64fdb4d Merge branch 'master' into feature/RM-6349_DockerMavenPluginIntegration
# Conflicts:
#	pom.xml
#	rm-community/rm-community-repo/pom.xml
2018-06-11 10:54:44 +03:00
Claudia Agache
43c3bb09d3 Merge branch 'feature/RM-6364_ConvertSearchIntegrationTestsInEndToEnd_no' into 'master'
RM-6364 Convert search integration tests to end to end tests done through api

See merge request records-management/records-management!1038
2018-06-11 08:15:36 +01:00
cagache
daa599e8cf code review changes 2018-06-11 10:15:14 +03:00
Rodica Sutu
9843b1b266 Merge branch 'feature/RM-6135_Updates_to_6.0_RC6' into 'master'
Update the repo dependencies to 6.0 RC6 versions

See merge request records-management/records-management!1040
2018-06-08 09:28:15 +01:00
Rodica Sutu
889f6ca59f Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6135_Updates_to_6.0_RC6 2018-06-08 10:12:59 +03:00
Rodica Sutu
cc723d7fc7 review changes 2018-06-08 10:11:31 +03:00
Tom Page
f821238d95 Merge branch 'feature/RM-6295_RemoveSdk_no' into 'master'
RM-6295 Remove Alfresco Maven SDK.

See merge request records-management/records-management!1027
2018-06-07 16:17:32 +01:00
Elena Hardon
8849c41700 RM-6349 Added docker maven plugin for the integration tests 2018-06-07 17:03:44 +03:00
Rodica Sutu
4ae7ec7e93 Update the repo dependencies to 6.0 RC6 versions
remove the workaround added for  ACE-5852
Add properties for solr6.
Move the Spring and Jackson dependencies from root pom to lower level
2018-06-07 16:48:28 +03:00
cagache
411c23dcd1 code review changes 2018-06-07 16:35:42 +03:00
Tom Page
ef8862c78e RM-6295 Remove unused definition of app.amp.client.war.artifactId. 2018-06-07 14:33:07 +01:00
Tom Page
860437d54d Set rm.module.repo.version.min using regex-properties. 2018-06-07 12:21:04 +01:00
cagache
39a78c7976 RM-6364 Convert search integration tests to end to end tests done through api 2018-06-07 10:43:37 +03:00
alfresco-build
5796d0ef11 [maven-release-plugin] prepare for next development iteration 2018-06-06 15:49:44 +01:00
alfresco-build
2ea308da3c [maven-release-plugin] prepare release V2.7.0.1 2018-06-06 15:49:42 +01:00
Tom Page
3b0f65d904 RM-6295 Remove dependency on h2. 2018-06-06 14:47:18 +01:00
Tom Page
981ebb12f4 RM-6295 Remove unneeded properties from root pom. 2018-06-06 14:35:08 +01:00
alfresco-build
1ae5c9a3ef [maven-release-plugin] prepare for next development iteration 2018-06-06 12:32:55 +01:00
alfresco-build
6fb73c0f26 [maven-release-plugin] prepare release V2.7.0.1 2018-06-06 12:32:53 +01:00
Tom Page
086e04dd26 RM-6295 Get enterprise integration tests working. 2018-06-06 11:37:09 +01:00
Ross Gale
dbca7142ab Finishing merge of 2.7.0.1 2018-06-06 11:32:10 +01:00
alfresco-build
f2c2a970d4 [maven-release-plugin] prepare for next development iteration 2018-06-06 10:47:51 +01:00
alfresco-build
35991c7bf2 [maven-release-plugin] prepare release V2.7.0.1 2018-06-06 10:47:49 +01:00
Ross Gale
6f671e7aeb Merging up from 2.5.4 2018-06-06 10:06:07 +01:00
Ross Gale
993b4f5846 MNT-19442 merging up fix for 2.5.4 2018-06-06 09:31:42 +01:00
Roxana Lucanu-Ghetu
ef1f8311be MNT-18558 Fix permission issue 2018-06-05 17:22:47 +03:00
Tom Page
cfb4d2ead5 Merge master into feature/RM-6295_RemoveSdk_no. 2018-06-05 08:48:14 +01:00
Elena Hardon
864789861d Merge branch 'feature/RM-6382_FixCommunityRestAPI_Regressions' into 'master'
RM-6382 Fix regressions caused by Jackson upgrade

See merge request records-management/records-management!1025
2018-06-05 08:47:19 +01:00
Tom Page
6ad134187d RM-6295 Remove dependency on Alfresco Maven SDK. 2018-06-04 16:57:55 +01:00
Ross Gale
783bccb925 MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider 2018-06-04 14:48:39 +01:00
Tom Page
0523884576 Merge branch 'feature/RM-6295_RefactorDependencies_no' into 'master'
Update dependency management section of root pom.

See merge request records-management/records-management!1023
2018-06-04 10:04:02 +01:00
Tom Page
f506fd6a4a Merge branch 'feature/RM-6135_RemoveSolr_no' into 'master'
RM-6135 Remove dependency on solr.

See merge request records-management/records-management!1024
2018-06-04 09:18:56 +01:00
Rodica Sutu
49510b15a3 fix the regressions spotted by community rest api after Jackson upgrade 2018-06-01 17:55:13 +03:00
Tom Page
427c1c6eb1 RM-6135 Remove dependency on solr. 2018-06-01 15:41:16 +01:00
Tom Page
fe9aedd770 Use dependency management in the root pom to avoid duplicating version declaration. 2018-06-01 15:15:41 +01:00
Tom Page
ba2b844ed9 Remove 'dependency.' from properties. 2018-06-01 14:46:23 +01:00
jcule
edcb62609d RM-6337: Accession action is visible after completing the event even if Accession step was defined with date And event: automation test 2018-06-01 13:51:16 +01:00
Rodica Sutu
7493708d8f Merge branch 'xperimental/RM-6313UpgradeRMSchedulers' into 'master'
RM-6313 Update RM schedulers, RM-6314 Spring 5 Upgrade & RM-6316 EOL hibernate

Closes RM-6353

See merge request records-management/records-management!1017
2018-06-01 11:14:46 +01:00