Skip to content

Commit d304f74

Browse files
committed
SHL-187: Build and Test fail on Windows
This closes spring-projects#91
1 parent ec9e3d4 commit d304f74

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ if (project.hasProperty('platformVersion')) {
3838

3939
[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial", "-Xlint:unchecked", "-Xlint:rawtypes"]
4040

41+
[compileJava, compileTestJava]*.options*.encoding = "UTF-8"
42+
4143
dependencies {
4244
compile "org.springframework:spring-core:$springVersion"
4345
compile "org.springframework:spring-context-support:$springVersion"
@@ -62,6 +64,7 @@ javadoc {
6264
ext.tmpDir = file("${buildDir}/api-work")
6365

6466
configure(options) {
67+
encoding = "UTF-8"
6568
stylesheetFile = file("${srcDir}/spring-javadoc.css")
6669
overview = "${srcDir}/overview.html"
6770
docFilesSubDirs = true

src/test/java/org/springframework/shell/table/AbstractTestWithSample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected String sample() throws IOException {
4242
this.getClass().getSimpleName(), testName.getMethodName());
4343
InputStream stream = TableTest.class.getResourceAsStream(sampleName);
4444
Assert.notNull(stream, "Can't find expected rendering result at " + sampleName);
45-
return FileCopyUtils.copyToString(new InputStreamReader(stream)).replace("&", "");
45+
return FileCopyUtils.copyToString(new InputStreamReader(stream, "UTF-8")).replace("&", "");
4646
}
4747

4848
/**

0 commit comments

Comments
 (0)