Merge branch '1.1.x' into 1.2.x

sjohnr · sjohnr · commit bf295315d381 · 2024-01-26T16:18:57.000-06:00
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id "io.spring.convention.root"
-	id "io.spring.security.release" version "1.0.1-SNAPSHOT"
+	id "io.spring.security.release" version "1.0.1"
 }
 
 group = "org.springframework.security"
diff --git a/settings.gradle b/settings.gradle
@@ -1,9 +1,6 @@
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven { url "https://repo.spring.io/release" }
-		maven { url "https://repo.spring.io/milestone" }
-		maven { url "https://repo.spring.io/snapshot" }
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "io.spring.convention.root"`
`3`		`- id "io.spring.security.release" version "1.0.1-SNAPSHOT"`
	`3`	`+ id "io.spring.security.release" version "1.0.1"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`group = "org.springframework.security"`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`pluginManagement {`
`2`	`2`	`repositories {`
`3`	`3`	`gradlePluginPortal()`
`4`		`- maven { url "https://repo.spring.io/release" }`
`5`		`- maven { url "https://repo.spring.io/milestone" }`
`6`		`- maven { url "https://repo.spring.io/snapshot" }`
`7`	`4`	`}`
`8`	`5`	`}`
`9`	`6`