Commit Graph

268 Commits

Author SHA1 Message Date
chriscochrane
78e7f62df3
Updated commons-io version 2024-10-15 10:11:58 +01:00
Rick Parker
ed3875c8b7
Merge branch 'release/os/4.10' into merge-release/os/4.9-release/os/4.10-2024-08-12-297 2024-08-12 19:27:12 +01:00
chriscochrane
9ba25720d8
Upgraded jackson 2024-07-30 16:09:59 +01:00
chriscochrane
4b90f93f77
Updates for security issues 2024-07-18 14:23:16 +01:00
chriscochrane
4534b3b024
Restored old netty version 2024-07-16 10:22:08 +01:00
chriscochrane
c7c89f33c7
Dependency updates for security issues. 2024-07-11 09:42:29 +01:00
Chris Cochrane
52a6d477da
Upgraded Jetty 2024-01-12 17:12:46 +00:00
Chris Cochrane
d1fae19c26
ENT-10803 - Upgraded Jetty (#7506) 2023-09-28 09:37:00 +01:00
Chris Cochrane
0ba1cef49d
Bumped up Jackson; removed unwanted gradle task 2023-04-27 17:00:08 +01:00
Chris Cochrane
2f53e8115f
Fwd-merge from OS 4.9 2023-04-27 16:45:16 +01:00
Chris Cochrane
34d4a5f667
Fwd-merge from OS 4.8 2023-04-26 22:54:20 +01:00
Chris Cochrane
e12ab8194f
Merge branch 'release/os/4.7' into cc/merge/os-4.7-os-4.8/25-apr-2023
Fwd-merge from OS 4.7.
2023-04-25 14:54:21 +01:00
Chris Cochrane
91c38fa84b
Merge branch 'release/os/4.6' into cc/merge/os-4.6-os-4.7/24-apr-2023
Fwd-merge from OS 4.6.
2023-04-24 20:13:50 +01:00
Chris Cochrane
c58c49d27a
Upgrade corda/crash, snakeyaml 2023-04-20 14:01:20 +01:00
Chris Cochrane
95c4a18352
ENT-6336,ENT-6960 - upgrade snakeyaml to address security vulnerabilities 2023-04-06 19:14:30 +01: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
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
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
Chris Cochrane
64d31d3fb3
Upgraded shiro and apache commons-text, to address security issues. 2022-10-17 17:44:32 +01:00
Chris Cochrane
1ec93f01e1
Reverted netty back to 4.1.77.Final 2022-10-06 12:33:36 +01:00
Chris Cochrane
0ab4ac94c8
ENT-6903 - address security issues reported by Snyk (#7244)
ENT-6903: Update versions of BC, Shiro, Netty okhttp
Also updated platform version to 12.
2022-09-30 17:49:21 +01:00
Chris Cochrane
877e00f8d3
Fwd-merge from OS-4.9 2022-08-01 13:00:57 +01:00
Chris Cochrane
3d52a67ded
ENT-6863 upgrade netty to 4.1.77.Final 2022-06-22 16:20:03 +01:00
Waldemar Zurowski
206f3ac088 Added missing update of Jackson version 2022-05-27 09:22:29 +02:00
Waldemar Zurowski
9d3548d36e NOTICK: Merging forward updates from OS 4.9 to OS 4.10 (2022-05-26)
Conflicts:
* build.gradle
2022-05-26 20:21:53 +02:00
Waldemar Zurowski
031eb263e6 NOTICK: Merging forward updates from OS 4.8 to OS 4.9 (2022-05-26)
Conflicts:
* constants.properties
2022-05-26 16:38:00 +02:00
Waldemar Zurowski
ec14f9ccba NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-05-26) 2022-05-26 14:13:33 +02:00
Waldemar Zurowski
0336c938a6 NOTICK: Merging forward updates from OS 4.6 to OS 4.7 (2022-05-25)
Conflicts:
* .ci/dev/regression/Jenkinsfile
*
core/src/main/kotlin/net/corda/core/internal/PlatformVersionSwitches.kt
2022-05-25 19:07:45 +02:00
Waldemar Zurowski
ef76ae0973 NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25)
Conflicts:
*
client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt
*
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
* constants.properties
* gradle/wrapper/gradle-wrapper.properties
* tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
2022-05-25 10:14:38 +02:00
Dimos Raptis
12f339a343 Port netty upgrade to constants.properties 2022-05-18 16:55:06 +01:00
Viktor Kolomeyko
355411b195 Merge remote-tracking branch 'origin/release/os/4.9' into vkolomeyko/cc4.9-cc4.10-merge
# Conflicts:
#	.ci/dev/regression/Jenkinsfile
#	build.gradle
2022-05-18 15:27:44 +01:00
Adel El-Beik
9259522a14 ENT-6480: Upgraded caffeine to 2.9.3. 2022-05-16 18:16:54 +01:00
Adel El-Beik
e33265f60d ENT-6765: Upgraded quassar and hibernate. 2022-05-09 13:36:16 +01:00
Viktor Kolomeyko
05be5d6c42
ENT-6627: Update version of Shiro to 1.8.0 (#7153) 2022-04-25 09:53:06 +01:00
Adel El-Beik
1262379447 ENT-6607: Update hibernate to 5.4.32.Final 2022-04-05 10:18:19 +01:00
Adel El-Beik
cb4c7a80ca Merge remote-tracking branch 'origin/release/os/4.9' into adel/merge-from-4.9-1stApr 2022-04-01 16:58:08 +01:00
rick.parker
5d734be807 ENT-6498 Fix API docs dependencies (bump dokka version missed from conflict resolution). 2022-02-25 13:29:20 +00:00
Chris Cochrane
59272e880d
ENT-6607 moved all 3rd party lib versions to constants.properties (#7077)
* ENT-6607 moved all 3rd party lib versions to constants.properties

* Post-review - Corrected Corda version number
2022-02-22 18:09:30 +00:00
nargas-ritu
cd8cd60a0f NOTICK: Changes done while creating a new branch for Corda 4.10 2022-02-17 10:43:34 +00:00
Chris Cochrane
b008f5f42a
Updated tcnative version to 2.0.48 (#7072) 2022-02-16 18:10:05 +00:00
Adel El-Beik
9444c9b637
ENT-6567: Bump platform version to 11 (#7043)
* ENT-6567: Bump platform version to 11

* ENT-6567: Bump platform version to 11
2022-01-26 11:37:22 +00:00
Adel El-Beik
b93ce6ed59
ENT-6550: Updated quasar version. (#7045) 2022-01-26 11:34:10 +00:00
nargas-ritu
f4a022ddce NOTICK: New branch for Corda OS 4.9 2022-01-04 12:33:03 +00:00
Chris Rankin
e93e7c2846
ENT-6412: Upgrade ClassGraph 4.8.90 -> 4.8.135. (#6973) 2021-11-23 09:43:41 +00:00
Nick Dunstone
c6c5c065a5
ENT-6295: Upgrade to BC 1.68 on O/S 4.5 (#6906)
* Upgrade to BC 1.68 on O/S 4.5

* Added Ed25519 fix
2021-05-11 12:04:15 +01:00
Edoardo Ierina
a17263124f
Bumped platformVersion from 9 to 10 (#6882) 2021-02-22 10:58:39 +00:00
Nick Dunstone
42bb25462d
CORDA-4098 assumption test (#6871) (#6873) (#6874)
* Upgrade of Bouncy Castle to resolve security issue

* Changed default signature scheme

* Reverted default change in draft

* Key conversion for BC with ed25519

* Initializing BC provider to use X509EdDSAEngine for Signature.Ed25519

* removed unsude imports

Co-authored-by: Nick Dunstone <nick.a.dunstone@gmail.com>

Co-authored-by: Alexey Kadyrov <67952405+alexey-kadyrov-r3@users.noreply.github.com>

Co-authored-by: Alexey Kadyrov <67952405+alexey-kadyrov-r3@users.noreply.github.com>
2021-02-17 17:14:05 +00:00
Nick Dunstone
d41f608e4e
CORDA-4098 assumption test (#6871) (#6873)
* Upgrade of Bouncy Castle to resolve security issue

* Changed default signature scheme

* Reverted default change in draft

* Key conversion for BC with ed25519

* Initializing BC provider to use X509EdDSAEngine for Signature.Ed25519

* removed unsude imports

Co-authored-by: Nick Dunstone <nick.a.dunstone@gmail.com>

Co-authored-by: Alexey Kadyrov <67952405+alexey-kadyrov-r3@users.noreply.github.com>
2021-02-17 12:53:30 +00:00
Alexey Kadyrov
ae2bb9992f
CORDA-4098 assumption test (#6871)
* Upgrade of Bouncy Castle to resolve security issue

* Changed default signature scheme

* Reverted default change in draft

* Key conversion for BC with ed25519

* Initializing BC provider to use X509EdDSAEngine for Signature.Ed25519

* removed unsude imports

Co-authored-by: Nick Dunstone <nick.a.dunstone@gmail.com>
2021-02-17 10:27:45 +00:00