Commit Graph

9495 Commits

Author SHA1 Message Date
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
Chris Cochrane
29dfda3730
Resolved build-check issues 2023-04-18 20:34:42 +01:00
Chris Cochrane
dfbfda5520
Upgrade corda/crash 2023-04-18 19:30:22 +01:00
Ronan Browne
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
Ronan Browne
1e7a515a8a INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17 17:26:39 +01:00
Ronan Browne
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
Ronan Browne
5e9dee18b1 INFRA-2040: Merging forward updates from 4.5 to 4.6 (2023-04-16) 2023-04-16 18:23:22 +01:00
Ronan Browne
2e9f62f4da
INFRA-2040: remove lingering nexus code (#7330) 2023-04-16 18:19:43 +01:00
Chris Cochrane
95c4a18352
ENT-6336,ENT-6960 - upgrade snakeyaml to address security vulnerabilities 2023-04-06 19:14:30 +01:00
Adel El-Beik
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
Connel McGovern
6e56dffba8
INFRA-1955: Shared lib implicit import syntax (#7313) 2023-03-15 14:49:10 +00:00
Ronan Browne
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
Connel McGovern
21d91171bc
INFRA-1955: Shared lib implicit import syntax 2023-03-15 09:58:00 +00:00
Connel McGovern
e70505afca
INFRA-1955: Shared lib implicit import syntax 2023-03-15 09:53:13 +00:00
Ronan Browne
ccc87824ac
Merge pull request #7309 from corda/connelm/INFRA-1955/forward-merge-46-47
INFRA-1955: Merging forward from 4.6 to 4.7
2023-03-14 16:47:28 +00:00
Connel McGovern
5a43cfb0cb
INFRA-1955: Remove duplicate 'Snyk Security' stage (#7310) 2023-03-14 16:44:18 +00:00
Connel McGovern
1dbd5147e5 INFRA-1955: Remove duplicate 'Snyk Security' stage 2023-03-14 14:47:42 +00:00
Connel McGovern
34d7c154a9 INFRA-1955: Merging forward from 4.6 to 4.7 2023-03-14 14:40:55 +00:00
Ronan Browne
7c2391e3fd
Merge pull request #7308 from corda/connelm/INFRA-1955/forward-merge-45-46
INFRA-1955: Merging forward from 4.5 to 4.6
2023-03-14 14:39:55 +00:00
Connel McGovern
7e908bb939 INFRA-1955: Merging forward from 4.5 to 4.6 2023-03-14 14:08:35 +00:00
Ronan Browne
e23d0502c4
Merge pull request #7307 from corda/connelm/INFRA-1955/c4-automation
INFRA-1955 - Corda Community Automation (see description)
2023-03-14 13:42:26 +00:00
Connel McGovern
81b694f40a INFRA-1804 - Use use latest AMI with snyk binaries 2023-03-14 11:53:46 +00:00
Connel McGovern
3180962640 INFRA-1919 - [C4 Automation] The output of the Git log between the RCs 2023-03-14 11:52:55 +00:00
Connel McGovern
5c68bc89e2 INFRA-2014 - Appy licence generation to C4 Community tag builds 2023-03-14 11:51:14 +00:00
Connel McGovern
9a4ea9c652 INFRA-2038 - Remove Nexus dependency from C4 Community builds 2023-03-14 11:41:20 +00:00
Connel McGovern
5e10aa40c9 INFRA-1957 - [C4 Automation] Enure snyk scans run nightly on C4 projects - Corda OS (Community) 2023-03-14 11:37:44 +00:00
Ronan Browne
3a9d6d6b26
Merge pull request #7283 from corda/connelm/merge-snyk-delta-46-47-2022-12-12
INFRA-1904: Merging forward snyk delta from 4.6 to 4.7 (2022-12-12)
2022-12-12 14:36:40 +00:00
Connel McGovern
f256040cee INFRA-1904: Merging forward snyk delta from 4.6 to 4.7 (2022-12-12) 2022-12-12 14:04:50 +00:00
Connel McGovern
d12a6ddc55
INFRA-1904: Enable Snyk Delta on C4 ENT/OS shared pipeline (#7282) 2022-12-12 13:57:40 +00:00
Jan Szkaradek
6f32d3d369
added modules for snyk scanning (#7231) 2022-09-02 14:17:53 +02:00
Jan Szkaradek
19c8dd5cfb
added modules for snyk scanning (#7232) 2022-09-02 14:17:31 +02:00
Jan Szkaradek
cb42ae2980
added modules for snyk scanning (#7233) 2022-09-02 14:17:03 +02:00
Ronan Browne
89a4259c78
Merge pull request #7220 from corda/add-snyk-scan-4.7
INFRA-1805: Add snyk scan 4.7
2022-07-27 13:47:31 +02:00
ronanbrowne88
9425bb5c19 INFRA-1697 minor tidy up 2022-07-26 18:15:01 +01:00
ronanbrowne88
e4a19f4622 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-26 18:11:51 +01:00
Ronan Browne
0b26ffa300
Merge pull request #7219 from corda/add-snyk-scan-4.6
INFRA-1805 Add snyk scan to 4.6 release job
2022-07-26 19:11:05 +02:00
ronanbrowne88
cd577afcd9 CORE-4769 add snyk scan open source 4.4 2022-07-26 16:06:05 +01:00
ronanbrowne88
121e67aa11 INFRA-1805 add snyk scanning to corda os 4.4 2022-07-26 16:06:05 +01:00
Ronan Browne
59775837a1
Merge pull request #7216 from corda/add-snyk-scan-4.5
INFRA-1805: Add snyk scan to 4.5 OS stream
2022-07-12 18:44:32 +02:00
ronanbrowne88
12bbf98de2 CORE-4769 add snyk scan open source 4.5 2022-07-12 13:06:02 +01:00
Ronan Browne
1b18f793ec
Merge pull request #7214 from corda/add-snyk-scan-4.4
INFRA-1805: Add snyk scan to 4.4 OS stream
2022-07-12 14:03:02 +02:00
ronanbrowne88
e35b755546 CORE-4769 add snyk scan open source 4.4 2022-07-11 22:01:25 +01:00