Commit Graph

5622 Commits

Author SHA1 Message Date
Rodica Sutu
041a0ca606 Merge branch 'feature-3.0/RM-6565_UpdateDockerComposeWithIE' of https://git.alfresco.com/records-management/records-management into feature-3-0/RM-6577_AutomatedRestApiTests 2019-07-02 12:04:11 +03:00
Rodica Sutu
ab41b55602 Merge branch 'release/V3.0' of https://git.alfresco.com/records-management/records-management into feature-3.0/RM-6565_UpdateDockerComposeWithIE 2019-07-02 11:53:47 +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
39245d19c8 Removed redundant local variables 2019-07-01 16:45:32 +03:00
cagache
723183021a Removed redundant conditional expression 2019-07-01 16:34:24 +03:00
cagache
c5907dbc10 Removed unnecessary null check before Boolean.parseBoolean 2019-07-01 16:28:48 +03:00
cagache
da33dc1ae1 Removed unnecessary semicolon 2019-07-01 16:19:52 +03:00
cagache
6bc4ec03a6 Sonar code smell: Replace the type specification in this constructor call with the diamond operator ("<>") 2019-07-01 16:01:43 +03:00
cagache
26019f50ea Merge changes from V3.0 branch 2019-07-01 12:12:32 +03:00
Ross Gale
602bcd7c63 Merge branch 'release/V3.0' into feature-3.0/RM-6564_IE_DevelopmentTask 2019-06-26 10:51:42 +01:00
Ross Gale
4cb74ad5b2 Merge branch 'feature-3.0/RM-6746_Java11' into 'release/V3.0'
Resolve RM-6746 "Feature 3.0/ java11"

See merge request records-management/records-management!1201
2019-06-26 08:39:30 +01:00
Ross Gale
4500017453 RM-6746 update from code review 2019-06-25 16:01:53 +01:00
Rodica Sutu
e3614fd3de Merge branch 'feature/RM-6825_IncreaseTravisTimeout' into 'master'
Increase Travis timeout

Closes RM-6825

See merge request records-management/records-management!1162
2019-06-25 16:00:23 +01:00
Ross Gale
a2362ed464 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-06-25 15:59:50 +01:00
Rodica Sutu
0c4b0dc23b test updates: minor refactoring and formatting fixes 2019-06-24 10:16:20 +03:00
cagache
8bac296cff Revert "removed unused variable"
This reverts commit c55c5929
2019-06-21 16:33:08 +03:00
Ross Gale
676e7be940 RM-6831 updating search value
(cherry picked from commit a002f1d1c5)
2019-06-21 16:21:49 +03:00
Ross Gale
5c7e51d8b3 RM-6831 adding sonar fix
(cherry picked from commit 01b4146582)
2019-06-21 16:21:30 +03:00
cagache
1a8ee3d19e fix Sonar: Empty statements should be removed
(cherry picked from commit 365fddc247)
2019-06-21 16:20:35 +03:00
cagache
e0aaea61d2 Fix sonar Performance - Boxed value is unboxed and then immediately reboxed
(cherry picked from commit 7f73ad8227)
2019-06-21 16:16:01 +03:00
cagache
b5d4d79fcb Fix "Either re-interrupt this method or rethrow the "InterruptedException"." sonar bug
(cherry picked from commit 929980e7c2)
2019-06-21 16:14:53 +03:00
cagache
c97adfaac4 delete unnecessary semicolon
(cherry picked from commit 5dcae9c608)
2019-06-21 16:14:30 +03:00
cagache
cc203c0cf2 removed contentService from child classes and made it protected in parent class
(cherry picked from commit 4fa230a322)
2019-06-21 16:12:31 +03:00
cagache
c55c5929fb removed unused variable
(cherry picked from commit ba729a0f2e)
2019-06-21 16:11:11 +03:00
cagache
aceaef2f44 removed contentService from child classes and made it protected in parent class
(cherry picked from commit a11feb9bfe)
2019-06-21 16:10:30 +03:00
Ross Gale
8b949ad483 RM-6836 remove unused imports
(cherry picked from commit 8515b9c2f8)
2019-06-21 16:06:43 +03:00
Ross Gale
8245909bf2 RM-6836 formatting change
(cherry picked from commit f0fe989822)
2019-06-21 16:06:18 +03:00
Ross Gale
fd8a6a0cd4 RM-6836 formatting change
(cherry picked from commit a000f99c04)
2019-06-21 16:05:55 +03:00
Ross Gale
b799e5600b RM-6836 formatting change
(cherry picked from commit 05c70ede63)
2019-06-21 16:05:24 +03:00
Ross Gale
b65400746e RM-6836 adding review comments
(cherry picked from commit 07d4c451ca)
2019-06-21 16:05:09 +03:00
Ross Gale
02093eac33 RM-6836 adding the severe and serious sonar fixes
(cherry picked from commit 9f2336d487)
2019-06-21 16:04:47 +03:00
Ross Gale
b44d8e3be5 Removing sonar warnings
(cherry picked from commit 86f66dbd85)
2019-06-21 16:04:28 +03:00
Ross Gale
16f96e6e91 Removing severe sonar warnings
(cherry picked from commit 665c579560)
2019-06-21 16:03:43 +03:00
Ross Gale
46212a2aae RM-6836 updating variable beanname
(cherry picked from commit c99fa9b421)
2019-06-21 16:03:22 +03:00
Rodica Sutu
75cad3231a Merge branch 'feature/RM-6833_SkipFailBuildOnJavaDocsError' into 'master'
RM-6833

See merge request records-management/records-management!1161
2019-06-20 15:24:41 +01:00
Claudia Agache
cc49cb09fa RM-6746 cherry picking merge request from RM-6803 and RM-6835 2019-06-20 15:24:39 +01:00
Rodica Sutu
77f750455c 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-06-20 15:14:31 +01:00
Claudia Agache
0e201874bc RM-6746 cherry picking merge request from RM-6790 2019-06-20 15:13:03 +01:00
cagache
ba70b24ce3 Record only merge of version change. 2019-06-20 14:33:22 +03:00
cagache
068fef7ac2 Update version to 3.1.0.1-SNAPSHOT 2019-06-20 14:31:42 +03:00
cagache
9238737f68 Update version to 3.1.1-SNAPSHOT 2019-06-20 14:28:45 +03:00
alfresco-build
93175c24ae [maven-release-plugin] prepare release V3.1.0 ags-3.1.0 2019-06-20 10:46:16 +01:00
Ross Gale
75b4bc5ca5 Merge branch 'feature/RM-6865_RemoveEncoding' into 'master'
Resolve RM-6865 "Feature/ removeencoding"

Closes RM-6865

See merge request records-management/records-management!1196
2019-06-20 07:33:47 +01:00
Rodica Sutu
29a64a8507 add the alfresco.port property 2019-06-19 14:55:23 +03:00
Ross Gale
8daac2d403 Revert "RM-6865 code review changes"
This reverts commit b4bc9195
2019-06-19 10:57:08 +01:00
Ross Gale
b4bc91950b RM-6865 code review changes 2019-06-19 10:16:25 +01:00
Tom Page
0bdc774240 RM-6141 Revert change of how a user is a member of the RM site.
The user should be an RM User, not a site manager.  Also revert a couple
of changes that were done to make this work.

Minor tweaks to use constants rather than member variables.

(cherry picked from commit b284ba90388ef360f5321826e292ec43bf2e5197)
2019-06-19 11:43:31 +03:00
Tom Page
9b89bdee32 RM-6141 Update SQL tests to use correct users.
Also hardcode the site id of the RM site to be "rm", so that we can use
this when adding site members.

(cherry picked from commit 92a6dcf8ae04151699b0b5a4bad79bc82f36ae71)

# Conflicts:
#	rm-enterprise/pom.xml
2019-06-19 11:41:23 +03:00
Rodica Sutu
23d1a3f7c1 adding search tests for the SQL support
(cherry picked from commit 29f2ddf2203261f477464528a9f5b83a7679223c)

# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/pom.xml
2019-06-19 11:36:45 +03:00