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,827 Commits 91 Branches 405 Tags 354 MiB
563001e0ac
Commit Graph

638 Commits

Author SHA1 Message Date
Waldemar Zurowski
7175d56f6c ES-1313: Merging forward updates from release/os/4.10 to release/os/4.11 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-08 09:09:58 +01:00
Waldemar Zurowski
9f395b5ec3 ES-1313: Merging forward updates from release/os/4.9 to release/os/4.10 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 20:36:14 +01:00
Waldemar Zurowski
a7274c4ec2 ES-1313: Merging forward updates from release/os/4.8 to release/os/4.9 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 18:30:28 +01:00
Waldemar Zurowski
fd55e4c8d4 ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 16:08:20 +01:00
Waldemar Zurowski
1c903b0ff2 ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7 
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 14:06:10 +01:00
Waldemar Żurowski
dfe0ed294e
ES-1313: changes for better future forward merges (#7486) 
* add more comments as a form of documentation
* move variable names away from calling pipeline for better experience
of future forward merges if pipeline parameters were to change
 2023-09-07 14:39:02 +02:00
Waldemar Zurowski
658e7217a3 ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7 
Conflicts:

* .ci/dev/forward-merge/Jenkinsfile
 2023-09-07 11:27:57 +01:00
Ronan Browne
8e2115293a
ES-1313: Update Jenkinsfile for slack channel (#7484) 2023-09-07 11:49:33 +02:00
Waldemar Żurowski
d7a5428665
Updated for new branch 2023-09-04 12:08:52 +01:00
r3-build
33798df51d Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-04 2023-09-04 10:21:44 +00:00
Waldemar Żurowski
8a01b25684
updated forward merger for current branch 
* updated originBranch to match current branch
* updated targetBranch to match branch with the next version
19:11
 2023-09-01 22:50:29 +02:00
r3-build
612cfcdb32 Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-09-01 2023-09-01 20:47:47 +00:00
Waldemar Żurowski
3a093ef324
updated forward merged to new branch 2023-09-01 18:25:46 +02:00
r3-build
313d342b02 Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-09-01 2023-09-01 16:23:11 +00:00
Waldemar Żurowski
3d8636c716
updated for new branch 2023-09-01 14:55:04 +02:00
r3-build
fe9483d331 Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-09-01 2023-09-01 12:47:45 +00:00
Waldemar Żurowski
267b500c93
updated forward merged to new branch 2023-09-01 11:56:24 +02:00
r3-build
8349675a23 Merging forward updates from release/os/4.6 to release/os/4.7 - 2023-09-01 2023-09-01 09:51:40 +00:00
Waldemar Żurowski
b0f86e26f9
ES-412: added automatic forward merge for Corda 4 (#7469) 
* uses an already existing shared pipeline
* will start automatic PR creation for changes between 4.6 and 4.7
 2023-09-01 10:50:47 +01:00
Waldemar Zurowski
849f8666a6 INFRA-1804: Merging forward updates from release/os/4.7 to release/os/4.8 2023-08-30 16:40:20 +01:00
Waldemar Zurowski
5daa091fdc INFRA-1804: Merging forward updates from release/os/4.6 to release/os/4.7 2023-08-30 14:30:31 +01:00
Waldemar Żurowski
00b1f3d2c7
INFRA-1804: revert back to standard agent (#7463) 
* Snyk binaries have been already incorporated into standard Jenkins
agent
 2023-08-30 15:28:29 +02:00
Jose Coll
3b78b46619 Merge remote-tracking branch 'origin/release/os/4.11' into colljos/encryption_receiver_self_recovery 2023-08-23 11:20:16 +01:00
Rick Parker
ec261cb0c3
ENT-10306 Swap logic from receive finality to receive transaction flows (#7451) 
* Swap logic from receive finality to receive transaction flows

* Remote TPV check

* Make finality check more robust

* Make emulation of finality in tests compliant with changes

* Improve deferring of ack when issue transaction

* Remove API checking of SignedTransactionWithDistributionList as added it 4.11 so cannot be incompatible, yet.

* Regenerated API file from 4.10 to check only compatibility with 4.10

* Move function to private

* Revert "Regenerated API file from 4.10 to check only compatibility with 4.10"

This reverts commit 6428f957e1.

* Reset ReceiveTransactionFlow and ReceiveFinalityFlow APIs
 2023-08-23 10:09:42 +01:00
Jose Coll
06e43eb9e2 Fixes following merge. 2023-08-17 08:47:58 +01:00
Shams Asari
e0e4f51ba2
ENT-10285: Remove experimental DJVM support (#7442) 2023-08-09 08:44:32 +01:00
Ronan Browne
2f80e5a252 ES-657: Merging forward updates from 4.10 to 4.11 (2023-07-18) 2023-07-18 08:48:54 +01:00
Ronan Browne
e59145dd61 ES-657: Merging forward updates from 4.9 to 4.10 (2023-07-17) 2023-07-17 18:37:05 +01:00
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
Ronan Browne
991aa9fff9 ES-853: Merging forward updates from 4.10 to 4.11 (2023-07-17) 2023-07-17 14:35:59 +01:00
Connel McGovern
b01f85fb11 Merge branch 'release/os/4.9' into connelm/merge-4.9-4.10-2023-07-14 
# Conflicts:
#	build.gradle
 2023-07-14 18:19:55 +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
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
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
9dd0bd8509
ES-757: ensure correct method is called with extra paramater 2023-07-11 13:11:02 +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
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
Jose Coll
0e877958fe
ENT-10009 Enhance SendTransactionFlow to allow sending a txn to multiple sessions. (#7393) 2023-06-09 17:19:43 +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
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
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
f212e0fd85 ES-562: Correct modules to scan for C4 OS Snyk scan nightly 2023-06-06 16:42:49 +01:00
Chris Cochrane
cca09fef58
Merge branch 'release/os/4.10' into cc/merge/os-4.10-os-4.11/03-may-2023 
Fwd-merge from OS 4.11.
 2023-05-03 17:47:44 +01:00
Jose Coll
1d4feedc62
ENT-9147 Propagate and handle Notary Error (Part 2) (#7346) 2023-04-26 09:06:32 +01:00
Ronan Browne
95a494f75a INFRA-2040: Merging forward updates from 4.9 to 4.10 (2023-04-24) 2023-04-24 20:41:10 +01:00
Ronan Browne
5f685be474
ES-93: use standard AMI agent for build (#7345) 2023-04-24 17:56:02 +01:00
Ronan Browne
5db96e679c use correct agent 2023-04-21 08:43:29 +01:00
Ronan Browne
269b196c57 INFRA-2040: Merging forward updates from 4.8 to 4.9 (2023-04-21) 2023-04-21 08:42:42 +01:00
Jose Coll
7bd3f5dd33
ENT-9147 Remove un-notarised transactions upon Double Spend. (#7324) 2023-04-19 15:31:47 +01:00
Ronan Browne
90cecf69e5 INFRA-2040: Merging forward updates from 4.7 to 4.8 (2023-04-18) 2023-04-18 19:20:47 +01:00
Ronan Browne
1e7a515a8a INFRA-2040: Merging forward updates from 4.6 to 4.7 2023-04-17 17:26:39 +01:00
Ronan Browne
5e9dee18b1 INFRA-2040: Merging forward updates from 4.5 to 4.6 (2023-04-16) 2023-04-16 18:23:22 +01:00
Ronan Browne
2e9f62f4da
INFRA-2040: remove lingering nexus code (#7330) 2023-04-16 18:19:43 +01:00
Shams Asari
2556fde971 Merge branch 'release/os/4.10' into shams-4.11-frwd-merge-fc531761 2023-04-13 10:55:03 +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
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
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
Connel McGovern
fda5cd07d2 INFRA-1955: Merging forward from 4.10 to 4.11 2023-03-22 11:24:31 +00:00
Connel McGovern
db08eb3a9b INFRA-1955: Merging forward from 4.9 to 4.10 2023-03-21 14:59:02 +00:00
Connel McGovern
6e56dffba8
INFRA-1955: Shared lib implicit import syntax (#7313) 2023-03-15 14:49:10 +00:00
Connel McGovern
519ae9ab81 INFRA-1955: Merging forward from 4.8 to 4.9 2023-03-15 10:48:53 +00:00
Connel McGovern
21d91171bc
INFRA-1955: Shared lib implicit import syntax 2023-03-15 09:58:00 +00:00
Connel McGovern
e70505afca
INFRA-1955: Shared lib implicit import syntax 2023-03-15 09:53:13 +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
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
Connel McGovern
7e908bb939 INFRA-1955: Merging forward from 4.5 to 4.6 2023-03-14 14:08:35 +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
Connel McGovern
fe4e607dfd INFRA-2021: Adding in authenticate Gradle wrapper to Snyk Delta 2023-02-21 11:54:38 +00:00
Connel McGovern
5b4fce52ce INFRA-2021: Adding in authenticate Gradle wrapper to Snyk Delta (seperate agent) 2023-02-21 11:48:37 +00:00
Connel McGovern
835ea723ea Revert "INFRA-2021: Temp fix for Snyk Delta " 
This reverts commit 2ce0409bd2.
 2023-02-21 11:40:39 +00:00
Connel McGovern
2ce0409bd2
INFRA-2021: Temp fix for Snyk Delta 
Moving the position of the Snyk Delta to execute as the first stage as there seems to be issues with running the under the hood 'snykResolvedDepsJson' task after other gradle tasks have been executed. To be investigated further but this should unblock and PR's hitting the Snyk Delta stage.
 2023-02-17 14:58:14 +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
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
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
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
d58443b431 ENT-8823: Updated api-current.txt. Additional boolean added to CordaRPCClient. 2022-12-08 18:03:23 +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
Chris Cochrane
e3d22dadbc
ENT-8796 - Fwd-merge from OS 4.9 2022-11-21 10:56:58 +00:00
Connel McGovern
aa72dec0f2
NOTICK: Add CORDA_USE_CACHE environment variable (#7262) 2022-11-07 20:05:01 +00:00
Adel El-Beik
7a133f687c
ENT-6893: First cut of telemetry integration. (#7247) 
First cut of telemetry integration.

Open telemetry can be enabled in two ways, first is via an opentelemetry java agent specified on the command line. With this way you get the advantage of spans created from other libraries, like hibernate. The java agent does byte code rewriting to insert spans.
The second way is with the open telemetry driver (that links with the opentelemetry sdk). This is a fat jar provided with this project and needs to go into the node drivers directory.
 2022-10-28 14:41:39 +01:00
Rick Parker
b29713d7b9
ENT-6947 Intern common types to reduce heap footprint (#7239) 
ENT-6947: Implement interning for SecureHash, CordaX500Name, PublicKey, AsbtractParty and SignatureAttachmentConstraint, including automatic detection of internable types off companion objects in AMQP & Kyro deserialization.  In some cases, add new factory methods to companion objects, and make main code base use them.

Performance tested in performance cluster with no negative impact visible (so default concurrency setting seems okay).

Testing suggests 5-6x memory saving for tokens in TokensSDK in memory selector.  Should see approx. 1 million tokens per GB or better (1.5 million for the tokens we tested with).
 2022-10-18 09:28:41 +01:00
Jan Szkaradek
6f32d3d369
added modules for snyk scanning (#7231) 2022-09-02 14:17:53 +02:00
Jan Szkaradek
19c8dd5cfb
added modules for snyk scanning (#7232) 2022-09-02 14:17:31 +02:00