ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-23 17:53:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,515 Commits 108 Branches 407 Tags
9b51bd3f81b2120a243ed5fc90a43e7898899fef
Commit Graph

10515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Chris Cochrane
5b9d65ad51 MockNetwork remove hibernate sessions on stop (#7857) 2024-10-28 13:25:52 +00: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
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
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
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
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