From a32d9f04e31ff93627715b5177809e2e8082ed44 Mon Sep 17 00:00:00 2001 From: Robert Winch <362503+rwinch@users.noreply.github.com> Date: Mon, 12 Jan 2026 16:04:56 -0600 Subject: [PATCH 1/2] Revert "Use project.artifactory(Username|Password)" This reverts commit 9c449000dc0508457d0e4392a46e8ca731ada0fa. --- .../security/crypto/password/PasswordEncoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index c333486b30..1e4e137e4e 100644 --- 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 @@ package org.springframework.security.crypto.password; import org.jspecify.annotations.Nullable; -/**` +/** * Service interface for encoding passwords. * * The preferred implementation is {@code BCryptPasswordEncoder}. From 7fcbf642b8f43838bbf1f8f620da7bb13eeee9f6 Mon Sep 17 00:00:00 2001 From: Robert Winch <362503+rwinch@users.noreply.github.com> Date: Mon, 12 Jan 2026 16:05:38 -0600 Subject: [PATCH 2/2] Use project.artifactory(Username|Password) --- .../io/spring/gradle/convention/ArtifactoryPlugin.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy index d24cdcbae0..7f76089fbb 100644 --- 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 { repository { repoKey = isSnapshot ? snapshotRepository : isMilestone ? milestoneRepository : releaseRepository if(project.hasProperty('artifactoryUsername')) { - username = artifactoryUsername - password = artifactoryPassword + username = project.artifactoryUsername + password = project.artifactoryPassword } } }