diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 1217cf4f16..78c15f422d 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -17,7 +17,7 @@ permissions: jobs: build: name: Build - uses: spring-io/spring-security-release-tools/.github/workflows/build.yml@b92832ecbc7cbe969201e6beafbde0ee400cf095 # v1.0.15 + uses: spring-io/spring-security-release-tools/.github/workflows/build.yml@3f6cc7ffc137ca160061749d5f34dc30d5f36986 # v1.0.17 strategy: matrix: os: [ ubuntu-latest, windows-latest ] diff --git a/.github/workflows/defer-issues.yml b/.github/workflows/defer-issues.yml index 12b99922c6..e9f852842a 100644 --- a/.github/workflows/defer-issues.yml +++ b/.github/workflows/defer-issues.yml @@ -21,7 +21,7 @@ jobs: uses: spring-io/spring-release-actions/compute-version@a1f321783a0769dd2aea4fad6c2ae2f95a52b885 # 0.0.5 - name: Get Today's Release Version id: todays-release - uses: spring-io/spring-release-actions/get-todays-release-version@a1f321783a0769dd2aea4fad6c2ae2f95a52b885 # 0.0.5 + uses: spring-io/spring-release-actions/get-todays-release-version@1b8671612c3eb3d9b9763e2d7b66f1a80d00ee95 # 0.0.6 with: snapshot-version: ${{ steps.compute-version.outputs.version }} milestone-repository: ${{ github.repository }} diff --git a/.github/workflows/gradle-wrapper-upgrade-execution.yml b/.github/workflows/gradle-wrapper-upgrade-execution.yml index f9776716b1..10672aa092 100644 --- a/.github/workflows/gradle-wrapper-upgrade-execution.yml +++ b/.github/workflows/gradle-wrapper-upgrade-execution.yml @@ -22,7 +22,7 @@ jobs: - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Set up JDK 25 - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 + uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6.0.0 with: java-version: '25' distribution: 'temurin' diff --git a/core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptor.java b/core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptor.java index 0264e6eceb..0080f8da92 100644 --- a/core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptor.java +++ b/core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptor.java @@ -123,7 +123,7 @@ public final class PostFilterAuthorizationMethodInterceptor implements Authoriza /** * Filter a {@code returnedObject} using the {@link PostFilter} annotation that the * {@link MethodInvocation} specifies. - * @param mi the {@link MethodInvocation} to check check + * @param mi the {@link MethodInvocation} to check * @return filtered {@code returnedObject} */ @Override diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java index d612348428..cb7fc115cb 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java @@ -131,7 +131,7 @@ public final class DelegatingSecurityContextCallable implements Callable { /** * Creates a {@link DelegatingSecurityContextCallable} and with the given * {@link Callable} and {@link SecurityContext}, but if the securityContext is null - * will defaults to the current {@link SecurityContext} on the + * will default to the current {@link SecurityContext} on the * {@link SecurityContextHolder} * @param delegate the delegate {@link DelegatingSecurityContextCallable} to run with * the specified {@link SecurityContext}. Cannot be null. diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java index b8e9576c6b..d8e7df569d 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java @@ -47,7 +47,7 @@ public final class DelegatingSecurityContextRunnable implements Runnable { .getContextHolderStrategy(); /** - * The {@link SecurityContext} that the delegate {@link Runnable} will be ran as. + * The {@link SecurityContext} that the delegate {@link Runnable} will be run as. */ private SecurityContext delegateSecurityContext; diff --git a/core/src/main/java/org/springframework/security/core/token/TokenService.java b/core/src/main/java/org/springframework/security/core/token/TokenService.java index a6248a8306..24aa5f0d2f 100644 --- a/core/src/main/java/org/springframework/security/core/token/TokenService.java +++ b/core/src/main/java/org/springframework/security/core/token/TokenService.java @@ -35,7 +35,7 @@ import org.jspecify.annotations.Nullable; * building block for more sophisticated token-based solutions. For example, * authentication systems that depend on stateless session keys. These could, for * instance, place the username inside the user-specified extended information associated - * with the key). It is important to recognise that we do not intend for this interface to + * with the key. It is important to recognise that we do not intend for this interface to * be expanded to provide such capabilities directly. *

* diff --git a/core/src/main/java/org/springframework/security/core/userdetails/User.java b/core/src/main/java/org/springframework/security/core/userdetails/User.java index 794b1d336d..3d613d05ad 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/User.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/User.java @@ -323,7 +323,7 @@ public class User implements UserDetails, CredentialsContainer { /** * Builds the user to be added. At minimum the username, password, and authorities - * should provided. The remaining attributes have reasonable defaults. + * should be provided. The remaining attributes have reasonable defaults. */ public static final class UserBuilder { diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java index 22ac216297..2fe823ee59 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java @@ -38,7 +38,7 @@ public interface UserDetailsService { * may possibly be case sensitive, or case insensitive depending on how the * implementation instance is configured. In this case, the UserDetails * object that comes back may have a username that is of a different case than what - * was actually requested.. + * was actually requested. * @param username the username identifying the user whose data is required. * @return a fully populated user record (never null) * @throws UsernameNotFoundException if the user could not be found or the user has no diff --git a/core/src/main/java/org/springframework/security/provisioning/package-info.java b/core/src/main/java/org/springframework/security/provisioning/package-info.java index fb0add19ed..6850abd647 100644 --- a/core/src/main/java/org/springframework/security/provisioning/package-info.java +++ b/core/src/main/java/org/springframework/security/provisioning/package-info.java @@ -16,7 +16,7 @@ /** * Contains simple user and authority group account provisioning interfaces together with - * a a JDBC-based implementation. + * a JDBC-based implementation. */ @NullMarked package org.springframework.security.provisioning; diff --git a/docs/package.json b/docs/package.json index cea078dac7..253ac52433 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "antora": "3.2.0-rc.2", + "antora": "3.2.0-rc.3", "@antora/atlas-extension": "1.0.0-alpha.5", "@antora/collector-extension": "1.0.3", "@asciidoctor/tabs": "1.0.0-beta.6",