ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 21:43:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,969 Commits 91 Branches 405 Tags 354 MiB
97d8549d4f
Commit Graph

9969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adel El-Beik
f61b4db527
Merge pull request #7291 from corda/colljos/bump_platform_version 
NOTICK Bump platform version to 13
 2023-01-24 14:57:10 +00:00
Jose Coll
6e4768cd02 Bump platform version. 2023-01-24 11:54:56 +00:00
Jose Coll
f8896ef706 Bump platform version. 2023-01-24 11:42:34 +00:00
nargas-ritu
10aaedc9fc NOTICK: Branch creation for 4.11 2023-01-17 12:04:35 +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
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
5fa1bba66b
Merge pull request #7281 from corda/adel/ENT-8823 
ENT-8823: StartEnd events now dont get mangled when parent span is a …
 2022-12-09 10:08:40 +00:00
Adel El-Beik
a5d8996760 ENT-8823: Added jfrog artifactory plugin. Hopefully will now publish to artifactory. 2022-12-08 18:42:51 +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
2e724cb82f ENT-8823: Removed unused import. 2022-12-08 16:57:45 +00:00
Adel El-Beik
044b83508e ENT-8823: Added copyBaggageToTags configuration option to control if baggage is copied to tags. 
Switched SimplLogTelemetryComponent to info logs.
 2022-12-08 16:54:38 +00:00
Adel El-Beik
50a1a4ce09 ENT-8823: StartEnd events now dont get mangled when parent span is a user span. Also other refactorings like using OT propagator now. 2022-12-06 19:24:19 +00:00
Rick Parker
c3083af4c3
Merge pull request #7276 from corda/cc/merge/os-4.9/os-4.10/28-Nov-2022 
ENT-8817 - Fwd-merge OS 4.9 to OS 4.10
 2022-11-29 08:47:00 +00:00
Chris Cochrane
563a7fb6c1
Merge branch 'release/os/4.9' into cc/merge/os-4.9/os-4.10/28-Nov-2022 
Fwd-merge from OS-4.9.
 2022-11-28 13:14:07 +00:00
Adel El-Beik
23b872db17
Merge pull request #7275 from corda/parkri/ENT-8817-compute-deadlocks 
ENT-8817 OS port of compute deadlock changes
 2022-11-25 13:07:19 +00:00
Rick Parker
724b61beb7
Merge pull request #7273 from corda/cc/merge/os-4.9/os-4.10/24-Nov-2022 
ENT-8814 - Fwd-merge OS 4.9 to OS 4.10
 2022-11-25 09:36:05 +00:00
rick.parker
3e25f7fd1a ENT-8817 OS port of compute deadlock changes 2022-11-25 09:31:41 +00:00
Chris Cochrane
31d9f0df09
Merge branch 'release/os/4.9' into cc/merge/os-4.9/os-4.10/24-Nov-2022 
Fwd-merge from OS 4.9.
 2022-11-24 18:27:54 +00:00
Chris Cochrane
0131163db0
ENT-8814 - back-fit changes from Enterprise to OS (#7272) 2022-11-24 18:13:35 +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
Rick Parker
188027c1f5
ENT-8811 OS port of flow draining fixes (#7269) 2022-11-24 10:27:00 +00:00
Adel El-Beik
4d14d718d5
Merge pull request #7270 from corda/cc/merge/os-4.9/os-4.10/21-Nov-2022 
ENT-8796 - cc/merge/os 4.9/os 4.10/21 nov 2022
 2022-11-21 13:15:49 +00:00
Chris Cochrane
e3d22dadbc
ENT-8796 - Fwd-merge from OS 4.9 2022-11-21 10:56:58 +00:00
Adel El-Beik
f8f374ec8c
Merge pull request #7268 from corda/cc/merge/os-4.8/os-4.9/16-Nov-2022 
ENT-8794 - cc/merge/os 4.8/os 4.9/16 nov 2022
 2022-11-17 14:21:58 +00:00
Chris Cochrane
71b17874a6
ENT-6983 - Filter out unwanted Artemis warnings (#7263) 
* Filter Artemis warnings out of the console but allow them to the log file
 2022-11-17 11:27:18 +00:00
Chris Cochrane
0c4c5bd138
Merge branch 'release/os/4.8' into cc/merge/os-4.8/os-4.9/16-Nov-2022 
Fwd-merge from OS 4.8.
 2022-11-16 17:35:33 +00:00
Rick Parker
43168387b4
ENT-8794 Delay closing of attachment class loaders (#7267) 
* Delay closing of attachment class loaders until all SerializationContext that refer to them (from BasicVerifier) have gone out of scope.

More comments

* Avoid any concurrency issues with queue processing

* Better concurrency behaviour

* Stop re-using attachment URLs as it turns out we can't close the URLClassLoaders when URLs are shared

* Refactor to use a ReferenceQueue.

Co-authored-by: Chris Rankin <chris.rankin@r3.com>
 2022-11-15 09:25:54 +00:00
Viktor Kolomeyko
1733b568e2
NOTICK: Remove vkolomeyko and rekalov from code owners file (#7265) 2022-11-09 16:37:52 +00:00
Connel McGovern
aa72dec0f2
NOTICK: Add CORDA_USE_CACHE environment variable (#7262) 2022-11-07 20:05:01 +00:00
Adel El-Beik
b6f6ca3fe1
Merge pull request #7259 from corda/adel/ENT-6993 
ENT-6993: Upgrade BC to 1.70
 2022-11-04 10:25:18 +00:00
Adel El-Beik
e0457d6762 ENT-6993: Reverting back to BC 1.70. 2022-11-03 09:18:47 +00:00
Adel El-Beik
79babc999c ENT-6993: Upgrade BC to 1.72. 2022-11-02 15:32:18 +00:00
Adel El-Beik
de76ebab23
ENT-6975: Update Zulu docker files to use Zulu JDK 352. (#7256) 2022-10-31 08:47:40 +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
bdcd25477d
ENT-7039: Notary signature checking requires non-interned SecureHashes. (#7254) 
There was a mistake made when we first introduced notary request signature checking, in that we didn't wrap it in SerializedBytes so it always got deserialized as part of the flow message payload. So to check the signature, it has to be re-serialized. This means for cross-version compatibility we can never change the serialized format of NotarisationRequest. In this case we need make sure that every SecureHash mentioned in that data structure is a distinct instance, even if the values are repeated / identical, as that is how it was in Corda 1.

With the introduction of interning of SecureHash, this ceased to be true once again, including undoing the attempts to force it on the sending side that had been introduced in previous versions of Corda. So here we introduce a way to force it, and consolidate the forcing to distinct SecureHash instances in the NotarisationRequest itself, rather than leaving to the caller of the constructor to remember to do it, so that serialized form will always be as per Corda 1.
 2022-10-28 14:03:47 +01:00
omahs
a627355543
NOTICK: Fix typos (#7255) 
Fix: typos
 2022-10-28 12:33:39 +02:00
Adel El-Beik
3fd3baa507
Merge pull request #7253 from corda/cc/os/4.9/ent-7034/upgrade_commons_text 
ENT-7034 - Upgraded shiro and commons-text to address security issues
 2022-10-19 12:48:11 +01:00
Chris Cochrane
0997b49b24
Upgraded shiro and commons-text to address security issues 2022-10-19 10:48:27 +01:00