Console Output

[appng-authentication] Running shell script
+ git merge --ff appng-authentication-1.11.x --strategy-option theirs
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 CODE_OF_CONDUCT.adoc                               |  71 ++++
 CONTRIBUTING.adoc                                  |   1 +
 README.adoc                                        |   7 +
 application-home/application.xml                   |   2 +-
 license-header.txt                                 |  13 +
 pom.xml                                            |  56 ++-
 src/main/asciidoc/appng.css                        | 405 +++++++++++++++++++++
 src/main/asciidoc/readme.adoc                      |  15 +-
 .../application/authentication/AbstractLogon.java  |   2 +-
 .../authentication/digest/DigestLogin.java         |   2 +-
 .../application/authentication/ntlm/NtlmLogin.java |   2 +-
 .../authentication/webform/LoginData.java          |  30 +-
 .../authentication/webform/LoginForm.java          |   2 +-
 .../authentication/webform/LoginUser.java          |   2 +-
 .../authentication/webform/LogoutUser.java         |   2 +-
 .../authentication/webform/PasswordChange.java     |  30 +-
 .../authentication/webform/PasswordReset.java      |   2 +-
 .../application/authentication/BaseLoginTest.java  |   2 +-
 .../authentication/digest/DigestLoginTest.java     |   2 +-
 .../authentication/ntlm/NtlmLoginTest.java         |   2 +-
 .../webform/AuthenticationTestDataProvider.java    |  30 +-
 .../authentication/webform/LoginFormTest.java      |   2 +-
 .../authentication/webform/LoginUserTest.java      |   2 +-
 .../authentication/webform/LogoutUserTest.java     |  30 +-
 .../authentication/webform/PasswordResetTest.java  |   2 +-
 25 files changed, 619 insertions(+), 97 deletions(-)
 create mode 100644 CODE_OF_CONDUCT.adoc
 create mode 100644 CONTRIBUTING.adoc
 create mode 100644 README.adoc
 create mode 100644 license-header.txt
 create mode 100644 src/main/asciidoc/appng.css