Skip to content

Commit

Permalink
Merge pull request #1724 from corda/merge-release/os/5.2-release/os/5…
Browse files Browse the repository at this point in the history
….3-2024-12-03-316

CORE-20920: Merging forward updates from release/os/5.2 to release/os/5.3 - 2024-12-03
  • Loading branch information
LWogan authored Dec 3, 2024
2 parents f2d9a46 + 3f9b91b commit 51e9a42
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
22 changes: 20 additions & 2 deletions .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ignore:
temporary files via Kotlin functions with insecure permissions. Corda
does not use any of the vulnerable functions so it not susceptible to
this vulnerability.
expires: 2024-08-27T10:40:55.991Z
expires: 2025-11-18T13:28:02.597Z
created: 2022-09-22T10:40:55.995Z
SNYK-JAVA-COMFASTERXMLWOODSTOX-3091135:
- '*':
Expand All @@ -18,6 +18,24 @@ ignore:
where this dependency originates, this is used at compile / build time
only for Kdoc generation and not shipped in any of our releasable
artifacts.
expires: 2024-08-27T13:28:02.582Z
expires: 2025-11-19T10:40:55.991Z
created: 2023-03-20T13:28:02.597Z
SNYK-JAVA-COMFASTERXMLJACKSONCORE-7569538:
- '*':
reason: >-
Corda5 Shippable artifacts do not make use of dokka-core, which is
where this dependency originates, this is used at compile / build time
only for Kdoc generation and not shipped in any of our releasable
artifacts.
expires: 2025-11-18T13:28:02.597Z
created: 2024-11-18T13:28:02.597Z
SNYK-JAVA-COMFASTERXMLJACKSONCORE-3038426:
- '*':
reason: >-
Corda5 Shippable artifacts do not make use of dokka-core, which is
where this dependency originates, this is used at compile / build time
only for Kdoc generation and not shipped in any of our releasable
artifacts.
expires: 2025-06-19T10:40:55.991Z
created: 2022-12-20T10:40:55.995Z
patch: {}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public interface ExternalMessaging {
*
* @param channelName The name of the channel the message should be sent through.
* @param message The contents of the message to be sent.
* @throws CordaRuntimeException if the channel does not exist.
* @throws CordaRuntimeException if the channel does not exist or if the message exceeds the max allowed message size.
*/
@Suspendable
void send(@NotNull String channelName, @NotNull String message);
Expand All @@ -73,7 +73,7 @@ public interface ExternalMessaging {
* @param channelName The name of the channel the message should be sent through.
* @param messageId An ID of the message to be sent.
* @param message The contents of the message to be sent.
* @throws CordaRuntimeException if the channel does not exist.
* @throws CordaRuntimeException if the channel does not exist or if the message exceeds the max allowed message size.
*/
@Suspendable
void send(@NotNull String channelName, @NotNull String messageId, @NotNull String message);
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kotlinVersion = "1.8.21"
slf4jVersion = "2.0.13"

# Main implementation dependencies
avroVersion = "1.11.3"
avroVersion = "1.11.4"
apacheCommonsCodecVersion="1.17.0"
commonsCompressVersion = "1.26.2"
bouncycastleVersion = "1.77"
bouncycastleVersion = "1.79"
javaxPersistenceApiVersion = "2.2"
jacksonVersion = "2.17.2"
osgiVersion = "8.0.0"
Expand Down

0 comments on commit 51e9a42

Please sign in to comment.