From 82198a99e0cd64a3040d44d6d3becf329323e6da Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 20 Apr 2021 11:15:13 +0100 Subject: [PATCH] Polish nohttp configuration Closes gh-26166 --- build.gradle | 11 +++++++++-- .../example/module-one/1.0.0/module-one-1.0.0.pom | 2 +- .../example/module-three/1.0.0/module-three-1.0.0.pom | 2 +- .../example/module-two/1.0.0/module-two-1.0.0.pom | 2 +- .../src/docs/asciidoc/spring-boot-features.adoc | 2 +- .../library/1.0-SNAPSHOT/library-1.0-SNAPSHOT.pom | 2 +- src/nohttp/whitelist.lines | 6 +++--- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 7080921537d..599d5be469f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "org.jetbrains.kotlin.jvm" apply false // https://youtrack.jetbrains.com/issue/KT-30276 - id "io.spring.nohttp" version "0.0.3.RELEASE" + id "io.spring.nohttp" version "0.0.6.RELEASE" } description = "Spring Boot Build" @@ -9,7 +9,14 @@ defaultTasks 'build' nohttp { whitelistFile = project.file("src/nohttp/whitelist.lines") - source.exclude "buildSrc/build/**" + source.exclude "**/bin/**" + source.exclude "**/build/**" + source.exclude "**/out/**" + source.exclude "**/target/**" +} + +task build { + dependsOn checkstyleNohttp } allprojects { diff --git a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom index f9fbedf9a1d..cd3ade53cfa 100644 --- a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom +++ b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-one/1.0.0/module-one-1.0.0.pom @@ -1,5 +1,5 @@ - diff --git a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom index 44671982409..d67dcd644a3 100644 --- a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom +++ b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-three/1.0.0/module-three-1.0.0.pom @@ -1,5 +1,5 @@ - diff --git a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom index 520f492762b..b8ef79e38cd 100644 --- a/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom +++ b/ci/images/releasescripts/src/test/resources/io/spring/concourse/releasescripts/sonatype/artifactory-repo/org/springframework/example/module-two/1.0.0/module-two-1.0.0.pom @@ -1,5 +1,5 @@ - diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index 0af49d74f6c..28283cee350 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc @@ -7533,7 +7533,7 @@ Alternatively, you can specify a source for your test, which disables the behavi If you wish to use Spock to test a Spring Boot application, you should add a dependency on Spock's `spock-spring` module to your application's build. `spock-spring` integrates Spring's test framework into Spock. It is recommended that you use Spock 1.2 or later to benefit from a number of improvements to Spock's Spring Framework and Spring Boot integration. -See http://spockframework.org/spock/docs/1.2/modules.html#_spring_module[the documentation for Spock's Spring module] for further details. +See https://spockframework.org/spock/docs/1.2/modules.html#_spring_module[the documentation for Spock's Spring module] for further details. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/repository/com/example/library/1.0-SNAPSHOT/library-1.0-SNAPSHOT.pom b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/repository/com/example/library/1.0-SNAPSHOT/library-1.0-SNAPSHOT.pom index 7b9e57a1d6c..61b2d25a54a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/repository/com/example/library/1.0-SNAPSHOT/library-1.0-SNAPSHOT.pom +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/repository/com/example/library/1.0-SNAPSHOT/library-1.0-SNAPSHOT.pom @@ -1,5 +1,5 @@ - 4.0.0 com.example diff --git a/src/nohttp/whitelist.lines b/src/nohttp/whitelist.lines index df63b380f4e..69d58187c60 100644 --- a/src/nohttp/whitelist.lines +++ b/src/nohttp/whitelist.lines @@ -1,8 +1,8 @@ ^http://exslt.org/common.* +^http://ganglia.sourceforge.net.* ^http://hsqldb.org.* ^http://livereload.com/.* +^http://logback.qos.ch/manual/loggingSeparation.html +^http://schemas.xmlsoap.org/.* ^http://www.jdotsoft.com.* -^http://spockframework.org.* -^http://ganglia.sourceforge.net.* -^http://schemas.xmlsoap.org.* ^http://www.liquibase.org/xml/ns/dbchangelog/.*