Commit Graph

667 Commits

Author SHA1 Message Date
alfresco-build
f77d20a260 [maven-release-plugin] prepare release V3.3.1-RC1 2020-04-27 10:23:42 +01:00
Claudia Agache
0642d52afc Revert "Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests, disabled test for now"
This reverts commit 2c334298
2020-04-12 19:12:32 +03:00
Claudia Agache
daa8e97684 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/RM-7148_RM-7145
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java
2020-04-12 19:10:31 +03:00
Claudia Agache
12b4d949ed small fix 2020-04-10 19:49:17 +03:00
Claudia Agache
e12612eee0 small fix 2020-04-10 19:25:06 +03:00
Claudia Agache
1b5ff187db Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7148_RM-7145 2020-04-10 19:21:02 +03:00
Claudia Agache
cda030cd80 wait for solr indexing 2020-04-10 14:53:45 +03:00
Claudia Agache
08b833b677 assignUserPermissionsOnCategoryAndRMRole method has been moved to RoleService 2020-04-10 08:58:22 +03:00
Roxana Lucanu
12d014d8d5 Merge branch 'release/V3.0' into merge-3.1/RM-7148_And_RM-7145 2020-04-10 08:26:14 +03:00
Roxana Lucanu
2c334298b0 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
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
a2a60a50ac 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
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
Ramona Popa
353520afd3 RM-7099: Update or Ignore Quarantined Tests
- removed delete hold from test
2020-01-31 09:52:55 +00:00
Ramona Popa
11ec50acd3 increase sleep time 2020-01-30 08:50:16 +02:00
Ramona Popa
63d1b5a571 RM-7099: Update or Ignore Quarantined Tests
- updated DeclareAndFileDocumentAsRecordTests to delete the created hold before delete the created category
2020-01-30 08:05:19 +02:00
Ramona Popa
ae77c261d5 Merge branch 'feature/mergeto33_RM-7099' into 'release/V3.3'
Merge branch 'feature/RM-7099_UpdateOrIgnoreQuarantinedTests' into 'master'

See merge request records-management/records-management!1355
2020-01-29 15:21:14 +00:00
Rodica Sutu
4d743591b8 address review comments 2020-01-29 15:45:13 +02:00
Rodica Sutu
aa03510779 Merge branch 'release/V3.3' of https://git.alfresco.com/records-management/records-management into feature-3.3/RM-7053_FixCmisQueryTest 2020-01-29 12:52:06 +02:00
Rodica Sutu
53f2825a58 increase the sleep max time 2020-01-29 10:37:01 +02:00
Rodica Sutu
8054c04caf fix header for community file 2020-01-29 10:13:05 +02:00
Rodica Sutu
d3284b1400 move the cmis query tests
add some additional usecase
2020-01-29 09:46:04 +02:00
Ramona Popa
2f2c31dfe6 Merge branch 'feature/RM-7099_UpdateOrIgnoreQuarantinedTests' into 'master'
Resolve RM-7099 "Feature/ updateorignorequarantinedtests"

Closes RM-7099

See merge request records-management/records-management!1354
2020-01-28 09:27:23 +00:00
Claudia Agache
0eb189e880 Update version to 3.3.1-SNAPSHOT 2020-01-14 12:36:02 +02:00
alfresco-build
bbb7eb2d3c [maven-release-plugin] prepare release V3.3.0 2020-01-13 15:45:26 +00:00
Sara Aspery
dcc20cbfb4 Update license headers 2020-01-03 10:53:19 +00:00
Sara Aspery
9601805568 Merge branch 'release/V3.2' 2020-01-03 10:45:13 +00:00
Sara Aspery
f90586ce32 Update license headers 2020-01-02 20:19:58 +00:00
Sara Aspery
16b6678fd3 Merge branch 'release/V3.1' into release/V3.2 2020-01-02 20:15:28 +00:00
Sara Aspery
92f4843a24 Update license headers 2020-01-02 18:27:23 +00:00
Sara Aspery
fb014ba5dc Merge branch 'release/V3.0' into release/V3.1 2020-01-02 18:21:48 +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