Commit Graph

635 Commits

Author SHA1 Message Date
Roxana Lucanu
dad0d17fb1 Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests 2020-04-09 16:40:08 +03:00
Claudia Agache
bf77bf7997 fix the parameter 2020-04-08 19:07:33 +03:00
Claudia Agache
e1b2a626cb 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
c7a558405a Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
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
Roxana Lucanu
07c6e56704 RM-7145 Code review changes 2020-04-08 14:32:22 +03:00
Roxana Lucanu
5bc81482a4 RM-7145 Addressed code review comments 2020-04-08 13:43:51 +03:00
Roxana Lucanu
eb2e085dd6 RM-7145 Addressed code review comments 2020-04-07 18:27:58 +03:00
Roxana Lucanu
235a2bc248 RM-7145 Added test for AFTS query 2020-04-06 17:10:56 +03:00
Roxana Lucanu
6daf69afde Merge branch 'release/V2.6' into feature-2.6/MNT-20822_CMIS_tests 2020-04-06 14:13:30 +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
rodicasutu
3fe01badff add the missing class 2020-04-02 08:34:34 +03:00
rodicasutu
9cb79e7b4b wip CMIS tests for MNT-20822 2020-04-01 08:59:06 +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)

# 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
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)

# 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
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