From b19535b57015f56f8d22a29f3d185c89c08b4754 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 22 Mar 2019 13:39:43 -0400 Subject: [PATCH] Fix Gradle build to read files in UTF-8 https://build.spring.io/browse/INT-SI51X-18 When we have non-standard symbols in the source code, the `updateCopyrights` Gradle task may break them after because of non-compatible encoding between file reader and source code. * Add `org.gradle.jvmargs='-Dfile.encoding=UTF-8'` to the `gradle.properties` to enforce an expected file reading encoding. * Fix `AbstractFilePayloadTransformerTests` to bring non-standard symbols back --- build.gradle | 2 +- gradle.properties | 1 + .../file/transformer/AbstractFilePayloadTransformerTests.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index dce6cf8fdf..46804be088 100644 --- a/build.gradle +++ b/build.gradle @@ -232,7 +232,7 @@ subprojects { subproject -> def years = "$beginningYear-$now" def sourceCode = file.text sourceCode = sourceCode.replaceFirst(/20\d\d(-20\d\d)?/, years) - file.write(sourceCode) + file.text = sourceCode println "Copyright updated for file: $file" } break diff --git a/gradle.properties b/gradle.properties index fa9ef2b6dd..f635866aca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ version=5.1.4.BUILD-SNAPSHOT +org.gradle.jvmargs='-Dfile.encoding=UTF-8' diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java index 46a39802b8..df442dbded 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java @@ -42,7 +42,7 @@ public abstract class AbstractFilePayloadTransformerTests