Merge branch 'master' into rm-whitespace

Conflicts: pom.xml
weixin007 · May 23, 2015 · bba6ca5 · bba6ca5
2 parents d3c8cd2 + 29d545f
commit bba6ca5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -1483,7 +1483,7 @@
         <xml.apis.version>1.4.01</xml.apis.version>
         <jstl.version>1.2</jstl.version>
         <openid4java.version>0.9.8</openid4java.version>
-        <cas-server-security-filter.version>2.0.2-SNAPSHOT</cas-server-security-filter.version>
+        <cas-server-security-filter.version>2.0.2</cas-server-security-filter.version>
         <google.guava.version>18.0</google.guava.version>
         <jcache.version>1.0.0</jcache.version>
         <jcache.ri.version>1.0.0</jcache.ri.version>