Merge branch '7.0.x'

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
 					}
 				}
 			}

crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java

@@ -18,7 +18,7 @@ package org.springframework.security.crypto.password;
 
 import org.jspecify.annotations.Nullable;
 
-/**`
+/**
  * Service interface for encoding passwords.
  *
  * The preferred implementation is {@code BCryptPasswordEncoder}.