ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 05:28:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7848 from corda/merge-release/os/4.11-release/os/4.12-2024-10-19-420

Browse Source 
ENT-12281: Merging forward updates from release/os/4.11 to release/os/4.12 - 2024-10-19
This commit is contained in:
Adel El-Beik 2024-10-21 16:59:20 +01:00 committed by GitHub
commit 4b109e0e1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants.properties
View File

@ -93,7 +93,7 @@ protonjVersion=0.33.0
snappyVersion=0.5 snappyVersion=0.5
jcabiManifestsVersion=1.1 jcabiManifestsVersion=1.1
picocliVersion=3.9.6 picocliVersion=3.9.6
commonsIoVersion=2.7 commonsIoVersion=2.17.0
controlsfxVersion=8.40.15 controlsfxVersion=8.40.15
fontawesomefxCommonsVersion=11.0 fontawesomefxCommonsVersion=11.0
fontawesomefxFontawesomeVersion=4.7.0-11 fontawesomefxFontawesomeVersion=4.7.0-11

7
tools/blobinspector/src/test/kotlin/net/corda/blobinspector/BlobInspectorTest.kt
View File

@ -55,7 +55,12 @@ class BlobInspectorTest {
private fun run(resourceName: String): String { private fun run(resourceName: String): String {
blobInspector.source = javaClass.getResource(resourceName) blobInspector.source = javaClass.getResource(resourceName)
val writer = StringWriter() val writer = StringWriter()
blobInspector.run(PrintStream(WriterOutputStream(writer, UTF_8))) val oStream = WriterOutputStream.builder()
.setCharset(UTF_8)
.setWriter(writer)
.get()
blobInspector.run(PrintStream(oStream))
val output = writer.toString() val output = writer.toString()
println(output) println(output)
return output return output