Commit Graph

5433 Commits

Author SHA1 Message Date
rlucanu
e4b8bc9510 RM-6723 code review changes 2019-04-09 09:55:43 +03:00
Ross Gale
3b9b87d22e Merge branch 'feature-2.7/RM-6787_ReduceBinDuplication_V3' into 'release/V2.7'
Version change fix

See merge request records-management/records-management!1147
2019-04-08 17:34:59 +01:00
rlucanu
9e0377c2b1 Merge remote-tracking branch 'origin/master' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-08 14:39:48 +03:00
cagache
dccac07da5 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/MergeTestChangesFromV2.7 2019-04-08 09:47:19 +03:00
rlucanu
830874b334 RM-6723 fixing tests 2019-04-07 23:11:10 +03:00
Ross Gale
3112962646 Merge branch 'feature-2.7/RM-6787_ReduceBinDuplication_V3' of git.alfresco.com:records-management/records-management into feature-2.7/RM-6787_ReduceBinDuplication_V3 2019-04-05 15:52:03 +01:00
Ross Gale
c9d1453025 RM-6787 adding fix for renditons 2019-04-05 15:50:33 +01:00
rlucanu
8640ff6a30 RM-6723 Added variables for versions 2019-04-05 16:07:53 +03:00
cagache
0a78908e42 Merge remote-tracking branch 'remotes/origin/release/V2.7' into 'merge-3.0/MergeTestChangesFromV2.7' 2019-04-05 15:07:50 +03:00
rlucanu
f098169dc6 Merge remote-tracking branch 'origin/master' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-05 14:47:27 +03:00
rlucanu
a0c4cd579c RM-6723 Added ActiveMQ 2019-04-05 14:44:30 +03:00
cagache
80924987c3 Revert "Revert "Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6787_ReduceBinDuplication_V3' into feature-2.7/RM-6787_VersionChangeTests_no""
This reverts commit 4f749c0fe4.
2019-04-05 13:08:38 +03:00
cagache
4f749c0fe4 Revert "Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6787_ReduceBinDuplication_V3' into feature-2.7/RM-6787_VersionChangeTests_no"
This reverts commit b5d1ae792eae2bd5adf4b1211011ace1046d40b7, reversing
changes made to d5dfbe7194c9e421b52e08032d192c089191e384.
2019-04-05 12:04:27 +03:00
Claudia Agache
7b520affae Merge branch 'feature/RM-6790_OpenJDK11Compatibility' into 'master'
RM-6790 Make RM automation project compatible with OpenJdk 11

Closes RM-6722

See merge request records-management/records-management!1140
2019-04-03 09:44:57 +01:00
Rodica Sutu
f36817682f Merge branch 'feature/RM-6722_OpenJDK11Compatibility' into 'feature/RM-6790_OpenJDK11Compatibility'
Resolve RM-6722 "Feature/ openjdk11compatibility"

See merge request records-management/records-management!1141
2019-04-03 09:34:33 +01:00
Ross Gale
0c2833a5a2 RM-6787 updating copy and add behaviors for other aspects to use duplication utility class 2019-04-02 11:47:29 +01:00
Rodica Sutu
e363bc7b50 version updates for the plugins used for OpenJDK 11 2019-04-02 12:43:16 +03:00
Rodica Sutu
ae5ea087d9 tidy up 2019-04-02 12:41:22 +03:00
rlucanu
36ac3edc5d Merge branch 'feature/RM-6722_OpenJDK11Compatibility' into feature/RM-6723_AGS_ACS6.1_compatibility 2019-04-02 12:21:14 +03:00
Ross Gale
47c8d875e9 RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
Rodica Sutu
1bb3a5681e fix getResourceAsStream() for OpenJdk11 2019-04-01 11:11:43 +03:00
rlucanu
70ae164da0 RM-6723 removed unwanted string 2019-03-29 12:06:01 +02:00
Rodica Sutu
e5ddc93262 update the maven java doc plugin to fix the Error fetching link: .../target/apidocs/package-list.
add the fabric8.docker.version to fix the warning "build.plugins.plugin.version' for io.fabric8:docker-maven-plugin is missing."
2019-03-29 10:14:03 +02:00
rlucanu
33e4ac3ac2 RM-6723 changes to be compatible with ACS6.1 2019-03-29 09:24:40 +02:00
Rodica Sutu
84796a516d update maven enforce plugin 2019-03-28 17:53:00 +02:00
Rodica Sutu
afa64ad3d1 update the versions for surefire and failsafe plugins and add an additional argument --illegal-access=permit to allow all reflection access for third party libraries: 2019-03-28 17:33:37 +02:00
Rodica Sutu
847c6d3d66 Merge remote-tracking branch 'remotes/origin/feature/RM-6790_OpenJDK11Compatibility' into feature/RM-6722_OpenJDKCOmpatibility 2019-03-28 11:32:05 +02:00
Rodica Sutu
d97b8c3785 update the maven.enforcer.plugin 2019-03-28 11:19:32 +02:00
Rodica Sutu
8c70dbce5b change back alfresco-maven-plugin
comment out thejava version from the maven-enforcer-plugin
2019-03-28 09:48:45 +02:00
Rodica Sutu
a891f75568 fix compilation error 2019-03-28 09:44:43 +02:00
cagache
aa84113c6d 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
8c88ef2883 Revert "call super.checkServerHealth"
This reverts commit e00e10aa
2019-03-26 16:19:15 +02:00
cagache
e00e10aa9d call super.checkServerHealth 2019-03-26 15:35:05 +02:00
Rodica Sutu
cbda231e9a 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
fe56544235 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
a6f1019cc6 RM-6790 Make RM automation module compatible with OpenJDK 11 2019-03-26 10:39:57 +02:00
Ross Gale
b0f2f0e841 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
14b135f46c Merge branch 'release/V3.0' into merge/RM-6788_DeclareArchivedContent 2019-03-18 13:11:36 +00:00
Ross Gale
6cf5344989 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
7f1f4b8041 Merge branch 'release/V3.0' into merge/RM-6786_FileCantBeDeclaredAsRecord 2019-03-15 15:31:41 +02:00
Rodica Sutu
bfb13c4fca 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
73c8c23766 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
ecb8127d5a 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
42241d7796 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
d1dee0a79b Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/RM-6785_JacksonLibraryUpdate 2019-03-15 09:00:51 +02:00
cagache
7056c2904e 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
86ae0f726a RM-6786 another fix 2019-03-14 16:24:50 +02:00
cagache
5c0d05d798 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
2f15cc786e RM-6786 Added check for records 2019-03-14 09:46:29 +02:00
cagache
09de772516 code review comments 2019-03-14 09:19:23 +02:00