Commit Graph

10320 Commits

Author SHA1 Message Date
Adel El-Beik
2208d56337
Merge pull request #7618 from corda/tom/ENT-11118/netty-ssl-handshake-fix
ENT-11118: Netty SSL handshake fix (#5028)
2023-12-15 19:59:39 +00:00
Tom Stark
71e187dddb ENT-11118: Netty SSL handshake fix (#5028)
* ENT-11118: Added fix for netty SSL handshake fail
2023-12-15 17:16:15 +00:00
Ronan Browne
292258a985
Merge pull request #7616 from corda/merge-release/os/4.10-release/os/4.11-2023-12-15-36
ENT-11281: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-15
2023-12-15 12:04:49 +00:00
r3-build
a475c275db Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-15 2023-12-15 11:41:19 +00:00
Ronan Browne
87a47c4ee5
Merge pull request #7615 from corda/merge-release/os/4.9-release/os/4.10-2023-12-14-35
ENT-11281: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14
2023-12-15 11:40:05 +00:00
r3-build
27759ea74f Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14 2023-12-14 17:51:03 +00:00
Maciej Swierad
bf6fcb2a8f
Merge pull request #7614 from corda/merge-release/os/4.8-release/os/4.9-2023-12-14-33
ENT-11281: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14
2023-12-14 17:48:48 +00:00
r3-build
40a96c5760 Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14 2023-12-14 17:06:04 +00:00
Maciej Swierad
bbc994882a
Merge pull request #7613 from corda/merge-release/os/4.7-release/os/4.8-2023-12-14-35
ENT-11281: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14
2023-12-14 17:03:24 +00:00
r3-build
0dbdd08984 Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14 2023-12-14 15:30:28 +00:00
Maciej Swierad
97310a8895 ENT-11281/Activating forward merge logic 2023-12-14 14:57:13 +00:00
Jose Coll
8f87b2060b
ENT-11245 Catch and transform new enum type value. (#7596) 2023-11-30 19:13:34 +00:00
Rick Parker
59ff476a40
ENT-11050: Support flag to indicate if in transaction back chain resolution, and use it to drop deserialization errors to warn (#7591)
* Support flag to indicate if in transaction back chain resolution, and use it to drop deserialization errors to warn
* Fix and rename test that has different outcome now
2023-11-28 11:15:21 +00:00
Adel El-Beik
72e5c4fed2
ENT-11036: initiatedBy is now a list of CordaX500Names. (#7592) 2023-11-28 07:10:53 +00:00
Connel McGovern
d6b9134700
Merge pull request #7589 from corda/merge-release/os/4.10-release/os/4.11-2023-11-24-14
ES-1131: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-24
2023-11-27 09:48:08 +00:00
r3-build
13417b037f Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-24 2023-11-24 16:14:21 +00:00
Ronan Browne
b4a95a63cc
Merge pull request #7587 from corda/merge-release/os/4.9-release/os/4.10-2023-11-22-11
ES-1131: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-22
2023-11-24 16:13:22 +00:00
Adel El-Beik
21a5f20d6d
Merge pull request #7588 from corda/adel/ENT-11171
ENT-11171: Updated JDK8 to 392.
2023-11-23 14:44:18 +00:00
Adel El-Beik
47fd1ec1e4 ENT-11171: Updated JDK8 to 392. 2023-11-23 11:33:16 +00:00
r3-build
04d2373a8a Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-22 2023-11-22 19:21:08 +00:00
Adel El-Beik
8776030a95
Merge pull request #7583 from corda/merge-release/os/4.8-release/os/4.9-2023-11-21-9
ES-1131: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-21
2023-11-22 19:20:14 +00:00
Adel El-Beik
daa5de7592
Merge pull request #7584 from corda/cc/dev/os/4.11/db_identifier_too_long
ENT-11168 - reduce database index name.
2023-11-21 15:07:58 +00:00
Connel McGovern
a1253c1f12
Merge pull request #7582 from corda/merge-release/os/4.10-release/os/4.11-2023-11-20-9
ES-1331: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-20
2023-11-21 13:03:25 +00:00
Chris Cochrane
d8b19de46e
Renamed index to keep Oracle happy 2023-11-21 11:48:37 +00:00
Connel McGovern
2adb502405
Merge branch 'release/os/4.11' into merge-release/os/4.10-release/os/4.11-2023-11-20-9 2023-11-21 09:16:06 +00:00
r3-build
aa4d2e56fc Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-21 2023-11-21 03:02:05 +00:00
Ronan Browne
171977574e
Merge pull request #7581 from corda/merge-release/os/4.9-release/os/4.10-2023-11-20-8
ES-1331: Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20
2023-11-20 21:18:43 +00:00
r3-build
5e9fdb7b2b Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-11-20 2023-11-20 14:29:12 +00:00
Connel McGovern
8d4eac4977
Merge pull request #7579 from corda/merge-release/os/4.8-release/os/4.9-2023-11-19-6
ES-1331: Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-11-19
2023-11-20 14:25:52 +00:00
Adel El-Beik
f8925687a2
Merge pull request #7580 from corda/connelm/ES-1131/re-add-authenticateGradleWrapper
ES-1131: Re-add authenticateGradleWrapper
2023-11-20 11:38:01 +00:00
Connel McGovern
7c681e025d ES-1131: Re-add authenticateGradleWrapper 2023-11-20 11:06:46 +00:00
Connel McGovern
fa899c55c2 ES-1131: Re-add authenticateGradleWrapper 2023-11-20 11:05:54 +00:00
Ronan Browne
18d98760b1
Merge branch 'release/os/4.9' into merge-release/os/4.8-release/os/4.9-2023-11-19-6 2023-11-19 19:56:09 +00:00
Ronan Browne
44bfb2821d
Merge pull request #7578 from corda/merge-release/os/4.7-release/os/4.8-2023-11-17-6
ES-1331: Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-11-17
2023-11-19 19:13:06 +00:00
Adel El-Beik
548242e3cd
Merge branch 'release/os/4.8' into merge-release/os/4.7-release/os/4.8-2023-11-17-6 2023-11-18 18:10:07 +00:00
Connel McGovern
5b846406c8
ES-1331: Enable Gradle Enterprise build scans & remote caching (#7574)
* ES-1131: Enable Gradle Enterprise build scans & remote caching
2023-11-17 17:41:45 +00:00
Jacob Scott
52e43d4223
ES-1622: Switch corda/corda Github Actions to use Github App for authentication (#7577)
* Update jira_assign_issue.yml

* Update jira_close_issue.yml

* Update jira_create_issue.yml

* Update .github/workflows/jira_assign_issue.yml

* Update .github/workflows/jira_assign_issue.yml

---------

Co-authored-by: Waldemar Żurowski <45210402+wzur-r3@users.noreply.github.com>
2023-11-16 16:21:07 +00:00
Adel El-Beik
afbd39660b
Merge pull request #7576 from corda/adel/ENT-11107
ENT-11107: Ctors added to LedgerRecoveryFlow to match EnterpriseLedge…
2023-11-16 11:35:10 +00:00
Adel El-Beik
b715140625 ENT-11107: Ctors added to LedgerRecoveryFlow to match EnterpriseLedgerRecoveryFlow. 2023-11-15 16:11:45 +00:00
Adel El-Beik
e39ceeab36
Merge pull request #7573 from corda/cc/dev/os/4.11/changeset_checksum
ENT-11130 - OS vs Enterprise changeset checksums
2023-11-14 13:55:53 +00:00
Chris Cochrane
9065c1703a
Updated changeset to match Enterprise 2023-11-13 17:07:49 +00:00
Adel El-Beik
f40b6599fe
Merge pull request #7571 from corda/cc/dev/4.11/revert_netty
ENT-11129 - Revert netty version
2023-11-10 15:58:57 +00:00
Chris Cochrane
974d81cf41
Revert netty version 2023-11-10 12:41:44 +00:00
Adel El-Beik
28bbe09710
Merge pull request #7569 from corda/colljos/fix_sdr_index
ENT-11127  Update index name (to meet Oracle max length limitation of 30 chars).
2023-11-09 15:50:05 +00:00
Jose Coll
e94e02fc4b Update index name (to meet Oracle max length limitation of 30 chars). 2023-11-09 11:25:56 +00:00
Jose Coll
c445c72d3a
ENT-10110 Store Ledger Recovery records only if the transaction was locally stored in the first place. (#7564) 2023-11-08 08:52:25 +00:00
Chris Cochrane
3c34caabc3
ENT-10888,ENT-11108 - Security vulnerabilties (#7556)
* Security vulnerabilties
* Upgraded netty
* ENT-11108: Upgraded tcnative depedency to 2.2.224.
* Added architecture classifiers for netty-tcnative
2023-11-07 10:46:03 +00:00
Adel El-Beik
517dbf118e
Merge pull request #7560 from corda/merge-release/os/4.10-release/os/4.11-2023-11-03-8
ENT-10760: Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-11-03
2023-11-03 21:35:59 +00:00
Adel El-Beik
2f8d164dd0
Merge pull request #7561 from corda/bk/update_h2_version
ENT-11115: Bumping up H2 version 2.2.224
2023-11-03 21:33:57 +00:00
Adel El-Beik
702842caeb
ENT-9940: Updated quasar to 0.7.16_r3 (#7559) 2023-11-03 15:43:51 +00:00