Commit Graph

5254 Commits

Author SHA1 Message Date
Rodica Sutu
7c27ac4782 fix compilation error 2019-03-28 09:44:43 +02:00
cagache
b860dd25c7 changed formatter used in tests because DateTimeFormatter.ISO_INSTANT outputs 9 nanoseconds and POST request to http://localhost:8080/alfresco/service/api/rma/actions/ExecutionQueue returns 500 2019-03-27 13:19:09 +02:00
cagache
076910017e Revert "call super.checkServerHealth"
This reverts commit 5b151008
2019-03-26 16:19:15 +02:00
cagache
5b15100839 call super.checkServerHealth 2019-03-26 15:35:05 +02:00
Rodica Sutu
c9ae6b8d91 Merge remote-tracking branch 'remotes/origin/feature/RM-6790_OpenJDK11Compatibility' into feature/RM-6722_OpenJDKCOmpatibility 2019-03-26 13:51:40 +02:00
Rodica Sutu
cb76ebed00 update the maven javadoc, maven war and alfresco-maven plugin to be compatible with OpenJDK 11
add javax libraries
2019-03-26 13:50:09 +02:00
cagache
5e6555db50 RM-6790 Make RM automation module compatible with OpenJDK 11 2019-03-26 10:39:57 +02:00
Ross Gale
3314a60b44 Merge branch 'merge/RM-6788_DeclareArchivedContent' into 'master'
Resolve RM-6788 "Merge/ declarearchivedcontent"

Closes RM-6788

See merge request records-management/records-management!1137
2019-03-22 13:52:17 +00:00
Ross Gale
47ecd4eb64 Merge branch 'release/V3.0' into merge/RM-6788_DeclareArchivedContent 2019-03-18 13:11:36 +00:00
Ross Gale
5b3666f6e1 Merge branch 'feature-3.0.1/RM-6788_ArchiveClassifyDeclareFix' into 'release/V3.0'
RM-6788 adding change to 3.0.1 branch

See merge request records-management/records-management!1133
2019-03-18 13:07:58 +00:00
cagache
7f2c73174a Merge branch 'release/V3.0' into merge/RM-6786_FileCantBeDeclaredAsRecord 2019-03-15 15:31:41 +02:00
Rodica Sutu
e7d32b93c1 Merge branch 'merge/RM-6785_JacksonLibraryUpdate' into 'master'
RM-6785 Update Jackson Library on master

Closes RM-6785

See merge request records-management/records-management!1136
2019-03-15 13:23:26 +00:00
cagache
7bce79e772 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6786_FileCan'tBeDeclaredAsRecord 2019-03-15 10:00:48 +02:00
Claudia Agache
2a0c0dd82c Merge branch 'feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no' into 'release/V2.7'
RM-6786 Declare file as record when file already has version declared as record

See merge request records-management/records-management!1134
2019-03-15 07:06:55 +00:00
Roxana Lucanu
2193a612bf Merge branch 'feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into 'release/V2.7'
RM-6786 Added check for records

See merge request records-management/records-management!1135
2019-03-15 07:03:50 +00:00
Rodica Sutu
53d0fb1cbd Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/RM-6785_JacksonLibraryUpdate 2019-03-15 09:00:51 +02:00
cagache
a1e0391042 Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no 2019-03-14 16:34:48 +02:00
rlucanu
2351eafd65 RM-6786 another fix 2019-03-14 16:24:50 +02:00
cagache
644b89b7f1 Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no 2019-03-14 09:55:10 +02:00
rlucanu
1b9d4306c8 RM-6786 Added check for records 2019-03-14 09:46:29 +02:00
cagache
497d16d806 code review comments 2019-03-14 09:19:23 +02:00
cagache
0a29bf0201 added cleanup method 2019-03-13 15:54:15 +02:00
Ross Gale
8bf3cdf913 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00
cagache
cd1a861f4e RM-6786 Create test to check that a file that has a record version can be declared as record 2019-03-13 12:23:25 +02:00
Rodica Sutu
8fd19d1da2 Merge branch 'feature-3.0/RM_UpdateJacksonLibrary' into 'release/V3.0'
Feature 3.0/ RM-6785 update jackson library

See merge request records-management/records-management!1131
2019-03-12 09:02:47 +00:00
Rodica Sutu
8a72644dec Update Jackson version library 2019-03-07 13:19:28 +02:00
Ross Gale
dd606fd941 Merge branch 'feature/PR-7_wossabi' into 'master'
Resolve PR-7 "Feature/ wossabi"

Closes PR-7

See merge request records-management/records-management!1130
2019-03-01 14:15:06 +00:00
GitHub
901ed61933 Update CONTRIBUTING.md
Adding in details of issues tab

Mirrored from community commit ba9468a98bb56e781144fc95cf03e8bdc3aa814a
2019-02-26 09:11:29 +00:00
GitHub
c40c426797 Update CONTRIBUTING.md
removing reference to ALF project

Mirrored from community commit 2b62b5d592de5f86c118e661ac91c5fe91d117fa
2019-02-26 09:05:55 +00:00
cagache
81cf904d33 Record only merge of version change. 2019-02-26 09:27:49 +02:00
cagache
e1f8197fb7 Record only merge of version change. 2019-02-26 09:19:16 +02:00
Rodica Sutu
5141e97129 Merge branch 'merge/MNT_20145_RM_6758_ChangesFrom2_6' into 'master'
Merge/mnt 20145 rm 6758 changes from2 6

See merge request records-management/records-management!1127
2019-02-26 07:07:22 +00:00
Rodica Sutu
c6a45874fb Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 23:31:20 +02:00
Rodica Sutu
08a13d4847 Merge branch 'merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6' into 'release/V3.0'
Merge 3.0/mnt 20145 rm 6758 changes from2 6

See merge request records-management/records-management!1126
2019-02-25 21:29:18 +00:00
cagache
918719be0c Record only merge of version change. 2019-02-25 16:29:44 +02:00
cagache
b62801534d Record only merge of version change. 2019-02-25 16:19:49 +02:00
cagache
c241b5899a Update version to 2.6.2.1-SNAPSHOT 2019-02-25 16:07:47 +02:00
Rodica Sutu
c96f9ae280 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 16:03:08 +02:00
Rodica Sutu
2f943394fd Merge branch 'merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6' into 'release/V2.7'
Merge 2.7/mnt 20145 rm 6758 changes from2 6

See merge request records-management/records-management!1125
2019-02-25 13:59:39 +00:00
alfresco-build
9fdc1588cf [maven-release-plugin] prepare for next development iteration 2019-02-25 13:44:27 +00:00
alfresco-build
201807cff5 [maven-release-plugin] prepare release V2.6.2 ags-2.6.2 2019-02-25 13:44:23 +00:00
Rodica Sutu
cc3f72cfaf Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 09:19:23 +02:00
Rodica Sutu
d6bfd9b5c7 Merge branch 'feature-2.6/MNT-20145_DeleteRecordsClassifyFileWhenHavingCopies' into 'release/V2.6'
MNT-20145

See merge request records-management/records-management!1119
2019-02-19 13:50:25 +00:00
Rodica Sutu
a632153027 Merge branch 'feature-2.6/MNT-20145_DeleteRecordsClassifyFileWhenHavingCopies' of https://git.alfresco.com/records-management/records-management into feature-2.6/MNT-20145_DeleteRecordsClassifyFileWhenHavingCopies 2019-02-19 12:15:51 +02:00
Rodica Sutu
7ac49b0ba9 Merge branch 'release/V2.6' of https://git.alfresco.com/records-management/records-management into feature-2.6/MNT-20145_DeleteRecordsClassifyFileWhenHavingCopies 2019-02-19 12:06:34 +02:00
Claudia Agache
1609edc47b Merge branch 'feature-2.6/DuplicateBinForNodesWithCopies' into 'release/V2.6'
MNT-20145 Duplicate bin for nodes with copies

See merge request records-management/records-management!1123
2019-02-19 08:12:05 +00:00
cagache
fb02ac0afa addressed code review comments 2019-02-19 09:37:36 +02:00
cagache
db47a2f6f2 addressed code review comments 2019-02-18 17:08:05 +02:00
cagache
a5629acc2a added unit tests 2019-02-18 15:16:48 +02:00
cagache
ab762cf8f5 addressed code review comments 2019-02-18 10:57:16 +02:00