ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 07:06:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,829 Commits 91 Branches 405 Tags 354 MiB
306951c97d
Commit Graph

9829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ronan Browne
306951c97d
ES-657: add auto import and snyk scanning for c4 corda community docker images (#7415) 2023-07-17 18:27:28 +01:00
Adel El-Beik
45c021326f
Merge pull request #7421 from corda/ronanb/merge-4.8-4.9-2023-07-13 
ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13)
 2023-07-14 17:34:32 +01:00
Ronan Browne
befae353ac ES-853: Merging forward updates from 4.8 to 4.9 (2023-07-13) 2023-07-13 15:25:55 +01:00
Ronan Browne
7a27a464f6
Merge pull request #7419 from corda/ronanb/merge-4.7-4.8-2023-07-13 
ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)
 2023-07-13 15:12:05 +01:00
Rick Parker
e6a808226e
Merge pull request #7412 from corda/shams-4.9-merge-0b8536b9 
ENT-10013, ENT-10016: 4.8 to 4.9 forward merge
 2023-07-13 09:38:08 +01:00
Ronan Browne
6bcc843f19 ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13) 2023-07-13 07:07:17 +01:00
Ronan Browne
c58bb4a090
Merge pull request #7418 from corda/ronanb/merge--4.6-4.7-2023-07-12 
ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12)
 2023-07-13 06:52:08 +01:00
Ronan Browne
010a9a6c08 ES-853: Merging forward updates from 4.6 to 4.7 (2023-07-12) 2023-07-12 20:02:32 +01:00
Ronan Browne
33df909cee
ES-757: update paramater in line with latest shared lib change (#7417) 2023-07-12 20:01:56 +01:00
Ronan Browne
b410cd2a5d
ES-853: update Artifactory refrences to new public location (#7416) 
* ES-853: update artifactory references to new public location
 2023-07-12 17:36:57 +01:00
Adel El-Beik
d6c858e42e
Merge pull request #7414 from corda/ES-757-Remove-Extra-paramater-from-the-calling-side 
ES-757: ensure correct method is called with extra paramater
 2023-07-12 11:11:50 +01:00
Ronan Browne
9dd0bd8509
ES-757: ensure correct method is called with extra paramater 2023-07-11 13:11:02 +01:00
Shams Asari
1e0f7cd690 Merge fix 2023-07-07 15:29:44 +01:00
Shams Asari
671ce9ef97 Merge branch 'os-4.8-merge-point' into shams-4.9-merge-0b8536b9 
# Conflicts:
#	.github/workflows/check-pr-title.yml
#	node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
 2023-07-07 15:20:43 +01:00
Ronan Browne
401a8593d2
Merge pull request #7411 from corda/ronanb/merge-4.7-4.8-2023-07-05 
ES-839: Merging forward updates from 4.7 to 4.8 (2023-07-25)
 2023-07-06 13:58:11 +01:00
Ronan Browne
5e3ee980b3 INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-07-05) 2023-07-05 20:54:02 +01:00
Ronan Browne
56c6eb42ef
ES-757: remove extra paramater (#7403) 2023-07-05 16:28:51 +01:00
Ronan Browne
6b1a2cb027
ES-839: Disable Internal docker publishing for 4.7 ( only supported post 4.9 pacthes) (#7410) 
* ES-839: Disable Docker publishing for 4.7
* ES-839: remove broken repo
 2023-07-05 16:28:08 +01:00
Chris Cochrane
e100bee4f1
ENT-10076,ENT-10080 - Security Vulnerabilities (#7405) 
* Updated dependencies

* Address compiler checks
 2023-06-28 13:20:58 +01:00
Chris Cochrane
d02f6ff68c
ENT-10048,ENT-10050 - Security vulnerabilities (#7397) 
* Updated netty and tcnative
 2023-06-27 13:29:28 +01:00
Ronan Browne
0afd220cfd
Merge pull request #7401 from corda/ronanb/merge-4.6-4.7-2023-06-23 
ES-758: forward merge 4.6 -> 4.7
 2023-06-26 08:59:12 +01:00
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