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

aesteve · web-flow · commit e63d304cd97f · 2023-03-18T15:52:39.000+01:00
(upgrade)  v1.2.0
diff --git a/.github/workflows/ci-release.yml b/.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
diff --git a/.github/workflows/ci-snapshot.yml b/.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
diff --git a/.github/workflows/ci-test.yml b/.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
diff --git a/README.md b/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  |
diff --git a/build.gradle.kts b/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> {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/test/java/io/reactiverse/awssdk/integration/apigateway/VertxApiGatewaySpec.java b/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 {
diff --git a/src/test/java/io/reactiverse/awssdk/integration/cloudwatch/VertxCloudWatchClientSpec.java b/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 {
diff --git a/src/test/java/io/reactiverse/awssdk/integration/dynamodb/VertxDynamoClientSpec.java b/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 {
 
diff --git a/src/test/java/io/reactiverse/awssdk/integration/firehose/VertxFirehoseClientSpec.java b/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";
diff --git a/src/test/java/io/reactiverse/awssdk/integration/kinesis/VertxKinesisClientSpec.java b/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";
diff --git a/src/test/java/io/reactiverse/awssdk/integration/lambda/VertxLambdaClientSpec.java b/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)
diff --git a/src/test/java/io/reactiverse/awssdk/integration/s3/VertxS3ClientSpec.java b/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)
