Merge pull request #152 from coheigea/SHIRO-708

SHIRO-708 - Remove deprecated shiro-cas module
apache · May 7, 2020 · 99c55f6 · 99c55f6
2 parents a92a79c + 7c301e1
commit 99c55f6
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 1,066 deletions.
diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,6 @@
         <!-- Don't change this version without also changing the shiro-aspect and shiro-features
              modules' OSGi metadata: -->
         <aspectj.version>1.9.4</aspectj.version>
-        <cas.client.core.version>3.2.2</cas.client.core.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
         <commons.cli.version>1.4</commons.cli.version>
         <commons.codec.version>1.14</commons.codec.version>
@@ -748,11 +747,6 @@
                 <artifactId>shiro-aspectj</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.shiro</groupId>
-                <artifactId>shiro-cas</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-ehcache</artifactId>
@@ -846,13 +840,6 @@
                 <artifactId>javax.annotation-api</artifactId>
                 <version>${javax.annotation.api.version}</version>
             </dependency>
-            <dependency>
-                <!-- runtime dependency for the shiro-cas module: -->
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>${commons.codec.version}</version>
-                <scope>runtime</scope>
-            </dependency>
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>aspectjrt</artifactId>

diff --git a/src/owasp-suppression.xml b/src/owasp-suppression.xml
@@ -31,10 +31,4 @@
         <cpe>cpe:/a:apache:tomcat:8.5.5</cpe>
     </suppress>
 
-    <suppress>
-        <notes><![CDATA[ file name: opensaml-1.1.jar ]]></notes>
-        <sha1>21ec22368b6baa211a29887e162aa4cf9a8f3c60</sha1>
-        <cpe>cpe:/a:internet2:opensaml:1.1</cpe>
-    </suppress>
-
-</suppressions>
+</suppressions>
diff --git a/support/cas/pom.xml b/support/cas/pom.xml
diff --git a/support/cas/src/main/java/org/apache/shiro/cas/CasAuthenticationException.java b/support/cas/src/main/java/org/apache/shiro/cas/CasAuthenticationException.java
diff --git a/support/cas/src/main/java/org/apache/shiro/cas/CasFilter.java b/support/cas/src/main/java/org/apache/shiro/cas/CasFilter.java