diff --git a/openid/spring-security-openid.gradle b/openid/spring-security-openid.gradle index b225ceeb97..8e3820d151 100644 --- a/openid/spring-security-openid.gradle +++ b/openid/spring-security-openid.gradle @@ -1,6 +1,6 @@ // NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are // encouraged to migrate -// to OpenID Connect. +// to OpenID Connect, which is supported by spring-security-oauth2. apply plugin: 'io.spring.convention.spring-module' diff --git a/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java b/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java index 20d6bc8056..e5e89d5e38 100644 --- a/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java +++ b/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java @@ -22,7 +22,7 @@ import org.springframework.security.core.AuthenticationException; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Robin Bramley, Opsera Ltd */ public class AuthenticationCancelledException extends AuthenticationException { diff --git a/openid/src/main/java/org/springframework/security/openid/AxFetchListFactory.java b/openid/src/main/java/org/springframework/security/openid/AxFetchListFactory.java index f125c214c0..3c99c94626 100644 --- a/openid/src/main/java/org/springframework/security/openid/AxFetchListFactory.java +++ b/openid/src/main/java/org/springframework/security/openid/AxFetchListFactory.java @@ -26,7 +26,7 @@ import java.util.List; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Luke Taylor * @since 3.1 */ diff --git a/openid/src/main/java/org/springframework/security/openid/NullAxFetchListFactory.java b/openid/src/main/java/org/springframework/security/openid/NullAxFetchListFactory.java index 1d305c7489..75df033bac 100644 --- a/openid/src/main/java/org/springframework/security/openid/NullAxFetchListFactory.java +++ b/openid/src/main/java/org/springframework/security/openid/NullAxFetchListFactory.java @@ -21,7 +21,7 @@ import java.util.List; /** * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Luke Taylor * @since 3.1 */ diff --git a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java index 63d6bec459..7ab6f47615 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java @@ -43,7 +43,7 @@ import org.springframework.util.StringUtils; /** * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Ray Krueger * @author Luke Taylor */ diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java index ec9d55dbd0..c15d45856d 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java @@ -29,7 +29,7 @@ import org.springframework.util.Assert; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Luke Taylor * @since 3.0 */ diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java index 707d5a37c6..9c3999d704 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java @@ -61,7 +61,7 @@ import java.util.*; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Robin Bramley * @author Ray Krueger * @author Luke Taylor diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java index f676a14c23..e42baa6d1f 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java @@ -46,7 +46,7 @@ import org.springframework.util.Assert; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Robin Bramley, Opsera Ltd. * @author Luke Taylor */ diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java index 958cf6f280..db2eee832b 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java @@ -20,7 +20,7 @@ package org.springframework.security.openid; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author JanRain Inc. * @author Robin Bramley, Opsera Ltd * @author Luke Taylor diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java index 49bc2e4dc6..0625e07727 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java @@ -28,7 +28,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Robin Bramley */ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken { diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java index 760b3e6f2c..303b143a9a 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Ray Krueger * @author Robin Bramley, Opsera Ltd */ diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java index 4748a3e84a..f184032c15 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java @@ -20,7 +20,7 @@ package org.springframework.security.openid; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Robin Bramley, Opsera Ltd */ public class OpenIDConsumerException extends Exception { diff --git a/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java b/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java index 35810f0a25..b59481bb38 100644 --- a/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java +++ b/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java @@ -24,7 +24,7 @@ import java.util.regex.Pattern; /** * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Luke Taylor * @since 3.1 */ diff --git a/openid/src/main/java/org/springframework/security/openid/package.html b/openid/src/main/java/org/springframework/security/openid/package.html index 14c95d0992..f2417fd615 100644 --- a/openid/src/main/java/org/springframework/security/openid/package.html +++ b/openid/src/main/java/org/springframework/security/openid/package.html @@ -4,6 +4,6 @@

NOTE: The OpenID 1.0 and 2.0 protocols have been deprecated and users are encouraged to migrate - to OpenID Connect.

+ to OpenID Connect, which is supported by spring-security-oauth2.

diff --git a/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java index 695e264530..ce8f1a2382 100644 --- a/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java +++ b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest; /** * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Robin Bramley, Opsera Ltd */ public class MockOpenIDConsumer implements OpenIDConsumer { diff --git a/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java b/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java index e076e7c1d8..971c19a15f 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java @@ -42,7 +42,7 @@ import java.util.*; /** * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Luke Taylor */ public class OpenID4JavaConsumerTests { diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java index ac72d3a5bd..dbaf2eeb68 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java @@ -34,7 +34,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti /** * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. */ public class OpenIDAuthenticationFilterTests { diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java index 3cf253cafc..902ca9b8fe 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java @@ -37,7 +37,7 @@ import org.springframework.security.core.userdetails.UserDetailsService; * * @deprecated The OpenID 1.0 and 2.0 protocols have been deprecated and users are * encouraged to migrate - * to OpenID Connect. + * to OpenID Connect, which is supported by spring-security-oauth2. * @author Robin Bramley, Opsera Ltd */ public class OpenIDAuthenticationProviderTests { diff --git a/openid/src/test/resources/logback-test.xml b/openid/src/test/resources/logback-test.xml index a3d205af5e..cc1fc42b4e 100644 --- a/openid/src/test/resources/logback-test.xml +++ b/openid/src/test/resources/logback-test.xml @@ -1,6 +1,6 @@ +to OpenID Connect, which is supported by spring-security-oauth2. -->