Commit Graph

601 Commits

Author SHA1 Message Date
Claudia Agache
9c7844447d wait for solr indexing 2020-04-10 14:53:45 +03:00
Claudia Agache
c14abdf119 assignUserPermissionsOnCategoryAndRMRole method has been moved to RoleService 2020-04-10 08:58:22 +03:00
Roxana Lucanu
8daecd303c Merge branch 'release/V3.0' into merge-3.1/RM-7148_And_RM-7145 2020-04-10 08:26:14 +03:00
Roxana Lucanu
314759978c Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests, disabled test for now 2020-04-09 19:01:44 +03:00
Roxana Lucanu
de510f8e73 Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests 2020-04-09 16:40:08 +03:00
Claudia Agache
64ddf0657b fix the parameter 2020-04-08 19:07:33 +03:00
Claudia Agache
1d93551204 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-20822_CMIS_tests 2020-04-08 18:52:37 +03:00
Claudia Agache
9ec55438c5 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-7148_And_RM-7145 2020-04-08 18:50:29 +03:00
Claudia Agache
2aafa46388 Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
Claudia Agache
06d0f76284 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
Roxana Lucanu
fce0793fd2 RM-7145 Code review changes 2020-04-08 14:32:22 +03:00
Roxana Lucanu
021e09acdd RM-7145 Addressed code review comments 2020-04-08 13:43:51 +03:00
Roxana Lucanu
3e4ce77328 RM-7145 Addressed code review comments 2020-04-07 18:27:58 +03:00
Roxana Lucanu
f02f4044da RM-7145 Added test for AFTS query 2020-04-06 17:10:56 +03:00
Roxana Lucanu
270da48aa2 Merge branch 'release/V2.6' into feature-2.6/MNT-20822_CMIS_tests 2020-04-06 14:13:30 +03:00
Claudia Agache
d3206cf363 fix the parameter 2020-04-03 16:26:03 +03:00
Claudia Agache
353ff7b8ee 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
604fc7785e code review comments 2020-04-03 14:51:02 +03:00
Claudia Agache
278699f183 fix header 2020-04-03 09:40:46 +03:00
Rodica Sutu
a18c22155f move the cmis query tests
add some additional usecase

(cherry picked from commit c20cfb3c6f)
2020-04-03 09:30:52 +03:00
rodicasutu
8f5c44d4a6 add the missing class 2020-04-02 08:34:34 +03:00
rodicasutu
b687127d57 wip CMIS tests for MNT-20822 2020-04-01 08:59:06 +03:00
Ramona Popa
0fd1adfc6e merge RM-7099 into V3.0 2020-01-31 16:13:09 +00:00
Ramona Popa
138ad5633a RM-7099: Update or Ignore Quarantined Tests
- removed delete hold from test
2020-01-31 09:52:55 +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
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
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