Skip to content

Commit 6e7b4cf

Browse files
committed
spring-projectsGH-169: Upgrade and prepare for release
Fixes spring-projectsGH-169 (spring-projects#169) * Upgrade Gradle and dependencies * Apply Checkstyle
1 parent ab73b6c commit 6e7b4cf

File tree

41 files changed

+2615
-2262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2615
-2262
lines changed

spring-integration-hazelcast/build.gradle

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
buildscript {
22
repositories {
3-
maven { url 'http://repo.spring.io/plugins-release' }
3+
maven { url 'https://repo.spring.io/plugins-release' }
44
}
55
dependencies {
6-
classpath 'io.spring.gradle:spring-io-plugin:0.0.5.RELEASE'
6+
classpath 'io.spring.gradle:dependency-management-plugin:1.0.0.RC2'
7+
classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
78
}
89
}
910

1011
plugins {
11-
id "org.sonarqube" version "1.2"
12+
id 'java'
13+
id 'eclipse'
14+
id 'idea'
15+
id 'jacoco'
16+
id 'checkstyle'
17+
id 'org.sonarqube' version '2.1'
1218
}
1319

1420
description = 'Spring Integration Hazelcast Support'
1521

16-
apply plugin: 'java'
1722
apply from: "${rootProject.projectDir}/publish-maven.gradle"
18-
apply plugin: 'eclipse'
19-
apply plugin: 'jacoco'
20-
apply plugin: 'idea'
2123

2224
group = 'org.springframework.integration'
2325

24-
2526
repositories {
2627
if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
2728
maven { url 'http://repo.spring.io/libs-snapshot' }
@@ -41,12 +42,20 @@ if (project.hasProperty('platformVersion')) {
4142
}
4243
}
4344

44-
sourceCompatibility = targetCompatibility = 1.7
45+
compileJava {
46+
sourceCompatibility = 1.7
47+
targetCompatibility = 1.7
48+
}
49+
50+
compileTestJava {
51+
sourceCompatibility = 1.8
52+
targetCompatibility = 1.8
53+
}
4554

4655
ext {
47-
hazelcastVersion = '3.6.4'
48-
slf4jVersion = '1.7.21'
49-
springIntegrationVersion = '4.3.1.BUILD-SNAPSHOT'
56+
hazelcastVersion = '3.7.4'
57+
slf4jVersion = '1.7.22'
58+
springIntegrationVersion = '4.3.6.RELEASE'
5059

5160
idPrefix = 'hazelcast'
5261

@@ -69,7 +78,12 @@ sourceSets {
6978
}
7079

7180
jacoco {
72-
toolVersion = "0.7.6.201602180812"
81+
toolVersion = "0.7.8"
82+
}
83+
84+
checkstyle {
85+
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
86+
toolVersion = "6.16.1"
7387
}
7488

7589
// enable all compiler warnings; individual projects may customize further
@@ -86,9 +100,6 @@ dependencies {
86100
testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"
87101
}
88102

89-
// enable all compiler warnings; individual projects may customize further
90-
[compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:all,-options']
91-
92103
test {
93104
// suppress all console output during testing unless running `gradle -i`
94105
logging.captureStandardOutput(LogLevel.INFO)
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jul 06 16:58:06 EDT 2016
1+
#Mon Jan 23 13:52:31 EST 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-2.14-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

spring-integration-hazelcast/gradlew

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
@@ -154,11 +154,19 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save ( ) {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
160161
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163163

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

spring-integration-hazelcast/gradlew.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ goto fail
4949
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5352

5453
:win9xME_args
5554
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
6059
if "x%~1" == "x" goto execute
6160

6261
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6862

6963
:execute
7064
@rem Setup the command line
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
^\Q/*\E$
2+
^\Q * Copyright \E20\d\d(\-20\d\d)?\Q the original author or authors.\E$
3+
^\Q *\E$
4+
^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
5+
^\Q * you may not use this file except in compliance with the License.\E$
6+
^\Q * You may obtain a copy of the License at\E$
7+
^\Q *\E$
8+
^\Q * http://www.apache.org/licenses/LICENSE-2.0\E$
9+
^\Q *\E$
10+
^\Q * Unless required by applicable law or agreed to in writing, software\E$
11+
^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$
12+
^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
13+
^\Q * See the License for the specific language governing permissions and\E$
14+
^\Q * limitations under the License.\E$
15+
^\Q */\E$
16+
^$
17+
^.*$
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE suppressions PUBLIC
3+
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
4+
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
5+
<suppressions>
6+
<suppress files="package-info\.java" checks=".*" />
7+
<suppress files="[\\/]test[\\/]" checks="RequireThis" />
8+
<suppress files="[\\/]test[\\/]" checks="FinalClass" />
9+
<suppress files="[\\/]test[\\/]" checks="AvoidStaticImport" />
10+
<suppress files="[\\/]test[\\/]" checks="InnerTypeLast" />
11+
<suppress files="[\\/]test[\\/]" checks="Javadoc*" />
12+
</suppressions>
Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
3+
<module name="Checker">
4+
5+
<module name="SuppressionFilter">
6+
<property name="file" value="src/checkstyle/checkstyle-suppressions.xml" />
7+
</module>
8+
9+
<!-- Root Checks -->
10+
<module name="RegexpHeader">
11+
<property name="headerFile" value="src/checkstyle/checkstyle-header.txt" />
12+
<property name="fileExtensions" value="java" />
13+
</module>
14+
<module name="NewlineAtEndOfFile">
15+
<property name="lineSeparator" value="lf"/>
16+
</module>
17+
18+
<!-- TreeWalker Checks -->
19+
<module name="TreeWalker">
20+
21+
<!-- Annotations -->
22+
<module name="AnnotationUseStyle">
23+
<property name="elementStyle" value="compact" />
24+
</module>
25+
<module name="MissingOverride" />
26+
<module name="PackageAnnotation" />
27+
<module name="AnnotationLocation">
28+
<property name="allowSamelineSingleParameterlessAnnotation"
29+
value="false" />
30+
</module>
31+
32+
<!-- Block Checks -->
33+
<module name="EmptyBlock">
34+
<property name="option" value="text" />
35+
</module>
36+
<module name="LeftCurly" />
37+
<module name="RightCurly">
38+
<property name="option" value="alone" />
39+
</module>
40+
<module name="NeedBraces" />
41+
<module name="AvoidNestedBlocks" />
42+
43+
<!-- Class Design -->
44+
<module name="FinalClass" />
45+
<module name="InterfaceIsType" />
46+
<module name="HideUtilityClassConstructor" />
47+
<module name="MutableException" />
48+
<module name="InnerTypeLast" />
49+
<module name="OneTopLevelClass" />
50+
51+
<!-- Coding -->
52+
<module name="CovariantEquals" />
53+
<module name="EmptyStatement" />
54+
<module name="EqualsHashCode" />
55+
<module name="InnerAssignment" />
56+
<module name="SimplifyBooleanExpression" />
57+
<module name="SimplifyBooleanReturn" />
58+
<module name="StringLiteralEquality" />
59+
<module name="NestedForDepth">
60+
<property name="max" value="3" />
61+
</module>
62+
<module name="NestedIfDepth">
63+
<property name="max" value="4" />
64+
</module>
65+
<module name="NestedTryDepth">
66+
<property name="max" value="3" />
67+
</module>
68+
<module name="MultipleVariableDeclarations" />
69+
<module name="RequireThis">
70+
<property name="checkMethods" value="false" />
71+
</module>
72+
<module name="OneStatementPerLine" />
73+
74+
<!-- Imports -->
75+
<module name="AvoidStarImport" />
76+
<module name="AvoidStaticImport">
77+
<property name="excludes"
78+
value="org.assertj.core.api.Assertions.*,
79+
org.junit.Assert.*,
80+
org.junit.Assume.*,
81+
org.junit.internal.matchers.ThrowableMessageMatcher.*,
82+
org.hamcrest.CoreMatchers.*,
83+
org.hamcrest.Matchers.*,
84+
org.mockito.Mockito.*,
85+
org.mockito.BDDMockito.*,
86+
org.mockito.Matchers.*" />
87+
</module>
88+
<module name="IllegalImport" />
89+
<module name="RedundantImport" />
90+
<module name="UnusedImports">
91+
<property name="processJavadoc" value="true" />
92+
</module>
93+
<module name="ImportOrder">
94+
<property name="groups" value="java,/^javax?\./,org,org.springframework,*" />
95+
<property name="ordered" value="true" />
96+
<property name="separated" value="true" />
97+
<property name="option" value="top" />
98+
<property name="sortStaticImportsAlphabetically" value="true" />
99+
</module>
100+
101+
<!-- Javadoc Comments -->
102+
<module name="JavadocType">
103+
<property name="scope" value="package"/>
104+
<property name="authorFormat" value=".+\s.+"/>
105+
</module>
106+
<module name="JavadocMethod">
107+
<property name="allowMissingJavadoc" value="true" />
108+
</module>
109+
<module name="JavadocVariable">
110+
<property name="scope" value="public"/>
111+
</module>
112+
<module name="JavadocStyle">
113+
<property name="checkEmptyJavadoc" value="true"/>
114+
</module>
115+
<module name="NonEmptyAtclauseDescription" />
116+
<module name="JavadocTagContinuationIndentation">
117+
<property name="offset" value="0"/>
118+
</module>
119+
<module name="AtclauseOrder">
120+
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
121+
<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
122+
</module>
123+
<module name="AtclauseOrder">
124+
<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
125+
<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
126+
</module>
127+
128+
<!-- Miscellaneous -->
129+
<module name="CommentsIndentation">
130+
<property name="tokens" value="BLOCK_COMMENT_BEGIN" />
131+
</module>
132+
<module name="UpperEll" />
133+
<module name="ArrayTypeStyle" />
134+
<module name="OuterTypeFilename" />
135+
136+
<!-- Modifiers -->
137+
<module name="RedundantModifier" />
138+
139+
<!-- Regexp -->
140+
<module name="RegexpSinglelineJava">
141+
<property name="format" value="^\t* +\t*\S" />
142+
<property name="message"
143+
value="Line has leading space characters; indentation should be performed with tabs only." />
144+
<property name="ignoreComments" value="true" />
145+
</module>
146+
<module name="RegexpSinglelineJava">
147+
<property name="maximum" value="0"/>
148+
<property name="format" value="org\.mockito\..*Mockito\.(when|doThrow|doAnswer)" />
149+
<property name="message"
150+
value="Please use BDDMockito instead of Mockito.(when|doThrow|doAnswer)." />
151+
<property name="ignoreComments" value="true" />
152+
</module>
153+
<!--<module name="RegexpSinglelineJava">
154+
<property name="maximum" value="0"/>
155+
<property name="format" value="org\.junit\.Assert\.assert" />
156+
<property name="message"
157+
value="Please use AssertJ imports." />
158+
<property name="ignoreComments" value="true" />
159+
</module>-->
160+
<module name="Regexp">
161+
<property name="format" value="[ \t]+$" />
162+
<property name="illegalPattern" value="true" />
163+
<property name="message" value="Trailing whitespace" />
164+
</module>
165+
<module name="Regexp">
166+
<property name="format" value="System.(out|err).print" />
167+
<property name="illegalPattern" value="true" />
168+
<property name="message" value="System.out or .err" />
169+
</module>
170+
<!-- Whitespace -->
171+
<module name="GenericWhitespace" />
172+
<module name="MethodParamPad" />
173+
<module name="NoWhitespaceAfter" >
174+
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/>
175+
</module>
176+
<module name="NoWhitespaceBefore" />
177+
<module name="ParenPad" />
178+
<module name="TypecastParenPad" />
179+
<module name="WhitespaceAfter" />
180+
<module name="WhitespaceAround" />
181+
182+
</module>
183+
</module>

0 commit comments

Comments
 (0)