Commit Graph

10063 Commits

Author SHA1 Message Date
Adel El-Beik
beb0e885fb
Merge pull request from corda/connelm/INFRA-1955/forward-merge-410-411
INFRA-1955: Merging forward from 4.10 to 4.11
2023-03-22 14:25:18 +00:00
Shams Asari
0213861d22
ENT-9569: Apply the 60s SSL handshake timeout to the embedded Artemis server () 2023-03-22 13:22:12 +00:00
Connel McGovern
fda5cd07d2 INFRA-1955: Merging forward from 4.10 to 4.11 2023-03-22 11:24:31 +00:00
Jose Coll
d2900d54ab
ENT-6875 Two Phase Finality Flow - improve ledger consistency & recoverability () 2023-03-22 10:47:51 +00:00
Adel El-Beik
96eb683d89
Merge pull request from corda/connelm/INFRA-1955/forward-merge-49-410
INFRA-1955: Merging forward from 4.9 to 4.10
2023-03-22 09:49:56 +00:00
Connel McGovern
db08eb3a9b INFRA-1955: Merging forward from 4.9 to 4.10 2023-03-21 14:59:02 +00:00
Adel El-Beik
55ef162764
Merge pull request 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
Adel El-Beik
5794ddd695
Merge pull request from corda/connelm/INFRA-1955/forward-merge-48-49
INFRA-1955: Merging forward from 4.8 to 4.9
2023-03-17 10:08:18 +00:00
Connel McGovern
6e56dffba8
INFRA-1955: Shared lib implicit import syntax () 2023-03-15 14:49:10 +00:00
Ronan Browne
212cee2406
Merge pull request 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
519ae9ab81 INFRA-1955: Merging forward from 4.8 to 4.9 2023-03-15 10:48:53 +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
ae953885d6
Merge pull request 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
Ronan Browne
f7c465d3f2
use correct syntax 2023-03-14 21:55:15 +00:00
Connel McGovern
a32b6483a4 INFRA-1955: Correcting post stage formatting 2023-03-14 17:06:20 +00:00
Connel McGovern
e83de1adf6 INFRA-1955: Merging forward from 4.7 to 4.8 2023-03-14 17:00:56 +00:00
Ronan Browne
ccc87824ac
Merge pull request 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 () 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 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 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
Mahmoud Almahroum
021c70143b
ENT-8826 Upgrade Liquibase to latest version - more review feedback () 2023-03-10 14:28:40 +00:00
Adel El-Beik
dae8f06afd
Merge pull request from corda/adel/ENT-9476-api-fix
ENT-9476: Added in missing Kotlin API.
2023-03-08 09:49:01 +00:00
Adel El-Beik
ec67e77c76 ENT-9476: Added in missing Kotlin API. 2023-03-07 18:18:37 +00:00
Adel El-Beik
f433137dee
Merge pull request from corda/adel/merge-from-OS4.10-7Mar23
NOTICK: Merge from OS 4.9
2023-03-07 18:06:50 +00:00
Adel El-Beik
f7c654bc65 NOTICK: Resolved Kotlin api change. 2023-03-07 13:30:10 +00:00
Adel El-Beik
2808347b58 Merge branch 'release/os/4.9' into adel/merge-from-OS4.10-7Mar23 2023-03-07 12:12:55 +00:00
Adel El-Beik
e216b7715e
ENT-9476: Notary handle timeout can now be passed to driver. ()
* ENT-9476: Notary handle timeout can now be passed to driver.
2023-03-03 17:54:52 +00:00
Mahmoud Almahroum
1a0d354903
ENT-8983 Upgrade H2 and liquibase to latest version () 2023-03-03 15:10:25 +00:00
Chris Cochrane
f63e049bcb
ENT-8924 Corrected JavaDoc/KDoc comments for ServiceLifecycleEvent () 2023-02-22 18:04:22 +00:00
Ronan Browne
c777e77962
Merge pull request from corda/connelm/INFRA-2021/reverting-snyk-delta-move
INFRA-2021: Revert - Temp fix for Snyk Delta
2023-02-21 16:25:50 +00:00
Connel McGovern
fe4e607dfd INFRA-2021: Adding in authenticate Gradle wrapper to Snyk Delta 2023-02-21 11:54:38 +00:00
Connel McGovern
5b4fce52ce INFRA-2021: Adding in authenticate Gradle wrapper to Snyk Delta (seperate agent) 2023-02-21 11:48:37 +00:00
Connel McGovern
835ea723ea Revert "INFRA-2021: Temp fix for Snyk Delta "
This reverts commit 2ce0409bd2.
2023-02-21 11:40:39 +00:00
Ronan Browne
9443bd7a6b
Merge pull request from corda/connelm/INFRA-2021/move-snyk-delta-stage
INFRA-2021: Unblock C4 PR gates - Snyk Delta
2023-02-21 10:49:27 +00:00
Connel McGovern
2ce0409bd2
INFRA-2021: Temp fix for Snyk Delta
Moving the position of the Snyk Delta to execute as the first stage as there seems to be issues with running the under the hood 'snykResolvedDepsJson' task after other gradle tasks have been executed. To be investigated further but this should unblock and PR's hitting the Snyk Delta stage.
2023-02-17 14:58:14 +00:00
Adel El-Beik
f61b4db527
Merge pull request from corda/colljos/bump_platform_version
NOTICK Bump platform version to 13
2023-01-24 14:57:10 +00:00
Jose Coll
6e4768cd02 Bump platform version. 2023-01-24 11:54:56 +00:00
Jose Coll
f8896ef706 Bump platform version. 2023-01-24 11:42:34 +00:00
nargas-ritu
10aaedc9fc NOTICK: Branch creation for 4.11 2023-01-17 12:04:35 +00:00
Ronan Browne
b8400b0e99
Merge pull request from corda/ritu_tmp_SNYK_waivers_remaining
NOTICK: Remaining snyk waivers updated for Corda OS 4.10
2023-01-05 17:09:16 +00:00
Ritu
e2ee13196d NOTICK: Remaining snyk waivers updated for Corda OS 4.10 2023-01-04 12:10:48 +00:00