Merge branch '2.5.x'

wilkinsona · wilkinsona · commit 37a71444260a · 2021-10-14T14:26:57.000+01:00
Closes gh-28343
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java b/buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForProhibitedDependencies.java
@@ -82,6 +82,9 @@ private boolean prohibited(ModuleVersionIdentifier id) {
 		if (group.startsWith("org.jboss.spec")) {
 			return true;
 		}
+		if (group.equals("org.apache.geronimo.specs")) {
+			return true;
+		}
 		return false;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ private boolean prohibited(ModuleVersionIdentifier id) {`
`82`	`82`	`if (group.startsWith("org.jboss.spec")) {`
`83`	`83`	`return true;`
`84`	`84`	`}`
	`85`	`+ if (group.equals("org.apache.geronimo.specs")) {`
	`86`	`+ return true;`
	`87`	`+ }`
`85`	`88`	`return false;`
`86`	`89`	`}`
`87`	`90`