Upgrade SI-Cassandra dependencies

spring-integration-cassandra/build.gradle

@@ -10,8 +10,9 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'jacoco'
-    id 'org.sonarqube' version '2.6.2'
+    id 'org.sonarqube' version '2.7.1'
     id 'checkstyle'
+    id 'io.spring.dependency-management' version '1.0.8.RELEASE'
 }
 
 apply from: "${rootProject.projectDir}/publish-maven.gradle"
@@ -29,12 +30,12 @@ repositories {
 }
 
 ext {
-    assertjVersion = '3.11.1'
-    cassandraUnitVersion = '3.5.0.1'
-    slf4jVersion = '1.7.25'
-    reactorVersion = '3.2.5.RELEASE'
-    springDataCassandraVersion = '2.1.4.RELEASE'
-    springIntegrationVersion = '5.1.4.BUILD-SNAPSHOT'
+    assertjVersion = '3.13.2'
+    cassandraUnitVersion = '3.11.2.0'
+    slf4jVersion = '1.7.28'
+    reactorVersion = 'Dysprosium-RELEASE'
+    springDataVersion = 'Moore-RELEASE'
+    springIntegrationVersion = '5.2.0.RELEASE'
 
     idPrefix = 'cassandra'
 
@@ -47,6 +48,23 @@ ext {
 
 }
 
+dependencyManagement {
+    resolutionStrategy {
+        cacheChangingModulesFor 0, 'seconds'
+    }
+    applyMavenExclusions = false
+    generatedPomCustomization {
+        enabled = false
+    }
+
+    imports {
+        mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion"
+        mavenBom "org.springframework.data:spring-data-releasetrain:$springDataVersion"
+        mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
+    }
+
+}
+
 compileJava {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -63,24 +81,24 @@ sourceSets {
 }
 
 jacoco {
-    toolVersion = "0.8.2"
+    toolVersion = '0.8.4'
 }
 
 checkstyle {
     configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
-    toolVersion = "8.16"
+    toolVersion = '8.24'
 }
 
 
 dependencies {
-    compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
-    compile "org.springframework.data:spring-data-cassandra:$springDataCassandraVersion"
+    compile 'org.springframework.integration:spring-integration-core'
+    compile 'org.springframework.data:spring-data-cassandra'
 
-    testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion"
+    testCompile 'org.springframework.integration:spring-integration-test'
 
     testCompile "org.assertj:assertj-core:$assertjVersion"
     testCompile "org.cassandraunit:cassandra-unit-spring:$cassandraUnitVersion"
-    testCompile "io.projectreactor:reactor-test:$reactorVersion"
+    testCompile 'io.projectreactor:reactor-test'
 
     testRuntime "org.slf4j:jcl-over-slf4j:$slf4jVersion"
 }
@@ -121,13 +139,13 @@ task javadocJar(type: Jar) {
 
 sonarqube {
     properties {
-        property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
-        property "sonar.links.homepage", linkHomepage
-        property "sonar.links.ci", linkCi
-        property "sonar.links.issue", linkIssue
-        property "sonar.links.scm", linkScmUrl
-        property "sonar.links.scm_dev", linkScmDevConnection
-        property "sonar.java.coveragePlugin", "jacoco"
+        property 'sonar.jacoco.reportPath', "${buildDir.name}/jacoco.exec"
+        property 'sonar.links.homepage', linkHomepage
+        property 'sonar.links.ci', linkCi
+        property 'sonar.links.issue', linkIssue
+        property 'sonar.links.scm', linkScmUrl
+        property 'sonar.links.scm_dev', linkScmDevConnection
+        property 'sonar.java.coveragePlugin', 'jacoco'
     }
 }
 

spring-integration-cassandra/gradle.properties

@@ -1 +1 @@
-version=0.6.1.BUILD-SNAPSHOT
+version=0.7.0.BUILD-SNAPSHOT

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-5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

spring-integration-cassandra/gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 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.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

spring-integration-cassandra/gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @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"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

spring-integration-cassandra/publish-maven.gradle

@@ -14,6 +14,17 @@ install {
 
 def customizePom(pom, gradleProject) {
 	pom.whenConfigured { generatedPom ->
+
+		// sort to make pom dependencies order consistent to ease comparison of older poms
+		generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
+			"$dep.scope:$dep.groupId:$dep.artifactId"
+		}
+
+		def managedVersions = dependencyManagement.managedVersions
+		generatedPom.dependencies.findAll{dep -> !dep.version }.each { dep ->
+			dep.version = managedVersions["${dep.groupId}:${dep.artifactId}"]
+		}
+
 		// respect 'optional' and 'provided' dependencies
 		gradleProject.optionalDeps.each { dep ->
 			generatedPom.dependencies.find { it.artifactId == dep.name }?.optional = true
@@ -46,15 +57,26 @@ def customizePom(pom, gradleProject) {
 
 			scm {
 				url = linkScmUrl
-				connection = 'scm:git:' + linkScmConnection
-				developerConnection = 'scm:git:' + linkScmDevConnection
+				connection = "scm:git:$linkScmConnection"
+				developerConnection = "scm:git:$linkScmDevConnection"
+			}
+
+			issueManagement {
+				system = 'GutHub'
+				url = linkIssue
 			}
 
 			developers {
 				developer {
-					id = 'schacko'
-					name = 'Soby Chacko'
-					email = 'schacko@pivotal.io'
+					id = 'garyrussell'
+					name = 'Gary Russell'
+					email = 'grussell@pivotal.io'
+					roles = ['project lead']
+				}
+				developer {
+					id = 'abilan'
+					name = 'Artem Bilan'
+					email = 'abilan@pivotal.io'
 				}
 			}
 		}

spring-integration-cassandra/src/main/resources/META-INF/spring.schemas

@@ -1,5 +1,3 @@
-http\://www.springframework.org/schema/integration/cassandra/spring-integration-cassandra-1.0.xsd=org/springframework/integration/config/xml/spring-integration-cassandra-1.0.xsd
-http\://www.springframework.org/schema/integration/cassandra/spring-integration-cassandra.xsd=org/springframework/integration/config/xml/spring-integration-cassandra-1.0.xsd
-https\://www.springframework.org/schema/integration/cassandra/spring-integration-cassandra-1.0.xsd=org/springframework/integration/config/xml/spring-integration-cassandra-1.0.xsd
-https\://www.springframework.org/schema/integration/cassandra/spring-integration-cassandra.xsd=org/springframework/integration/config/xml/spring-integration-cassandra-1.0.xsd
+http\://www.springframework.org/schema/integration/cassandra/spring-integration-cassandra.xsd=org/springframework/integration/config/xml/spring-integration-cassandra.xsd
+https\://www.springframework.org/schema/integration/cassandra/spring-integration-cassandra.xsd=org/springframework/integration/config/xml/spring-integration-cassandra.xsd