Commit Graph

9625 Commits

Author SHA1 Message Date
596b51c2fd Removing bridge/bridgecapsule from main release branch CI pipeline 2023-06-06 16:59:15 +01:00
ac9f3c150f Include 'ES' jira code in PR title check 2023-06-06 16:59:14 +01:00
dfcc7019dc ES-562: Correct modules to scan for C4 OS Snyk scan nightly 2023-06-06 16:57:27 +01:00
a817218b08 ENT-9806: Added peer info to SSL handshake logging, and other changes for ENT merge (#7380) 2023-06-01 15:51:58 +01:00
e15f92b526 Merge pull request #7355 from corda/shams-crl-netty-threads-blocked
ENT-9806: Netty threads no longer blocked if CRL endpoints are unresponsive
2023-05-27 10:43:41 +01:00
763d1fa706 Merge pull request #7372 from corda/shams-vault-query-tx-order
ENT-8827: The ordering of vault query results is clobbered by ServiceHub.loadStates
2023-05-27 10:43:01 +01:00
c065021328 ENT-8827: The ordering of vault query results is clobbered by ServiceHub.loadStates 2023-05-18 15:59:25 +01:00
0cc3ffe1d6 ENT-9941: Moved new connector factory to node-api (#7369) 2023-05-16 08:45:01 +01:00
0a617097be ENT-9806: Prevent Netty threads being blocked due to unresponsive CRL endpoints 2023-05-15 12:59:24 +01:00
31a34e5a5c ENT-9941: Improved Netty logging, especially of the embedded broker (#7365) 2023-05-12 10:11:09 +01:00
0951853207 ENT-6515: Cherry-pick of ENT-6315 - Allow dumping of paused flows (#7008) (#7363)
This is a cherry-pick of https://github.com/corda/corda/pull/7008, which also resolves ENT-6515

Co-authored-by: Dan Newton <dan.newton@r3.com>
2023-05-11 09:49:40 +01:00
50ef6b7e9a Merge pull request #7358 from corda/adel/ENT-9883-OS4.8
ENT-9883: Updated CODEOWNERS file.
2023-05-02 17:32:29 +01:00
efb901dcb4 ENT-9883: Updated CODEOWNERS file. 2023-05-02 11:31:55 +01:00
f87d7521dc Merge pull request #7352 from corda/cc/merge/os-4.7-os-4.8/25-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
2023-04-26 08:53:52 +01:00
e12ab8194f Merge branch 'release/os/4.7' into cc/merge/os-4.7-os-4.8/25-apr-2023
Fwd-merge from OS 4.7.
2023-04-25 14:54:21 +01:00
097011784b Merge pull request #7350 from corda/cc/merge/os-4.6-os-4.7/24-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
2023-04-25 08:49:36 +01:00
91c38fa84b Merge branch 'release/os/4.6' into cc/merge/os-4.6-os-4.7/24-apr-2023
Fwd-merge from OS 4.6.
2023-04-24 20:13:50 +01:00
58366caa3d Merge pull request #7340 from corda/cc/merge/os-4.5-os-4.6/20-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
2023-04-24 14:57:34 +01:00
e5a6cac9e8 Flakey test fix 2023-04-21 16:00:19 +01:00
fc758ab766 Update build.gradle
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
2023-04-20 17:14:23 +01:00
c58c49d27a Upgrade corda/crash, snakeyaml 2023-04-20 14:01:20 +01:00
845a72cf5b Merge pull request #7337 from corda/cc/os/4.5/ent-7033/upgrade_shiro
ENT-7033 - upgrade shiro
2023-04-20 10:10:40 +01:00
641a47bf32 Upgraded shiro to address security issues 2023-04-20 07:37:00 +01:00
f906bfc14b Merge pull request #7335 from corda/cc/os/4.5/security_vulnerabilities
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096 - dependency updates
2023-04-19 15:35:17 +01:00
c263ba7563 Updated to fix Jackson tests 2023-04-19 13:06:35 +01:00
b6fbef5463 Merge pull request #7334 from corda/ronanb/merge-4.7-4.8-2023-04-18
INFRA-2040: Merging forward updates from 4.7 to 4.8
2023-04-19 09:11:34 +01:00
29dfda3730 Resolved build-check issues 2023-04-18 20:34:42 +01:00
dfbfda5520 Upgrade corda/crash 2023-04-18 19:30:22 +01:00
90cecf69e5 INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-04-18) 2023-04-18 19:20:47 +01:00
2ffe2eafcb Merge pull request #7333 from corda/ronanb/merge-4.6-4.7-2023-04-17
INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17
2023-04-18 17:11:24 +01:00
1e7a515a8a INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17 17:26:39 +01:00
f189fad14a Merge pull request #7331 from corda/ronanb/merge-4.5-4.6-2023-04-16
* INFRA-1955: Shared lib implicit import syntax
* INFRA-2040: remove lingering nexus code (#7330)
2023-04-17 17:22:53 +01:00
5e9dee18b1 INFRA-2040: Merging forward updates from 4.5 to 4.6 (2023-04-16) 2023-04-16 18:23:22 +01:00
2e9f62f4da INFRA-2040: remove lingering nexus code (#7330) 2023-04-16 18:19:43 +01:00
4cedeb7b9e Merge pull request #7326 from corda/shams-revert-quasar-jar
ENT-9569: Revert lib/quasar.jar
2023-04-12 09:47:40 +01:00
04d86e9cfe ENT-9569: Revert lib/quasar.jar
It was meant to be deleted (since it's meant to be git ignored), instead it was changed. Reverting the file back to its original content, and leaving as is.
2023-04-11 15:56:55 +01:00
d140cb5974 Merge pull request #7323 from corda/shams-ent-8898-cherrypick
ENT-8898: Revert change made to externalCrlSource checking
2023-04-11 09:33:38 +01:00
95c4a18352 ENT-6336,ENT-6960 - upgrade snakeyaml to address security vulnerabilities 2023-04-06 19:14:30 +01:00
ddb979d693 ENT-8898: Revert change made to externalCrlSource checking
It's now moved back to createPKIXRevocationChecker(). RevocationConfig.enrichExternalCrlSource has also been removed, and moved to where it's called.
2023-04-06 14:42:38 +01:00
1e6ccfdb60 ENT-8898: Replaced JDK cert revocation with custom plugable implementation (#7322) 2023-04-03 10:26:01 +01:00
0213861d22 ENT-9569: Apply the 60s SSL handshake timeout to the embedded Artemis server (#7315) 2023-03-22 13:22:12 +00:00
55ef162764 Merge pull request #7314 from corda/connelm/INFRA-1955/shared-lib-import-syntax4.7
INFRA-1955: Shared lib implicit import syntax
2023-03-17 10:09:10 +00:00
6e56dffba8 INFRA-1955: Shared lib implicit import syntax (#7313) 2023-03-15 14:49:10 +00:00
212cee2406 Merge pull request #7312 from corda/connelm/INFRA-1955/shared-lib-import-syntax
INFRA-1955: Shared lib implicit import syntax
2023-03-15 14:49:01 +00:00
21d91171bc INFRA-1955: Shared lib implicit import syntax 2023-03-15 09:58:00 +00:00
e70505afca INFRA-1955: Shared lib implicit import syntax 2023-03-15 09:53:13 +00:00
ae953885d6 Merge pull request #7311 from corda/connelm/INFRA-1955/forward-merge-47-48
INFRA-1955: Merging forward from 4.7 to 4.8
2023-03-15 09:33:36 +00:00
f7c465d3f2 use correct syntax 2023-03-14 21:55:15 +00:00
a32b6483a4 INFRA-1955: Correcting post stage formatting 2023-03-14 17:06:20 +00:00
e83de1adf6 INFRA-1955: Merging forward from 4.7 to 4.8 2023-03-14 17:00:56 +00:00