diff --git a/event-stream-rpc-client/build.gradle.kts b/event-stream-rpc-client/build.gradle.kts index 8f165b3..0d90d52 100644 --- a/event-stream-rpc-client/build.gradle.kts +++ b/event-stream-rpc-client/build.gradle.kts @@ -25,13 +25,13 @@ tasks.withType { dependencies { implementation(project(":event-stream-rpc-model")) - implementation("com.google.code.gson:gson:2.8.6") - implementation("software.amazon.awssdk.crt:aws-crt:0.16.14") + implementation("com.google.code.gson:gson:2.9.0") + implementation("software.amazon.awssdk.crt:aws-crt:0.29.9") - testImplementation("org.json:json:20200518") - testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") - testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0") + testImplementation("org.json:json:20231013") + testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1") testImplementation("org.junit.platform:junit-platform-console-standalone:1.7.0") testRuntimeOnly("org.slf4j:slf4j-jdk14:1.7.30") diff --git a/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java b/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java index 0388af9..e0171dc 100644 --- a/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java +++ b/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java @@ -94,7 +94,7 @@ public CompletableFuture connect(final LifecycleHandler lifecycleHandler) } final CompletableFuture initialConnectFuture = new CompletableFuture<>(); - ClientConnection.connect(config.getHost(), (short) config.getPort(), config.getSocketOptions(), + ClientConnection.connect(config.getHost(), config.getPort(), config.getSocketOptions(), config.getTlsContext(), config.getClientBootstrap(), new ClientConnectionHandler() { @Override protected void onConnectionSetup(final ClientConnection clientConnection, int errorCode) { diff --git a/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java b/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java index ef4fbb1..eef8278 100644 --- a/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java +++ b/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java @@ -57,9 +57,6 @@ public EventStreamRPCConnectionConfig(ClientBootstrap clientBootstrap, EventLoop this.port = port; this.connectMessageAmender = connectMessageAmender; - //perform cast to throw exception here if port value is out of short value range - final short shortPort = (short)port; - //bit of C++ RAII here, validate what we can if (clientBootstrap == null || eventLoopGroup == null || socketOptions == null || host == null || host.isEmpty() || port < 0) { diff --git a/event-stream-rpc-model/build.gradle.kts b/event-stream-rpc-model/build.gradle.kts index dc1ed6b..9d2c84a 100644 --- a/event-stream-rpc-model/build.gradle.kts +++ b/event-stream-rpc-model/build.gradle.kts @@ -27,13 +27,13 @@ tasks.withType { } dependencies { - testImplementation("org.json:json:20200518") - implementation("com.google.code.gson:gson:2.8.6") - implementation("software.amazon.awssdk.crt:aws-crt:0.16.14") + testImplementation("org.json:json:20231013") + implementation("com.google.code.gson:gson:2.9.0") + implementation("software.amazon.awssdk.crt:aws-crt:0.29.9") - testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") - testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0") + testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1") testRuntimeOnly("org.slf4j:slf4j-jdk14:1.7.30") testImplementation(project(":test-model-codegen")) diff --git a/event-stream-rpc-server/build.gradle.kts b/event-stream-rpc-server/build.gradle.kts index 2197dbf..54947eb 100644 --- a/event-stream-rpc-server/build.gradle.kts +++ b/event-stream-rpc-server/build.gradle.kts @@ -25,13 +25,13 @@ tasks.withType { dependencies { implementation(project(":event-stream-rpc-model")) - implementation("com.google.code.gson:gson:2.8.6") - implementation("software.amazon.awssdk.crt:aws-crt:0.16.14") + implementation("com.google.code.gson:gson:2.9.0") + implementation("software.amazon.awssdk.crt:aws-crt:0.29.9") implementation("org.slf4j:slf4j-api:1.7.30") - testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") - testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0") + testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1") //pull in server for tests testImplementation(project(":test-model-codegen")) diff --git a/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java b/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java index d93738d..08b7843 100644 --- a/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java +++ b/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java @@ -71,7 +71,7 @@ public void runServer() { } serverBootstrap = new ServerBootstrap(eventLoopGroup); tlsContext = tlsContextOptions != null ? new ServerTlsContext(tlsContextOptions) : null; - listener = new ServerListener(hostname, (short) port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() { + listener = new ServerListener(hostname, port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() { @Override public ServerConnectionHandler onNewConnection(ServerConnection serverConnection, int errorCode) { try { diff --git a/greengrass-client/build.gradle.kts b/greengrass-client/build.gradle.kts index e9d0737..9fd8b29 100644 --- a/greengrass-client/build.gradle.kts +++ b/greengrass-client/build.gradle.kts @@ -56,8 +56,8 @@ dependencies { implementation(project(":event-stream-rpc-model")) implementation(project(":event-stream-rpc-client")) - implementation("software.amazon.awssdk.crt:aws-crt:0.16.14") - implementation("com.google.code.gson:gson:2.8.6") + implementation("com.google.code.gson:gson:2.9.0") + implementation("software.amazon.awssdk.crt:aws-crt:0.29.9") } java { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/greengrass-server/build.gradle.kts b/greengrass-server/build.gradle.kts index 0218825..b53a0e9 100644 --- a/greengrass-server/build.gradle.kts +++ b/greengrass-server/build.gradle.kts @@ -55,8 +55,8 @@ dependencies { implementation(project(":event-stream-rpc-model")) implementation(project(":event-stream-rpc-server")) - implementation("software.amazon.awssdk.crt:aws-crt:0.16.14") - implementation("com.google.code.gson:gson:2.8.6") + implementation("com.google.code.gson:gson:2.9.0") + implementation("software.amazon.awssdk.crt:aws-crt:0.29.9") } java { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/import-spec.ini b/import-spec.ini index 0c5bb3c..e75417c 100644 --- a/import-spec.ini +++ b/import-spec.ini @@ -1,8 +1,8 @@ # sdk version to build from -SDK_VERSION=1.12.1 +SDK_VERSION=1.19.1 # target sdk version to deploy -TARGET_VERSION=1.12.2-CLI-SNAPSHOT +TARGET_VERSION=1.19.1-CLI-SNAPSHOT #Python sdk to build on top of PYTHON_SDK_VERSION=1.6.1 diff --git a/smithy-event-stream-rpc-cpp/build.gradle.kts b/smithy-event-stream-rpc-cpp/build.gradle.kts index 11004ea..292df7f 100644 --- a/smithy-event-stream-rpc-cpp/build.gradle.kts +++ b/smithy-event-stream-rpc-cpp/build.gradle.kts @@ -30,8 +30,8 @@ dependencies { implementation("org.jsoup:jsoup:1.13.1") implementation("software.amazon.smithy:smithy-protocol-test-traits:[1.0.2,1.1.0[") - testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") - testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0") + testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1") testCompileOnly("org.hamcrest:hamcrest:2.1") } diff --git a/smithy-event-stream-rpc-java/build.gradle.kts b/smithy-event-stream-rpc-java/build.gradle.kts index 9d00201..a5dc460 100644 --- a/smithy-event-stream-rpc-java/build.gradle.kts +++ b/smithy-event-stream-rpc-java/build.gradle.kts @@ -30,8 +30,8 @@ dependencies { implementation("org.jsoup:jsoup:1.13.1") implementation("software.amazon.smithy:smithy-protocol-test-traits:[1.0.2,1.1.0[") - testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") - testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0") + testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1") testCompileOnly("org.hamcrest:hamcrest:2.1") } diff --git a/smithy-event-stream-rpc-javascript/build.gradle.kts b/smithy-event-stream-rpc-javascript/build.gradle.kts index 8c1db00..f76ba4c 100644 --- a/smithy-event-stream-rpc-javascript/build.gradle.kts +++ b/smithy-event-stream-rpc-javascript/build.gradle.kts @@ -30,8 +30,8 @@ dependencies { implementation("org.jsoup:jsoup:1.13.1") implementation("software.amazon.smithy:smithy-protocol-test-traits:[1.0.2,1.1.0[") - testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") - testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0") + testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1") testCompileOnly("org.hamcrest:hamcrest:2.1") } diff --git a/smithy-event-stream-rpc-python/build.gradle.kts b/smithy-event-stream-rpc-python/build.gradle.kts index 9ae7e2a..dd0bdca 100644 --- a/smithy-event-stream-rpc-python/build.gradle.kts +++ b/smithy-event-stream-rpc-python/build.gradle.kts @@ -30,8 +30,8 @@ dependencies { implementation("org.jsoup:jsoup:1.13.1") implementation("software.amazon.smithy:smithy-protocol-test-traits:[1.0.2,1.1.0[") - testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") - testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0") + testCompileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + testCompileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1") testCompileOnly("org.hamcrest:hamcrest:2.1") } diff --git a/test-model-codegen/build.gradle.kts b/test-model-codegen/build.gradle.kts index 95e1d6d..286af10 100644 --- a/test-model-codegen/build.gradle.kts +++ b/test-model-codegen/build.gradle.kts @@ -42,12 +42,12 @@ dependencies { implementation(project(":event-stream-rpc-client")) implementation(project(":event-stream-rpc-server")) - compileOnly("org.junit.jupiter:junit-jupiter-api:5.4.0") - compileOnly("org.junit.jupiter:junit-jupiter-params:5.4.0") - runtimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.0") + compileOnly("org.junit.jupiter:junit-jupiter-api:5.8.1") + compileOnly("org.junit.jupiter:junit-jupiter-params:5.8.1") + runtimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") - implementation("software.amazon.awssdk.crt:aws-crt:0.16.14") - implementation("com.google.code.gson:gson:2.8.6") + implementation("com.google.code.gson:gson:2.9.0") + implementation("software.amazon.awssdk.crt:aws-crt:0.29.9") } java {