Adel El-Beik
c6fc18356e
Merge branch 'merge-release/os/4.11-release/os/4.12-2024-11-28-469' of github.com:corda/corda into merge-release/os/4.11-release/os/4.12-2024-11-28-469
2024-12-04 15:21:20 +00:00
Adel El-Beik
b4f0499465
ENT-12385: Fixed merge artifact.
2024-12-04 15:20:42 +00:00
Chris Cochrane
7caafd626f
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-28-469
2024-12-02 20:35:23 +00:00
Adel El-Beik
8ebf4ad835
Merge pull request #7884 from corda/merge-release/os/4.11-release/os/4.12-2024-11-27-467
...
ENT-12433: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-27
2024-11-28 16:24:28 +00:00
Adel El-Beik
ed0a696562
Merge pull request #7885 from corda/merge-release/os/4.10-release/os/4.11-2024-11-27-425
...
ENT-12385: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-27
2024-11-28 16:23:59 +00:00
Chris Cochrane
61aa4de348
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-27-467
2024-11-27 11:22:57 +00:00
r3-build
9b51bd3f81
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-27
2024-11-27 10:51:08 +00:00
Adel El-Beik
7895bbff92
Merge pull request #7883 from corda/merge-release/os/4.9-release/os/4.10-2024-11-25-422
...
ENT-12385: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-25
2024-11-27 10:49:45 +00:00
Adel El-Beik
761a3ab049
Merge pull request #7882 from corda/merge-release/os/4.10-release/os/4.11-2024-11-25-422
...
ENT-12433: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-25
2024-11-27 10:49:11 +00:00
chriscochrane
fc7ad4281d
Fwd-merge jackson version reversion
2024-11-25 16:52:22 +00:00
Chris Cochrane
2ed9753f87
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-11-25-422
2024-11-25 16:49:21 +00:00
Adel El-Beik
1b72f3c10f
Merge pull request #7880 from corda/cc/dev/os/4.9/ent-12385/revert_jackson_version
...
ENT-12385 - Reverted Jackson version
2024-11-25 16:16:55 +00:00
r3-build
c3bf65cf7d
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-25
2024-11-25 13:38:09 +00:00
Adel El-Beik
cbb1f10871
Merge pull request #7879 from corda/merge-release/os/4.9-release/os/4.10-2024-11-20-416
...
ENT-12433: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-20
2024-11-25 13:35:52 +00:00
Adel El-Beik
5b9d61224f
Merge pull request #7881 from corda/jzadroga/ent-12442/update-bc-dependencies
...
ENT-12442: Add bcutil dependency for Bouncy Castle
2024-11-25 11:58:45 +00:00
jakub.zadroga
83a7f28c67
Add bcutil dependency for BC
2024-11-21 18:41:24 +07:00
chriscochrane
3d26a5a07e
ENT-12385: reverted Jackson version
2024-11-21 11:31:08 +00:00
r3-build
640f119d67
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-20
2024-11-20 21:18:38 +00:00
Adel El-Beik
3623e45653
Merge pull request #7878 from corda/cc/dev/os/4.9/ent-12433/bc_package_list
...
ENT-12433 - Bouncy Castle docs generation
2024-11-20 21:17:43 +00:00
chriscochrane
33757a2a29
Updated BC package list URL
2024-11-14 11:20:21 +00:00
Adel El-Beik
ba977d8a5a
Merge pull request #7877 from corda/merge-release/os/4.11-release/os/4.12-2024-11-09-448
...
ENT-12373: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-09
2024-11-10 20:32:05 +00:00
Adel El-Beik
35b04b0502
ENT-12373: Fixed merge typo.
2024-11-10 17:06:38 +00:00
Adel El-Beik
5846cda6bb
ENT-12373: Removed extra line from merge.
2024-11-10 17:04:25 +00:00
Adel El-Beik
301dc7469b
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-09-448
2024-11-10 17:02:33 +00:00
Adel El-Beik
11a398a5af
Merge pull request #7875 from corda/merge-release/os/4.11-release/os/4.12-2024-11-07-445
...
ENT-12373: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-07
2024-11-08 19:42:39 +00:00
Adel El-Beik
194d50071b
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-07-445
2024-11-08 11:06:08 +00:00
Adel El-Beik
dc4d888a30
Merge pull request #7876 from corda/merge-release/os/4.10-release/os/4.11-2024-11-08-404
...
ENT-12373: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-08
2024-11-08 08:49:23 +00:00
r3-build
8335dcc931
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-08
2024-11-08 03:33:27 +00:00
Adel El-Beik
5552044ddb
Merge pull request #7873 from corda/merge-release/os/4.10-release/os/4.11-2024-11-07-402
...
ENT-12373: Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-07
2024-11-07 17:51:28 +00:00
Adel El-Beik
844b33ee94
Merge pull request #7874 from corda/adel/ENT-12402
...
ENT-12402: In external verifier pass the rotated keys to attachment c…
2024-11-07 17:50:22 +00:00
Adel El-Beik
48ec90f9b7
Merge pull request #7872 from corda/merge-release/os/4.9-release/os/4.10-2024-11-07-402
...
ENT-12373: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-07
2024-11-07 14:36:39 +00:00
Adel El-Beik
4c25e674b8
ENT-12402: In external verifier pass the rotated keys to attachment cache loader cache so that LedgerTransaction picks it up.
2024-11-07 11:31:57 +00:00
r3-build
b6dbd51326
Merging forward updates from release/os/4.10 to release/os/4.11 - 2024-11-07
2024-11-07 11:08:57 +00:00
r3-build
78fd46fb1f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-07
2024-11-07 11:08:32 +00:00
Adel El-Beik
74c1c69c8e
Merge pull request #7869 from corda/merge-release/os/4.11-release/os/4.12-2024-11-06-443
...
ENT-12153: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-11-06
2024-11-07 11:08:13 +00:00
Adel El-Beik
377cae6f8a
Merge pull request #7870 from corda/merge-release/os/4.9-release/os/4.10-2024-11-06-400
...
ENT-12314: Merging forward updates from release/os/4.9 to release/os/4.10 - 2024-11-06
2024-11-07 11:07:55 +00:00
Adel El-Beik
9acce23bce
Merge pull request #7871 from corda/adel/ENT-12401
...
ENT-12373: Can now cope with diff input states from diff rotated CorDapps
2024-11-07 11:07:11 +00:00
Adel El-Beik
4524c6522f
ENT-12401: Fixed compilation errors and changed alias from 4.12 variant.
2024-11-06 15:17:23 +00:00
Adel El-Beik
d54f1e2eeb
ENT-12373: Can now cope with diff input states from diff rotated CorDapps.
2024-11-06 13:39:32 +00:00
Chris Cochrane
3c57dcc4cf
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2024-11-06-443
2024-11-06 09:47:02 +00:00
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 4e884a551986e9f499891091a3ff301bb17fc091.
* ENT-12366 Attempt to appease warnings in both 1.2 and 1.9 compilers
2024-11-01 16:27:36 +00:00
