Commit Graph

10723 Commits

Author SHA1 Message Date
r3-build
5f39faf438 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-25 2024-09-25 13:19:28 +00:00
Adel El-Beik
071c6da518
Merge pull request #7818 from corda/cc/dev/os/4.9/dsl_orgunit
ENT-12033 - Recognise OU in DSL node X500 name
2024-09-25 14:17:59 +01:00
Chris Cochrane
42ec266ed6
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-09-24-389 2024-09-25 10:06:18 +01:00
r3-build
0212655363 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-09-25 2024-09-25 03:33:27 +00:00
chriscochrane
63405a28ea
Recognise OU in DSL node X500 name 2024-09-24 17:16:47 +01:00
Adel El-Beik
447f0711e8
Merge pull request #7815 from corda/merge-release/os/4.10-release/os/4.11-2024-09-23-346
ENT-12169: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-09-23
2024-09-24 15:16:56 +01:00
Adel El-Beik
2723ec36a5
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-09-23-346 2024-09-24 11:56:09 +01:00
Adel El-Beik
2a21975088
Merge pull request #7809 from corda/merge-release/os/4.11-release/os/4.12-2024-09-16-379
: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-09-16
2024-09-24 11:52:25 +01:00
Adel El-Beik
0c0ec67170
Merge pull request #7816 from corda/merge-release/os/4.9-release/os/4.10-2024-09-23-346
ENT-12044: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-23
2024-09-24 11:51:11 +01:00
r3-build
0d5cf110e5 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-23 2024-09-23 15:36:01 +00:00
Adel El-Beik
ba787494c8
Merge pull request #7813 from corda/merge-release/os/4.8-release/os/4.9-2024-09-19-323
ENT-12044: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-09-19
2024-09-23 16:35:07 +01:00
Adel El-Beik
851bbbca1e
Merge pull request #7814 from corda/merge-release/os/4.9-release/os/4.10-2024-09-19-341
ENT-12169: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-19
2024-09-23 16:34:31 +01:00
Chris Cochrane
bc08210344
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2024-09-19-323 2024-09-20 09:36:19 +01:00
r3-build
eae11e20a8 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-19 2024-09-19 15:05:07 +00:00
Chris Cochrane
4e265001c2
ENT-12168 - Upgrade JDKs (#7812) 2024-09-19 16:04:21 +01:00
Chris Cochrane
64f900dc38
ENT-12045 - Updated Jackson (#7811) 2024-09-19 16:03:41 +01:00
Chris Cochrane
0d85c6d27f
ENT-12094 - Upgraded sshd-common (#7810) 2024-09-19 16:02:58 +01:00
r3-build
eead117697 Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-09-16 2024-09-16 15:27:01 +00:00
Adel El-Beik
03fc1f9093
Merge pull request #7777 from corda/snyk-fix-3017c366b51002b71ff063b8d5e9e162
[Snyk] Fix for 4 vulnerabilities
2024-09-16 16:26:17 +01:00
Adel El-Beik
740144cf61
Merge pull request #7807 from corda/cc/dev/os/4.9/security_vulns
ENT-12098 - Upgraded sshd-common
2024-09-16 16:24:59 +01:00
Adel El-Beik
0e140f9bfd
Merge pull request #7808 from corda/cc/dev/os/4.10/security_vulns
ENT-12096 - Upgraded sshd-common
2024-09-16 16:24:33 +01:00
chriscochrane
433deb94dd
Upgraded sshd-common 2024-09-16 12:01:48 +01:00
chriscochrane
e0e574caf0
Upgraded sshd-common 2024-09-16 11:37:40 +01:00
Adel El-Beik
d578cae797
Merge pull request #7805 from corda/merge-release/os/4.11-release/os/4.12-2024-08-15-346
ENT-12108: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-15
2024-08-15 10:36:19 +01:00
r3-build
5a94803222 Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-15 2024-08-15 06:08:14 +00:00
Rick Parker
cc44c77ed4
ENT-12108 ReceiveFinalityFlow returns a transaction that is not signed by the notary (#7804) 2024-08-15 07:06:58 +01:00
Adel El-Beik
454ae72905
Merge pull request #7803 from corda/merge-release/os/4.11-release/os/4.12-2024-08-14-344
ENT-12093: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-14
2024-08-14 16:15:26 +01:00
r3-build
a1c1e722bc Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-14 2024-08-14 14:56:26 +00:00
Adel El-Beik
d888dea3c2
Merge pull request #7802 from corda/merge-release/os/4.10-release/os/4.11-2024-08-14-304
ENT-12093: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-14
2024-08-14 15:55:42 +01:00
r3-build
680da7791f Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-14 2024-08-14 14:54:44 +00:00
Adel El-Beik
af27b60917
Merge pull request #7801 from corda/merge-release/os/4.9-release/os/4.10-2024-08-14-303
ENT-12093: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-14
2024-08-14 15:53:59 +01:00
r3-build
7f4977a111 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-14 2024-08-14 14:52:13 +00:00
Adel El-Beik
1f598f9d68
Merge pull request #7800 from corda/merge-release/os/4.8-release/os/4.9-2024-08-14-286
ENT-12093: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-08-14
2024-08-14 15:51:27 +01:00
Adel El-Beik
8cfa851d86
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2024-08-14-286 2024-08-14 15:48:45 +01:00
Adel El-Beik
f9599ed349
ENT-12093: Updated BC api docs url. (#7799) 2024-08-14 15:43:35 +01:00
Adel El-Beik
04c3642695
Merge pull request #7798 from corda/merge-release/os/4.11-release/os/4.12-2024-08-14-343
ENT-12093: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-14
2024-08-14 15:37:56 +01:00
Adel El-Beik
9075bac696 Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-08-14-343 2024-08-14 13:54:47 +01:00
Adel El-Beik
b875a074fc
Merge pull request #7797 from corda/merge-release/os/4.10-release/os/4.11-2024-08-14-303
ENT-12093: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-14
2024-08-14 12:06:52 +01:00
r3-build
dce854fa89 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-14 2024-08-14 10:15:00 +00:00
Adel El-Beik
b7db5ad109
Merge pull request #7796 from corda/merge-release/os/4.9-release/os/4.10-2024-08-14-302
ENT-12093: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-14
2024-08-14 11:14:05 +01:00
r3-build
0cc464fe51 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-14 2024-08-14 09:29:33 +00:00
Adel El-Beik
d56016f8a7
ENT-12093: Updated with correct links for BC. (#7795) 2024-08-14 10:28:13 +01:00
Rick Parker
8bca04ac12
Merge pull request #7794 from corda/merge-release/os/4.11-release/os/4.12-2024-08-13-341
ENT-12080: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-08-13
2024-08-13 18:25:40 +01:00
rick.parker
1d8cf545b0 ENT-12072 ENT-12073 Fix merge of NotaryCertificateRotationTest 2024-08-13 17:47:56 +01:00
rick.parker
967402122c Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-08-13-341
# Conflicts:
#	docker/src/docker/DockerfileAL
#	node/src/integration-test/kotlin/net/corda/node/services/identity/NotaryCertificateRotationTest.kt
2024-08-13 17:26:41 +01:00
Rick Parker
c2efdc0d52
Merge pull request #7793 from corda/merge-release/os/4.10-release/os/4.11-2024-08-13-301
ENT-12080: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-08-13
2024-08-13 16:43:39 +01:00
rick.parker
137c7fb19a Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-08-13-301
# Conflicts:
#	tools/checkpoint-agent/build.gradle
2024-08-13 16:38:11 +01:00
Rick Parker
2e63c153d7
Merge pull request #7792 from corda/merge-release/os/4.9-release/os/4.10-2024-08-13-300
ENT-12080: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-13
2024-08-13 16:26:40 +01:00
r3-build
5fd8875ed2 Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-08-13 2024-08-13 15:08:09 +00:00
Rick Parker
891164e5d6
Merge pull request #7791 from corda/merge-release/os/4.8-release/os/4.9-2024-08-13-284
ENT-12080: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-08-13
2024-08-13 16:07:21 +01:00