# Conflicts:
#	delivery-core/pom.xml
#	delivery-core/src/main/java/org/opengroup/osdu/delivery/service/EntitlementsAndCacheServiceImpl.java
#	delivery-core/src/main/java/org/opengroup/osdu/delivery/service/SearchServiceImpl.java
#	delivery-core/src/test/java/org/opengroup/osdu/delivery/service/SearchServiceImplTest.java
#	provider/delivery-aws/pom.xml
#	provider/delivery-gcp/pom.xml
#	testing/delivery-test-core/pom.xml