Claudia Agache
8008ace24e
Merge branch 'release/V2.7' into merge-3.0/RM-7148_And_RM-7145
...
# Conflicts:
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CmisQueryTests.java
# rm-enterprise/pom.xml
2020-04-08 15:14:00 +03:00
Claudia Agache
4c4b41bfb8
fix the parameter
2020-04-03 16:26:03 +03:00
Claudia Agache
d222954e15
Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/RM-7148_UpdateACSVersion
...
# Conflicts:
# rm-enterprise/pom.xml
2020-04-03 16:21:40 +03:00
Claudia Agache
59feba75e4
code review comments
2020-04-03 14:51:02 +03:00
Claudia Agache
3b51ce4966
fix header
2020-04-03 09:40:46 +03:00
Rodica Sutu
019a9a0375
move the cmis query tests
...
add some additional usecase
(cherry picked from commit d3284b1400
2020-04-03 09:30:52 +03:00
Ramona Popa
852c77477e
merge RM-7099 into V3.0
2020-01-31 16:13:09 +00:00
Sara Aspery
5865482fe6
Update license headers
2020-01-02 16:20:24 +00:00
Sara Aspery
304180f49e
Merge branch 'release/V2.7' into release/V3.0
...
# Conflicts:
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
2020-01-02 16:15:49 +00:00
Sara Aspery
5849812683
Update license headers
2020-01-02 15:05:02 +00:00
Sara Aspery
1f7a81fd45
Merge branch 'release/V2.6' into release/V2.7
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
2020-01-02 14:19:01 +00:00
Sara Aspery
8ae4ef6290
Update license headers
2020-01-02 13:57:59 +00:00
Tom Page
0a7372eeb7
Merge release/V2.7 into release/V3.0.
2019-08-05 08:11:57 +01:00
Tom Page
c8a0fe16b2
Merge release/V2.6 into release/V2.7.
2019-08-01 13:39:25 +01:00
Tom Page
cca83d07b9
Revert "Use AlfrescoRuntimeException."
...
This reverts commit 59232c44f8
2019-08-01 13:33:26 +01:00
Tom Page
59232c44f8
Use AlfrescoRuntimeException.
2019-08-01 13:23:43 +01:00
Tom Page
484722d7ba
Remove unthrown checked exceptions.
...
Update the javadoc to refer to RuntimeExceptions instead. Also conversion from
IOException to RuntimeException in UnfiledContainerAPI and UnfiledRecordFolderAPI
to add consistency with RecordFolderAPI.
2019-08-01 09:51:31 +01:00
alfresco-build
fb8eb1a428
[maven-release-plugin] prepare for next development iteration
2019-07-15 12:22:08 +01:00
alfresco-build
076467447b
[maven-release-plugin] prepare release V3.0.2
2019-07-15 12:22:04 +01:00
Rodica Sutu
5f4a5feb2a
fix sonar final warning
2019-07-05 12:50:19 +03:00
cagache
2a9aca2ced
transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
...
(cherry picked from commit ebc860ea2a
2019-07-05 10:32:10 +03:00
Rodica Sutu
ed02c79096
Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests
2019-07-04 17:59:38 +03:00
cagache
1070562e07
transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
...
(cherry picked from commit 451eaaf679
2019-07-04 16:03:20 +03:00
Rodica Sutu
fce52415cb
review updates
2019-07-04 13:18:16 +03:00
Rodica Sutu
9dddcdc110
code review changes
2019-07-03 18:23:45 +03:00
Rodica Sutu
c689274db8
Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests
2019-07-02 10:34:50 +03:00
Rodica Sutu
11a638c827
refactoring of the added rest api tests for SQL queries
...
new tests added for sql queries for: record categories, record folders and records
2019-07-02 10:29:21 +03:00
cagache
e27ea5218c
Merge changes from V3.0 branch
2019-07-01 12:12:32 +03:00
Ross Gale
0b386d14ef
RM-6746 update from code review
2019-06-25 16:01:53 +01:00
Rodica Sutu
9314432beb
test updates: minor refactoring and formatting fixes
2019-06-24 10:16:20 +03:00
cagache
c747e2bdab
Revert "removed unused variable"
...
This reverts commit 06c7cfd2
2019-06-21 16:33:08 +03:00
cagache
0d4c5d2979
Fix "Either re-interrupt this method or rethrow the "InterruptedException"." sonar bug
...
(cherry picked from commit 8225920986
2019-06-21 16:14:53 +03:00
cagache
d5335dc0cd
delete unnecessary semicolon
...
(cherry picked from commit 162456217a
2019-06-21 16:14:30 +03:00
cagache
f7498fa152
removed contentService from child classes and made it protected in parent class
...
(cherry picked from commit 320a7546f7
2019-06-21 16:12:31 +03:00
cagache
06c7cfd2a5
removed unused variable
...
(cherry picked from commit b29f087bb2
2019-06-21 16:11:11 +03:00
cagache
de585f0af1
removed contentService from child classes and made it protected in parent class
...
(cherry picked from commit 1162485074
2019-06-21 16:10:30 +03:00
Claudia Agache
b6c36ded25
RM-6746 cherry picking merge request from RM-6803 and RM-6835
2019-06-20 15:24:39 +01:00
Claudia Agache
f70e3f92f1
RM-6746 cherry picking merge request from RM-6790
2019-06-20 15:13:03 +01:00
Rodica Sutu
b32f324c31
add the alfresco.port property
2019-06-19 14:55:23 +03:00
Tom Page
23c98eaa08
RM-6141 Revert change of how a user is a member of the RM site.
...
The user should be an RM User, not a site manager. Also revert a couple
of changes that were done to make this work.
Minor tweaks to use constants rather than member variables.
(cherry picked from commit b284ba90388ef360f5321826e292ec43bf2e5197)
2019-06-19 11:43:31 +03:00
Tom Page
2ab90aad6b
RM-6141 Update SQL tests to use correct users.
...
Also hardcode the site id of the RM site to be "rm", so that we can use
this when adding site members.
(cherry picked from commit 92a6dcf8ae04151699b0b5a4bad79bc82f36ae71)
# Conflicts:
# rm-enterprise/pom.xml
2019-06-19 11:41:23 +03:00
Rodica Sutu
84aca54f31
adding search tests for the SQL support
...
(cherry picked from commit 29f2ddf2203261f477464528a9f5b83a7679223c)
# Conflicts:
# rm-automation/rm-automation-enterprise-rest-api/pom.xml
2019-06-19 11:36:45 +03:00
Tom Page
76658f0206
Update TAS rest api to the latest version from 5.2.0.X - 5.2.0.15
2019-06-19 11:34:04 +03:00
Rodica Sutu
2742f70220
update tas rest api version to 5.2.0.12
...
(cherry picked from commit f76491b09fb9d2daff3387a4d19de32fd0dd179d)
2019-06-19 11:20:28 +03:00
alfresco-build
8aeb41d83d
[maven-release-plugin] prepare for next development iteration
2019-04-30 11:32:13 +01:00
alfresco-build
6117c4e018
[maven-release-plugin] prepare release V3.0.1
2019-04-30 11:32:08 +01:00
cagache
3310d3805a
Renamed files to end with Test or Tests to get rid of java.lang.ClassNotFoundException
2019-04-10 17:47:48 +03:00
alfresco-build
e782840243
[maven-release-plugin] prepare for next development iteration
2019-04-09 09:04:42 +01:00
alfresco-build
124a1b964b
[maven-release-plugin] prepare release V2.7.2
2019-04-09 09:04:38 +01:00
cagache
73c8c23766
Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6786_FileCan'tBeDeclaredAsRecord
2019-03-15 10:00:48 +02:00
