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
Adel El-Beik
dae8f06afd
Merge pull request #7304 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 #7303 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. ( #7302 )
...
* ENT-9476: Notary handle timeout can now be passed to driver.
2023-03-03 17:54:52 +00:00
Chris Cochrane
f63e049bcb
ENT-8924 Corrected JavaDoc/KDoc comments for ServiceLifecycleEvent ( #7294 )
2023-02-22 18:04:22 +00:00
Ronan Browne
b8400b0e99
Merge pull request #7289 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
Ritu
a98f17922c
NOTICK: Remaining snyk waivers updated for Corda OS 4.10
2023-01-04 11:56:03 +00:00
nargas-ritu
9d0525ec7f
Merge pull request #7288 from corda/SNYK-waivers-4.10
...
NOTICK: Snyk waivers for Community 4.10
2023-01-03 10:31:39 +00:00
Ritu
14ab3f38c2
NOTICK: Snyk waivers for Community 4.10
2022-12-29 11:50:07 +00:00
Ronan Browne
293cb9e9f8
Merge pull request #7286 from corda/connelm/merge-snyk-delta-49-410-2022-12-12
...
INFRA-1904: merge snyk delta 4.9->4.10 2022-12-12
2022-12-12 19:57:46 +00:00
Connel McGovern
8debdf9b84
INFRA-1904: Merging forward snyk delta from 4.9 to 4.10 (2022-12-12)
2022-12-12 18:53:52 +00:00
Ronan Browne
71a7b6f25d
Merge pull request #7285 from corda/connelm/merge-snyk-delta-48-49-2022-12-12
...
INFRA-1904: Merging forward snyk delta from 4.8 to 4.9 (2022-12-12)
2022-12-12 17:14:07 +00:00
Connel McGovern
cd948b1b5e
INFRA-1904: Merging forward snyk delta from 4.8 to 4.9 (2022-12-12)
2022-12-12 16:33:12 +00:00
Ronan Browne
1f705a45e9
Merge pull request #7284 from corda/connelm/merge-snyk-delta-47-48-2022-12-12
...
INFRA-1904: Merging forward snyk delta from 4.7 to 4.8 (2022-12-12)
2022-12-12 15:47:27 +00:00
Connel McGovern
6e569faf8f
INFRA-1904: Merging forward snyk delta from 4.7 to 4.8 (2022-12-12)
2022-12-12 14:40:02 +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
Adel El-Beik
5fa1bba66b
Merge pull request #7281 from corda/adel/ENT-8823
...
ENT-8823: StartEnd events now dont get mangled when parent span is a …
2022-12-09 10:08:40 +00:00
Adel El-Beik
a5d8996760
ENT-8823: Added jfrog artifactory plugin. Hopefully will now publish to artifactory.
2022-12-08 18:42:51 +00:00
Adel El-Beik
d58443b431
ENT-8823: Updated api-current.txt. Additional boolean added to CordaRPCClient.
2022-12-08 18:03:23 +00:00
Adel El-Beik
2e724cb82f
ENT-8823: Removed unused import.
2022-12-08 16:57:45 +00:00
Adel El-Beik
044b83508e
ENT-8823: Added copyBaggageToTags configuration option to control if baggage is copied to tags.
...
Switched SimplLogTelemetryComponent to info logs.
2022-12-08 16:54:38 +00:00
Adel El-Beik
50a1a4ce09
ENT-8823: StartEnd events now dont get mangled when parent span is a user span. Also other refactorings like using OT propagator now.
2022-12-06 19:24:19 +00:00
Rick Parker
c3083af4c3
Merge pull request #7276 from corda/cc/merge/os-4.9/os-4.10/28-Nov-2022
...
ENT-8817 - Fwd-merge OS 4.9 to OS 4.10
2022-11-29 08:47:00 +00:00
Chris Cochrane
563a7fb6c1
Merge branch 'release/os/4.9' into cc/merge/os-4.9/os-4.10/28-Nov-2022
...
Fwd-merge from OS-4.9.
2022-11-28 13:14:07 +00:00
Adel El-Beik
23b872db17
Merge pull request #7275 from corda/parkri/ENT-8817-compute-deadlocks
...
ENT-8817 OS port of compute deadlock changes
2022-11-25 13:07:19 +00:00
Rick Parker
724b61beb7
Merge pull request #7273 from corda/cc/merge/os-4.9/os-4.10/24-Nov-2022
...
ENT-8814 - Fwd-merge OS 4.9 to OS 4.10
2022-11-25 09:36:05 +00:00
rick.parker
3e25f7fd1a
ENT-8817 OS port of compute deadlock changes
2022-11-25 09:31:41 +00:00
Chris Cochrane
31d9f0df09
Merge branch 'release/os/4.9' into cc/merge/os-4.9/os-4.10/24-Nov-2022
...
Fwd-merge from OS 4.9.
2022-11-24 18:27:54 +00:00
Chris Cochrane
0131163db0
ENT-8814 - back-fit changes from Enterprise to OS ( #7272 )
2022-11-24 18:13:35 +00:00
Adel El-Beik
e46b7bdd5a
ENT-6893: Added interface for clients to grab openetelemetry handle. ( #7264 )
...
* ENT-6893: Added interface for clients to grab openetelemetry handle.
* ENT-6893: Make detekt happy.
* ENT-6893: Fix warnings.
* ENT-6893: Make detekt happy.
* ENT-6893: Now shutdown opentelemetry when node stops or client is closed.
* ENT-6893: OpenTelemetryDriver is not not a singleton.
2022-11-24 13:34:08 +00:00
Rick Parker
188027c1f5
ENT-8811 OS port of flow draining fixes ( #7269 )
2022-11-24 10:27:00 +00:00
Adel El-Beik
4d14d718d5
Merge pull request #7270 from corda/cc/merge/os-4.9/os-4.10/21-Nov-2022
...
ENT-8796 - cc/merge/os 4.9/os 4.10/21 nov 2022
2022-11-21 13:15:49 +00:00
Chris Cochrane
e3d22dadbc
ENT-8796 - Fwd-merge from OS 4.9
2022-11-21 10:56:58 +00:00
