Upgrade to Gradle 4.0 and SI-4.3.10

spring-integration-zip/build.gradle

@@ -2,6 +2,10 @@ buildscript {
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
+	dependencies {
+		classpath 'io.spring.gradle:dependency-management-plugin:1.0.2.RELEASE'
+		classpath 'io.spring.gradle:spring-io-plugin:0.0.7.RELEASE'
+	}
 }
 
 plugins {
@@ -9,7 +13,7 @@ plugins {
 	id 'eclipse'
 	id 'idea'
 	id 'jacoco'
-	id 'org.sonarqube' version '2.1-rc3'
+	id "org.sonarqube" version "2.5"
 }
 
 description = 'Spring Integration Zip Adapter'
@@ -37,6 +41,12 @@ if (project.hasProperty('platformVersion')) {
 
 		}
 	}
+
+	springIoDependencyVersionMappingCheck {
+		configuration = configurations.testRuntime
+		failOnUnmappedDirectDependency = false
+		failOnUnmappedTransitiveDependency = true
+	}
 }
 
 sourceCompatibility=1.6
@@ -52,7 +62,7 @@ ext {
 	linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-extensions.git'
 
 	slf4jVersion = "1.7.21"
-	springIntegrationVersion = '4.3.1.RELEASE'
+	springIntegrationVersion = '4.3.10.RELEASE'
 	ztZipVersion = '1.9'
 
 	idPrefix = 'zip'
@@ -73,7 +83,7 @@ sourceSets {
 }
 
 jacoco {
-	toolVersion = "0.7.6.201602180812"
+	toolVersion = "0.7.8"
 }
 
 dependencies {
@@ -104,7 +114,7 @@ jacocoTestReport {
 	reports {
 		xml.enabled false
 		csv.enabled false
-		html.destination "${buildDir}/reports/jacoco/html"
+		html.destination file("${buildDir}/reports/jacoco/html")
 	}
 }
 

spring-integration-zip/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Sep 21 17:15:24 EDT 2016
+#Wed Jun 21 15:16:28 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

spring-integration-zip/gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

spring-integration-zip/gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

spring-integration-zip/src/test/java/org/springframework/integration/zip/config/xml/ZipTransformerParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015-2017 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
@@ -43,6 +43,8 @@ import org.springframework.util.Assert;
 
 /**
  * @author Gunnar Hillert
+ * @author Artem Bilan
+ *
  * @since 1.0
  */
 public class ZipTransformerParserTests {
@@ -139,8 +141,8 @@ public class ZipTransformerParserTests {
 			fail("Expected a BeanDefinitionParsingException to be thrown.");
 		}
 		catch (BeanCreationException e) {
-			assertThat(e.getMessage(), containsString("Failed to convert property value of type [java.lang.String] " +
-					"to required type [org.springframework.integration.zip.transformer.ZipResultType] "));
+			assertThat(e.getMessage(), containsString("Failed to convert property value of type 'java.lang.String' " +
+					"to required type 'org.springframework.integration.zip.transformer.ZipResultType'"));
 		}
 	}