ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,190 Commits 91 Branches 405 Tags 354 MiB
a66042ec09
Commit Graph

10190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Connel McGovern
41e9298b19
ES-562: Updating modules to scan on Snyk nightly (#7392) 2023-06-07 13:49:40 +01:00
Connel McGovern
25e7d2fdfd
ES-562: Updating .snyk YAML expiry & updating modules to scan on Snyk nightly (#7391) 
* ES-562: Updating .snyk YAML expiry & updating modules to scan on Snyk nightly
 2023-06-07 09:58:41 +01:00
Jose Coll
c56ee1cc73
Fix failing slow test. (#7387) 2023-06-07 09:30:24 +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
Adel El-Beik
2cdd931fcf
Merge pull request #7384 from corda/shams-vault-page-stream 
ENT-9793: Use streams when loading vault query pages
 2023-06-06 15:30:51 +01:00
Shams Asari
ff0693a598 ENT-9793: Use streams when loading vault query pages 2023-06-06 13:13:22 +01:00
nargas-ritu
5510cb151b
Merge pull request #7375 from corda/shams-vault-page-overlap 
ENT-9793: Added Page.previousPageAnchor to allow detection of vault changes whilst pages are loaded
 2023-06-06 11:07:45 +01:00
Jose Coll
f791adf442
ENT-9924 (Follow-up) Update recording of transaction flow recovery metadata into Send/Receive transaction flows. (#7382) 2023-06-05 16:59:06 +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
Jose Coll
2c775bcc41
ENT-9924 Update recording of transaction flow recovery metadata into Send/Receive transaction flows. (#7374) 2023-06-02 16:05:28 +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
e60f30c28d
Merge pull request #7378 from corda/adel/merge-from-4.9 
NOTICK: Merge from OS 4.9
 2023-05-31 17:20:08 +01:00
Adel El-Beik
d37df1572e Merge remote-tracking branch 'origin/release/os/4.9' into adel/merge-from-4.9 2023-05-31 12:27:41 +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
ed08b2c5de ENT-9793: Added Page.previousPageAnchor to allow detection of vault changes whilst pages are loaded 2023-05-26 12:52:06 +01:00
Jose Coll
2e29e36e01
ENT-9923 Ledger Recovery: split out recovery metadata into own database schema. (#7364) 2023-05-24 09:42:09 +01:00
Rick Parker
c7e21b3a65
Merge pull request #7373 from corda/shams-4.11-fwrd-merge-046ed0ac 
ENT-6515, ENT-9941: 4.10 to 4.11 forward merge
 2023-05-22 17:34:41 +01:00
Shams Asari
9ebcfd3176 Merge fix 2023-05-22 10:00:03 +01:00
Shams Asari
e6336666c2 Merge branch 'release/os/4.10' into shams-4.11-fwrd-merge-046ed0ac 
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/X509Utilities.kt
 2023-05-22 09:55:19 +01:00
Rick Parker
046ed0ac3b
Merge pull request #7370 from corda/shams-4.10-fwrd-merge-7b7e3847 
ENT-6515, ENT-9941: 4.9 to 4.10 forward merge
 2023-05-19 19:07:56 +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
Shams Asari
a37d09486f Merge branch 'release/os/4.9' into shams-4.10-fwrd-merge-7b7e3847 2023-05-15 09:55:31 +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