Commit Graph

600 Commits

Author SHA1 Message Date
Sara Aspery
e1da6ab294 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
18b14ceca8 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
bd67c3bf6b Update license headers 2020-01-02 18:27:23 +00:00
Sara Aspery
f7e69629bb Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +00:00
Sara Aspery
03eee1b8e3 Update license headers 2020-01-02 16:20:24 +00:00
Sara Aspery
841340c1e8 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
b48d31457a Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5 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
943dc45a10 Update license headers 2020-01-02 13:57:59 +00:00
cagache
6691917456 Update version to 3.2.1-SNAPSHOT 2019-10-22 12:48:00 +03:00
alfresco-build
8f43d02bee [maven-release-plugin] prepare release V3.2.0 2019-10-22 09:18:45 +01:00
cagache
1dff0dbecd Replace exception messages in tests 2019-10-11 10:16:23 +03:00
cagache
9d606baf3c Replace exception messages in tests 2019-10-11 09:32:58 +03:00
Tom Page
c2a27f6370 Set declared Java version to 11.
This should ensure that IDEs default to the correct Java version.
2019-09-20 16:00:11 +01:00
Meenal Bhave
7dd104c28e Search-1835: Updated GS Automation to use TAS Rest API Version 6.0.1.2, to be used with IE automation 2019-09-18 09:52:53 +01:00
cagache
bc2f13e0f7 Code review comments 2019-09-06 08:50:49 +03:00
cagache
720abc0ab5 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6918_ViewHoldContentTests 2019-09-05 11:07:53 +03:00
cagache
9fd3d7f9d8 RM-6918 View legal holds content UI tests 2019-09-05 10:26:58 +03:00
cagache
f5879bb7fb RM-6918 View legal holds content UI tests 2019-09-04 16:20:43 +03:00
Rodica Sutu
c087c888c6 add an end to end test to check the search disposition schedule properties 2019-09-04 16:07:38 +03:00
Rodica Sutu
bcefca962c code review updates 2019-08-28 10:57:13 +03:00
Rodica Sutu
184673cef1 Add tests for RM-6929 2019-08-27 13:55:54 +03:00
Rodica Sutu
0a26da478b update the tests to allow remove from hold with a user with read permission, filling permission over the hold and remove from hold capabilities 2019-08-22 14:51:33 +03:00
Rodica Sutu
0e4501d27a minor updates of the java doc and code style 2019-08-21 14:41:05 +03:00
Rodica Sutu
0d85f2cadd code review changes 2019-08-21 12:03:01 +03:00
Rodica Sutu
849252b125 tests updates java docs and clean up data after test run 2019-08-20 11:33:42 +03:00
Rodica Sutu
36f5c76599 Tests for Add and Remove active content to/from hold using exiting API's 2019-08-20 08:50:58 +03:00
Tom Page
d8f75eaf59 Merge release/V3.1 into master. 2019-08-06 09:17:33 +01:00
Tom Page
0b3652b5a4 Merge release/V3.0 into release/V3.1. 2019-08-05 15:28:53 +01:00
Tom Page
79c9244a14 Merge release/V2.7 into release/V3.0. 2019-08-05 08:11:57 +01:00
Tom Page
a97bf04cff Merge release/V2.6 into release/V2.7. 2019-08-01 13:39:25 +01:00
Tom Page
1df5a307c4 Revert "Use AlfrescoRuntimeException."
This reverts commit b2c0afd8d5.
2019-08-01 13:33:26 +01:00
Tom Page
b2c0afd8d5 Use AlfrescoRuntimeException. 2019-08-01 13:23:43 +01:00
Tom Page
9a36a9e8d6 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
aed94d26cf [maven-release-plugin] prepare for next development iteration 2019-07-15 12:22:08 +01:00
alfresco-build
0788a065c6 [maven-release-plugin] prepare release V3.0.2 2019-07-15 12:22:04 +01:00
cagache
5551b6f89f Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/RM-6577_MergeIERMTests 2019-07-12 15:29:30 +03:00
Rodica Sutu
8bedb94a5e Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-6823_MergeIERMTests
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/RoleService.java
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/UpdateRecordsTests.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/base/BaseRMEnterpriseRestTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/ClassifyCompleteRecordsTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/SetRMExemptionReasonTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/search/SearchClassifiedRecordFoldersTests.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/search/SearchClassifiedRecordsTests.java
2019-07-09 08:48:13 +03:00
Rodica Sutu
8ab3078bba fix sonar final warning 2019-07-05 12:50:19 +03:00
cagache
5a30bb57d1 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
(cherry picked from commit e8725860eb)

# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/content/SetRMExemptionReasonTest.java
2019-07-05 10:32:10 +03:00
Rodica Sutu
ab6a5dbe02 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
a976789861 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance
(cherry picked from commit a54a80f6a6)

# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/base/BaseRMEnterpriseRestTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/v0/classification/folder/RecordFolderClassificationTest.java
2019-07-04 16:03:20 +03:00
Rodica Sutu
53b843d958 review updates 2019-07-04 13:18:16 +03:00
Rodica Sutu
65fd23c294 code review changes 2019-07-03 18:23:45 +03:00
Rodica Sutu
da636f2061 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
7c323aa809 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
26019f50ea Merge changes from V3.0 branch 2019-07-01 12:12:32 +03:00
Ross Gale
4500017453 RM-6746 update from code review 2019-06-25 16:01:53 +01:00
Rodica Sutu
0c4b0dc23b test updates: minor refactoring and formatting fixes 2019-06-24 10:16:20 +03:00
cagache
8bac296cff Revert "removed unused variable"
This reverts commit c55c5929
2019-06-21 16:33:08 +03:00