Shams Asari
33f7fea8d2
Fix compile issues
2023-04-12 16:30:37 +01:00
Shams Asari
7b6fc51710
Merge branch 'release/os/4.9' into shams-4.10-fwrd-merge-ceb76c56
...
# Conflicts:
# common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/SSLHelper.kt
2023-04-12 16:23:59 +01:00
Rick Parker
ceb76c56de
Merge pull request #7325 from corda/shams-4.9-fwrd-merge-d140cb59
...
ENT-8898 & ENT-9569: Forward merge from 4.8 to 4.9 (4cedeb7
2023-04-12 15:30:55 +01:00
Shams Asari
40697d5450
Merge branch 'release/os/4.8' into shams-4.9-fwrd-merge-d140cb59
2023-04-12 10:46:00 +01:00
Adel El-Beik
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
Shams Asari
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
Shams Asari
c9fd22855e
Resolve compile issues
2023-04-11 12:16:02 +01:00
Shams Asari
724a4e5a36
Merge branch 'release/os/4.8' into shams-4.9-fwrd-merge-d140cb59
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
# node/src/main/kotlin/net/corda/node/internal/artemis/CertificateChainCheckPolicy.kt
2023-04-11 11:54:26 +01:00
Adel El-Beik
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
Shams Asari
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
Shams Asari
1e6ccfdb60
ENT-8898: Replaced JDK cert revocation with custom plugable implementation ( #7322 )
2023-04-03 10:26:01 +01:00
Shams Asari
0213861d22
ENT-9569: Apply the 60s SSL handshake timeout to the embedded Artemis server ( #7315 )
2023-03-22 13:22:12 +00:00
Adel El-Beik
96eb683d89
Merge pull request #7319 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
5794ddd695
Merge pull request #7316 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
519ae9ab81
INFRA-1955: Merging forward from 4.8 to 4.9
2023-03-15 10:48:53 +00:00
Ronan Browne
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
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 #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
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
