diff --git a/spring-integration-cassandra/build.gradle b/spring-integration-cassandra/build.gradle index 17f9749..57fcb31 100644 --- a/spring-integration-cassandra/build.gradle +++ b/spring-integration-cassandra/build.gradle @@ -5,8 +5,8 @@ plugins { id 'jacoco' id 'org.sonarqube' version '2.8' id 'checkstyle' - 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.2' } description = 'Spring Integration Cassandra Support' @@ -14,7 +14,7 @@ description = 'Spring Integration Cassandra Support' group = 'org.springframework.integration' repositories { - if (version.endsWith('BUILD-SNAPSHOT')) { + if (version.endsWith('-SNAPSHOT')) { maven { url 'https://repo.spring.io/libs-snapshot' } } maven { url 'https://repo.spring.io/libs-milestone' } @@ -22,13 +22,13 @@ repositories { } ext { - assertjVersion = '3.16.1' + assertjVersion = '3.18.0' cassandraUnitVersion = '4.3.1.0' - junitVersion = '5.6.2' - reactorVersion = 'Dysprosium-SR7' + junitVersion = '5.7.0' + reactorVersion = '2020.0.0' slf4jVersion = '1.7.30' - springDataVersion = 'Neumann-SR1' - springIntegrationVersion = '5.3.1.RELEASE' + springDataVersion = '2020.0.0' + springIntegrationVersion = '5.4.0' idPrefix = 'cassandra' @@ -52,7 +52,7 @@ dependencyManagement { imports { mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" - mavenBom "org.springframework.data:spring-data-releasetrain:$springDataVersion" + mavenBom "org.springframework.data:spring-data-bom:$springDataVersion" mavenBom "io.projectreactor:reactor-bom:$reactorVersion" mavenBom "org.junit:junit-bom:$junitVersion" } @@ -80,12 +80,12 @@ sourceSets { } jacoco { - toolVersion = '0.8.5' + toolVersion = '0.8.6' } checkstyle { configDirectory.set(rootProject.file("src/checkstyle")) - toolVersion = '8.32' + toolVersion = '8.36.2' } diff --git a/spring-integration-cassandra/gradle/wrapper/gradle-wrapper.jar b/spring-integration-cassandra/gradle/wrapper/gradle-wrapper.jar index 62d4c05..e708b1c 100644 Binary files a/spring-integration-cassandra/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-cassandra/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-integration-cassandra/gradle/wrapper/gradle-wrapper.properties b/spring-integration-cassandra/gradle/wrapper/gradle-wrapper.properties index 622ab64..be52383 100644 --- a/spring-integration-cassandra/gradle/wrapper/gradle-wrapper.properties +++ b/spring-integration-cassandra/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/spring-integration-cassandra/gradlew b/spring-integration-cassandra/gradlew index fbd7c51..4f906e0 100755 --- a/spring-integration-cassandra/gradlew +++ b/spring-integration-cassandra/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/spring-integration-cassandra/gradlew.bat b/spring-integration-cassandra/gradlew.bat index a9f778a..ac1b06f 100644 --- a/spring-integration-cassandra/gradlew.bat +++ b/spring-integration-cassandra/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/spring-integration-cassandra/publish-maven.gradle b/spring-integration-cassandra/publish-maven.gradle index a058a78..e903381 100644 --- a/spring-integration-cassandra/publish-maven.gradle +++ b/spring-integration-cassandra/publish-maven.gradle @@ -34,7 +34,7 @@ publishing { developer { id = 'artembilan' name = 'Artem Bilan' - email = 'abilan@pivotal.io' + email = 'abilan@vmware.com' roles = ['project lead'] } } diff --git a/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/config/xml/CassandraParserUtils.java b/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/config/xml/CassandraParserUtils.java index d7ffcc0..6056765 100644 --- a/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/config/xml/CassandraParserUtils.java +++ b/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/config/xml/CassandraParserUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-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. @@ -46,12 +46,12 @@ public final class CassandraParserUtils { String ingestQuery = element.getAttribute("ingest-query"); String query = element.getAttribute("query"); - if (StringUtils.isEmpty(cassandraTemplate)) { + if (!StringUtils.hasText(cassandraTemplate)) { parserContext.getReaderContext().error("cassandra-template is required", element); } builder.addConstructorArgReference(cassandraTemplate); - if (!StringUtils.isEmpty(mode)) { + if (StringUtils.hasText(mode)) { builder.addConstructorArgValue(mode); } @@ -92,7 +92,7 @@ public final class CassandraParserUtils { public static boolean areMutuallyExclusive(String query, BeanDefinition statementExpressionDef, String ingestQuery) { - return StringUtils.isEmpty(query) && statementExpressionDef == null && StringUtils.isEmpty(ingestQuery) + return !StringUtils.hasText(query) && statementExpressionDef == null && !StringUtils.hasText(ingestQuery) || !(StringUtils.hasText(query) && statementExpressionDef != null && StringUtils.hasText(ingestQuery)) && (StringUtils.hasText(query) ^ statementExpressionDef != null) ^ StringUtils.hasText(ingestQuery); } diff --git a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandlerTests.java b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandlerTests.java index b5bde0f..997a45f 100644 --- a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandlerTests.java +++ b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandlerTests.java @@ -180,7 +180,7 @@ public class CassandraMessageHandlerTests { @Override public String[] getEntityBasePackages() { - return new String[] { Book.class.getPackage().getName() }; + return new String[]{ Book.class.getPackage().getName() }; } @Bean