# Conflicts:
#	smp-ui-tests/src/main/java/pages/service_groups/ServiceGroupRow.java
#	smp-ui-tests/src/main/java/utils/rest/SMPRestClient.java

2)some locator and method got changed as some feature changes for expanding metadata

2) Handling nullpointer exception while quitting of driver in BaseTest class
3) Code Fix for SRCH-60 and SRCH-70 due feature changes in ServiceGroupRow

Merge in EDELIVERY/smp from bugfix/EDELIVERY-8808-time-mask-username-or-password-failure to development

* commit '3f6bf59e8dd2075297563aa3e83bb4ffb27f4ca3':
  Failed login delay
  Failed login delay

2) Handling nullpointer exception while quitting of driver in BaseTest class
3) Code Fix for SRCH-60 and SRCH-70 due feature changes in ServiceGroupRow

Merge in EDELIVERY/smp from smpAutomation to development

* commit 'fd9b91ce588c8de7fda43606ade07963ed4b4e94':
  minor changes
  Changes are made according to the comment provided in pull request 174.
  1)Duplicate domain code validation in domain 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
  1)Duplicate domain code validation in domain 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

# 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