Merge branch '5.8.x' into 6.0.x

rwinch · rwinch · commit c4b773b150ac · 2023-08-07T10:27:32.000-05:00
Use includeGroupByRegex This makes the include more robust Issue gh-13582
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy
@@ -38,8 +38,8 @@ class RepositoryConventionPlugin implements Plugin<Project> {
 				name = 'shibboleth'
 				url = 'https://build.shibboleth.net/nexus/content/repositories/releases/'
 				content {
-					includeGroup('org.opensaml')
-					includeGroup('net.shibboleth.utilities')
+					includeGroupByRegex('org\\.opensaml.*')
+					includeGroupByRegex('net\\.shibboleth.*')
 				}
 			}
 			mavenCentral()

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ class RepositoryConventionPlugin implements Plugin<Project> {`
`38`	`38`	`name = 'shibboleth'`
`39`	`39`	`url = 'https://build.shibboleth.net/nexus/content/repositories/releases/'`
`40`	`40`	`content {`
`41`		`- includeGroup('org.opensaml')`
`42`		`- includeGroup('net.shibboleth.utilities')`
	`41`	`+ includeGroupByRegex('org\\.opensaml.*')`
	`42`	`+ includeGroupByRegex('net\\.shibboleth.*')`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`mavenCentral()`