Merge branch '7.0.x'

rwinch · rwinch · commit fe138d6434d7 · 2026-01-12T16:05:51.000-06:00
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy
@@ -81,8 +81,8 @@ class ArtifactoryPlugin implements Plugin<Project> {
 				repository {
 					repoKey = isSnapshot ? snapshotRepository : isMilestone ? milestoneRepository : releaseRepository
 					if(project.hasProperty('artifactoryUsername')) {
-						username = artifactoryUsername
-						password = artifactoryPassword
+						username = project.artifactoryUsername
+						password = project.artifactoryPassword
 					}
 				}
 			}
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java
@@ -18,7 +18,7 @@
 
 import org.jspecify.annotations.Nullable;
 
-/**`
+/**
  * Service interface for encoding passwords.
  *
  * The preferred implementation is {@code BCryptPasswordEncoder}.

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ class ArtifactoryPlugin implements Plugin<Project> {`
`81`	`81`	`repository {`
`82`	`82`	`repoKey = isSnapshot ? snapshotRepository : isMilestone ? milestoneRepository : releaseRepository`
`83`	`83`	`if(project.hasProperty('artifactoryUsername')) {`
`84`		`- username = artifactoryUsername`
`85`		`- password = artifactoryPassword`
	`84`	`+ username = project.artifactoryUsername`
	`85`	`+ password = project.artifactoryPassword`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`import org.jspecify.annotations.Nullable;`
`20`	`20`
`21`		-/**`
	`21`	`+/**`
`22`	`22`	`* Service interface for encoding passwords.`
`23`	`23`	`*`
`24`	`24`	`* The preferred implementation is {@code BCryptPasswordEncoder}.`