This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository shiro.
commit b343a3458ec66f1dac19b4078ae1658af7a3729a Merge: 06823c3 971db44 Author: tony mancill <[email protected]> Date: Sun Jun 12 11:42:35 2016 -0700 Merge tag 'upstream/1.2.5' Upstream version 1.2.5 .gitignore | 42 ++++ all/pom.xml | 2 +- core/pom.xml | 2 +- .../apache/shiro/authc/AbstractAuthenticator.java | 4 +- .../shiro/authc/pam/ModularRealmAuthenticator.java | 4 +- .../shiro/authz/permission/WildcardPermission.java | 7 +- .../shiro/mgt/AbstractRememberMeManager.java | 16 +- .../mgt/AbstractValidatingSessionManager.java | 12 +- .../shiro/authc/AbstractAuthenticatorTest.java | 39 ++++ .../realm/ldap/DefaultLdapContextFactoryTest.java | 212 ++++++++++----------- pom.xml | 51 ++--- samples/aspectj/pom.xml | 9 +- samples/pom.xml | 2 +- samples/quickstart/pom.xml | 2 +- samples/spring-client/pom.xml | 33 +++- samples/spring-hibernate/pom.xml | 2 +- samples/spring/pom.xml | 2 +- samples/web/pom.xml | 2 +- samples/web/src/main/webapp/WEB-INF/shiro.ini | 4 + shiro.doap.rdf | 8 +- support/aspectj/pom.xml | 9 +- support/cas/pom.xml | 178 ++++++++--------- .../main/java/org/apache/shiro/cas/CasFilter.java | 3 + support/ehcache/pom.xml | 2 +- support/features/pom.xml | 196 +++++++++---------- support/guice/pom.xml | 190 +++++++++--------- support/pom.xml | 2 +- support/quartz/pom.xml | 2 +- support/spring/pom.xml | 2 +- tools/hasher/pom.xml | 202 ++++++++++---------- tools/pom.xml | 80 ++++---- web/pom.xml | 2 +- .../web/filter/authc/FormAuthenticationFilter.java | 3 + .../shiro/web/mgt/CookieRememberMeManagerTest.java | 40 ++++ 34 files changed, 754 insertions(+), 612 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/shiro.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
