diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index fecbe951ba..554d3db3eb 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -14,4 +14,4 @@ case "$1" in *) echo $"Unknown java version" exit 1 -esac \ No newline at end of file +esac diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index 8097ffbbba..a47962b975 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -43,4 +43,4 @@ if [[ ${existing_jdk_issues} = "" ]]; then POST "https://api.github.com/repos/${GITHUB_ORGANIZATION}/${GITHUB_REPO}/issues" > /dev/null || { echo "Failed to create issue" >&2; exit 1; } else echo "Issue already exists." -fi \ No newline at end of file +fi diff --git a/ci/tasks/build-pr-project.yml b/ci/tasks/build-pr-project.yml index 9430bc0057..b4576a4849 100644 --- a/ci/tasks/build-pr-project.yml +++ b/ci/tasks/build-pr-project.yml @@ -8,4 +8,4 @@ caches: - path: maven - path: gradle run: - path: git-repo/ci/scripts/build-project.sh \ No newline at end of file + path: git-repo/ci/scripts/build-project.sh diff --git a/pom.xml b/pom.xml index a00d7bd35b..57ed54a042 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,9 @@ src/checkstyle/checkstyle-suppressions.xml true main.basedir=${main.basedir} - **\/*.* + ./ + **/* + .git/**/*,target/**/* check diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html index 8b13789179..139597f9cb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html @@ -1 +1,2 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring b/spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring index 3411a395a4..5953917b3f 100755 --- a/spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring +++ b/spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring @@ -113,4 +113,4 @@ if $cygwin; then fi IFS=" " read -r -a javaOpts <<< "$JAVA_OPTS" -"${JAVA_HOME}/bin/java" "${javaOpts[@]}" -cp "$CLASSPATH" org.springframework.boot.loader.JarLauncher "$@" \ No newline at end of file +"${JAVA_HOME}/bin/java" "${javaOpts[@]}" -cp "$CLASSPATH" org.springframework.boot.loader.JarLauncher "$@" diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl b/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl index 340d4759c4..22cbd772e9 100644 --- a/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl +++ b/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-dependencies/src/main/xslt/single-project.xsl b/spring-boot-project/spring-boot-dependencies/src/main/xslt/single-project.xsl index 895d255cad..6ceb1e59f8 100644 --- a/spring-boot-project/spring-boot-dependencies/src/main/xslt/single-project.xsl +++ b/spring-boot-project/spring-boot-dependencies/src/main/xslt/single-project.xsl @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-starters/src/main/assembly/starter-poms-assembly.xml b/spring-boot-project/spring-boot-starters/src/main/assembly/starter-poms-assembly.xml index cbc5e48bec..dc90e356e2 100644 --- a/spring-boot-project/spring-boot-starters/src/main/assembly/starter-poms-assembly.xml +++ b/spring-boot-project/spring-boot-starters/src/main/assembly/starter-poms-assembly.xml @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-test/src/main/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensions.kt b/spring-boot-project/spring-boot-test/src/main/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensions.kt index 064e821baa..d8141d7220 100644 --- a/spring-boot-project/spring-boot-test/src/main/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensions.kt +++ b/spring-boot-project/spring-boot-test/src/main/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensions.kt @@ -274,4 +274,4 @@ inline fun TestRestTemplate.exchange(url: URI, method: HttpMet */ @Throws(RestClientException::class) inline fun TestRestTemplate.exchange(requestEntity: RequestEntity<*>): ResponseEntity = - exchange(requestEntity, object : ParameterizedTypeReference() {}) \ No newline at end of file + exchange(requestEntity, object : ParameterizedTypeReference() {}) diff --git a/spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources b/spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources +++ b/spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic b/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic +++ b/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources b/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources +++ b/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-test/src/test/resources/static/instatic b/spring-boot-project/spring-boot-test/src/test/resources/static/instatic index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-test/src/test/resources/static/instatic +++ b/spring-boot-project/spring-boot-test/src/test/resources/static/instatic @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp b/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp index e69de29bb2..8b13789179 100644 --- a/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp +++ b/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/src/main/kotlin/org/test/SampleApplication.kt b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/src/main/kotlin/org/test/SampleApplication.kt index 2588a9247c..a78d47ab61 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/src/main/kotlin/org/test/SampleApplication.kt +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/src/main/kotlin/org/test/SampleApplication.kt @@ -19,4 +19,4 @@ package org.test; fun main(args: Array) { -} \ No newline at end of file +} diff --git a/spring-boot-samples/spring-boot-sample-oauth2-resource-server/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-oauth2-resource-server/src/main/resources/application.yml index 885202551f..b646f10227 100644 --- a/spring-boot-samples/spring-boot-sample-oauth2-resource-server/src/main/resources/application.yml +++ b/spring-boot-samples/spring-boot-sample-oauth2-resource-server/src/main/resources/application.yml @@ -4,4 +4,4 @@ spring: resource: jwt: # To run the application, replace this with a valid JWK Set URI - jwk-set-uri: https://example.com/oauth2/default/v1/keys \ No newline at end of file + jwk-set-uri: https://example.com/oauth2/default/v1/keys diff --git a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml index de1516ce84..eaa5de3c96 100644 --- a/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml +++ b/spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/main/resources/application.yml @@ -22,4 +22,4 @@ spring: client-secret: ${YAHOO-CLIENT-SECRET} provider: yahoo-oidc: - issuer-uri: https://api.login.yahoo.com \ No newline at end of file + issuer-uri: https://api.login.yahoo.com diff --git a/spring-boot-samples/spring-boot-sample-reactive-oauth2-resource-server/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-reactive-oauth2-resource-server/src/main/resources/application.yml index 23f8d2ae96..7ac3b07dc6 100644 --- a/spring-boot-samples/spring-boot-sample-reactive-oauth2-resource-server/src/main/resources/application.yml +++ b/spring-boot-samples/spring-boot-sample-reactive-oauth2-resource-server/src/main/resources/application.yml @@ -4,4 +4,4 @@ spring: resourceserver: jwt: # To run the application, replace this with a valid JWK Set URI - jwk-set-uri: https://example.com/oauth2/default/v1/keys \ No newline at end of file + jwk-set-uri: https://example.com/oauth2/default/v1/keys diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html index 325c1f7946..474e67a1c0 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html +++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html @@ -3,4 +3,4 @@

Hello

Hello World! - \ No newline at end of file + diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml index ba76982111..4ff13ba3c2 100644 --- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/src/main/webapp/WEB-INF/glassfish-web.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 0be213a211..9936b8e1cf 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -3,8 +3,12 @@ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd"> - + + + + + diff --git a/src/checkstyle/nohttp-whitelist.txt b/src/checkstyle/nohttp-whitelist.txt index 79936fb7c7..2c6f8a3b61 100644 --- a/src/checkstyle/nohttp-whitelist.txt +++ b/src/checkstyle/nohttp-whitelist.txt @@ -1 +1,2 @@ -^http://livereload.com/protocols/official-7$ +^http://livereload.com/protocols/official-7.* +^http://exslt.org/common.*