Merge branch '2.6.x' into 2.7.x

wilkinsona · wilkinsona · commit 1e536f5c20c4 · 2022-11-08T13:53:35.000Z
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -8,11 +8,6 @@ repositories {
 	mavenCentral()
 	gradlePluginPortal()
 	maven { url "https://repo.spring.io/release" }
-	jcenter() {
-		content {
-			includeGroup("org.ysb33r.gradle")
-		}
-	}
 }
 
 sourceCompatibility = 1.8
diff --git a/settings.gradle b/settings.gradle
@@ -8,11 +8,6 @@ pluginManagement {
 		if (version.endsWith('-SNAPSHOT')) {
 			maven { url "https://repo.spring.io/snapshot" }
 		}
-		jcenter() {
-			content {
-				includeGroup("org.ysb33r.gradle")
-			}
-		}
 	}
 	resolutionStrategy {
 		eachPlugin {

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,6 @@ pluginManagement {`
`8`	`8`	`if (version.endsWith('-SNAPSHOT')) {`
`9`	`9`	`maven { url "https://repo.spring.io/snapshot" }`
`10`	`10`	`}`
`11`		`- jcenter() {`
`12`		`- content {`
`13`		`- includeGroup("org.ysb33r.gradle")`
`14`		`- }`
`15`		`- }`
`16`	`11`	`}`
`17`	`12`	`resolutionStrategy {`
`18`	`13`	`eachPlugin {`