Skip to content

Commit e0284a4

Browse files
hdeadmanmarcusdacoregio
authored andcommitted
Fix CAS packages for 4.0.1 and Jasig references
Issue gh-11674
1 parent b4d3ac6 commit e0284a4

30 files changed

+78
-80
lines changed

cas/spring-security-cas.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies {
44
management platform(project(":spring-security-dependencies"))
55
api project(':spring-security-core')
66
api project(':spring-security-web')
7-
api 'org.jasig.cas.client:cas-client-core'
7+
api 'org.apereo.cas.client:cas-client-core'
88
api 'org.springframework:spring-beans'
99
api 'org.springframework:spring-context'
1010
api 'org.springframework:spring-core'

cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.ArrayList;
2020

21-
import org.jasig.cas.client.validation.Assertion;
21+
import org.apereo.cas.client.validation.Assertion;
2222

2323
import org.springframework.security.authentication.AbstractAuthenticationToken;
2424
import org.springframework.security.core.SpringSecurityCoreVersion;

cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import org.apache.commons.logging.Log;
2020
import org.apache.commons.logging.LogFactory;
21-
import org.jasig.cas.client.validation.Assertion;
22-
import org.jasig.cas.client.validation.TicketValidationException;
23-
import org.jasig.cas.client.validation.TicketValidator;
21+
import org.apereo.cas.client.validation.Assertion;
22+
import org.apereo.cas.client.validation.TicketValidationException;
23+
import org.apereo.cas.client.validation.TicketValidator;
2424

2525
import org.springframework.beans.factory.InitializingBean;
2626
import org.springframework.context.MessageSource;

cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.io.Serializable;
2020
import java.util.Collection;
2121

22-
import org.jasig.cas.client.validation.Assertion;
22+
import org.apereo.cas.client.validation.Assertion;
2323

2424
import org.springframework.security.authentication.AbstractAuthenticationToken;
2525
import org.springframework.security.core.GrantedAuthority;

cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

cas/src/main/java/org/springframework/security/cas/authentication/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2016 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,11 +24,11 @@
2424
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2525
import com.fasterxml.jackson.annotation.JsonProperty;
2626
import com.fasterxml.jackson.annotation.JsonTypeInfo;
27-
import org.jasig.cas.client.authentication.AttributePrincipal;
27+
import org.apereo.cas.client.authentication.AttributePrincipal;
2828

2929
/**
3030
* Helps in jackson deserialization of class
31-
* {@link org.jasig.cas.client.validation.AssertionImpl}, which is used with
31+
* {@link org.apereo.cas.client.validation.AssertionImpl}, which is used with
3232
* {@link org.springframework.security.cas.authentication.CasAuthenticationToken}. To use
3333
* this class we need to register with
3434
* {@link com.fasterxml.jackson.databind.ObjectMapper}. Type information will be stored
@@ -52,7 +52,7 @@ class AssertionImplMixin {
5252

5353
/**
5454
* Mixin Constructor helps in deserialize
55-
* {@link org.jasig.cas.client.validation.AssertionImpl}
55+
* {@link org.apereo.cas.client.validation.AssertionImpl}
5656
* @param principal the Principal to associate with the Assertion.
5757
* @param validFromDate when the assertion is valid from.
5858
* @param validUntilDate when the assertion is valid to.

cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2016 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,11 +23,11 @@
2323
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
2525
import com.fasterxml.jackson.annotation.JsonTypeInfo;
26-
import org.jasig.cas.client.proxy.ProxyRetriever;
26+
import org.apereo.cas.client.proxy.ProxyRetriever;
2727

2828
/**
29-
* Helps in deserialize {@link org.jasig.cas.client.authentication.AttributePrincipalImpl}
30-
* which is used with
29+
* Helps in deserialize
30+
* {@link org.apereo.cas.client.authentication.AttributePrincipalImpl} which is used with
3131
* {@link org.springframework.security.cas.authentication.CasAuthenticationToken}. Type
3232
* information will be stored in property named @class.
3333
* <p>
@@ -49,7 +49,7 @@ class AttributePrincipalImplMixin {
4949

5050
/**
5151
* Mixin Constructor helps in deserialize
52-
* {@link org.jasig.cas.client.authentication.AttributePrincipalImpl}
52+
* {@link org.apereo.cas.client.authentication.AttributePrincipalImpl}
5353
* @param name the unique identifier for the principal.
5454
* @param attributes the key/value pairs for this principal.
5555
* @param proxyGrantingTicket the ticket associated with this principal.

cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2016 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
2525
import com.fasterxml.jackson.annotation.JsonTypeInfo;
26-
import org.jasig.cas.client.validation.Assertion;
26+
import org.apereo.cas.client.validation.Assertion;
2727

2828
import org.springframework.security.cas.authentication.CasAuthenticationProvider;
2929
import org.springframework.security.cas.authentication.CasAuthenticationToken;

cas/src/main/java/org/springframework/security/cas/jackson2/CasJackson2Module.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2016 the original author or authors.
2+
* Copyright 2015-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
1818

1919
import com.fasterxml.jackson.core.Version;
2020
import com.fasterxml.jackson.databind.module.SimpleModule;
21-
import org.jasig.cas.client.authentication.AttributePrincipalImpl;
22-
import org.jasig.cas.client.validation.AssertionImpl;
21+
import org.apereo.cas.client.authentication.AttributePrincipalImpl;
22+
import org.apereo.cas.client.validation.AssertionImpl;
2323

2424
import org.springframework.security.cas.authentication.CasAuthenticationToken;
2525
import org.springframework.security.jackson2.SecurityJackson2Modules;

0 commit comments

Comments
 (0)