You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2012/01/06 22:00:17 UTC
svn commit: r1228401 - in /shiro/trunk: pom.xml support/cas/pom.xml
support/features/pom.xml support/features/src/main/resources/features.xml
Author: lhazlewood
Date: Fri Jan 6 21:00:17 2012
New Revision: 1228401
URL: http://svn.apache.org/viewvc?rev=1228401&view=rev
Log:
SHIRO-285: added CAS runtime dependency. Upgraded other dependencies to latest stable versions where possible/prudent.
Modified:
shiro/trunk/pom.xml
shiro/trunk/support/cas/pom.xml
shiro/trunk/support/features/pom.xml
shiro/trunk/support/features/src/main/resources/features.xml
Modified: shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/pom.xml?rev=1228401&r1=1228400&r2=1228401&view=diff
==============================================================================
--- shiro/trunk/pom.xml (original)
+++ shiro/trunk/pom.xml Fri Jan 6 21:00:17 2012
@@ -70,28 +70,29 @@
<!-- Compile 3rd party dependencies: -->
<!-- Don't change this version without also changing the shiro-aspect and shiro-features
modules' OSGi metadata: -->
- <aspectj.version>1.6.9</aspectj.version>
+ <aspectj.version>1.6.12</aspectj.version>
<commons.cli.version>1.2</commons.cli.version>
+ <commons.codec.version>1.4</commons.codec.version>
<crowd.version>1.5.2</crowd.version>
<!-- Don't change this version without also changing the shiro-ehcache and shiro-features
modules' OSGi metadata: -->
- <ehcache.version>2.3.0</ehcache.version>
+ <ehcache.version>2.5.0</ehcache.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
<jdk.version>1.5</jdk.version>
- <jetty.version>6.1.21</jetty.version>
+ <jetty.version>6.1.26</jetty.version>
<openid4j.version>0.9.5</openid4j.version>
<!-- Don't change this version without also changing the shiro-quartz and shiro-features
modules' OSGi metadata: -->
<quartz.version>1.6.1</quartz.version>
- <slf4j.version>1.6.1</slf4j.version>
- <spring.version>3.0.5.RELEASE</spring.version>
+ <slf4j.version>1.6.4</slf4j.version>
+ <spring.version>3.1.0.RELEASE</spring.version>
<guice.version>3.0</guice.version>
<guava.version>r09</guava.version>
<!-- Test 3rd-party dependencies: -->
- <easymock.version>3.0</easymock.version>
+ <easymock.version>3.1</easymock.version>
<gmaven.version>1.3</gmaven.version>
- <groovy.version>1.7.8</groovy.version>
+ <groovy.version>1.8.5</groovy.version>
<junit.version>4.8.2</junit.version>
</properties>
@@ -516,6 +517,13 @@
<version>${commons.cli.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>
<version>${aspectj.version}</version>
Modified: shiro/trunk/support/cas/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/cas/pom.xml?rev=1228401&r1=1228400&r2=1228401&view=diff
==============================================================================
--- shiro/trunk/support/cas/pom.xml (original)
+++ shiro/trunk/support/cas/pom.xml Fri Jan 6 21:00:17 2012
@@ -41,18 +41,24 @@
<artifactId>cas-client-core</artifactId>
<version>3.2.1</version>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
<!-- for SAML ticket validation -->
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>1.1</version>
+ <scope>runtime</scope>
</dependency>
+ <!-- for SAML ticket validation -->
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>1.4.3</version>
+ <scope>runtime</scope>
</dependency>
- <!-- for SAML ticket validation -->
</dependencies>
<build>
Modified: shiro/trunk/support/features/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/features/pom.xml?rev=1228401&r1=1228400&r2=1228401&view=diff
==============================================================================
--- shiro/trunk/support/features/pom.xml (original)
+++ shiro/trunk/support/features/pom.xml Fri Jan 6 21:00:17 2012
@@ -33,8 +33,8 @@
<packaging>pom</packaging>
<properties>
- <aspectj.bundle.version>1.6.8_1</aspectj.bundle.version>
- <ehcache.bundle.version>2.3.0_1</ehcache.bundle.version>
+ <aspectj.bundle.version>1.6.16_1</aspectj.bundle.version>
+ <ehcache.bundle.version>2.5.0_1</ehcache.bundle.version>
<quartz.bundle.version>1.6.1_1</quartz.bundle.version>
<!-- Not a Shiro dependency - used for quartz bundle resolution only (see features.xml): -->
<commons.collections.version>3.2.1</commons.collections.version>
Modified: shiro/trunk/support/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/support/features/src/main/resources/features.xml?rev=1228401&r1=1228400&r2=1228401&view=diff
==============================================================================
--- shiro/trunk/support/features/src/main/resources/features.xml (original)
+++ shiro/trunk/support/features/src/main/resources/features.xml Fri Jan 6 21:00:17 2012
@@ -39,6 +39,14 @@
<bundle>mvn:org.apache.shiro/shiro-aspectj/${project.version}</bundle>
</feature>
+ <feature name="shiro-cas" version="${project.version}" resolver="(obr)">
+ <feature version="${project.version}">shiro-cas</feature>
+ <!-- Is there a CAS client osgi bundle somewhere?
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${casclient.bundle.version}</bundle>
+ -->
+ <bundle>mvn:org.apache.shiro/shiro-cas/${project.version}</bundle>
+ </feature>
+
<feature name="shiro-ehcache" version="${project.version}" resolver="(obr)">
<feature version="${project.version}">shiro-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}</bundle>