Author: lhazlewood
Date: Fri Jan 6 21:06:58 2012
New Revision: 1228405
URL: http://svn.apache.org/viewvc?rev=1228405&view=rev
Log:
SHIRO-285: updated SAML-based dependencies to be optional (they are not
required by shiro-cas at runtime - only if the end-user configures 'saml'.
Also updated the OSGi import statement to be org.jasig.cas.client* as the main
org.jasig.cas* namespace is not required.
Modified:
shiro/trunk/support/cas/pom.xml
Modified: shiro/trunk/support/cas/pom.xml
URL:
http://svn.apache.org/viewvc/shiro/trunk/support/cas/pom.xml?rev=1228405&r1=1228404&r2=1228405&view=diff
==============================================================================
--- shiro/trunk/support/cas/pom.xml (original)
+++ shiro/trunk/support/cas/pom.xml Fri Jan 6 21:06:58 2012
@@ -42,22 +42,26 @@
<version>3.2.1</version>
</dependency>
<dependency>
+ <!-- for Optional SAML ticket validation: -->
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <optional>true</optional>
</dependency>
- <!-- for SAML ticket validation -->
<dependency>
+ <!-- for Optional SAML ticket validation: -->
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>1.1</version>
<scope>runtime</scope>
+ <optional>true</optional>
</dependency>
- <!-- for SAML ticket validation -->
<dependency>
+ <!-- for Optional SAML ticket validation: -->
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>1.4.3</version>
<scope>runtime</scope>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -73,7 +77,7 @@
<Export-Package>org.apache.shiro.cas*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
- org.jasig.cas*;version="[3.1.3, 4)",
+ org.jasig.cas.client*;version="[3.2, 4)",
*
</Import-Package>
</instructions>
