Upgrade to Gradle 4.0 and Checkstyle 8.0

This commit is contained in:
Artem Bilan
2017-07-07 19:54:04 -04:00
parent 0bd7d4e198
commit 6474ce9bb6
7 changed files with 16 additions and 19 deletions

View File

@@ -3,8 +3,8 @@ buildscript {
maven { url 'https://repo.spring.io/plugins-release' }
}
dependencies {
classpath 'io.spring.gradle:dependency-management-plugin:1.0.0.RC2'
classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
classpath 'io.spring.gradle:dependency-management-plugin:1.0.2.RELEASE'
classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
}
}
@@ -14,7 +14,7 @@ plugins {
id 'idea'
id 'jacoco'
id 'checkstyle'
id 'org.sonarqube' version '2.1'
id 'org.sonarqube' version '2.5'
}
description = 'Spring Integration Hazelcast Support'
@@ -53,9 +53,9 @@ compileTestJava {
}
ext {
hazelcastVersion = '3.7.4'
slf4jVersion = '1.7.22'
springIntegrationVersion = '4.3.6.RELEASE'
hazelcastVersion = '3.8.3'
slf4jVersion = '1.7.25'
springIntegrationVersion = '4.3.10.RELEASE'
idPrefix = 'hazelcast'
@@ -78,12 +78,12 @@ sourceSets {
}
jacoco {
toolVersion = "0.7.8"
toolVersion = "0.7.9"
}
checkstyle {
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
toolVersion = "6.16.1"
toolVersion = "8.0"
}
// enable all compiler warnings; individual projects may customize further
@@ -116,7 +116,7 @@ jacocoTestReport {
reports {
xml.enabled false
csv.enabled false
html.destination "${buildDir}/reports/jacoco/html"
html.destination file("${buildDir}/reports/jacoco/html")
}
}

View File

@@ -1,6 +1,6 @@
#Mon Jan 23 13:52:31 EST 2017
#Fri Jul 07 17:27:53 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

View File

@@ -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
@@ -155,7 +155,7 @@ if $cygwin ; then
fi
# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}

View File

@@ -4,8 +4,6 @@
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
<suppress files="package-info\.java" checks=".*" />
<suppress files="[\\/]test[\\/]" checks="RequireThis" />
<suppress files="[\\/]test[\\/]" checks="FinalClass" />
<suppress files="[\\/]test[\\/]" checks="AvoidStaticImport" />
<suppress files="[\\/]test[\\/]" checks="InnerTypeLast" />
<suppress files="[\\/]test[\\/]" checks="Javadoc*" />

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015 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.
@@ -26,7 +26,6 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
import org.springframework.integration.hazelcast.inbound.HazelcastClusterMonitorMessageProducer;
import org.springframework.util.StringUtils;
/**

View File

@@ -133,7 +133,7 @@ public class LeaderInitiator implements SmartLifecycle, DisposableBean, Applicat
* @param leaderEventPublisher the event publisher
*/
public void setLeaderEventPublisher(LeaderEventPublisher leaderEventPublisher) {
Assert.notNull(leaderEventPublisher);
Assert.notNull(leaderEventPublisher, "'leaderEventPublisher' must not be null");
this.leaderEventPublisher = leaderEventPublisher;
this.customPublisher = true;
}