diff --git a/build.gradle b/build.gradle index 60f97fd..b49c44e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,11 @@ plugins { id 'eclipse' id 'idea' id 'jacoco' - id 'org.sonarqube' version '2.8' + id 'org.sonarqube' version '3.0' id 'checkstyle' id 'org.ajoberstar.grgit' version '4.0.2' - id "io.spring.dependency-management" version '1.0.9.RELEASE' - id 'com.jfrog.artifactory' version '4.15.2' + id "io.spring.dependency-management" version '1.0.10.RELEASE' + id 'com.jfrog.artifactory' version '4.17.0' } description = 'Spring Integration AWS Support' @@ -26,15 +26,15 @@ ext { assertjVersion = '3.16.1' awaitilityVersion = '4.0.3' dynamodbLockClientVersion = '1.1.0' - jacksonVersion = '2.10.4' - junitVersion = '5.5.2' + jacksonVersion = '2.11.2' + junitVersion = '5.6.2' servletApiVersion = '4.0.1' localstackVersion = '0.1.22' log4jVersion = '2.13.3' - springCloudAwsVersion = '2.2.2.RELEASE' - springIntegrationVersion = '5.2.6.RELEASE' - kinesisClientVersion = '1.13.0' - kinesisProducerVersion = '0.14.0' + springCloudAwsVersion = '2.2.3.RELEASE' + springIntegrationVersion = '5.2.8.RELEASE' + kinesisClientVersion = '1.13.3' + kinesisProducerVersion = '0.14.1' idPrefix = 'aws' @@ -95,7 +95,7 @@ jacoco { checkstyle { configDirectory.set(rootProject.file("src/checkstyle")) - toolVersion = '8.32' + toolVersion = '8.35' } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4f0001..6c9a224 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 5093609..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/org/springframework/integration/aws/inbound/kinesis/KclMessageDrivenChannelAdapter.java b/src/main/java/org/springframework/integration/aws/inbound/kinesis/KclMessageDrivenChannelAdapter.java index 5bded3d..44fea62 100644 --- a/src/main/java/org/springframework/integration/aws/inbound/kinesis/KclMessageDrivenChannelAdapter.java +++ b/src/main/java/org/springframework/integration/aws/inbound/kinesis/KclMessageDrivenChannelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ import com.amazonaws.services.kinesis.model.Record; * The {@link MessageProducerSupport} implementation for receiving data from Amazon * Kinesis stream(s) using AWS KCL. * - * @author Hervé Fortin + * @author Herv? Fortin * @author Artem Bilan * @author Dirk Bonhomme * @@ -293,7 +293,7 @@ public class KclMessageDrivenChannelAdapter extends MessageProducerSupport { KinesisClientLibConfiguration.DEFAULT_METRICS_MAX_QUEUE_SIZE, KinesisClientLibConfiguration.DEFAULT_VALIDATE_SEQUENCE_NUMBER_BEFORE_CHECKPOINTING, null, - KinesisClientLibConfiguration.DEFAULT_SHUTDOWN_GRACE_MILLIS); + KinesisClientLibConfiguration.DEFAULT_SHUTDOWN_GRACE_MILLIS, null); } this.consumerGroup = this.config.getApplicationName();