Adel El-Beik
|
3d9c682ce8
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:34:37 +01:00 |
|
Adel El-Beik
|
efb901dcb4
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:31:55 +01:00 |
|
Adel El-Beik
|
708fe93039
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:30:24 +01:00 |
|
Adel El-Beik
|
ee50313260
|
ENT-9883: Updated CODEOWNERS file.
|
2023-05-02 11:24:39 +01:00 |
|
Adel El-Beik
|
35a2b3d48b
|
Merge pull request #7354 from corda/cc/merge/os-4.9-os-4.10/27-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-28 10:00:49 +01:00 |
|
Chris Cochrane
|
0ba1cef49d
|
Bumped up Jackson; removed unwanted gradle task
|
2023-04-27 17:00:08 +01:00 |
|
Jose Coll
|
c3e39a7052
|
ENT-9842 Re-factor 2PF to support issuance transactions (no notarisation) with observers. (#7349)
Re-factor 2PF to support issuance transactions (no notarisation) with observers.
|
2023-04-27 16:58:17 +01:00 |
|
Chris Cochrane
|
2f53e8115f
|
Fwd-merge from OS 4.9
|
2023-04-27 16:45:16 +01:00 |
|
Adel El-Beik
|
9975ddcdd9
|
Merge pull request #7353 from corda/cc/merge/os-4.8-os-4.9/26-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-27 09:19:05 +01:00 |
|
Chris Cochrane
|
c61ea7de81
|
Fixed bracketing issue after merge
|
2023-04-27 02:44:30 +01:00 |
|
Chris Cochrane
|
34d4a5f667
|
Fwd-merge from OS 4.8
|
2023-04-26 22:54:20 +01:00 |
|
Rick Parker
|
9ba3919980
|
ENT-9583 Public key caching of encoded form (OS) (#7332)
|
2023-04-26 17:49:52 +01:00 |
|
Rick Parker
|
f4917e08e1
|
ENT-9837 Use a cache to avoid resolving contract class name for a contract state repeatedly. (#7348)
|
2023-04-26 12:34:57 +01:00 |
|
Adel El-Beik
|
32326a168f
|
Merge pull request #7347 from corda/parkri/ENT-9838-deserialization-logger
ENT-9838 DeserializationInput creates a logger each time.
|
2023-04-26 12:05:07 +01:00 |
|
Jose Coll
|
1d4feedc62
|
ENT-9147 Propagate and handle Notary Error (Part 2) (#7346)
|
2023-04-26 09:06:32 +01:00 |
|
Rick Parker
|
f87d7521dc
|
Merge pull request #7352 from corda/cc/merge/os-4.7-os-4.8/25-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-26 08:53:52 +01:00 |
|
Ronan Browne
|
5047b7fa86
|
Merge pull request #7351 from corda/ronanb/merge-4.9-4.10-2023-04-24
INFRA-2040: Merging forward updates from 4.9 to 4.10 (2023-04-24)
|
2023-04-25 20:25:18 +01:00 |
|
Chris Cochrane
|
e12ab8194f
|
Merge branch 'release/os/4.7' into cc/merge/os-4.7-os-4.8/25-apr-2023
Fwd-merge from OS 4.7.
|
2023-04-25 14:54:21 +01:00 |
|
Rick Parker
|
097011784b
|
Merge pull request #7350 from corda/cc/merge/os-4.6-os-4.7/24-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-25 08:49:36 +01:00 |
|
Ronan Browne
|
95a494f75a
|
INFRA-2040: Merging forward updates from 4.9 to 4.10 (2023-04-24)
|
2023-04-24 20:41:10 +01:00 |
|
Chris Cochrane
|
91c38fa84b
|
Merge branch 'release/os/4.6' into cc/merge/os-4.6-os-4.7/24-apr-2023
Fwd-merge from OS 4.6.
|
2023-04-24 20:13:50 +01:00 |
|
Ronan Browne
|
5f685be474
|
ES-93: use standard AMI agent for build (#7345)
|
2023-04-24 17:56:02 +01:00 |
|
rick.parker
|
3cbf693307
|
DeserializationInput creates a logger each time.
|
2023-04-24 15:26:21 +01:00 |
|
Adel El-Beik
|
58366caa3d
|
Merge pull request #7340 from corda/cc/merge/os-4.5-os-4.6/20-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
|
2023-04-24 14:57:34 +01:00 |
|
Ronan Browne
|
82018bc7eb
|
Merge pull request #7341 from corda/ronanb/merge-4.8-4.9-2023-04-21
INFRA-2040: Merging forward updates from 4.8 to 4.9
|
2023-04-21 16:38:40 +01:00 |
|
Chris Cochrane
|
e5a6cac9e8
|
Flakey test fix
|
2023-04-21 16:00:19 +01:00 |
|
Ronan Browne
|
5db96e679c
|
use correct agent
|
2023-04-21 08:43:29 +01:00 |
|
Ronan Browne
|
269b196c57
|
INFRA-2040: Merging forward updates from 4.8 to 4.9 (2023-04-21)
|
2023-04-21 08:42:42 +01:00 |
|
Chris Cochrane
|
fc758ab766
|
Update build.gradle
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
|
2023-04-20 17:14:23 +01:00 |
|
Jose Coll
|
190acdc87c
|
NOTICK Fix failing StateMachineFinalityErrorHandlingTest's. (#7339)
|
2023-04-20 15:45:10 +01:00 |
|
Jose Coll
|
0bd4364653
|
ENT-9823 Rename handleDoubleSpend -> propagateDoubleSpendErrorToPeers (#7338)
|
2023-04-20 15:34:46 +01:00 |
|
Chris Cochrane
|
c58c49d27a
|
Upgrade corda/crash, snakeyaml
|
2023-04-20 14:01:20 +01:00 |
|
Adel El-Beik
|
845a72cf5b
|
Merge pull request #7337 from corda/cc/os/4.5/ent-7033/upgrade_shiro
ENT-7033 - upgrade shiro
|
2023-04-20 10:10:40 +01:00 |
|
Jose Coll
|
fffc3e4c5d
|
ENT-9822 Performance optimisation: use getNodeByLegalIdentity() backed by cache. (#7336)
|
2023-04-20 09:16:55 +01:00 |
|
Chris Cochrane
|
641a47bf32
|
Upgraded shiro to address security issues
|
2023-04-20 07:37:00 +01:00 |
|
Adel El-Beik
|
f906bfc14b
|
Merge pull request #7335 from corda/cc/os/4.5/security_vulnerabilities
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096 - dependency updates
|
2023-04-19 15:35:17 +01:00 |
|
Jose Coll
|
7bd3f5dd33
|
ENT-9147 Remove un-notarised transactions upon Double Spend. (#7324)
|
2023-04-19 15:31:47 +01:00 |
|
Chris Cochrane
|
c263ba7563
|
Updated to fix Jackson tests
|
2023-04-19 13:06:35 +01:00 |
|
Ronan Browne
|
b6fbef5463
|
Merge pull request #7334 from corda/ronanb/merge-4.7-4.8-2023-04-18
INFRA-2040: Merging forward updates from 4.7 to 4.8
|
2023-04-19 09:11:34 +01:00 |
|
Chris Cochrane
|
29dfda3730
|
Resolved build-check issues
|
2023-04-18 20:34:42 +01:00 |
|
Chris Cochrane
|
dfbfda5520
|
Upgrade corda/crash
|
2023-04-18 19:30:22 +01:00 |
|
Ronan Browne
|
90cecf69e5
|
INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-04-18)
|
2023-04-18 19:20:47 +01:00 |
|
Ronan Browne
|
2ffe2eafcb
|
Merge pull request #7333 from corda/ronanb/merge-4.6-4.7-2023-04-17
INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17
|
2023-04-18 17:11:24 +01:00 |
|
Ronan Browne
|
1e7a515a8a
|
INFRA-2040: Merging forward updates from 4.6 to 4.7
|
2023-04-17 17:26:39 +01:00 |
|
Ronan Browne
|
f189fad14a
|
Merge pull request #7331 from corda/ronanb/merge-4.5-4.6-2023-04-16
* INFRA-1955: Shared lib implicit import syntax
* INFRA-2040: remove lingering nexus code (#7330)
|
2023-04-17 17:22:53 +01:00 |
|
Ronan Browne
|
5e9dee18b1
|
INFRA-2040: Merging forward updates from 4.5 to 4.6 (2023-04-16)
|
2023-04-16 18:23:22 +01:00 |
|
Ronan Browne
|
2e9f62f4da
|
INFRA-2040: remove lingering nexus code (#7330)
|
2023-04-16 18:19:43 +01:00 |
|
Rick Parker
|
c6532f0077
|
Merge pull request #7329 from corda/shams-4.11-frwd-merge-fc531761
ENT-8898 & ENT-9569: Forward merge from 4.10 to 4.11 (fc531761)
|
2023-04-14 08:57:03 +01:00 |
|
Shams Asari
|
2556fde971
|
Merge branch 'release/os/4.10' into shams-4.11-frwd-merge-fc531761
|
2023-04-13 10:55:03 +01:00 |
|
Rick Parker
|
fc53176175
|
Merge pull request #7328 from corda/shams-4.10-fwrd-merge-ceb76c56
ENT-8898 & ENT-9569: Forward merge from 4.9 to 4.10 (ceb76c56)
|
2023-04-13 09:21:28 +01:00 |
|