From 61d226a79e72f1ffecd25b5aa4fa991aa81d06a4 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Wed, 26 Feb 2025 09:46:07 +0530 Subject: [PATCH 1/3] Prepare for update 12 release --- build-config/resources/Ballerina.toml | 2 +- gradle.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 702a475fd..f4cea4b59 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -7,7 +7,7 @@ keywords = ["ws", "network", "bi-directional", "streaming", "service", "client"] repository = "https://github.com/ballerina-platform/module-ballerina-websocket" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.11.0" +distribution = "2201.12.0" [platform.java21] graalvmCompatible = true diff --git a/gradle.properties b/gradle.properties index eeb468b51..52bcbcf3c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.caching=true group=io.ballerina.stdlib -version=2.13.2-SNAPSHOT -ballerinaLangVersion=2201.11.0 +version=2.14.0-SNAPSHOT +ballerinaLangVersion=2201.12.0-20250221-092200-b3de4372 ballerinaTomlParserVersion=1.2.2 nettyVersion=4.1.118.Final slf4jVersion=1.7.30 @@ -42,7 +42,7 @@ stdlibJwtVersion=2.14.0 stdlibOAuth2Version=2.13.0 # Level 05 -stdlibHttpVersion=2.13.1 +stdlibHttpVersion=2.14.0-20250226-085300-8348bec # Ballerinax Observer observeVersion=1.4.0 From 514eaacc53cf863bca26e19dee0f35324d11bd65 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Wed, 26 Feb 2025 09:46:22 +0530 Subject: [PATCH 2/3] Initialize SSL context in client init --- .../io/ballerina/stdlib/websocket/client/SyncInitEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/src/main/java/io/ballerina/stdlib/websocket/client/SyncInitEndpoint.java b/native/src/main/java/io/ballerina/stdlib/websocket/client/SyncInitEndpoint.java index 923fc0c18..9c9defecf 100644 --- a/native/src/main/java/io/ballerina/stdlib/websocket/client/SyncInitEndpoint.java +++ b/native/src/main/java/io/ballerina/stdlib/websocket/client/SyncInitEndpoint.java @@ -78,7 +78,7 @@ public static Object initEndpoint(Environment env, BObject wsSyncClient) { populateRetryConnectorConfig(retryConfig, retryConnectorConfig); wsSyncClient.addNativeData(WebSocketConstants.RETRY_CONFIG.toString(), retryConnectorConfig); } - WebSocketClientConnector clientConnector = connectorFactory.createWsClientConnector( + WebSocketClientConnector clientConnector = connectorFactory.createWsClientConnectorWithSSL( clientConnectorConfig); wsSyncClient.addNativeData(WebSocketConstants.CONNECTOR_FACTORY, connectorFactory); wsSyncClient.addNativeData(WebSocketConstants.CLIENT_CONNECTOR, clientConnector); From eb1141498f21aee4f62c976e7e1523fb4118b804 Mon Sep 17 00:00:00 2001 From: TharmiganK Date: Wed, 26 Feb 2025 09:46:54 +0530 Subject: [PATCH 3/3] Update changelog --- changelog.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog.md b/changelog.md index 162e93c7d..a73a4a4e9 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,12 @@ This file contains all the notable changes done to the Ballerina WebSocket packa The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Changed + +- [Move SSL context creation to the client initialization](https://github.com/ballerina-platform/ballerina-library/issues/1798) + ## [2.13.1] - 2025-02-11 ### Fixed