diff --git a/build.gradle b/build.gradle index b605a27..60f97fd 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ plugins { id 'jacoco' id 'org.sonarqube' version '2.8' id 'checkstyle' - id 'org.ajoberstar.grgit' version '4.0.0' - id "io.spring.dependency-management" version '1.0.8.RELEASE' - id 'com.jfrog.artifactory' version '4.11.0' + 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' } description = 'Spring Integration AWS Support' @@ -23,16 +23,16 @@ repositories { } ext { - assertjVersion = '3.14.0' - awaitilityVersion = '4.0.1' + assertjVersion = '3.16.1' + awaitilityVersion = '4.0.3' dynamodbLockClientVersion = '1.1.0' - jacksonVersion = '2.10.2' + jacksonVersion = '2.10.4' junitVersion = '5.5.2' servletApiVersion = '4.0.1' localstackVersion = '0.1.22' - log4jVersion = '2.13.0' - springCloudAwsVersion = '2.2.1.RELEASE' - springIntegrationVersion = '5.2.3.RELEASE' + log4jVersion = '2.13.3' + springCloudAwsVersion = '2.2.2.RELEASE' + springIntegrationVersion = '5.2.6.RELEASE' kinesisClientVersion = '1.13.0' kinesisProducerVersion = '0.14.0' @@ -94,8 +94,8 @@ jacoco { } checkstyle { - configFile = file("${rootDir}/src/checkstyle/checkstyle.xml") - toolVersion = '8.27' + configDirectory.set(rootProject.file("src/checkstyle")) + toolVersion = '8.32' } dependencies { @@ -144,11 +144,11 @@ javadoc { options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED options.author = true options.header = project.description - options.overview = 'src/api/overview.html' + options.overview = file('src/api/overview.html') options.stylesheetFile = file('src/api/stylesheet.css') options.splitIndex = true options.links(project.ext.javadocLinks) - + options.addStringOption('Xdoclint:none', '-quiet') source = sourceSets.main.allJava classpath = project.sourceSets.main.compileClasspath destinationDir = file("$buildDir/api") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc2..62d4c05 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 9492014..a4f0001 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.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7..fbd7c51 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +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 9618d8d..5093609 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%* 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% diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 8c634f4..cd161ef 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -5,17 +5,15 @@ - + - + - - - +