Merge conflicts on jar versions

.gitlab-ci.yml

NOTICE

devops/azure/chart/helm-config.yaml

devops/azure/chart/templates/deployment.yaml

devops/azure/chart/templates/hpa.yaml

devops/azure/chart/templates/service.yaml

devops/azure/chart/templates/virtual-service.yaml

devops/azure/chart/values.yaml

devops/gcp/configmap/templates/legal-variables.yml

devops/gcp/configmap/values.yaml

legal-core/pom.xml

...pengroup/osdu/legal/middleware/GlobalExceptionMapper.java

...oup/osdu/legal/middleware/GlobalExceptionMapperTests.java

pom.xml

provider/legal-aws/pom.xml

provider/legal-azure/pom.xml

provider/legal-byoc/pom.xml

provider/legal-gcp/pom.xml

...r/legal-gcp/src/main/resources/application-dev.properties

provider/legal-gcp/src/main/resources/application.properties