Commit Graph

10754 Commits

Author SHA1 Message Date
rick.parker
778661181a ENT-12366 ExternalVerifier no longer needs legacy contracts folder, and can derive everything it needs from attachments. 2024-11-01 10:50:32 +00:00
Adel El-Beik
a67e6cdb1e
Merge pull request #7860 from corda/merge-release/os/4.11-release/os/4.12-2024-10-29-432
ENT-11275: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-29
2024-10-31 14:18:47 +00:00
Adel El-Beik
8a3ac3882c
Merge pull request #7863 from corda/parkri/legacy-min-platform-version
ENT-11479 TransactionBuilder will not add legacy attachments once minimum platform version reaches 140 (4.12)
2024-10-31 14:17:33 +00:00
rick.parker
33592910ee ENT-11479 TransactionBuilder will not add legacy attachments once minimum platform version reaches 140 (4.12) 2024-10-30 18:05:13 +00:00
Adel El-Beik
06e24e2a3b
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-10-29-432 2024-10-29 17:06:05 +00:00
Adel El-Beik
ea46724196
Merge pull request #7853 from corda/merge-release/os/4.10-release/os/4.11-2024-10-23-383
ENT-11275: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-23
2024-10-29 09:36:40 +00:00
Adel El-Beik
33cf48e04b
ENT-12366: External verifier now sets appclassloader to legacy contra… (#7855)
* ENT-12366: External verifier now sets appclassloader to legacy contracts directory instead of the cordapps directory.
* ENT-12366: Now check legacy-contracts exists before start external verifier.
2024-10-28 15:28:50 +00:00
Adel El-Beik
8edfbb792c ENT-11275: Removing obsolete DJVM stuff. 2024-10-28 14:11:19 +00:00
Adel El-Beik
7852754ad9
Merge pull request #7856 from corda/cc/dev/os/4.12/ent-12154/mocknetwork_leak
ENT-12154 - Remove Hibernate sessions when done with them
2024-10-28 13:40:13 +00:00
chriscochrane
eece1e923c
Mocknetwork remove hibernate sessions on stop 2024-10-25 15:25:59 +01:00
Chris Cochrane
863b795f25
Jetty upgrade (#7851) 2024-10-24 13:27:56 +01:00
Chris Cochrane
d27aa0e685
Force commons-io version (#7852) 2024-10-24 13:27:22 +01:00
r3-build
3fb3917695 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-23 2024-10-23 07:59:33 +00:00
Adel El-Beik
1022d1ec97
ENT-11275: Added span to multi send and receive calls. (#7845)
* ENT-12275: Added spans around multi send & receive.
2024-10-23 08:58:40 +01:00
Adel El-Beik
4b109e0e1c
Merge pull request #7848 from corda/merge-release/os/4.11-release/os/4.12-2024-10-19-420
ENT-12281: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-19
2024-10-21 16:59:20 +01:00
Adel El-Beik
c59040fbc2 ENT-11975:Merge typo, removed commons_lang_version added. 2024-10-21 09:01:25 +01:00
Adel El-Beik
fc261beff0
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-10-19-420 2024-10-21 08:49:56 +01:00
Adel El-Beik
a448ee8e68
Merge pull request #7846 from corda/cc/dev/os/4.12/security_vulns
ENT-12327,ENT-12328 - Security vulnerabilities
2024-10-18 14:30:09 +01:00
chriscochrane
df7c073e3e
Dependency updates 2024-10-18 11:48:44 +01:00
Adel El-Beik
9852366f86
Merge pull request #7843 from corda/merge-release/os/4.11-release/os/4.12-2024-10-16-416
ENT-12291: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-16
2024-10-18 10:25:15 +01:00
Adel El-Beik
3422830dcf ENT-12291: Fixing up merge errors. 2024-10-18 10:22:36 +01:00
Adel El-Beik
616ac4bae4
Merge pull request #7844 from corda/merge-release/os/4.10-release/os/4.11-2024-10-17-376
ENT-12281: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-17
2024-10-17 14:26:33 +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
r3-build
ea568e0780 Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-17 2024-10-17 03:33:27 +00: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
d1cfcfe74f
Merge pull request #7842 from corda/merge-release/os/4.9-release/os/4.10-2024-10-15-374
ENT-12283: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-15
2024-10-15 14:49:06 +01:00
chriscochrane
78e7f62df3
Updated commons-io version 2024-10-15 10:11:58 +01:00
Chris Cochrane
992265622a
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-10-15-374 2024-10-15 09:44:09 +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
60c5e97d54
Merge pull request #7840 from corda/cc/dev/os/4.9/security_vulns
ENT-12287 - Security vulnerabilities
2024-10-14 17:00:24 +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
chriscochrane
31ad1d99c4
New WriterOutputStream API 2024-10-14 14:43:45 +01:00
chriscochrane
94bd9dceac
Dependency update 2024-10-14 13:34:49 +01:00
Adel El-Beik
81268177ac
Merge pull request #7839 from corda/adel/ENT-11975-config-fix
ENT-11975: Updating config parsing with 4.12 version, which correctly parses the rotated keys config item.
2024-10-14 10:42:41 +01:00
Adel El-Beik
76b56679e6 ENT-11975: Updating config parsing with 4.12 version, which correctly parses the 4.12 rotated keys config item. 2024-10-13 19:26:01 +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