Commit Graph

9648 Commits

Author SHA1 Message Date
Ronan Browne
5e3ee980b3 INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-07-05) 2023-07-05 20:54:02 +01:00
Ronan Browne
6b1a2cb027
ES-839: Disable Internal docker publishing for 4.7 ( only supported post 4.9 pacthes) (#7410)
* ES-839: Disable Docker publishing for 4.7
* ES-839: remove broken repo
2023-07-05 16:28:08 +01:00
Chris Cochrane
e100bee4f1
ENT-10076,ENT-10080 - Security Vulnerabilities (#7405)
* Updated dependencies

* Address compiler checks
2023-06-28 13:20:58 +01:00
Ronan Browne
0afd220cfd
Merge pull request #7401 from corda/ronanb/merge-4.6-4.7-2023-06-23
ES-758: forward merge 4.6 -> 4.7
2023-06-26 08:59:12 +01:00
Ronan Browne
1dc94b438c INFRA-2040: Merging forward updates from 4.6 to 4.7 (2023-06-23) 2023-06-23 20:50:53 +01:00
Ronan Browne
01ead5376b
ES-758: add corda remotes env vars to Jenkins logic (#7400)
* ES-758: add corda remotes

* ES-758: add corda remotes
2023-06-23 20:46:36 +01:00
Adel El-Beik
210a1999e8
Merge pull request #7396 from corda/cc/dev/os/4.8/security_vulnerabilities
ENT-10048,ENT-10050 - Security vulnerabilities
2023-06-19 11:09:49 +01:00
Chris Cochrane
89b2deebe3
Upgraded tcnative, for nett (previous commit) 2023-06-15 16:56:42 +01:00
Chris Cochrane
40f928da50
Upgrade netty 2023-06-15 14:35:49 +01:00
Adel El-Beik
0b8536b97c
Merge pull request #7395 from corda/shams-thread-names
ENT-10016: Give all node threads descriptive names
2023-06-09 16:05:48 +01:00
nargas-ritu
7a37ec3257
Merge pull request #7388 from corda/shams-vault-service-refactor
ENT-10013: Vault service refactoring backport
2023-06-09 14:06:05 +01:00
Shams Asari
5b3180bf7b ENT-10016: Give all node threads descriptive names 2023-06-09 11:17:26 +01:00
Adel El-Beik
8ac05c2c34
Merge pull request #7389 from corda/connelm/ES-562/snyk-submodules-to-scan47
ES-562: Correct modules to scan for C4 OS Snyk scan nightly
2023-06-06 17:37:09 +01:00
Adel El-Beik
746e16bca0
Merge pull request #7390 from corda/connelm/ES-562/snyk-submodules-to-scan48
ES-562: Correct modules to scan for C4 OS Snyk scan nightly
2023-06-06 17:36:09 +01:00
Connel McGovern
596b51c2fd Removing bridge/bridgecapsule from main release branch CI pipeline 2023-06-06 16:59:15 +01:00
Connel McGovern
ac9f3c150f Include 'ES' jira code in PR title check 2023-06-06 16:59:14 +01:00
Connel McGovern
dfcc7019dc ES-562: Correct modules to scan for C4 OS Snyk scan nightly 2023-06-06 16:57:27 +01:00
Connel McGovern
7b16352218
ES-562: Correct modules to scan for C4 OS Snyk scan nightly (#7386)
* ES-562: Correct modules to scan for C4 OS Snyk scan nightly
* Include 'ES' jira code in PR title check
2023-06-06 16:46:58 +01:00
Connel McGovern
51fc4910cc Removing bridge/bridgecapsule from main release branch CI pipeline 2023-06-06 16:43:28 +01:00
Connel McGovern
df62044b6e Include 'ES' jira code in PR title check 2023-06-06 16:42:50 +01:00
Connel McGovern
f212e0fd85 ES-562: Correct modules to scan for C4 OS Snyk scan nightly 2023-06-06 16:42:49 +01:00
Shams Asari
0bfce451ea ENT-10013: Vault service refactoring backport 2023-06-06 16:17:58 +01:00
Shams Asari
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
Adel El-Beik
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
Adel El-Beik
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
Shams Asari
c065021328 ENT-8827: The ordering of vault query results is clobbered by ServiceHub.loadStates 2023-05-18 15:59:25 +01:00
Shams Asari
0cc3ffe1d6
ENT-9941: Moved new connector factory to node-api (#7369) 2023-05-16 08:45:01 +01:00
Shams Asari
0a617097be ENT-9806: Prevent Netty threads being blocked due to unresponsive CRL endpoints 2023-05-15 12:59:24 +01:00
Shams Asari
31a34e5a5c
ENT-9941: Improved Netty logging, especially of the embedded broker (#7365) 2023-05-12 10:11:09 +01:00
Shams Asari
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
Adel El-Beik
832af0d09e
Merge pull request #7356 from corda/adel/ENT-9883-OS4.6
ENT-9883: Updated CODEOWNERS file.
2023-05-02 17:33:55 +01:00
Adel El-Beik
657aa64988
Merge pull request #7357 from corda/adel/ENT-9883-OS4.7
ENT-9883: Updated CODEOWNERS file.
2023-05-02 17:33:21 +01:00
Adel El-Beik
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
Adel El-Beik
efb901dcb4 ENT-9883: Updated CODEOWNERS file. 2023-05-02 11:31:55 +01:00
Adel El-Beik
708fe93039 ENT-9883: Updated CODEOWNERS file. 2023-05-02 11:30:24 +01:00
Adel El-Beik
ee50313260 ENT-9883: Updated CODEOWNERS file. 2023-05-02 11:24:39 +01:00
Rick Parker
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
Chris Cochrane
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
Rick Parker
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
Chris Cochrane
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
Adel El-Beik
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
Chris Cochrane
e5a6cac9e8
Flakey test fix 2023-04-21 16:00:19 +01:00
Chris Cochrane
fc758ab766
Update build.gradle
Co-authored-by: Viktor Kolomeyko <viktor.kolomeyko@r3.com>
2023-04-20 17:14:23 +01:00
Chris Cochrane
c58c49d27a
Upgrade corda/crash, snakeyaml 2023-04-20 14:01:20 +01:00
Adel El-Beik
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
Chris Cochrane
641a47bf32
Upgraded shiro to address security issues 2023-04-20 07:37:00 +01:00
Adel El-Beik
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
Chris Cochrane
c263ba7563
Updated to fix Jackson tests 2023-04-19 13:06:35 +01:00
Ronan Browne
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
Chris Cochrane
29dfda3730
Resolved build-check issues 2023-04-18 20:34:42 +01:00