r3-build
9bbdde5fbd
Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-05-01
2024-05-01 12:34:09 +00:00
Adel El-Beik
d75c540760
Merge pull request #7724 from corda/ronanb/ES-2349/update-cron
...
ES-2349: update Crons to not run at the weekend
2024-05-01 13:32:36 +01:00
Ronan Browne
1f2dea4eb1
ES-2349: update Crons to not run at the weekend
2024-05-01 10:38:19 +01:00
Adel El-Beik
468b1eac12
Merge pull request #7717 from corda/merge-release/os/4.9-release/os/4.10-2024-04-12-170
...
ENT-11695: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-04-12
2024-04-12 15:35:51 +01:00
Chris Cochrane
b969af5ac4
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-04-12-170
2024-04-12 10:57:32 +01:00
Adel El-Beik
66eeb44029
Merge pull request #7716 from corda/cc/dev/os/4.9/security_vulns
...
ENT-11695,ENT-11696 - Dependency update for security vulns
2024-04-12 10:27:00 +01:00
Chris Cochrane
503d887fd1
Upgrade for security vulns
2024-04-11 14:01:57 +01:00
Adel El-Beik
82170a6ee1
Merge pull request #7712 from corda/merge-release/os/4.9-release/os/4.10-2024-04-08-165
...
ES-1919: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-04-08
2024-04-08 12:41:31 +01:00
Ronan Browne
9b393bd58d
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-04-08-165
2024-04-08 09:11:14 +01:00
Ronan Browne
866e30a11d
Merge pull request #7711 from corda/merge-release/os/4.8-release/os/4.9-2024-04-07-149
...
ES-1919: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-04-07
2024-04-08 09:01:16 +01:00
r3-build
c83c59a374
Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-04-07
2024-04-07 18:39:40 +00:00
Adel El-Beik
7185ba9f56
Merge pull request #7710 from corda/merge-release/os/4.7-release/os/4.8-2024-04-07-152
...
ES-1919: Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-04-07
2024-04-07 19:38:35 +01:00
r3-build
9734c9c34f
Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-04-07
2024-04-07 08:34:15 +00:00
Adel El-Beik
50b65c0183
Merge pull request #7705 from corda/ES-1919/Update-Github-Workflows
...
ES-1919/Update-Github-Workflows
2024-04-02 10:45:34 +01:00
LukeBrowne-R3
764b47ad18
ES-1919/Update-Github-Workflows
2024-03-29 12:09:56 +00:00
Adel El-Beik
a6ee0e940a
Merge pull request #7688 from corda/adel/ENT-11620
...
ENT-11620: Set the thread context class loader so all fibres involved…
2024-03-13 17:22:49 +00:00
Adel El-Beik
99faeaf667
ENT-11620: Set the thread context class loader so all fibres involved in a flow has the thread context class loader set to the app class loader.
2024-03-13 11:01:41 +00:00
Rick Parker
4faa0caeb3
Merge pull request #7667 from corda/merge-release/os/4.9-release/os/4.10-2024-01-30-95
...
ENT-11387: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-01-30
2024-01-30 11:49:45 +00:00
r3-build
f2522943f2
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-01-30
2024-01-30 09:08:36 +00:00
Adel El-Beik
fa173baaee
ENT-11387: Fix to prevent interleaved stop/start causing bridge to be started with null session. ( #7665 )
...
* ENT-11387: Fix to prevent interleaved stop/start causing bridge to be started with null session.
* ENT-11387: Fixed bug in assigning null to session.
2024-01-30 09:07:18 +00:00
Adel El-Beik
418a0c1585
Merge pull request #7653 from corda/merge-release/os/4.9-release/os/4.10-2024-01-17-81
...
ENT-10900: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-01-17
2024-01-22 12:10:39 +00:00
Chris Cochrane
f7157abf9a
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-01-17-81
2024-01-17 17:08:59 +00:00
Adel El-Beik
3d7db25d13
Merge pull request #7645 from corda/cc/dev/4.10/security_vulns
...
ENT-10894 - Security vulnerabilities
2024-01-15 11:05:20 +00:00
Adel El-Beik
4793cd5f31
Merge pull request #7644 from corda/cc/dev/4.9/security_vulns
...
ENT-10900 - Security vulnerabilities
2024-01-12 18:29:16 +00:00
Chris Cochrane
52a6d477da
Upgraded Jetty
2024-01-12 17:12:46 +00:00
Chris Cochrane
07a2d98d0b
Security vulnerabilities
2024-01-12 11:51:12 +00:00
Adel El-Beik
5569cd37be
Merge pull request #7619 from corda/merge-release/os/4.9-release/os/4.10-2023-12-15-37
...
ENT-11118: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-15
2023-12-16 19:15:09 +00:00
r3-build
1cf66d4a8f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-15
2023-12-15 20:02:41 +00:00
Adel El-Beik
2208d56337
Merge pull request #7618 from corda/tom/ENT-11118/netty-ssl-handshake-fix
...
ENT-11118: Netty SSL handshake fix (#5028 )
2023-12-15 19:59:39 +00:00
Tom Stark
71e187dddb
ENT-11118: Netty SSL handshake fix ( #5028 )
...
* ENT-11118: Added fix for netty SSL handshake fail
2023-12-15 17:16:15 +00:00
Ronan Browne
87a47c4ee5
Merge pull request #7615 from corda/merge-release/os/4.9-release/os/4.10-2023-12-14-35
...
ENT-11281: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14
2023-12-15 11:40:05 +00:00
r3-build
27759ea74f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14
2023-12-14 17:51:03 +00:00
Maciej Swierad
bf6fcb2a8f
Merge pull request #7614 from corda/merge-release/os/4.8-release/os/4.9-2023-12-14-33
...
ENT-11281: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14
2023-12-14 17:48:48 +00:00
r3-build
40a96c5760
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14
2023-12-14 17:06:04 +00:00
Maciej Swierad
bbc994882a
Merge pull request #7613 from corda/merge-release/os/4.7-release/os/4.8-2023-12-14-35
...
ENT-11281: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14
2023-12-14 17:03:24 +00:00
r3-build
0dbdd08984
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14
2023-12-14 15:30:28 +00:00
Maciej Swierad
97310a8895
ENT-11281/Activating forward merge logic
2023-12-14 14:57:13 +00:00
Ronan Browne
b4a95a63cc
Merge pull request #7587 from corda/merge-release/os/4.9-release/os/4.10-2023-11-22-11
...
ES-1131: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-22
2023-11-24 16:13:22 +00:00
r3-build
04d2373a8a
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-22
2023-11-22 19:21:08 +00:00
Adel El-Beik
8776030a95
Merge pull request #7583 from corda/merge-release/os/4.8-release/os/4.9-2023-11-21-9
...
ES-1131: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-21
2023-11-22 19:20:14 +00:00
r3-build
aa4d2e56fc
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-21
2023-11-21 03:02:05 +00:00
Ronan Browne
171977574e
Merge pull request #7581 from corda/merge-release/os/4.9-release/os/4.10-2023-11-20-8
...
ES-1331: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20
2023-11-20 21:18:43 +00:00
r3-build
5e9fdb7b2b
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20
2023-11-20 14:29:12 +00:00
Connel McGovern
8d4eac4977
Merge pull request #7579 from corda/merge-release/os/4.8-release/os/4.9-2023-11-19-6
...
ES-1331: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-19
2023-11-20 14:25:52 +00:00
Adel El-Beik
f8925687a2
Merge pull request #7580 from corda/connelm/ES-1131/re-add-authenticateGradleWrapper
...
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:38:01 +00:00
Connel McGovern
7c681e025d
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:06:46 +00:00
Connel McGovern
fa899c55c2
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:05:54 +00:00
Ronan Browne
18d98760b1
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2023-11-19-6
2023-11-19 19:56:09 +00:00
Ronan Browne
44bfb2821d
Merge pull request #7578 from corda/merge-release/os/4.7-release/os/4.8-2023-11-17-6
...
ES-1331: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-11-17
2023-11-19 19:13:06 +00:00
Adel El-Beik
548242e3cd
Merge branch 'release/os/4.8' into merge-release/os/4.7-release/os/4.8-2023-11-17-6
2023-11-18 18:10:07 +00:00