Commit Graph

5297 Commits

Author SHA1 Message Date
Ross Gale
493821f1c2 Merge branch 'feature/RM-6836_SonarFixes' into 'master'
Resolve RM-6836 "Feature/ sonarfixes"

Closes RM-6836

See merge request records-management/records-management!1170
2019-05-09 13:12:46 +01:00
Ross Gale
8515b9c2f8 RM-6836 remove unused imports 2019-05-08 10:27:13 +01:00
Ross Gale
f0fe989822 RM-6836 formatting change 2019-05-08 09:25:19 +01:00
Ross Gale
a000f99c04 RM-6836 formatting change 2019-05-08 09:17:19 +01:00
Ross Gale
8f9ca689df Merge branch 'master' into 'feature/RM-6836_SonarFixes'
# Conflicts:
#   rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
2019-05-08 09:08:42 +01:00
Ross Gale
05c70ede63 RM-6836 formatting change 2019-05-08 09:06:08 +01:00
Ross Gale
07d4c451ca RM-6836 adding review comments 2019-05-08 08:30:30 +01:00
Ross Gale
9f2336d487 RM-6836 adding the severe and serious sonar fixes 2019-05-07 17:23:11 +01:00
Rodica Sutu
709588ff42 Merge branch 'feature/RM-6835_FixJavaDocRMCommunity' into 'master'
Fix java docs for rm community repo:

Closes RM-6835

See merge request records-management/records-management!1163
2019-05-07 06:51:48 +01:00
Rodica Sutu
bac70edcd1 review comments: add the missing @param values, @return type 2019-05-06 21:47:26 +03:00
Ross Gale
86f66dbd85 Removing sonar warnings 2019-05-06 14:06:21 +01:00
Ross Gale
665c579560 Removing severe sonar warnings 2019-05-03 14:57:12 +01:00
Ross Gale
c99fa9b421 RM-6836 updating variable beanname 2019-05-03 14:04:01 +01:00
Ross Gale
e19e3c8b35 Merge branch 'feature/RM-6834_RecordSearchFix' into 'master'
Resolve RM-6834 "Feature/ recordsearchfix"

Closes RM-6834

See merge request records-management/records-management!1165
2019-05-03 10:35:45 +01:00
Rodica Sutu
9b2525e006 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6835_FixJavaDocRMCommunity 2019-05-02 13:45:09 +03:00
Ross Gale
5a964b50cd Merge branch 'merge/RM-6773' into 'master'
Resolve RM-6773 "Merge/"

Closes RM-6773

See merge request records-management/records-management!1166
2019-05-02 09:16:25 +01:00
Ross Gale
6fa7d75f0a Record only merge for release 2019-04-30 14:43:56 +01:00
alfresco-build
ff84a1ae37 [maven-release-plugin] prepare for next development iteration 2019-04-30 11:32:13 +01:00
alfresco-build
f07dd878bf [maven-release-plugin] prepare release V3.0.1 ags-3.0.1 2019-04-30 11:32:08 +01:00
Ross Gale
943345ab78 RM-6834 adding fix for system edited records not being returned from search 2019-04-25 14:10:12 +01:00
Rodica Sutu
905a8996b5 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
Rodica Sutu
78ed0e4404 Record only merge of ACS 6.0.1 changes. 2019-04-22 15:52:50 +03:00
Rodica Sutu
0710c81b53 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
06cb843fac 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
ba8cd73a10 Increase Travis timeout 2019-04-22 09:24:03 +03:00
Rodica Sutu
c3b4b0cd77 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
11d48c0c36 Update to ACS 6.0.1.2 2019-04-19 15:13:59 +01:00
Rodica Sutu
d719f535db 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
61e50fb10f RM-6833 Fix java docs generation on openJDK 11.0.2 2019-04-19 14:40:52 +01:00
cagache
f6d0b2fd05 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6821_IntermittentSearchRestApiTests 2019-04-19 14:37:28 +03:00
cagache
d68070051d try to search for content ~1.45 min 2019-04-18 16:40:31 +03:00
Ross Gale
ecfb3fdca9 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
3cb127b620 RM-6825 update travis to use openjdk11 2019-04-17 11:04:26 +01:00
cagache
29a7047db1 try to search for content ~2 min 2019-04-16 14:17:55 +03:00
cagache
94454b1f6c try to search for content ~1.45 min 2019-04-16 10:38:24 +03:00
cagache
f74303fc50 removed afterMethod annotation 2019-04-16 09:16:20 +03:00
cagache
11a193bdbf Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6821_IntermittentSearchRestApiTests 2019-04-16 08:17:37 +03:00
cagache
15b5c167af try to search for content ~1.45 min 2019-04-15 15:42:01 +03:00
cagache
ce60d3e89f Renamed test classes to end with Test or Tests 2019-04-12 14:32:52 +03:00
cagache
72493a9a13 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/Fix_ClassNotFoundException_logs 2019-04-12 14:17:40 +03:00
cagache
688628258d try to search for content ~1.30 min 2019-04-12 14:14:59 +03:00
Rodica Sutu
c17fc2ac6f 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
e311f8c0ca 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
3d91c28743 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
99bf4bba4a 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
107ae75f35 fix the illegal reflective access operation warning from xstream library 2019-04-12 10:31:23 +03:00
cagache
1bee02b8df try to search for content ~1 min 2019-04-11 17:47:08 +03:00
cagache
ce8522a2c1 refactoring 2019-04-11 17:33:26 +03:00
cagache
2e5ce4c6a2 fix javadoc 2019-04-11 17:10:08 +03:00
cagache
b6daa30fba 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