Skip to content

Commit 6474ce9

Browse files
committed
Upgrade to Gradle 4.0 and Checkstyle 8.0
1 parent 0bd7d4e commit 6474ce9

File tree

7 files changed

+16
-19
lines changed

7 files changed

+16
-19
lines changed

spring-integration-hazelcast/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ buildscript {
33
maven { url 'https://repo.spring.io/plugins-release' }
44
}
55
dependencies {
6-
classpath 'io.spring.gradle:dependency-management-plugin:1.0.0.RC2'
7-
classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
6+
classpath 'io.spring.gradle:dependency-management-plugin:1.0.2.RELEASE'
7+
classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
88
}
99
}
1010

@@ -14,7 +14,7 @@ plugins {
1414
id 'idea'
1515
id 'jacoco'
1616
id 'checkstyle'
17-
id 'org.sonarqube' version '2.1'
17+
id 'org.sonarqube' version '2.5'
1818
}
1919

2020
description = 'Spring Integration Hazelcast Support'
@@ -53,9 +53,9 @@ compileTestJava {
5353
}
5454

5555
ext {
56-
hazelcastVersion = '3.7.4'
57-
slf4jVersion = '1.7.22'
58-
springIntegrationVersion = '4.3.6.RELEASE'
56+
hazelcastVersion = '3.8.3'
57+
slf4jVersion = '1.7.25'
58+
springIntegrationVersion = '4.3.10.RELEASE'
5959

6060
idPrefix = 'hazelcast'
6161

@@ -78,12 +78,12 @@ sourceSets {
7878
}
7979

8080
jacoco {
81-
toolVersion = "0.7.8"
81+
toolVersion = "0.7.9"
8282
}
8383

8484
checkstyle {
8585
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
86-
toolVersion = "6.16.1"
86+
toolVersion = "8.0"
8787
}
8888

8989
// enable all compiler warnings; individual projects may customize further
@@ -116,7 +116,7 @@ jacocoTestReport {
116116
reports {
117117
xml.enabled false
118118
csv.enabled false
119-
html.destination "${buildDir}/reports/jacoco/html"
119+
html.destination file("${buildDir}/reports/jacoco/html")
120120
}
121121
}
122122

Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jan 23 13:52:31 EST 2017
1+
#Fri Jul 07 17:27:53 EDT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

spring-integration-hazelcast/gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

spring-integration-hazelcast/src/checkstyle/checkstyle-suppressions.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
55
<suppressions>
66
<suppress files="package-info\.java" checks=".*" />
7-
<suppress files="[\\/]test[\\/]" checks="RequireThis" />
8-
<suppress files="[\\/]test[\\/]" checks="FinalClass" />
97
<suppress files="[\\/]test[\\/]" checks="AvoidStaticImport" />
108
<suppress files="[\\/]test[\\/]" checks="InnerTypeLast" />
119
<suppress files="[\\/]test[\\/]" checks="Javadoc*" />

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/config/xml/HazelcastClusterMonitorInboundChannelAdapterParser.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015 the original author or authors.
2+
* Copyright 2015-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
2626
import org.springframework.beans.factory.xml.ParserContext;
2727
import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
2828
import org.springframework.integration.hazelcast.inbound.HazelcastClusterMonitorMessageProducer;
29-
3029
import org.springframework.util.StringUtils;
3130

3231
/**

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/leader/LeaderInitiator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public LeaderInitiator(HazelcastInstance client, Candidate candidate) {
133133
* @param leaderEventPublisher the event publisher
134134
*/
135135
public void setLeaderEventPublisher(LeaderEventPublisher leaderEventPublisher) {
136-
Assert.notNull(leaderEventPublisher);
136+
Assert.notNull(leaderEventPublisher, "'leaderEventPublisher' must not be null");
137137
this.leaderEventPublisher = leaderEventPublisher;
138138
this.customPublisher = true;
139139
}

0 commit comments

Comments
 (0)