Console Output

+ git merge --ff appng-authentication-1.12.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 CONTRIBUTING.adoc                                  |  4 +
 application-home/application.xml                   |  8 +-
 application-home/conf/ev-digest.xml                |  1 +
 application-home/conf/ev-ntlm.xml                  |  1 +
 changelog.txt                                      | 14 ++++
 license-header.txt                                 |  2 +-
 lombok.config                                      |  1 +
 pom.xml                                            | 87 ++++++++++++++++++++--
 .../application/authentication/AbstractLogon.java  | 65 +++++++++-------
 .../authentication/digest/DigestLogin.java         | 20 ++---
 .../application/authentication/ntlm/NtlmLogin.java | 10 ++-
 .../authentication/webform/LoginData.java          | 48 ++----------
 .../authentication/webform/LoginForm.java          |  8 +-
 .../authentication/webform/LoginUser.java          | 10 +--
 .../authentication/webform/LogoutUser.java         | 13 +++-
 .../authentication/webform/PasswordChange.java     | 44 ++++++-----
 .../authentication/webform/PasswordReset.java      | 65 ++++++++--------
 .../application/authentication/BaseLoginTest.java  |  2 +-
 .../authentication/digest/DigestLoginTest.java     |  2 +-
 .../authentication/digest/Digestgenerator.java     | 39 ++++++++++
 .../authentication/ntlm/NtlmLoginTest.java         |  4 +-
 .../webform/AuthenticationTestDataProvider.java    |  2 +-
 .../authentication/webform/LoginFormTest.java      |  3 +-
 .../authentication/webform/LoginUserTest.java      |  5 +-
 .../authentication/webform/LogoutUserTest.java     |  4 +-
 .../authentication/webform/PasswordResetTest.java  |  2 +-
 26 files changed, 295 insertions(+), 169 deletions(-)
 create mode 100644 changelog.txt
 create mode 100644 lombok.config
 create mode 100644 src/test/java/org/appng/application/authentication/digest/Digestgenerator.java