This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git
commit ab229c644358522636584164f7f8d5da54fd00ee Merge: d456d54 cabe66b Author: [email protected] <[email protected]> AuthorDate: Sat May 18 16:57:18 2019 -0400 Merge branch 'roller-5.2.x' # Conflicts: # app/pom.xml # app/src/main/resources/struts.xml # assembly-release/pom.xml # assembly-release/sign-release.sh # it-selenium/pom.xml # it-selenium/src/test/resources/roller-jettyrun.properties # pom.xml .../roller/weblogger/ui/core/RollerContext.java | 25 --- .../ui/core/filters/SchemeEnforcementFilter.java | 210 --------------------- .../RollerRememberMeAuthenticationProvider.java | 44 +++++ .../ui/core/security/RollerRememberMeServices.java | 73 +++++++ .../plugins/comments/MathCommentAuthenticator.java | 10 +- .../roller/weblogger/config/roller.properties | 6 +- app/src/main/resources/sql/400-to-500-migration.vm | 1 - app/src/main/resources/sql/createdb.vm | 1 - app/src/main/resources/struts.xml | 1 + app/src/main/webapp/WEB-INF/security.xml | 30 ++- app/src/main/webapp/WEB-INF/web.xml | 12 -- 11 files changed, 148 insertions(+), 265 deletions(-)
