merge conflicts

indexer-core/maven/settings.xml

indexer-core/mvnw

indexer-core/mvnw.cmd

indexer-core/pom.xml

...n/java/org/opengroup/osdu/indexer/IndexerApplication.java

...java/org/opengroup/osdu/indexer/ServerletInitializer.java

.../src/main/java/org/opengroup/osdu/indexer/SwaggerDoc.java

...n/java/org/opengroup/osdu/indexer/api/HealthCheckApi.java

...java/org/opengroup/osdu/indexer/api/RecordIndexerApi.java

.../main/java/org/opengroup/osdu/indexer/api/ReindexApi.java

...p/osdu/indexer/auth/AuthorizationServiceEntitlements.java

.../java/org/opengroup/osdu/indexer/logging/AuditEvents.java

.../java/org/opengroup/osdu/indexer/logging/AuditLogger.java

...java/org/opengroup/osdu/indexer/logging/ServiceLogId.java

...pengroup/osdu/indexer/middleware/AuthorizationFilter.java

...va/org/opengroup/osdu/indexer/model/ConversionStatus.java

...in/java/org/opengroup/osdu/indexer/model/ElasticType.java

.../java/org/opengroup/osdu/indexer/model/IndexProgress.java

...in/java/org/opengroup/osdu/indexer/model/IndexSchema.java

...java/org/opengroup/osdu/indexer/model/IndexingStatus.java