# Conflicts:
#	smp-ui-tests/src/main/java/pages/domain/DomainGrid.java
#	smp-ui-tests/src/main/java/pages/domain/DomainPopup.java
#	smp-ui-tests/src/main/java/pages/users/UserPopup.java
#	smp-ui-tests/src/main/java/pages/users/UsersPage.java
#	smp-ui-tests/src/test/java/ui/DomainPgTest.java
#	smp-ui-tests/src/test/java/ui/UsersPgTest.java

2)domain code is showing as strikethrough in domain grid page when only domain code is used to create new domain
3)Error message is showing while creating duplicate user
4)Error message is showing when password and confirm password doesn't match in user pop up page

2)domain code is showing as strikethrough in domain grid page when only domain code is used to create new domain
3)Error message is showing while creating duplicate user
4)Error message is showing when password and confirm password doesn't match in user pop up page

Merge in EDELIVERY/smp from smpAutomation to development

* commit '6eee2960185a8043bee55d5a94c0969bf104ef4d':
  1) new testcases for login and search page 2)try catch block added in isLoginButtonEnable() methods. 3) renamed few methods

2)try catch block added in isLoginButtonEnable() methods.
3) renamed few methods

Merge branch 'development' of https://ec.europa.eu/cefdigital/code/scm/edelivery/smp into development

* commit '6a1a9f18de249fda08bb152f52945c6027b55943':
  update  "OWASP" libraries

Merge pull request #169 in EDELIVERY/smp from bugfix/EDELIVERY-6496-upgrade-libraries-to-lastes-possible-versions-and-fix-owasp-threats to development

* commit 'd9bedec51673cccfe6e3bf0ba60d159ef0014ad1':
  fix angular "OWASP issues"
  update angular dependecies
  Replace log "engine" Log4j with logback

Merge pull request #168 in EDELIVERY/smp from feature/EDELIVERY-6309-session-termination-for-smp-console to development

* commit 'cd87d5a84728c30a2b84b04837c75249ee463a87':
  Add authentication guard to create, delete, edit table actions
  upgrade angular to 12.0
  Session termination implementation + lib upgrades

Merge pull request #166 in EDELIVERY/smp from bugfix/EDELIVERY-6343-set-csrf-tokens-for-the-smp-console to development

* commit 'af5f5d82ef26d83e75d2d12eacfe45e77820354a':
  Fix path segment '%' encoding
  Fix merge
  Update security config with exception handler for "http basic"
  Update Securioty config with exception handler for "http basic"
  Set csrf configuration
  Set csrf configuration

Merge pull request #167 in EDELIVERY/smp from bugfix/EDELIVERY-6583-problem-with-workaround-for-the-grp-space-test-in-the-metadata-url to bugfix/EDELIVERY-6343-set-csrf-tokens-for-the-smp-console

* commit 'ed3eebf70ecbaace7433f96bd5b26d530b4102c7':
  Fix path segment '%' encoding

Merge branch 'development' of https://ec.europa.eu/cefdigital/code/scm/edelivery/smp into bugfix/EDELIVERY-6343-set-csrf-tokens-for-the-smp-console

 Conflicts:
	smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SpringSecurityConfig.java
	smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResource.java

Merge pull request #165 in EDELIVERY/smp from bugfix/EDELIVERY-6308-set-values-for-the-session-id-cookie-flags-for-smp-console to development

* commit '0a56a27232290955cfb8f1c17930bb5edbc5404f':
  PR updates
  Update the parameter type
  Update unit tests
  Set spring security programmatically and add session cookie parameters