Adel El-Beik
3422830dcf
ENT-12291: Fixing up merge errors.
2024-10-18 10:22:36 +01:00
Adel El-Beik
8e6c4b3b87
ENT-11975: Fixed up merge issues.
2024-10-17 14:21:52 +01:00
Adel El-Beik
14f966ccd3
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-10-16-416
2024-10-17 12:02:04 +01:00
Adel El-Beik
5d0593c20f
Merge pull request #7841 from corda/merge-release/os/4.10-release/os/4.11-2024-10-14-372
...
ENT-12291: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-14
2024-10-16 23:20:21 +01:00
Adel El-Beik
98d9263aba
ENT-11975: Fixed merge errors.
2024-10-15 17:38:56 +01:00
Adel El-Beik
5b812a56c2
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-10-14-372
2024-10-15 16:33:13 +01:00
Adel El-Beik
5193de2323
Merge pull request #7837 from corda/merge-release/os/4.9-release/os/4.10-2024-10-10-367
...
ENT-12291: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-10
2024-10-14 20:03:32 +01:00
Adel El-Beik
3bf717a747
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-10-10-367
2024-10-14 16:11:30 +01:00
Rick Parker
9bc1ee1ad5
ENT-12070 System property feature flag for AMQP Serialization performance improvements ( #7838 )
2024-10-11 13:33:01 +01:00
Rick Parker
852127c648
ENT-12070 AMQP Serialisation performance improvements ( #7778 )
...
* Serialization performance test of creating wire transaction
* Initial serialization refactoring to enable future caching of schema
* Add caching of schema
* Move encoder pool to the companion object so it actually gets re-used!
* Slightly better cache concurrency for LocalSerializerFactory
* Upgrade grgit to 4.1.1 as 4.0.0 seems to have vanished
2024-10-10 17:22:07 +01:00
Adel El-Beik
d721bb7f3e
Merge pull request #7835 from corda/parkri/legacy-third-party-jars
...
ENT-12248 Support for a new legacy-jars directory of 3rd party JARs for the external verifier
2024-10-10 17:15:59 +01:00
Adel El-Beik
c9bbb5373a
Merge pull request #7836 from corda/adel/ENT-12291
...
ENT-12291: Backport of contract key rotation to 4.9.
2024-10-10 17:13:04 +01:00
Adel El-Beik
4c0aa16f1e
ENT-12291: RotatedKeys can be retrieved from MockServices.
2024-10-10 12:49:46 +01:00
Adel El-Beik
a2537d59f5
ENT-12291: Removed from rotated keys from public api.
2024-10-09 17:16:04 +01:00
Adel El-Beik
828066a646
Backport contract key rotation to 4.9.
2024-10-09 14:46:57 +01:00
rick.parker
38d7d71a63
ENT-12248 Support for a new legacy-jars directory of 3rd party JARs for the external verifier
2024-10-08 10:09:39 +01:00
Adel El-Beik
282ee95188
ENT-11975: Contract key rotation ( #7806 )
...
ENT-11975: Contract key rotation implementation.
2024-10-07 16:55:50 +01:00
Adel El-Beik
babaceab5d
ENT-12276: Exception now takes a string not a Method object, which wa… ( #7834 )
...
* ENT-12276: Exception now takes a string not a Method object, which was causing problems in Jackson parsing.
2024-10-04 11:32:20 +01:00
Adel El-Beik
088846f428
Merge pull request #7833 from corda/merge-release/os/4.11-release/os/4.12-2024-10-02-401
...
ENT-12072: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-02
2024-10-03 09:34:58 +01:00
Adel El-Beik
6f4ec5d9e5
ENT-11975: Contract key rotation ( #7806 )
...
ENT-11975: Contract key rotation implementation.
2024-10-02 12:53:11 +01:00
r3-build
0989b5c846
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-02
2024-10-02 09:55:04 +00:00
Adel El-Beik
46cfdad07a
Merge pull request #7832 from corda/merge-release/os/4.10-release/os/4.11-2024-10-02-359
...
ENT-12072: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-02
2024-10-02 10:54:14 +01:00
r3-build
403cae5721
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-02
2024-10-02 08:33:34 +00:00
Adel El-Beik
1f193b0ef7
Merge pull request #7830 from corda/merge-release/os/4.9-release/os/4.10-2024-10-01-357
...
ENT-12072: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-01
2024-10-02 09:32:13 +01:00
Adel El-Beik
56234ecbe9
Merge pull request #7831 from corda/merge-release/os/4.11-release/os/4.12-2024-10-02-400
...
ENT-12072: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-02
2024-10-02 09:30:59 +01:00
r3-build
d61daad1cd
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-02
2024-10-02 03:50:27 +00:00
r3-build
e3d6edb8b2
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-01
2024-10-01 13:48:28 +00:00
Adel El-Beik
61a4504d6d
Merge pull request #7824 from corda/merge-release/os/4.8-release/os/4.9-2024-10-01-337
...
ENT-12072: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-10-01
2024-10-01 14:47:45 +01:00
Adel El-Beik
f1092eb12d
Merge pull request #7828 from corda/merge-release/os/4.11-release/os/4.12-2024-10-01-398
...
ENT-12072: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-01
2024-10-01 14:46:42 +01:00
Adel El-Beik
229d3b26f0
Merge pull request #7829 from corda/merge-release/os/4.10-release/os/4.11-2024-10-01-357
...
ENT-12072: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-01
2024-10-01 14:46:00 +01:00
Adel El-Beik
b9fb90edda
Update build.gradle
2024-10-01 09:06:39 +01:00
Adel El-Beik
576e37c3bb
Update build.gradle
2024-10-01 09:06:15 +01:00
r3-build
2350de8635
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-01
2024-10-01 08:05:01 +00:00
Adel El-Beik
423fbf6993
Update constants.properties
2024-10-01 09:04:55 +01:00
r3-build
9a438c0c56
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-01
2024-10-01 08:04:21 +00:00
Adel El-Beik
e9f05ce0e9
Merge pull request #7825 from corda/merge-release/os/4.9-release/os/4.10-2024-10-01-356
...
ENT-12072: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-01
2024-10-01 09:04:07 +01:00
Adel El-Beik
41550a0c28
Merge pull request #7826 from corda/merge-release/os/4.10-release/os/4.11-2024-10-01-356
...
ENT-12072: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-01
2024-10-01 09:03:28 +01:00
Adel El-Beik
f168645f9e
Merge pull request #7827 from corda/merge-release/os/4.11-release/os/4.12-2024-10-01-397
...
ENT-12072: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-01
2024-10-01 09:02:38 +01:00
r3-build
55bcc346bb
Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-01
2024-10-01 03:50:29 +00:00
r3-build
f968aa34d8
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-01
2024-10-01 03:33:29 +00:00
r3-build
a032641a01
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-01
2024-10-01 03:23:28 +00:00
r3-build
732c6afe6a
Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-10-01
2024-10-01 03:02:01 +00:00
Adel El-Beik
511633a80e
Merge pull request #7817 from corda/merge-release/os/4.11-release/os/4.12-2024-09-24-389
...
ENT-12169: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-09-24
2024-09-30 19:01:29 +01:00
Adel El-Beik
ca56d350b7
Merge pull request #7819 from corda/merge-release/os/4.10-release/os/4.11-2024-09-25-349
...
ENT-12044: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-09-25
2024-09-30 10:22:11 +01:00
Adel El-Beik
1a93ac6807
Merge pull request #7820 from corda/merge-release/os/4.9-release/os/4.10-2024-09-25-349
...
ENT-12033: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-09-25
2024-09-30 10:20:50 +01:00
Adel El-Beik
615cda1c91
Merge pull request #7822 from corda/merge-release/os/4.8-release/os/4.9-2024-09-27-332
...
ENT-12072: Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-09-27
2024-09-30 10:20:12 +01:00
Adel El-Beik
b17027e46a
Merge pull request #7823 from corda/adel/ENT-12072-andENT-12073-pt2
...
ENT-12072: Reverted BC
2024-09-27 10:14:23 +01:00
Adel El-Beik
b048c28125
ENT-12072: Reverted BC
2024-09-27 09:58:51 +01:00
r3-build
a483b420f3
Merging forward updates from release/os/4.8 to release/os/4.9 - 2024-09-27
2024-09-27 07:24:48 +00:00
Adel El-Beik
76ff377dca
Merge pull request #7821 from corda/adel/ENT-12072-and-ENT-12073
...
ENT-12072 ENT-12073: Check notary whitelist when resolving old identities and don't depend on network map availability first for old network parameters
2024-09-27 08:23:52 +01:00
