Skip to content

Commit 0c70635

Browse files
committed
spring-projectsGH-168: Upgrade to SI-4.3.6 and others
Fixes spring-projectsGH-168 (spring-projects#168)
1 parent f4990ee commit 0c70635

Some content is hidden

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

44 files changed

+908
-525
lines changed

spring-integration-smb/.travis.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
language: java
2+
jdk: oraclejdk8
3+
sudo: false
4+
before_cache:
5+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
6+
cache:
7+
directories:
8+
- $HOME/.gradle/caches/
9+
- $HOME/.gradle/wrapper/
10+
install: true
11+
script:
12+
- ./gradlew check --no-daemon

spring-integration-smb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Spring Integration Smb Support
33

44
## Introduction
55

6-
This module add Spring Integration* support for [Server Message Block][] (SMB).
6+
This module add Spring Integration support for [Server Message Block][] (SMB).
77

88
[Server Message Block]: http://en.wikipedia.org/wiki/Server_Message_Block
99

spring-integration-smb/build.gradle

Lines changed: 77 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,62 @@
1-
description = 'Spring Integration SMB Support'
2-
31
buildscript {
42
repositories {
5-
maven { url 'https://repo.springsource.org/plugins-snapshot' }
3+
maven { url 'https://repo.spring.io/plugins-release' }
64
}
75
dependencies {
8-
classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.5'
6+
classpath 'io.spring.gradle:dependency-management-plugin:1.0.0.RC2'
7+
classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
8+
classpath 'io.spring.gradle:docbook-reference-plugin:0.3.1'
99
}
1010
}
1111

12-
apply plugin: 'java'
12+
plugins {
13+
id 'java'
14+
id 'eclipse'
15+
id 'idea'
16+
id 'jacoco'
17+
id 'checkstyle'
18+
id 'org.sonarqube' version '2.1'
19+
}
20+
21+
description = 'Spring Integration SMB Support'
22+
1323
apply from: "${rootProject.projectDir}/publish-maven.gradle"
14-
apply plugin: 'eclipse'
15-
apply plugin: 'idea'
1624

1725
group = 'org.springframework.integration'
1826

1927
repositories {
20-
maven { url 'http://repo.springsource.org/libs-milestone' }
21-
maven { url 'http://repo.springsource.org/plugins-release' } // for bundlor
28+
if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
29+
maven { url 'http://repo.spring.io/libs-snapshot' }
30+
}
31+
maven { url 'http://repo.spring.io/libs-milestone' }
32+
}
33+
34+
if (project.hasProperty('platformVersion')) {
35+
apply plugin: 'spring-io'
36+
37+
dependencyManagement {
38+
springIoTestRuntime {
39+
imports {
40+
mavenBom "io.spring.platform:platform-bom:${platformVersion}"
41+
}
42+
}
43+
}
44+
}
45+
46+
compileJava {
47+
sourceCompatibility = 1.7
48+
targetCompatibility = 1.7
2249
}
2350

24-
// ensure JDK 5 compatibility (GRADLE-18; INT-1578)
25-
sourceCompatibility=1.6
26-
targetCompatibility=1.6
51+
compileTestJava {
52+
sourceCompatibility = 1.8
53+
targetCompatibility = 1.8
54+
}
2755

2856
ext {
29-
aspectjVersion = '1.6.8'
30-
cglibVersion = '2.2'
31-
commonsNetVersion = '3.0.1'
32-
groovyVersion = '1.8.5'
33-
jacksonVersion = '1.9.2'
34-
javaxActivationVersion = '1.1.1'
35-
junitVersion = '4.11'
36-
log4jVersion = '1.2.12'
37-
mockitoVersion = '1.9.0'
38-
39-
springVersion = '3.1.3.RELEASE'
40-
springIntegrationVersion = '2.2.1.RELEASE'
57+
jcifsVersion = '1.3.18.2'
58+
log4jVersion = '1.2.17'
59+
springIntegrationVersion = '4.3.6.RELEASE'
4160

4261
idPrefix = 'smb'
4362

@@ -50,24 +69,7 @@ ext {
5069

5170
}
5271

53-
dependencies {
54-
55-
compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
56-
compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion"
57-
compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion"
58-
compile "jcifs:jcifs:1.3.17"
59-
compile "org.springframework:spring-context-support:$springVersion"
60-
compile("javax.activation:activation:$javaxActivationVersion", optional)
61-
testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion"
62-
63-
}
64-
65-
66-
eclipse {
67-
project {
68-
natures += 'org.springframework.ide.eclipse.core.springnature'
69-
}
70-
}
72+
eclipse.project.natures += 'org.springframework.ide.eclipse.core.springnature'
7173

7274
sourceSets {
7375
test {
@@ -77,31 +79,43 @@ sourceSets {
7779
}
7880
}
7981

80-
// See http://www.gradle.org/docs/current/userguide/dependency_management.html#sub:configurations
81-
// and http://www.gradle.org/docs/current/dsl/org.gradle.api.artifacts.ConfigurationContainer.html
82-
configurations {
83-
jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo
82+
jacoco {
83+
toolVersion = "0.7.8"
84+
}
85+
86+
checkstyle {
87+
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
88+
toolVersion = "6.16.1"
8489
}
8590

86-
// dependencies that are common across all java projects
8791
dependencies {
88-
testCompile "cglib:cglib-nodep:$cglibVersion"
89-
testCompile "junit:junit-dep:$junitVersion"
90-
testCompile "log4j:log4j:$log4jVersion"
91-
testCompile "org.hamcrest:hamcrest-all:1.1"
92-
testCompile "org.mockito:mockito-all:$mockitoVersion"
93-
testCompile "org.springframework:spring-test:$springVersion"
94-
jacoco group: "org.jacoco", name: "org.jacoco.agent", version: "0.5.6.201201232323", classifier: "runtime"
92+
compile "org.codelibs:jcifs:$jcifsVersion"
93+
compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion"
94+
compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion"
95+
96+
testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion"
97+
testRuntime "log4j:log4j:$log4jVersion"
9598
}
9699

97100
// enable all compiler warnings; individual projects may customize further
98-
ext.xLintArg = '-Xlint:all'
99-
[compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
101+
[compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:all,-options,-processing']
102+
103+
jacocoTestReport {
104+
reports {
105+
xml.enabled false
106+
csv.enabled false
107+
html.destination "${buildDir}/reports/jacoco/html"
108+
}
109+
}
100110

101111
test {
102112
// suppress all console output during testing unless running `gradle -i`
103113
logging.captureStandardOutput(LogLevel.INFO)
104-
jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${buildDir}/jacoco.exec,includes=*"
114+
maxHeapSize = "1024m"
115+
jacoco {
116+
append = false
117+
destinationFile = file("$buildDir/jacoco.exec")
118+
}
105119
}
106120

107121
task sourcesJar(type: Jar) {
@@ -125,10 +139,8 @@ reference {
125139
sourceDir = file('src/reference/docbook')
126140
}
127141

128-
apply plugin: 'sonar-runner'
129-
130-
sonarRunner {
131-
sonarProperties {
142+
sonarqube {
143+
properties {
132144
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
133145
property "sonar.links.homepage", linkHomepage
134146
property "sonar.links.ci", linkCi
@@ -150,7 +162,7 @@ task api(type: Javadoc) {
150162

151163
source = sourceSets.main.allJava
152164
classpath = project.sourceSets.main.compileClasspath
153-
destinationDir = new File(buildDir, "api")
165+
destinationDir = file("$buildDir/api")
154166
}
155167

156168
task schemaZip(type: Zip) {
@@ -163,15 +175,15 @@ task schemaZip(type: Zip) {
163175
def shortName = idPrefix.replaceFirst("${idPrefix}-", '')
164176

165177
project.sourceSets.main.resources.find {
166-
it.path.endsWith('META-INF/spring.schemas')
178+
it.path.endsWith("META-INF${File.separator}spring.schemas")
167179
}?.withInputStream { schemas.load(it) }
168180

169181
for (def key : schemas.keySet()) {
170182
File xsdFile = project.sourceSets.main.resources.find {
171-
it.path.endsWith(schemas.get(key))
183+
it.path.replaceAll('\\\\', '/').endsWith(schemas.get(key))
172184
}
173185
assert xsdFile != null
174-
into ("integration/${shortName}") {
186+
into("integration/${shortName}") {
175187
from xsdFile.path
176188
}
177189
}
@@ -266,8 +278,3 @@ task dist(dependsOn: assemble) {
266278
group = 'Distribution'
267279
description = 'Builds -dist, -docs and -schema distribution archives.'
268280
}
269-
270-
task wrapper(type: Wrapper) {
271-
description = 'Generates gradlew[.bat] scripts'
272-
gradleVersion = '1.6'
273-
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.0.0.BUILD-SNAPSHOT
1+
version=0.5.0.BUILD-SNAPSHOT
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed May 15 22:13:48 EDT 2013
1+
#Mon Jan 16 10:37:27 EST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

spring-integration-smb/gradlew

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
50-
# Attempt to set APP_HOME
51-
# Resolve links: $0 may be a link
52-
PRG="$0"
53-
# Need this for relative symlinks.
54-
while [ -h "$PRG" ] ; do
55-
ls=`ls -ld "$PRG"`
56-
link=`expr "$ls" : '.*-> \(.*\)$'`
57-
if expr "$link" : '/.*' > /dev/null; then
58-
PRG="$link"
59-
else
60-
PRG=`dirname "$PRG"`"/$link"
61-
fi
62-
done
63-
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
65-
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
67-
6867
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6968

7069
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
9089
fi
9190

9291
# Increase the maximum file descriptors if we can.
93-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
9493
MAX_FD_LIMIT=`ulimit -H -n`
9594
if [ $? -eq 0 ] ; then
9695
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
114113
if $cygwin ; then
115114
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116115
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117117

118118
# We build the pattern for arguments to be converted via cygpath
119119
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -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 "$@")
163+
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
163171

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)