Merge in EDELIVERY/smp from bugfix/EDELIVERY-8962-delete-button-is-not-showing-properly-in-edit-keystore-popup-page-for-domain to development

* commit '81a29640fef541843c16a839dd18b7f2975b8300':
  Upgrade angular version to 13 and fix button visibility issue

Merge in EDELIVERY/smp from bugfix/EDELIVERY-8826-build-error-v2 to development

* commit 'a51a9a3e7193c61359da0b5c432c47a2361b6551':
  Fix windows build issue
  Fix windows build issue

Merge remote-tracking branch 'origin/bugfix/EDELIVERY-8826-build-error-v2' into bugfix/EDELIVERY-8826-build-error-v2

Merge in EDELIVERY/smp from feature/EDELIVERY-8880-use-eu-login-for-smp-console-implementation-part-2 to development

* commit '26ad743bdf7071ad9609d6b0e04dddeb4dfec6c7':
  remove parent pom
  HSTS small fix
  update favicon ico
  Enable HSTS and add property for max age
  Implement SSO-CAS authentication

Merge branch 'development' of https://ec.europa.eu/cefdigital/code/scm/edelivery/smp into feature/EDELIVERY-8880-use-eu-login-for-smp-console-implementation-part-2

 Conflicts:
	smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh
	smp-docker/compose/tomcat-mysql/runCompose.sh

Merge in EDELIVERY/smp from feature/EDELIVERY-6312-hsts-headers to feature/EDELIVERY-8880-use-eu-login-for-smp-console-implementation-part-2

* commit '0478917ebcaa3747a9a3150e32dbc8bf127cfec2':
  remove parent pom
  HSTS small fix
  update favicon ico
  Enable HSTS and add property for max age

Marcio SAMPAIO authored 3 years ago and Joze RIHTARSIC committed 3 years ago

Merge in EDELIVERY/smp from bugfix/EDELIVERY-8826-build-error-in-smp-project to feature/EDELIVERY-6312-hsts-headers

* commit '457c80a12e04a11c8fd0cb36c28c71e50e4fcc44':
  remove parent pom

Merge in EDELIVERY/smp from smpAutomation to development

* commit '66c1f6d43b1a0cc77954d959484e94003f7d955b':
  1)All the changes made as per the comment 2)some locator and method got changed as some feature changes for expanding metadata
  1) handling of cookies from login method to other Rest Api Method - Fix of 401 Unauthorized 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
  1) handling of cookies from login method to other Rest Api Method - Fix of 401 Unauthorized 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

# 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