Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

SHIRO-285: added CAS runtime dependency. Upgraded other dependencies …

…to latest stable versions where possible/prudent.

git-svn-id: https://svn.apache.org/repos/asf/shiro/trunk@1228401 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit cbe3f9423927bfd6ac718f8ae85b3ecc42e53b88 1 parent e53e980
authored January 06, 2012
22  pom.xml
@@ -70,28 +70,29 @@
70 70
         <!-- Compile 3rd party dependencies: -->
71 71
         <!-- Don't change this version without also changing the shiro-aspect and shiro-features
72 72
              modules' OSGi metadata: -->
73  
-        <aspectj.version>1.6.9</aspectj.version>
  73
+        <aspectj.version>1.6.12</aspectj.version>
74 74
         <commons.cli.version>1.2</commons.cli.version>
  75
+        <commons.codec.version>1.4</commons.codec.version>
75 76
         <crowd.version>1.5.2</crowd.version>
76 77
         <!-- Don't change this version without also changing the shiro-ehcache and shiro-features
77 78
              modules' OSGi metadata: -->
78  
-        <ehcache.version>2.3.0</ehcache.version>
  79
+        <ehcache.version>2.5.0</ehcache.version>
79 80
         <hsqldb.version>1.8.0.7</hsqldb.version>
80 81
         <jdk.version>1.5</jdk.version>
81  
-        <jetty.version>6.1.21</jetty.version>
  82
+        <jetty.version>6.1.26</jetty.version>
82 83
         <openid4j.version>0.9.5</openid4j.version>
83 84
         <!-- Don't change this version without also changing the shiro-quartz and shiro-features
84 85
              modules' OSGi metadata: -->
85 86
         <quartz.version>1.6.1</quartz.version>
86  
-        <slf4j.version>1.6.1</slf4j.version>
87  
-        <spring.version>3.0.5.RELEASE</spring.version>
  87
+        <slf4j.version>1.6.4</slf4j.version>
  88
+        <spring.version>3.1.0.RELEASE</spring.version>
88 89
         <guice.version>3.0</guice.version>
89 90
         <guava.version>r09</guava.version>
90 91
 
91 92
         <!-- Test 3rd-party dependencies: -->
92  
-        <easymock.version>3.0</easymock.version>
  93
+        <easymock.version>3.1</easymock.version>
93 94
         <gmaven.version>1.3</gmaven.version>
94  
-        <groovy.version>1.7.8</groovy.version>
  95
+        <groovy.version>1.8.5</groovy.version>
95 96
         <junit.version>4.8.2</junit.version>
96 97
 
97 98
     </properties>
@@ -516,6 +517,13 @@
516 517
                 <version>${commons.cli.version}</version>
517 518
             </dependency>
518 519
             <dependency>
  520
+                <!-- runtime dependency for the shiro-cas module: -->
  521
+                <groupId>commons-codec</groupId>
  522
+                <artifactId>commons-codec</artifactId>
  523
+                <version>${commons.codec.version}</version>
  524
+                <scope>runtime</scope>
  525
+            </dependency>
  526
+            <dependency>
519 527
                 <groupId>org.aspectj</groupId>
520 528
                 <artifactId>aspectjrt</artifactId>
521 529
                 <version>${aspectj.version}</version>
8  support/cas/pom.xml
@@ -41,18 +41,24 @@
41 41
             <artifactId>cas-client-core</artifactId>
42 42
             <version>3.2.1</version>
43 43
         </dependency>
  44
+        <dependency>
  45
+            <groupId>commons-codec</groupId>
  46
+            <artifactId>commons-codec</artifactId>
  47
+        </dependency>
44 48
         <!-- for SAML ticket validation -->
45 49
         <dependency>
46 50
             <groupId>org.opensaml</groupId>
47 51
             <artifactId>opensaml</artifactId>
48 52
             <version>1.1</version>
  53
+            <scope>runtime</scope>
49 54
         </dependency>
  55
+        <!-- for SAML ticket validation -->
50 56
         <dependency>
51 57
             <groupId>org.apache.santuario</groupId>
52 58
             <artifactId>xmlsec</artifactId>
53 59
             <version>1.4.3</version>
  60
+            <scope>runtime</scope>
54 61
         </dependency>
55  
-        <!-- for SAML ticket validation -->
56 62
     </dependencies>
57 63
 
58 64
     <build>
4  support/features/pom.xml
@@ -33,8 +33,8 @@
33 33
     <packaging>pom</packaging>
34 34
 
35 35
     <properties>
36  
-        <aspectj.bundle.version>1.6.8_1</aspectj.bundle.version>
37  
-        <ehcache.bundle.version>2.3.0_1</ehcache.bundle.version>
  36
+        <aspectj.bundle.version>1.6.16_1</aspectj.bundle.version>
  37
+        <ehcache.bundle.version>2.5.0_1</ehcache.bundle.version>
38 38
         <quartz.bundle.version>1.6.1_1</quartz.bundle.version>
39 39
         <!-- Not a Shiro dependency - used for quartz bundle resolution only (see features.xml): -->
40 40
         <commons.collections.version>3.2.1</commons.collections.version>
8  support/features/src/main/resources/features.xml
@@ -39,6 +39,14 @@
39 39
         <bundle>mvn:org.apache.shiro/shiro-aspectj/${project.version}</bundle>
40 40
     </feature>
41 41
 
  42
+    <feature name="shiro-cas" version="${project.version}" resolver="(obr)">
  43
+        <feature version="${project.version}">shiro-cas</feature>
  44
+        <!-- Is there a CAS client osgi bundle somewhere?
  45
+        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${casclient.bundle.version}</bundle>
  46
+        -->
  47
+        <bundle>mvn:org.apache.shiro/shiro-cas/${project.version}</bundle>
  48
+    </feature>
  49
+
42 50
     <feature name="shiro-ehcache" version="${project.version}" resolver="(obr)">
43 51
         <feature version="${project.version}">shiro-core</feature>
44 52
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}</bundle>

0 notes on commit cbe3f94

Please sign in to comment.
Something went wrong with that request. Please try again.