Skip to content
This repository was archived by the owner on Nov 10, 2025. It is now read-only.

Commit 99af572

Browse files
committed
Upgrade dependencies; prepare for release
* Fix compatibility with the latest KCL
1 parent e0df55a commit 99af572

File tree

6 files changed

+18
-33
lines changed

6 files changed

+18
-33
lines changed

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ plugins {
33
id 'eclipse'
44
id 'idea'
55
id 'jacoco'
6-
id 'org.sonarqube' version '2.8'
6+
id 'org.sonarqube' version '3.0'
77
id 'checkstyle'
88
id 'org.ajoberstar.grgit' version '4.0.2'
9-
id "io.spring.dependency-management" version '1.0.9.RELEASE'
10-
id 'com.jfrog.artifactory' version '4.15.2'
9+
id "io.spring.dependency-management" version '1.0.10.RELEASE'
10+
id 'com.jfrog.artifactory' version '4.17.0'
1111
}
1212

1313
description = 'Spring Integration AWS Support'
@@ -26,15 +26,15 @@ ext {
2626
assertjVersion = '3.16.1'
2727
awaitilityVersion = '4.0.3'
2828
dynamodbLockClientVersion = '1.1.0'
29-
jacksonVersion = '2.10.4'
30-
junitVersion = '5.5.2'
29+
jacksonVersion = '2.11.2'
30+
junitVersion = '5.6.2'
3131
servletApiVersion = '4.0.1'
3232
localstackVersion = '0.1.22'
3333
log4jVersion = '2.13.3'
34-
springCloudAwsVersion = '2.2.2.RELEASE'
35-
springIntegrationVersion = '5.2.6.RELEASE'
36-
kinesisClientVersion = '1.13.0'
37-
kinesisProducerVersion = '0.14.0'
34+
springCloudAwsVersion = '2.2.3.RELEASE'
35+
springIntegrationVersion = '5.2.8.RELEASE'
36+
kinesisClientVersion = '1.13.3'
37+
kinesisProducerVersion = '0.14.1'
3838

3939
idPrefix = 'aws'
4040

@@ -95,7 +95,7 @@ jacoco {
9595

9696
checkstyle {
9797
configDirectory.set(rootProject.file("src/checkstyle"))
98-
toolVersion = '8.32'
98+
toolVersion = '8.35'
9999
}
100100

101101
dependencies {

gradle/wrapper/gradle-wrapper.jar

293 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fi
130130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133-
133+
134134
JAVACMD=`cygpath --unix "$JAVACMD"`
135135

136136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
5454
set JAVA_HOME=%JAVA_HOME:"=%
5555
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5656

57-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5858

5959
echo.
6060
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
6464

6565
goto fail
6666

67-
:init
68-
@rem Get command-line arguments, handling Windows variants
69-
70-
if not "%OS%" == "Windows_NT" goto win9xME_args
71-
72-
:win9xME_args
73-
@rem Slurp the command line arguments.
74-
set CMD_LINE_ARGS=
75-
set _SKIP=2
76-
77-
:win9xME_args_slurp
78-
if "x%~1" == "x" goto execute
79-
80-
set CMD_LINE_ARGS=%*
81-
8267
:execute
8368
@rem Setup the command line
8469

8570
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8671

8772

8873
@rem Execute Gradle
89-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
9075

9176
:end
9277
@rem End local scope for the variables with windows NT shell

src/main/java/org/springframework/integration/aws/inbound/kinesis/KclMessageDrivenChannelAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 the original author or authors.
2+
* Copyright 2019-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@
7171
* The {@link MessageProducerSupport} implementation for receiving data from Amazon
7272
* Kinesis stream(s) using AWS KCL.
7373
*
74-
* @author Hervé Fortin
74+
* @author Herv? Fortin
7575
* @author Artem Bilan
7676
* @author Dirk Bonhomme
7777
*
@@ -293,7 +293,7 @@ protected void onInit() {
293293
KinesisClientLibConfiguration.DEFAULT_METRICS_MAX_QUEUE_SIZE,
294294
KinesisClientLibConfiguration.DEFAULT_VALIDATE_SEQUENCE_NUMBER_BEFORE_CHECKPOINTING,
295295
null,
296-
KinesisClientLibConfiguration.DEFAULT_SHUTDOWN_GRACE_MILLIS);
296+
KinesisClientLibConfiguration.DEFAULT_SHUTDOWN_GRACE_MILLIS, null);
297297
}
298298

299299
this.consumerGroup = this.config.getApplicationName();

0 commit comments

Comments
 (0)