diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..48ca03426f2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,11 @@ +* text eol=lf + +*.groovy text diff=java +*.java text diff=java +*.kt text diff=java + +*.bat text eol=crlf + +*.gif binary +*.jar binary +*.jpg binary diff --git a/ci/scripts/build-project-windows.bat b/ci/scripts/build-project-windows.bat index 6087255d727..b260a9b1fad 100755 --- a/ci/scripts/build-project-windows.bat +++ b/ci/scripts/build-project-windows.bat @@ -1,4 +1,4 @@ -SET "JAVA_HOME=C:\opt\jdk-8" -SET PATH=%PATH%;C:\Program Files\Git\usr\bin -cd git-repo -.\gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 build +SET "JAVA_HOME=C:\opt\jdk-8" +SET PATH=%PATH%;C:\Program Files\Git\usr\bin +cd git-repo +.\gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 build diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema-sample.ldif b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema-sample.ldif index c5b81e84cee..91159a86b0f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema-sample.ldif +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema-sample.ldif @@ -1,7 +1,7 @@ -dn: dc=spring,dc=org -objectclass: top -objectclass: domain -objectclass: extensibleObject -objectClass: exampleAuxiliaryClass -dc: spring -exampleAttributeName: exampleAttributeName +dn: dc=spring,dc=org +objectclass: top +objectclass: domain +objectclass: extensibleObject +objectClass: exampleAuxiliaryClass +dc: spring +exampleAttributeName: exampleAttributeName diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif index 2bb925dd6d9..ca6a82170d1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif @@ -1,17 +1,17 @@ -dn: cn=schema -attributeTypes: ( 1.3.6.1.4.1.32473.1.1.1 - NAME 'exampleAttributeName' - DESC 'An example attribute type definition' - EQUALITY caseIgnoreMatch - ORDERING caseIgnoreOrderingMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 - SINGLE-VALUE - X-ORIGIN 'Managing Schema Document' ) -objectClasses: ( 1.3.6.1.4.1.32473.1.2.2 - NAME 'exampleAuxiliaryClass' - DESC 'An example auxiliary object class definition' - SUP top - AUXILIARY - MAY exampleAttributeName - X-ORIGIN 'Managing Schema Document' ) +dn: cn=schema +attributeTypes: ( 1.3.6.1.4.1.32473.1.1.1 + NAME 'exampleAttributeName' + DESC 'An example attribute type definition' + EQUALITY caseIgnoreMatch + ORDERING caseIgnoreOrderingMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE + X-ORIGIN 'Managing Schema Document' ) +objectClasses: ( 1.3.6.1.4.1.32473.1.2.2 + NAME 'exampleAuxiliaryClass' + DESC 'An example auxiliary object class definition' + SUP top + AUXILIARY + MAY exampleAttributeName + X-ORIGIN 'Managing Schema Document' ) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/load-stream.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/load-stream.json index 282e9ef7c7b..6dc66acf296 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/load-stream.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/load-stream.json @@ -1 +1 @@ -{"stream":"Loaded image: pack.local/builder/auqfjjbaod:latest\n"} +{"stream":"Loaded image: pack.local/builder/auqfjjbaod:latest\n"}