Commit Graph

5254 Commits

Author SHA1 Message Date
Rodica Sutu
a0663b2cf8 temporary solution 2018-06-25 13:50:58 +03:00
Rodica Sutu
3bbff09d83 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6393_Apply_RM_Enterprise_repo 2018-06-22 14:39:58 +03:00
Rodica Sutu
d79b798fb6 temporary fix for module.properties issue 2018-06-22 14:27:32 +03:00
Roxana Lucanu
f9f0069034 Merge branch 'feature/RM-6372_AGSCommunityRepoDockerImage' into 'master'
RM-6372 removed ARG and updated tag for acs image

See merge request records-management/records-management!1053
2018-06-22 11:53:08 +01:00
Roxana Lucanu-Ghetu
ffaf28d64c RM-6372 removed ARG and updated tag for acs 2018-06-22 12:36:01 +03:00
Claudia Agache
c2bae72e0e Merge branch 'feature/RM-6374_ConfigureBambooPlansToUseEnterpriseImages_no' into 'master'
RM-6374 Profiles and dockerfiles updates in order to build docker images in bamboo

See merge request records-management/records-management!1052
2018-06-22 06:46:08 +01:00
cagache
03dab3584a changed execution phase to deploy for internal profile 2018-06-21 17:04:25 +03:00
cagache
8e77c144b9 added verify execution phase to buildDockerImage profile and changed execution phase for master profile 2018-06-21 16:27:21 +03:00
Roxana Lucanu
98845eeef5 Merge branch 'feature/RM-6372_AGSCommunityRepoDockerImage' into 'master'
Produce Docker image for community repo

See merge request records-management/records-management!1050
2018-06-21 12:41:34 +01:00
Roxana Lucanu-Ghetu
1fecb6f981 RM-6372 Code review changes 2018-06-21 13:38:28 +03:00
Rodica Sutu
d28b0d50be Merge branch 'feature/RM-6394_StringWithTime_toLocalDate' into 'master'
RM-6394 date-time string not changed to a simple date

See merge request records-management/records-management!1049
2018-06-21 11:26:25 +01:00
Roxana Lucanu-Ghetu
dfdab3c696 RM-6372 Removed share from Dockerfile and force option 2018-06-21 10:55:31 +03:00
Rodica Sutu
7e81bd4f6e fix the date-time string not changed to a simple date 2018-06-20 17:52:28 +03:00
Roxana Lucanu-Ghetu
d0fed54c0d RM-6372 Removed unwanted properties and image from pom. 2018-06-20 17:36:52 +03:00
Roxana Lucanu-Ghetu
6caf496e56 RM-6372 Profile changes 2018-06-20 17:14:01 +03:00
Roxana Lucanu-Ghetu
b63641df4b Merge 'origin/master' into feature/RM-6372_AGSCommunityRepoDockerImage 2018-06-20 16:29:16 +03:00
Claudia Agache
43ccce2b67 Merge branch 'feature/RM-6138_CreateEnterpriseDockerImages' into 'master'
RM-6138 Create Enterprise Repo and Share Docker Images

See merge request records-management/records-management!1048
2018-06-20 14:23:47 +01:00
Tom Page
aa554366d4 Merge branch 'feature/RM-6391_SkipDockerWithITs_no' into 'master'
RM-6391 Skip the docker steps if skipping the integration tests.

See merge request records-management/records-management!1047
2018-06-20 14:11:28 +01:00
cagache
91a64d6eb8 Applied code review changes 2018-06-20 15:32:17 +03:00
cagache
701705a7ce RM-6138 Create docker images for rm-enterprise-share and rm-enterprise-repo 2018-06-20 12:03:22 +03:00
Roxana Lucanu-Ghetu
9e12237808 RM-6372 Intermediate stuff 2018-06-19 16:37:52 +03:00
Rodica Sutu
b979e58a81 Merge branch 'feature/RM-6386_LocalDateDateTime_de_serialization' into 'master'
RM-6386 LocalDate DateTime deserialisation serialisation of joda DateTime,LocalDate types

See merge request records-management/records-management!1046
2018-06-19 09:23:58 +01:00
Tom Page
ae7c8bef9e RM-6391 Skip the docker steps if skipping the integration tests. 2018-06-19 09:03:12 +01:00
Rodica Sutu
3411800240 revert the change for truncating the date with time 2018-06-19 08:44:10 +03:00
Rodica Sutu
895fca9455 review changes and fix for converting string with time to date using a LocalDateDeserializer 2018-06-18 10:58:48 +03:00
Tom Page
21fffe3b0c Record-only merge release/V2.7.0.x into release/V2.7. 2018-06-15 14:02:25 +01:00
alfresco-build
26bdefcb40 [maven-release-plugin] prepare for next development iteration 2018-06-15 13:14:52 +01:00
alfresco-build
35e2523fe6 [maven-release-plugin] prepare release V2.7.0.1 ags-2.7.0.1 2018-06-15 13:14:50 +01:00
Rodica Sutu
9b16443987 java docs updates and fix the deserialisation for the LocalDate from topics 2018-06-15 14:30:33 +03:00
Tom Page
43a0dd6d4c Merge release/V2.7.0.x into release/V2.7. 2018-06-15 11:49:00 +01:00
Tom Page
cd60e37522 Merge release/V2.6 into release/V2.7. 2018-06-15 11:48:36 +01:00
Tom Page
54285c1fd9 RM-6363 Use internal-releases credentials for all deployment repos.
(cherry picked from commit 7840703706)
2018-06-15 11:46:24 +01:00
Tom Page
e381b8ba15 RM-6363 Add correct destinations for released artifacts.
(cherry picked from commit f47875c100)
2018-06-15 11:46:20 +01:00
Tom Page
6b5cf5c346 Record-only merge release/V2.5 into release/V2.6. 2018-06-15 11:44:41 +01:00
Tom Page
7100310534 Merge release/V2.6.0.x into release/V2.6. 2018-06-15 11:44:00 +01:00
Tom Page
5f6c135b7f RM-6363 Use internal-releases credentials for all deployment repos.
(cherry picked from commit 7840703706)
2018-06-15 11:42:51 +01:00
Tom Page
3698f57469 RM-6363 Add correct destinations for released artifacts.
(cherry picked from commit f47875c100)
2018-06-15 11:42:48 +01:00
Tom Page
f37086e813 Record-only merge release/V2.5.3.x into release/V2.5. 2018-06-15 11:40:04 +01:00
Tom Page
2a9579275f Record only merge release/V2.5.2.x into release/V2.5. 2018-06-15 11:39:27 +01:00
Tom Page
faa4e86a18 Record-only merge release/V2.5.1.x into release/V2.5. 2018-06-15 11:39:01 +01:00
Tom Page
e004c30dc3 Record-only merge release/V2.5.0.x into release/V2.5. 2018-06-15 11:38:38 +01:00
Tom Page
35d836f9c1 RM-6363 Use internal-releases credentials for all deployment repos.
(cherry picked from commit 7840703706)
2018-06-15 11:29:58 +01:00
Tom Page
6b3d3e0cc2 RM-6363 Add correct destinations for released artifacts.
(cherry picked from commit f47875c100)
2018-06-15 11:29:58 +01:00
Tom Page
0c0ad37f4e RM-6363 Use internal-releases credentials for all deployment repos.
(cherry picked from commit 7840703706)
2018-06-15 11:29:30 +01:00
Tom Page
1fd4abfcde RM-6363 Add correct destinations for released artifacts.
(cherry picked from commit f47875c100)
2018-06-15 11:29:30 +01:00
Tom Page
f8a03c8642 RM-6363 Use internal-releases credentials for all deployment repos.
(cherry picked from commit 7840703706)
2018-06-15 11:29:04 +01:00
Tom Page
43a92fb7d8 RM-6363 Add correct destinations for released artifacts.
(cherry picked from commit f47875c100)
2018-06-15 11:29:04 +01:00
Tom Page
113b3cb201 RM-6363 Use internal-releases credentials for all deployment repos.
(cherry picked from commit 7840703706)
2018-06-15 11:28:11 +01:00
Tom Page
45578eb582 RM-6363 Add correct destinations for released artifacts.
(cherry picked from commit f47875c100)
2018-06-15 11:28:07 +01:00
Rodica Sutu
d2f303fab8 additional changes for RM-6354 2018-06-15 13:11:19 +03:00