Commit Graph

9958 Commits

Author SHA1 Message Date
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
2246c94fd5
ES-562: Updating .snyk YAML indentation & updating modules to scan on Snyk nightly (#7385)
* NOTICK: Correct Yaml whitespace
* Update JenkinsfileSnykScan Snyk modules
* Correcting YAML indentation
* NOTICK: Update reges to match ES Jira tickets
* Removing bridge/bridgecapsule from main release branch CI pipeline
2023-06-06 17:08:19 +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
Rick Parker
d0f28a607f
Merge pull request #7381 from corda/shams-4.9-frwd-merge-a817218b
ENT-9806: 4.8 to 4.9 forward merge
2023-06-05 09:33:24 +01:00
Shams Asari
4dcd9245d3 ENT-9806: Using Artemis SSLContextFactory service to pass in custom TrustManagerFactory. This removes the need to copy code from NettyAcceptor. 2023-06-02 15:10:58 +01:00
Shams Asari
5706f89639 Merge branch 'release/os/4.8' into shams-4.9-frwd-merge-a817218b
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
#	node-api/src/test/kotlin/net/corda/nodeapi/internal/revocation/RevocationTest.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
#	node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/artemis/BrokerJaasLoginModule.kt
#	node/src/main/kotlin/net/corda/node/internal/artemis/CertificateChainCheckPolicy.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
2023-06-01 16:37:57 +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
ac4255ca75
Merge pull request #7377 from corda/ritu_tmp_4.9.7-waivers
ENT-9108: Corda OS 4.9.7 remaining waivers
2023-05-31 09:59:08 +01:00
nargas-ritu
c64ad75ee3 ENT-9108: Corda OS 4.9.7 remaining waivers 2023-05-30 19:08:43 +01:00
nargas-ritu
20a155f260
Merge pull request #7376 from corda/ritu_tmp_4.9.7-waivers
ENT-9108: Corda OS 4.9.7 waivers
2023-05-30 15:52:52 +01:00
nargas-ritu
9af77719d0 NOTICK: Corda OS 4.9.7 waivers 2023-05-30 11:54:05 +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
Adel El-Beik
79c16f2df1
Merge pull request #7371 from corda/cc/os/4.9/ENT-9962/upgrade_sshd_compile_dependency
ENT-9962 - update compile-time dependency
2023-05-18 14:18:37 +01:00
Chris Cochrane
6e06630980
Upgraded sshd-common compile-time dependency 2023-05-18 11:25:46 +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
Adel El-Beik
7b7e38476a
Merge pull request #7368 from corda/shams-fix-connector-location
ENT-9941: Moved new connector factory to node-api
2023-05-12 21:23:09 +01:00
Shams Asari
13ca00deea ENT-9941: Moved new connector factory to node-api 2023-05-12 17:42:27 +01:00
Adel El-Beik
71a99c861a
Merge pull request #7366 from corda/shams-4.9-frwd-merge-31a34e5a
ENT-6515, ENT-9941: Forward merge 4.8 to 4.9
2023-05-12 16:53:19 +01:00
Shams Asari
151dc16a0e Merge branch 'release/os/4.8' into shams-4.9-frwd-merge-31a34e5a
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
2023-05-12 14:34:33 +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
1d0dccfc5f
Merge pull request #7359 from corda/adel/ENT-9883-OS4.9
ENT-9883: Updated CODEOWNERS file.
2023-05-04 15:28:55 +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
3d9c682ce8 ENT-9883: Updated CODEOWNERS file. 2023-05-02 11:34:37 +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
Adel El-Beik
9975ddcdd9
Merge pull request #7353 from corda/cc/merge/os-4.8-os-4.9/26-apr-2023
ENT-6336,ENT-6960,ENT-8917,ENT-9019,ENT-9096,ENT-7033 - dependency updates
2023-04-27 09:19:05 +01:00
Chris Cochrane
c61ea7de81
Fixed bracketing issue after merge 2023-04-27 02:44:30 +01:00