diff --git a/.gitattributes b/.gitattributes
index fcadb2cf9791..36dd43751ff6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-* text eol=lf
+*.java text=auto eol=lf
diff --git a/ci/scripts/windows/test-run.sh b/ci/scripts/windows/test-run.sh
index 99c6255be8bf..43c6cf335deb 100755
--- a/ci/scripts/windows/test-run.sh
+++ b/ci/scripts/windows/test-run.sh
@@ -40,7 +40,7 @@ directories_file=${DEST_DIR}/artifact_directories
 echo "GRADLE_TASK = ${GRADLE_TASK}"
 echo "BASE_FILENAME = ${BASE_FILENAME}"
 
-DEFAULT_GRADLE_TASK_OPTIONS="--no-daemon -x javadoc"
+DEFAULT_GRADLE_TASK_OPTIONS="--no-daemon -x javadoc -x spotlessCheck"
 
 if [[ -n "${GRADLE_TEST_CATEGORY}" ]]; then
   GRADLE_TASK_OPTIONS="-PtestCategory=${GRADLE_TEST_CATEGORY}"
diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
index 9910aaacac5f..9b404054100b 100644
--- a/gradle/spotless.gradle
+++ b/gradle/spotless.gradle
@@ -18,6 +18,7 @@
 subprojects {
   apply plugin: "com.diffplug.gradle.spotless"
   spotless {
+    lineEndings = 'unix'
     java {
       target project.fileTree(project.projectDir) {
         include '**/*.java'