Skip to content

Commit 9a13e41

Browse files
artembilangaryrussell
authored andcommitted
spring-projectsGH-164: Fix ZipTransformer deleteFile Mode
Fixes spring-projectsGH-164 (spring-projects#164) * Move `deleteFile` logic to the end of of `ZipTransformer#doZipTransform()` * Add `deleteFile = true` for the `ZipTransformerTests` * Add `<request-handler-advice-chain>` to the transformers XSD definitions * Upgrade to Gradle 3.0 * Upgrade dependencies Move delete logic before reply message creation
1 parent 0ba8414 commit 9a13e41

File tree

10 files changed

+189
-170
lines changed

10 files changed

+189
-170
lines changed

spring-integration-zip/build.gradle

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,42 @@
1-
description = 'Spring Integration Zip Adapter'
2-
31
buildscript {
42
repositories {
53
maven { url 'https://repo.spring.io/plugins-release' }
64
}
75
}
86

9-
apply plugin: 'java'
10-
apply from: "${rootProject.projectDir}/publish-maven.gradle"
11-
apply plugin: 'eclipse'
12-
apply plugin: 'idea'
13-
apply plugin: 'jacoco'
7+
plugins {
8+
id 'java'
9+
id 'eclipse'
10+
id 'idea'
11+
id 'jacoco'
12+
id 'org.sonarqube' version '2.1-rc3'
13+
}
14+
15+
description = 'Spring Integration Zip Adapter'
16+
17+
18+
apply from: "${rootProject.projectDir}/publish-maven.gradle"
1419

1520
group = 'org.springframework.integration'
1621

1722
repositories {
18-
if (version.endsWith('BUILD-SNAPSHOT')) {
19-
maven { url 'https://repo.spring.io/libs-snapshot' }
23+
if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
24+
maven { url 'http://repo.spring.io/libs-snapshot' }
2025
}
2126
maven { url 'https://repo.spring.io/libs-milestone' }
22-
mavenCentral()
27+
}
28+
29+
if (project.hasProperty('platformVersion')) {
30+
apply plugin: 'spring-io'
31+
32+
dependencyManagement {
33+
springIoTestRuntime {
34+
imports {
35+
mavenBom "io.spring.platform:platform-bom:${platformVersion}"
36+
}
37+
38+
}
39+
}
2340
}
2441

2542
sourceCompatibility=1.6
@@ -34,8 +51,8 @@ ext {
3451
linkScmConnection = 'https://github.com/spring-projects/spring-integration-extensions.git'
3552
linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-extensions.git'
3653

37-
slf4jVersion = "1.7.13"
38-
springIntegrationVersion = '4.2.4.RELEASE'
54+
slf4jVersion = "1.7.21"
55+
springIntegrationVersion = '4.3.1.RELEASE'
3956
ztZipVersion = '1.9'
4057

4158
idPrefix = 'zip'
@@ -56,7 +73,7 @@ sourceSets {
5673
}
5774

5875
jacoco {
59-
toolVersion = "0.7.2.201409121644"
76+
toolVersion = "0.7.6.201602180812"
6077
}
6178

6279
dependencies {
@@ -73,14 +90,6 @@ dependencies {
7390
ext.xLintArg = '-Xlint:all,-options'
7491
[compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
7592

76-
jacocoTestReport {
77-
reports {
78-
xml.enabled false
79-
csv.enabled false
80-
html.destination "${buildDir}/reports/jacoco/html"
81-
}
82-
}
83-
8493
test {
8594
// suppress all console output during testing unless running `gradle -i`
8695
logging.captureStandardOutput(LogLevel.INFO)
@@ -91,6 +100,14 @@ test {
91100
}
92101
}
93102

103+
jacocoTestReport {
104+
reports {
105+
xml.enabled false
106+
csv.enabled false
107+
html.destination "${buildDir}/reports/jacoco/html"
108+
}
109+
}
110+
94111
task sourcesJar(type: Jar) {
95112
classifier = 'sources'
96113
from sourceSets.main.allJava
@@ -108,10 +125,8 @@ artifacts {
108125

109126
build.dependsOn jacocoTestReport
110127

111-
apply plugin: 'sonar-runner'
112-
113-
sonarRunner {
114-
sonarProperties {
128+
sonarqube {
129+
properties {
115130
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
116131
property "sonar.links.homepage", linkHomepage
117132
property "sonar.links.ci", linkCi
@@ -245,9 +260,3 @@ task dist(dependsOn: assemble) {
245260
group = 'Distribution'
246261
description = 'Builds -dist, -docs and -schema distribution archives.'
247262
}
248-
249-
task wrapper(type: Wrapper) {
250-
description = 'Generates gradlew[.bat] scripts'
251-
gradleVersion = '2.5'
252-
distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
253-
}
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Jan 07 20:03:45 EST 2016
1+
#Fri Sep 09 09:39:49 EDT 2016
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-2.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

spring-integration-zip/gradlew

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,30 @@
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`
@@ -161,4 +161,9 @@ function splitJvmOpts() {
161161
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162162
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163163

164+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165+
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
166+
cd "$(dirname "$0")"
167+
fi
168+
164169
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

spring-integration-zip/gradlew.bat

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1411
set DIRNAME=%~dp0
1512
if "%DIRNAME%" == "" set DIRNAME=.
1613
set APP_BASE_NAME=%~n0
1714
set APP_HOME=%DIRNAME%
1815

16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

@@ -46,10 +46,9 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@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

0 commit comments

Comments
 (0)