Merge pull request #60 from reactiverse/upgrade/prepare-1.2.0

(upgrade)  v1.2.0

.github/workflows/ci-release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.4
+          gradle-version: current
 
       - name: Get Project version
         id: get_version
@@ -34,7 +34,7 @@ jobs:
       - name: Publish Release to Sonatype
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.4
+          gradle-version: current
           arguments: assemble publish -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=${{secrets.SIGNING_PASSWORD}} -Psigning.secretKeyRingFile=/tmp/secring.gpg -PossrhUsername=${{secrets.SONATYPE_NEXUS_USERNAME}} -PossrhPassword=${{secrets.SONATYPE_NEXUS_PASSWORD}} --stacktrace
 
       - name: Create Release in Github

.github/workflows/ci-snapshot.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.4
+          gradle-version: current
 
       - name: Get Project version
         id: get_version
@@ -33,7 +33,7 @@ jobs:
       - name: Publish Snapshot to Sonatype
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.4
+          gradle-version: current
           arguments: assemble publish -Psigning.keyId=${{secrets.SIGNING_KEY_ID}} -Psigning.password=${{secrets.SIGNING_PASSWORD}} -Psigning.secretKeyRingFile=/tmp/secring.gpg -PossrhUsername=${{secrets.SONATYPE_NEXUS_USERNAME}} -PossrhPassword=${{secrets.SONATYPE_NEXUS_PASSWORD}} --stacktrace
 
       - name: Create Release in Github

.github/workflows/ci-test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 8, 11, 17, 19 ] # LTS versions + latest version
     name: "Run tests with JDK ${{ matrix.java }}"
     steps:
       - uses: actions/checkout@v3
@@ -22,5 +22,5 @@ jobs:
 
       - uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.4
+          gradle-version: current
           arguments: test -Dtests.integration=localstack

README.md

@@ -12,6 +12,7 @@ Artifacts are published [here](https://search.maven.org/artifact/io.reactiverse/
 
 | Project | Vert.x | AWS sdk  |
 |---------|--------|----------|
+| 1.2.0   | 4.4.0  | 2.20.2   |
 | 1.1.0   | 4.2.4  | 2.17.129 |
 | 1.0.0   | 4.0.0  | 2.15.45  |
 | 0.7.0   | 3.9.4  | 2.15.23  |

build.gradle.kts

@@ -1,11 +1,12 @@
-val vertxVersion = "4.2.4"
-val awsSdkVersion = "2.17.129"
+val vertxVersion = "4.4.0"
+val awsSdkVersion = "2.20.22"
 val junit5Version = "5.8.2"
 val logbackVersion = "1.2.10"
+val localstackVersion = "0.2.22"
 val integrationOption = "tests.integration"
 
 group = "io.reactiverse"
-version = "1.1.0"
+version = "1.2.0"
 
 plugins {
     `java-library`
@@ -48,7 +49,7 @@ dependencies {
 
     testImplementation("io.vertx:vertx-junit5:$vertxVersion")
     testImplementation("io.vertx:vertx-rx-java2:$vertxVersion")
-    testImplementation("cloud.localstack:localstack-utils:0.2.20")
+    testImplementation("cloud.localstack:localstack-utils:$localstackVersion")
     testImplementation("ch.qos.logback:logback-classic:$logbackVersion")
     testImplementation("ch.qos.logback:logback-core:$logbackVersion")
     testImplementation("software.amazon.awssdk:aws-sdk-java:$awsSdkVersion")
@@ -126,7 +127,7 @@ tasks {
     }
 
     withType<Wrapper> {
-      gradleVersion = "7.4"
+      gradleVersion = "8.0"
     }
 
     withType<JavaCompile> {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/test/java/io/reactiverse/awssdk/integration/apigateway/VertxApiGatewaySpec.java

@@ -1,6 +1,7 @@
 package io.reactiverse.awssdk.integration.apigateway;
 
 import cloud.localstack.Localstack;
+import cloud.localstack.ServiceName;
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import io.reactiverse.awssdk.VertxSdkClient;
@@ -40,7 +41,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @EnabledIfSystemProperty(named = "tests.integration", matches = "localstack")
-@LocalstackDockerProperties(services = { "apigateway" }, imageTag = "0.12.2")
+@LocalstackDockerProperties(services = { ServiceName.API_GATEWAY }, imageTag = "1.4.0")
 @ExtendWith(VertxExtension.class)
 @ExtendWith(LocalstackDockerExtension.class)
 public class VertxApiGatewaySpec extends LocalStackBaseSpec {

src/test/java/io/reactiverse/awssdk/integration/cloudwatch/VertxCloudWatchClientSpec.java

@@ -1,6 +1,7 @@
 package io.reactiverse.awssdk.integration.cloudwatch;
 
 import cloud.localstack.Localstack;
+import cloud.localstack.ServiceName;
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import io.reactiverse.awssdk.VertxSdkClient;
@@ -26,7 +27,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = "tests.integration", matches = "localstack")
-@LocalstackDockerProperties(services = { "cloudwatch" }, imageTag = "0.12.2")
+@LocalstackDockerProperties(services = { ServiceName.CLOUDWATCH }, imageTag = "1.4.0")
 @ExtendWith(VertxExtension.class)
 @ExtendWith(LocalstackDockerExtension.class)
 public class VertxCloudWatchClientSpec extends LocalStackBaseSpec {

src/test/java/io/reactiverse/awssdk/integration/dynamodb/VertxDynamoClientSpec.java

@@ -1,6 +1,7 @@
 package io.reactiverse.awssdk.integration.dynamodb;
 
 import cloud.localstack.Localstack;
+import cloud.localstack.ServiceName;
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import io.reactiverse.awssdk.VertxSdkClient;
@@ -37,7 +38,7 @@
 @ExtendWith(VertxExtension.class)
 @ExtendWith(LocalstackDockerExtension.class)
 @EnabledIfSystemProperty(named = "tests.integration", matches = "localstack")
-@LocalstackDockerProperties(services = { "dynamodb" }, imageTag = "0.12.2")
+@LocalstackDockerProperties(services = { ServiceName.DYNAMO }, imageTag = "1.4.0")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class VertxDynamoClientSpec extends LocalStackBaseSpec {
 

src/test/java/io/reactiverse/awssdk/integration/firehose/VertxFirehoseClientSpec.java

@@ -1,6 +1,7 @@
 package io.reactiverse.awssdk.integration.firehose;
 
 import cloud.localstack.Localstack;
+import cloud.localstack.ServiceName;
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import io.reactiverse.awssdk.VertxSdkClient;
@@ -52,7 +53,7 @@
 @ExtendWith(VertxExtension.class)
 @ExtendWith(LocalstackDockerExtension.class)
 @EnabledIfSystemProperty(named = "tests.integration", matches = "localstack")
-@LocalstackDockerProperties(services = { "firehose", "s3" }, imageTag = "0.12.2")
+@LocalstackDockerProperties(services = { ServiceName.FIREHOSE, ServiceName.S3 }, imageTag = "1.4.0")
 public class VertxFirehoseClientSpec extends LocalStackBaseSpec {
 
     private final static String STREAM = "My-Vertx-Firehose-Stream";

src/test/java/io/reactiverse/awssdk/integration/kinesis/VertxKinesisClientSpec.java

@@ -1,6 +1,7 @@
 package io.reactiverse.awssdk.integration.kinesis;
 
 import cloud.localstack.Localstack;
+import cloud.localstack.ServiceName;
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import io.reactiverse.awssdk.VertxSdkClient;
@@ -41,7 +42,7 @@
 @ExtendWith(VertxExtension.class)
 @ExtendWith(LocalstackDockerExtension.class)
 @EnabledIfSystemProperty(named = "tests.integration", matches = "localstack")
-@LocalstackDockerProperties(services = { "kinesis" }, imageTag = "0.12.2")
+@LocalstackDockerProperties(services = { ServiceName.KINESIS }, imageTag = "1.4.0")
 public class VertxKinesisClientSpec extends LocalStackBaseSpec {
 
     private final static String STREAM = "my-awesome-stream";

src/test/java/io/reactiverse/awssdk/integration/lambda/VertxLambdaClientSpec.java

@@ -1,6 +1,7 @@
 package io.reactiverse.awssdk.integration.lambda;
 
 import cloud.localstack.Localstack;
+import cloud.localstack.ServiceName;
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import io.reactiverse.awssdk.VertxSdkClient;
@@ -38,7 +39,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @EnabledIfSystemProperty(named = "tests.integration", matches = "localstack")
-@LocalstackDockerProperties(services = { "lambda" }, imageTag = "0.12.2")
+@LocalstackDockerProperties(services = { ServiceName.LAMBDA }, imageTag = "1.4.0")
 @ExtendWith(VertxExtension.class)
 @ExtendWith(LocalstackDockerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)

src/test/java/io/reactiverse/awssdk/integration/s3/VertxS3ClientSpec.java

@@ -1,5 +1,6 @@
 package io.reactiverse.awssdk.integration.s3;
 
+import cloud.localstack.ServiceName;
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import io.reactiverse.awssdk.converters.VertxAsyncResponseTransformer;
@@ -51,7 +52,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIfSystemProperty(named = "tests.integration", matches = "localstack")
-@LocalstackDockerProperties(services = { "s3" }, imageTag = "0.12.2")
+@LocalstackDockerProperties(services = { ServiceName.S3 }, imageTag = "1.4.0")
 @ExtendWith(VertxExtension.class)
 @ExtendWith(LocalstackDockerExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)