Commit Graph

10349 Commits

Author SHA1 Message Date
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
6107f800fd
Merge pull request #7689 from corda/merge-release/os/4.10-release/os/4.11-2024-03-13-131
ENT-11620: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-03-13
2024-03-14 11:44:43 +00:00
r3-build
121ec42d6c Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-03-13 2024-03-13 17:23:47 +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
Adel El-Beik
df07b7b8da
Merge pull request #7668 from corda/merge-release/os/4.10-release/os/4.11-2024-01-30-87
ENT-11387: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-30
2024-01-30 15:43:36 +00:00
r3-build
b6c2d17dae Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-30 2024-01-30 11:51:24 +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
d1ab9b1c25
Merge pull request #7657 from corda/merge-release/os/4.10-release/os/4.11-2024-01-22-78
ENT-10900: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-22
2024-01-22 14:08:28 +00:00
r3-build
aca4c81a27 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-22 2024-01-22 12:11:53 +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
aad2f3c170
Merge pull request #7649 from corda/merge-release/os/4.10-release/os/4.11-2024-01-15-70
ENT-10894: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-15
2024-01-15 13:55:56 +00:00
r3-build
7986c8bca6 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-01-15 2024-01-15 11:06:22 +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
4182e9f999
Merge pull request #7620 from corda/merge-release/os/4.10-release/os/4.11-2023-12-16-39
ENT-11118: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-16
2023-12-17 20:13:26 +00:00
r3-build
16ade601ad Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-16 2023-12-16 19:18:14 +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
292258a985
Merge pull request #7616 from corda/merge-release/os/4.10-release/os/4.11-2023-12-15-36
ENT-11281: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-15
2023-12-15 12:04:49 +00:00
r3-build
a475c275db Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-15 2023-12-15 11:41:19 +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
Jose Coll
8f87b2060b
ENT-11245 Catch and transform new enum type value. (#7596) 2023-11-30 19:13:34 +00:00
Rick Parker
59ff476a40
ENT-11050: Support flag to indicate if in transaction back chain resolution, and use it to drop deserialization errors to warn (#7591)
* Support flag to indicate if in transaction back chain resolution, and use it to drop deserialization errors to warn
* Fix and rename test that has different outcome now
2023-11-28 11:15:21 +00:00
Adel El-Beik
72e5c4fed2
ENT-11036: initiatedBy is now a list of CordaX500Names. (#7592) 2023-11-28 07:10:53 +00:00
Connel McGovern
d6b9134700
Merge pull request #7589 from corda/merge-release/os/4.10-release/os/4.11-2023-11-24-14
ES-1131: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-24
2023-11-27 09:48:08 +00:00
r3-build
13417b037f Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-24 2023-11-24 16:14:21 +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
Adel El-Beik
21a5f20d6d
Merge pull request #7588 from corda/adel/ENT-11171
ENT-11171: Updated JDK8 to 392.
2023-11-23 14:44:18 +00:00
Adel El-Beik
47fd1ec1e4 ENT-11171: Updated JDK8 to 392. 2023-11-23 11:33:16 +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