r3-build
e34d019f85
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-06
2024-11-06 09:46:41 +00:00
Adel El-Beik
397a91f365
Merge pull request #7847 from corda/adel/ENT-12314
...
ENT-12314: Updated signature attachment constraint warning message to mention the key may be a rotated key.
2024-11-06 09:45:04 +00:00
Adel El-Beik
8d9120713c
ENT-12314: Dont display warning for sig constraint fail if checking for rotated keys after.
2024-11-05 18:17:58 +00:00
Adel El-Beik
7c591de607
Merge pull request #7868 from corda/adel/ENT-12373
...
ENT-12373: Can now cope with diff input states from diff rotated CorDapps.
2024-11-05 17:34:50 +00:00
Adel El-Beik
003da6906f
Merge pull request #7865 from corda/merge-release/os/4.11-release/os/4.12-2024-11-01-437
...
ENT-12153: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-01
2024-11-05 12:07:14 +00:00
Adel El-Beik
f0c73cc95f
ENT-12373: Can now cope with diff input states from diff rotated CorDapps.
2024-11-04 19:44:25 +00:00
Rick Parker
d3b847aa8e
ENT-12395: Stop warning about failed verification when resolving missing dependencies in TransactionBuilder ( #7867 )
...
* Stop warning about failed verification when resolving missing dependencies in TransactionBuilder
* Stop warning about failed verification when resolving missing dependencies in TransactionBuilder
2024-11-04 13:06:22 +00:00
Adel El-Beik
a6713e315c
ENT-12153: Changed the compile dependency to implementation.
2024-11-01 16:57:27 +00:00
Adel El-Beik
d4fb51ea73
Merge pull request #7864 from corda/merge-release/os/4.10-release/os/4.11-2024-10-31-394
...
ENT-12153: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-31
2024-11-01 16:53:08 +00:00
Rick Parker
436eca1524
ENT-12366 ExternalVerifier no longer needs legacy contracts folder, and can derive everything it needs from attachments. ( #7866 )
...
* ENT-12366 ExternalVerifier no longer needs legacy contracts folder, and can derive everything it needs from attachments.
* ENT-12366 Fix compiler warnings
* Revert "ENT-12366 Fix compiler warnings"
This reverts commit 4e884a5519
.
* ENT-12366 Attempt to appease warnings in both 1.2 and 1.9 compilers
2024-11-01 16:27:36 +00:00
Chris Cochrane
9eb54ee4d1
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-01-437
2024-11-01 08:23:37 +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
Chris Cochrane
d28ced3ba7
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2024-10-31-394
2024-10-31 10:47:06 +00:00
Adel El-Beik
c78d9d6c08
Merge pull request #7861 from corda/merge-release/os/4.9-release/os/4.10-2024-10-30-392
...
ENT-12153: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-30
2024-10-31 09:39:53 +00:00
Adel El-Beik
24dbce529b
Merge pull request #7862 from corda/merge-release/os/4.10-release/os/4.11-2024-10-30-392
...
ENT-12152: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-30
2024-10-31 09:38:58 +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
chriscochrane
41b19f7c57
Hikari upgrade
2024-10-30 10:09:40 +00:00
Chris Cochrane
8609df89db
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-10-30-392
2024-10-30 10:08:21 +00:00
r3-build
47c2aa54e9
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-10-30
2024-10-30 03:33:29 +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
Chris Cochrane
2bd47a2122
ENT-12355 - Javassist runtime dependency ( #7854 )
...
* Added javassist as a runtime dependency
* Removed javassist dependency in node
2024-10-29 10:55:59 +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
a905c5b245
Merge pull request #7858 from corda/merge-release/os/4.9-release/os/4.10-2024-10-28-389
...
ENT-12152: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-10-28
2024-10-29 09:35:04 +00:00
Adel El-Beik
fb8a71a43b
Merge pull request #7859 from corda/cc/dev/os/4.9/hikari_upgrade
...
ENT-12153 - Upgrade Hikari
2024-10-29 09:33:38 +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
Chris Cochrane
e59ebba66a
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-10-28-389
2024-10-28 14:42:03 +00:00
chriscochrane
23bfcfe6c0
Upgrade Hikari
2024-10-28 14:33:37 +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
Chris Cochrane
5b9d65ad51
MockNetwork remove hibernate sessions on stop ( #7857 )
2024-10-28 13:25:52 +00:00
chriscochrane
eece1e923c
Mocknetwork remove hibernate sessions on stop
2024-10-25 15:25:59 +01:00
Chris Cochrane
af83cb9c8c
Jetty upgrade ( #7849 )
2024-10-24 13:29:04 +01:00
Chris Cochrane
f0688e8222
Jetty upgrade ( #7850 )
2024-10-24 13:28:33 +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
Adel El-Beik
a3519d9fd0
ENT-12314: Updated signature attachment constraint warning message to mention the key may be a rotated key.
2024-10-18 13:55:43 +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