Skip to content

Commit 82198a9

Browse files
committed
Polish nohttp configuration
Closes gh-26166
1 parent 57c199d commit 82198a9

File tree

7 files changed

+17
-10
lines changed

7 files changed

+17
-10
lines changed

build.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "org.jetbrains.kotlin.jvm" apply false // https://youtrack.jetbrains.com/issue/KT-30276
3-
id "io.spring.nohttp" version "0.0.3.RELEASE"
3+
id "io.spring.nohttp" version "0.0.6.RELEASE"
44
}
55

66
description = "Spring Boot Build"
@@ -9,7 +9,14 @@ defaultTasks 'build'
99

1010
nohttp {
1111
whitelistFile = project.file("src/nohttp/whitelist.lines")
12-
source.exclude "buildSrc/build/**"
12+
source.exclude "**/bin/**"
13+
source.exclude "**/build/**"
14+
source.exclude "**/out/**"
15+
source.exclude "**/target/**"
16+
}
17+
18+
task build {
19+
dependsOn checkstyleNohttp
1320
}
1421

1522
allprojects {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<!-- This module was also published with a richer model, Gradle metadata, -->
55
<!-- which should be used instead. Do not delete the following line which -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<!-- This module was also published with a richer model, Gradle metadata, -->
55
<!-- which should be used instead. Do not delete the following line which -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<!-- This module was also published with a richer model, Gradle metadata, -->
55
<!-- which should be used instead. Do not delete the following line which -->

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7533,7 +7533,7 @@ Alternatively, you can specify a source for your test, which disables the behavi
75337533
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.
75347534
`spock-spring` integrates Spring's test framework into Spock.
75357535
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.
7536-
See http://spockframework.org/spock/docs/1.2/modules.html#_spring_module[the documentation for Spock's Spring module] for further details.
7536+
See https://spockframework.org/spock/docs/1.2/modules.html#_spring_module[the documentation for Spock's Spring module] for further details.
75377537

75387538

75397539

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.example</groupId>

src/nohttp/whitelist.lines

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
^http://exslt.org/common.*
2+
^http://ganglia.sourceforge.net.*
23
^http://hsqldb.org.*
34
^http://livereload.com/.*
5+
^http://logback.qos.ch/manual/loggingSeparation.html
6+
^http://schemas.xmlsoap.org/.*
47
^http://www.jdotsoft.com.*
5-
^http://spockframework.org.*
6-
^http://ganglia.sourceforge.net.*
7-
^http://schemas.xmlsoap.org.*
88
^http://www.liquibase.org/xml/ns/dbchangelog/.*

0 commit comments

Comments
 (0)