diff --git a/build.gradle b/build.gradle index c1a6988d35e..2236167bdc2 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,15 @@ 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/**" + source.exclude "spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/export.tar" +} + +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-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java index 8ab4be1d799..0a39f1ec261 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java @@ -579,7 +579,7 @@ class FlywayAutoConfigurationTests { @Test void vaultUrlIsCorrectlyMapped() { this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class) - .withPropertyValues("spring.flyway.vault-url=http://foo.com/secrets") + .withPropertyValues("spring.flyway.vault-url=https://example.com/secrets") .run(validateFlywayTeamsPropertyOnly("vaultUrl")); } 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 174f3f3bad6..dd1fc99cd78 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 @@ -7564,7 +7564,7 @@ Alternatively, you can specify a source for your test, which disables the behavi ==== Using Spock to Test Spring Boot Applications 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. -See http://spockframework.org/spock/docs/2.0-M4/modules.html#_spring_module[the documentation for Spock's Spring module] for further details. +See https://spockframework.org/spock/docs/2.0-M4/modules.html#_spring_module[the documentation for Spock's Spring module] for further details. NOTE: As of Spring Boot 2.5.x and its support for Groovy 3.x you have two options to make use of Spock: Either use the latest Spock 2.0 milestone or release that is compatible with Groovy 3.x or stick with Spock 1.3 and downgrade Spring Boot's Groovy version to 2.5.x. 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..69d702f86ee 100644 --- a/src/nohttp/whitelist.lines +++ b/src/nohttp/whitelist.lines @@ -1,8 +1,9 @@ ^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/.* +^http://www.w3.org/2000/09/xmldsig.* \ No newline at end of file