Rick Parker
ed3875c8b7
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-08-12-297
2024-08-12 19:27:12 +01:00
Rick Parker
38f24d33ba
ENT-12072 ENT-12073: Check notary whitelist when resolving old identities and don't depend on network map availability first for old network parameters ( #7781 )
...
Nodes currently will try and resolve network parameters from the network map and fail if it not available, rather than preferring the availability of a node they are currently interacting with.
A migrated notary identity could not be resolved on new nodes added post-migration, but the old identity is available in the network parameter notary whitelist.
Added a test that covers both bugs in a single reproduction test that simulates the scenario in which both were uncovered.
2024-08-12 19:19:30 +01:00
Adel El-Beik
2223d2808d
Merge pull request #7771 from corda/cc/dev/os/49/security_vulnerabilities
...
ENT-11781 - BouncyCastle update for security issues
2024-07-31 13:21:02 +01:00
Adel El-Beik
b5575b2f94
Merge pull request #7774 from corda/cc/dev/os/410/security_vulns
...
ENT-12041 - security issues
2024-07-31 10:48:34 +01:00
chriscochrane
9ba25720d8
Upgraded jackson
2024-07-30 16:09:59 +01:00
chriscochrane
e7e4d361f4
Upgraded jackson
2024-07-29 18:08:28 +01:00
chriscochrane
43d0c6a372
Disabled unwanted tests
2024-07-29 14:06:36 +01:00
chriscochrane
4b90f93f77
Updates for security issues
2024-07-18 14:23:16 +01:00
Adel El-Beik
94c2a7bd1e
Merge pull request #7762 from corda/cc/dev/os/410/security_vulns
...
ENT-11687,ENT-11688,ENT-11707,ENT-11884 - security vulnerabilities
2024-07-17 10:26:09 +01:00
chriscochrane
4534b3b024
Restored old netty version
2024-07-16 10:22:08 +01:00
Adel El-Beik
13182f949b
Merge pull request #7765 from corda/cc/dev/os/410/prevent_mergebot
...
ENT-11687 - Empty PR to prevent mergebot
2024-07-16 09:08:21 +01:00
chriscochrane
e63d675609
Satisfy mergebot
...
# Conflicts:
# build.gradle
2024-07-15 16:41:43 +01:00
Adel El-Beik
d3cb3da89d
Merge pull request #7761 from corda/cc/dev/os/49/security_vulns
...
ENT-11887 - Security issues
2024-07-15 11:41:43 +01:00
chriscochrane
c7c89f33c7
Dependency updates for security issues.
2024-07-11 09:42:29 +01:00
chriscochrane
04010b74a1
Reverted Bouncy Castle version
2024-07-09 16:17:35 +01:00
chriscochrane
7cde5523dc
Dependency updates for security issues
2024-07-09 16:13:53 +01:00
Adel El-Beik
625cf82821
Merge pull request #7749 from corda/merge-release/os/4.9-release/os/4.10-2024-06-11-232
...
ES-2340: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-06-11
2024-06-11 10:53:18 +01:00
r3-build
55f0731b57
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-06-11
2024-06-11 07:20:23 +00:00
Waldemar Żurowski
48e385a9a2
Merge pull request #7748 from corda/merge-release/os/4.8-release/os/4.9-2024-06-10-215
...
ES-2340: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-06-10
2024-06-11 08:18:58 +01:00
r3-build
b443b2c3f9
Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-06-10
2024-06-10 14:19:09 +00:00
Sean Brereton
729883555f
Merge pull request #7746 from corda/merge-release/os/4.7-release/os/4.8-2024-06-10-218
...
ES-2340: Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-06-10
2024-06-10 15:18:23 +01:00
r3-build
6408ffd065
Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-06-10
2024-06-10 10:29:54 +00:00
Sean Brereton
b608500fe5
ES-2340/Add snyk code ( #7745 )
2024-06-10 11:28:58 +01:00
Adel El-Beik
9e5987442c
Merge pull request #7728 from corda/merge-release/os/4.9-release/os/4.10-2024-05-03-192
...
ES-2349: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-05-03
2024-05-03 14:05:47 +01:00
r3-build
c44f1974b2
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-05-03
2024-05-03 10:04:20 +00:00
Adel El-Beik
4d8515c384
Merge pull request #7726 from corda/merge-release/os/4.8-release/os/4.9-2024-05-01-174
...
ES-2349: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-05-01
2024-05-03 11:03:19 +01:00
r3-build
dca0e420c0
Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-05-01
2024-05-01 16:43:39 +00:00
Ronan Browne
5b2211af5d
Merge pull request #7725 from corda/merge-release/os/4.7-release/os/4.8-2024-05-01-177
...
ES-2349: Merging forward updates from release/os/4.7 to release/os/4.8 - 2024-05-01
2024-05-01 17:42:40 +01:00
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
