[geode] branch develop updated: GEODE-6090: Reverting changes, causes new clones to get modified files.

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 184dd3c  GEODE-6090: Reverting changes, causes new clones to get modified files.
184dd3c is described below

commit 184dd3c81b9f23cfef6552b33b083ceaa4c90896
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Nov 26 09:47:39 2018 -0800

    GEODE-6090: Reverting changes, causes new clones to get modified files.
    
    Revert "GEODE-6073:  All files have lf endings (#2873)"
    
    This reverts commit be99d7be0dd92159fc69856b8d26a046c3989e37.
---
 .gitattributes                 | 2 +-
 ci/scripts/windows/test-run.sh | 2 +-
 gradle/spotless.gradle         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index fcadb2c..36dd437 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 99c6255..43c6cf3 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 9910aaa..9b40405 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'