Merge branch '1.2.x'

sjohnr · sjohnr · commit ccad52dede17 · 2024-01-02T17:34:01.000-06:00
diff --git a/buildSrc/src/main/java/org/springframework/gradle/nohttp/SpringNoHttpPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/nohttp/SpringNoHttpPlugin.java
@@ -36,6 +36,6 @@ public void apply(Project project) {
 		NoHttpExtension nohttp = project.getExtensions().getByType(NoHttpExtension.class);
 		File allowlistFile = project.getRootProject().file("etc/nohttp/allowlist.lines");
 		nohttp.setAllowlistFile(allowlistFile);
-		nohttp.getSource().exclude("buildSrc/build/**");
+		nohttp.getSource().exclude("**/build/**");
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ public void apply(Project project) {`
`36`	`36`	`NoHttpExtension nohttp = project.getExtensions().getByType(NoHttpExtension.class);`
`37`	`37`	`File allowlistFile = project.getRootProject().file("etc/nohttp/allowlist.lines");`
`38`	`38`	`nohttp.setAllowlistFile(allowlistFile);`
`39`		`- nohttp.getSource().exclude("buildSrc/build/**");`
	`39`	`+ nohttp.getSource().exclude("/build/");`
`40`	`40`	`}`
`41`	`41`	`}`