Commit Graph

5433 Commits

Author SHA1 Message Date
cagache
ba191a889c split test class in 2 2019-04-25 16:21:01 +03:00
Ross Gale
e5ba3f5574 RM-6834 adding fix for system edited records not being returned from search 2019-04-25 14:10:12 +01:00
cagache
58da20f5fa RM-6796 Added automated tests for Declare and file to a record folder functionality 2019-04-25 15:05:18 +03:00
Rodica Sutu
fc839d3307 Fix java docs for rm community repo:
update/remove/add  method parameters as @param in doc comments
substitute element < with &lt;
substitute element > with &gt;
substitute element & with  &amp;
2019-04-25 09:32:00 +03:00
Sara Aspery
efc037a974 RM-6792 Optional Record Locn 2019-04-24 11:42:42 +01:00
cagache
ebc860ea2a transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance 2019-04-23 12:15:38 +03:00
cagache
451eaaf679 transform UserPermissions in enum; add helper methods to create users with rm role, permissions or clearance 2019-04-23 08:23:43 +03:00
Rodica Sutu
3520ffa271 Record only merge of ACS 6.0.1 changes. 2019-04-22 15:52:50 +03:00
Rodica Sutu
deb2dd3efe Merge branch 'feature/RM-6825_IncreaseTravisTimeout' into 'master'
Increase Travis timeout

Closes RM-6825

See merge request records-management/records-management!1162
2019-04-22 11:54:22 +01:00
Claudia Agache
1c9764adb6 Merge branch 'feature/RM-6821_IntermittentSearchRestApiTests' into 'master'
RM-6821 Try to fix intermittent enterprise search rest api failures by increasing the search time with 30 sec

See merge request records-management/records-management!1154
2019-04-22 08:06:48 +01:00
Rodica Sutu
2f968d9335 Increase Travis timeout 2019-04-22 09:24:03 +03:00
Rodica Sutu
85353d5bd1 Merge branch 'feature-3.0/RM-6823_UpgradeToACS601' into 'release/V3.0'
RM-6823 "Feature 3.0/ upgradetoacs601"

See merge request records-management/records-management!1160
2019-04-19 15:13:59 +01:00
Rodica Sutu
82842a9a5e Update to ACS 6.0.1.2 2019-04-19 15:13:59 +01:00
Rodica Sutu
76dc68ae58 Merge branch 'feature/RM-6833_SkipFailBuildOnJavaDocsError' into 'master'
RM-6833

See merge request records-management/records-management!1161
2019-04-19 14:40:52 +01:00
Rodica Sutu
c885dde18d RM-6833 Fix java docs generation on openJDK 11.0.2 2019-04-19 14:40:52 +01:00
cagache
12c11bb6f2 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6821_IntermittentSearchRestApiTests 2019-04-19 14:37:28 +03:00
cagache
b5305aee70 try to search for content ~1.45 min 2019-04-18 16:40:31 +03:00
Ross Gale
55ed417a8c Merge branch 'feature/RM-6825_UpdateTravis' into 'master'
RM-6825 update travis to use openjdk11

Closes RM-6825

See merge request records-management/records-management!1157
2019-04-17 13:21:30 +01:00
Ross Gale
902c8a4463 RM-6825 update travis to use openjdk11 2019-04-17 11:04:26 +01:00
cagache
95ee11f82c try to search for content ~2 min 2019-04-16 14:17:55 +03:00
cagache
08acacf4f5 try to search for content ~1.45 min 2019-04-16 10:38:24 +03:00
cagache
4e83a921b9 removed afterMethod annotation 2019-04-16 09:16:20 +03:00
cagache
f1453e5a7c Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6821_IntermittentSearchRestApiTests 2019-04-16 08:17:37 +03:00
cagache
a1b0799133 try to search for content ~1.45 min 2019-04-15 15:42:01 +03:00
cagache
1047fd46a2 Renamed test classes to end with Test or Tests 2019-04-12 14:32:52 +03:00
cagache
9957dd3f55 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/Fix_ClassNotFoundException_logs 2019-04-12 14:17:40 +03:00
cagache
f26612f00b try to search for content ~1.30 min 2019-04-12 14:14:59 +03:00
Rodica Sutu
fb3b4547db Merge branch 'feature/RM-6804_FixWarningsIllegalReflecticeAccess' into 'master'
RM-6804_FixWarningsIllegalReflecticeAccess

See merge request records-management/records-management!1153
2019-04-12 12:13:21 +01:00
Claudia Agache
805c24c62a Merge branch 'feature-3.0/Fix_ClassNotFoundException_logs' into 'release/V3.0'
RM-6822 Renamed test classes to end with Test or Tests to get rid of java.lang.ClassNotFoundException

See merge request records-management/records-management!1152
2019-04-12 09:33:17 +01:00
Rodica Sutu
e55cadcb38 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6804_FixWarningsIllegalReflecticeAccess
# Conflicts:
#	pom.xml
2019-04-12 11:32:10 +03:00
Claudia Agache
1696a6521a Merge branch 'feature/RM-6803_JavadocNotGenerated_no' into 'master'
RM-6803 Skip Javadoc execution for not a Java classpath-capable packages

Closes RM-6803

See merge request records-management/records-management!1151
2019-04-12 08:47:23 +01:00
Rodica Sutu
cb6b79124f fix the illegal reflective access operation warning from xstream library 2019-04-12 10:31:23 +03:00
cagache
456bd75968 try to search for content ~1 min 2019-04-11 17:47:08 +03:00
cagache
9249b8cb80 refactoring 2019-04-11 17:33:26 +03:00
cagache
de1dd13900 fix javadoc 2019-04-11 17:10:08 +03:00
cagache
0300ac3317 Added slf4j-log4j12 dependency to automation community rest api project and log4j.properties file because logs didn't work on rest api tests after moving to OpenJdk 11 2019-04-11 17:09:40 +03: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
Roxana Lucanu
efe66ed4c5 Merge branch 'feature/RM-6723_AGS_ACS6.1_compatibility' into 'master'
Resolve RM-6723 "Feature/ ags acs6.1 compatibility"

Closes RM-6723

See merge request records-management/records-management!1148
2019-04-10 15:18:46 +01:00
cagache
320908db31 RM-6803 Skip Javadoc execution for not a Java classpath-capable packages 2019-04-10 15:39:35 +03:00
cagache
d11d37aac2 Record only merge of version change. 2019-04-10 13:31:04 +03:00
Rodica Sutu
930c3a4e43 Merge branch 'merge/RM-6787_VersionWhenClassifyFileWithCopies' into 'master'
Resolve RM-6787 "Merge/ versionwhenclassifyfilewithcopies"

Closes RM-6787

See merge request records-management/records-management!1150
2019-04-10 10:54:41 +01:00
cagache
433654202c Record only merge of version change. 2019-04-10 09:57:12 +03:00
cagache
608827075f Record only merge of version change. 2019-04-10 09:54:17 +03:00
Rodica Sutu
8eb05df07b Merge remote-tracking branch 'origin/release/V3.0' into merge/RM-6787_VersionWhenClassifyFileWithCopies 2019-04-10 09:04:01 +03:00
Rodica Sutu
bb4b573da4 Merge branch 'merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies' into 'release/V3.0'
Resolve RM-6787 "Merge 3.0/ versionwhenclassifyfilewithcopies"

See merge request records-management/records-management!1149
2019-04-09 16:24:43 +01:00
rlucanu
2144621448 RM-6723 review changes 2019-04-09 16:45:22 +03:00
Rodica Sutu
b60b877922 Update version to 2.7.2.1-SNAPSHOT 2019-04-09 11:47:20 +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
Rodica Sutu
4934fa5634 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6787_VersionWhenClassifyFileWithCopies
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspect.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/secured/aspect/SecuredAspectUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/securitymarks/SecurityMarkingServiceImplUnitTest.java
2019-04-09 10:51:44 +03:00