Commit Graph

10179 Commits

Author SHA1 Message Date
Adel El-Beik
c1002697c7 ENT-6743: Reverted RetryFlowMockTest as the retry op only available on ENT. 2022-04-25 11:30:24 +01:00
Adel El-Beik
fa607024c2 ENT-6743: Contains method of flow hospital now correctly returns if flow is in hospital. Historic patient records not used. 2022-04-25 11:24:21 +01:00
Viktor Kolomeyko
05be5d6c42
ENT-6627: Update version of Shiro to 1.8.0 (#7153) 2022-04-25 09:53:06 +01:00
Dimos Raptis
b331a421b2 ENT-6579 - Upgrade netty 2022-04-22 15:40:28 +01:00
Adel El-Beik
0ee1211aab
Merge pull request #7146 from corda/chrisr3-snapshot-dependencies
NOTICK: Force Gradle to use the most recent SNAPSHOTs.
2022-04-13 14:45:00 +01:00
Adel El-Beik
d2f7a3467c
Merge pull request #7152 from corda/feature/ENT-6753/update-image-4.9-os
ENT-6753 Bump base image to ensure latest JDK8 in use
2022-04-13 14:42:44 +01:00
Ronan Browne
415c068616
ENT-6753 update base images 2022-04-12 13:56:06 +01:00
Adel El-Beik
3f2168b562
Merge pull request #7151 from corda/adel/ENT-6748-11Apr
ENT-6748: Make sure correct artemis is picked up
2022-04-11 15:56:02 +01:00
Adel El-Beik
c53b0af997 ENT-6748: Make sure correct artemis is picked up, and don't rely on cache. 2022-04-11 12:21:49 +01:00
Adel El-Beik
6592920aeb
Merge pull request #7150 from corda/adel/merge-from-os-4.5-5Apr
NOTICK: Merge from OS 4.5
2022-04-06 10:02:08 +01:00
Adel El-Beik
6d2a9931af NOTICK: Reverted Jenkins.nightly. 2022-04-05 18:07:25 +01:00
Adel El-Beik
6023482412 Merge remote-tracking branch 'origin/release/os/4.5' into adel/merge-from-os-4.5-5Apr 2022-04-05 18:02:16 +01:00
Adel El-Beik
41f1f3068a
Merge pull request #7145 from corda/adel/ENT-6607-updatehibernate
ENT-6607: Update hibernate to 5.4.32.Final
2022-04-05 17:44:40 +01:00
Adel El-Beik
a99a25fcf7
Merge pull request #7149 from corda/adel/merge-from-os4.4-4Apr
NOTICK: Merge from OS 4.4
2022-04-05 17:02:51 +01:00
Adel El-Beik
52451fcb6e NOTICK: Reverted file in merge. 2022-04-05 14:31:17 +01:00
Adel El-Beik
4fba67b8c5 Merge remote-tracking branch 'origin/release/os/4.4' into adel/merge-from-os4.4-4Apr 2022-04-05 14:25:59 +01:00
Adel El-Beik
ee55da42fd
Merge pull request #7147 from corda/adel/merge-from-4.3-4Apr
NOTICK: Merge from OS 4.3
2022-04-05 14:17:11 +01:00
Adel El-Beik
1262379447 ENT-6607: Update hibernate to 5.4.32.Final 2022-04-05 10:18:19 +01:00
Chris Rankin
c25e0f1c73 NOTICK: Force Gradle to use the most recent SNAPSHOTs. 2022-04-04 15:16:34 +01:00
Adel El-Beik
e2fc6884c2
Merge pull request #7142 from corda/adel/merge-from-4.9-1stApr
NOTICK: Merge from OS 4.9
2022-04-04 13:53:24 +01:00
Adel El-Beik
2e47c4ea43 Merge remote-tracking branch 'origin/release/os/4.3' into adel/merge-from-4.3-4Apr 2022-04-04 10:32:15 +01:00
Adel El-Beik
8355366119
Merge pull request #7144 from corda/adel/ENT-6629
ENT-6629: Update hibernate version to match ent.
2022-04-04 10:09:17 +01:00
Adel El-Beik
4de36292c3
Merge pull request #7143 from corda/adel/CORDA-4239-43
CORDA-4239: Regenerate test certificates with 10yr validity.
2022-04-04 10:08:38 +01:00
Adel El-Beik
9e99af2355 CORDA-4239: Regenerate test certificates with 10yr validity. 2022-04-01 17:38:00 +01:00
Adel El-Beik
cb4c7a80ca Merge remote-tracking branch 'origin/release/os/4.9' into adel/merge-from-4.9-1stApr 2022-04-01 16:58:08 +01:00
Adel El-Beik
f89cb76309 ENT-6629: Update hibernate version to match ent. 2022-04-01 16:40:19 +01:00
Adel El-Beik
84f4979306
Merge pull request #7141 from corda/adel/merge-from-4.8-1stApr
NOTICK: Merge from OS 4.8.
2022-04-01 13:58:04 +01:00
Adel El-Beik
5a41348679 Merge branch 'release/os/4.8' into adel/merge-from-4.8-1stApr 2022-04-01 11:10:58 +01:00
Adel El-Beik
43acf7bf55
Merge pull request #7140 from corda/adel/merge-from-4.7-31March
NOTICK: Merge from OS 4.7
2022-04-01 10:22:43 +01:00
Adel El-Beik
05eb510353 NOTICK: Fixed merge change. 2022-03-31 16:27:52 +01:00
Adel El-Beik
b22f6339f7 NOTICK: Fixed merge typo. 2022-03-31 16:21:23 +01:00
Adel El-Beik
20f3b25d4d Merge remote-tracking branch 'origin/release/os/4.7' into adel/merge-from-4.7-31March 2022-03-31 16:19:54 +01:00
Adel El-Beik
579c66dd7e
Merge pull request #7138 from corda/adel/CORDA-4239
CORDA-4239: Regenerate test certificates with 10yr validity.
2022-03-31 12:45:26 +01:00
Adel El-Beik
6c11184eae CORDA-4239: Regenerate test certificates with 10yr validity. 2022-03-30 16:35:40 +01:00
Ronan Browne
1001926075
Merge pull request #7133 from corda/connelm/INFRA-1743/release-email-notification4.6
INFRA-1743 Activate C4 email notifications Open source and Ent
2022-03-25 17:33:19 +00:00
Ronan Browne
b5d11e7e2f
Merge pull request #7134 from corda/connelm/INFRA-1743/release-email-notification4.5
INFRA-1743 Activate C4 email notifications Open source and Ent
2022-03-25 17:33:06 +00:00
Ronan Browne
475acb6495
Merge pull request #7135 from corda/connelm/INFRA-1743/release-email-notification4.4
INFRA-1743 Activate C4 email notifications Open source and Ent
2022-03-25 17:32:52 +00:00
Ronan Browne
c7d586da28
Merge pull request #7124 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.4
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
2022-03-23 17:13:58 +00:00
Ronan Browne
4802c7bc51
Merge pull request #7125 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.5
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
2022-03-23 17:13:43 +00:00
Ronan Browne
44a5654c40
Merge pull request #7126 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.6
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
2022-03-23 17:13:28 +00:00
Ronan Browne
909b7643ca
Merge pull request #7127 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.7
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
2022-03-23 17:13:14 +00:00
Ronan Browne
5f7bc6ce7b
Merge pull request #7128 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.3
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
2022-03-23 17:13:01 +00:00
ConnelMcGovern
b03e71cb53 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:56:35 +00:00
ConnelMcGovern
682aa43f97 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:54:21 +00:00
ConnelMcGovern
8a0249b08b INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:53:09 +00:00
ConnelMcGovern
8808a5563c INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:52:30 +00:00
ConnelMcGovern
b89eedb744 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:51:48 +00:00
ConnelMcGovern
ae0bf74505 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 16:50:37 +00:00
ConnelMcGovern
c624bb0cc0 INFRA-1743 Activate C4 email notifications Open source and Ent 2022-03-23 13:09:00 +00:00
Connel McGovern
7de81c5cd7
Merge branch 'release/os/4.10' into connelm/INFRA-1743/release-email-notification4.10 2022-03-23 13:08:22 +00:00