Update to latest packages

provider/indexer-aws/pom.xml

@@ -19,8 +19,8 @@
   <parent>
       <groupId>org.opengroup.osdu.indexer</groupId>
       <artifactId>indexer-service</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-      <relativePath>../../pom.xml</relativePath>
+      <version>1.0.1</version>
+      <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -42,6 +42,11 @@
       <version>0.1.3</version>
       <scope>compile</scope>
     </dependency>
+      <dependency>
+          <groupId>org.opengroup.osdu</groupId>
+          <artifactId>os-core-common-model</artifactId>
+          <version>0.0.2</version>
+      </dependency>
     <dependency>
         <groupId>org.opengroup.osdu.indexer</groupId>
         <artifactId>indexer-core</artifactId>
@@ -58,11 +63,6 @@
       <version>1.0.15</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opengroup.osdu</groupId>
-      <artifactId>os-core-common-model</artifactId>
-      <version>0.0.1-snapshot</version>
-    </dependency>
     <!-- AWS managed packages -->
     <dependency>
       <groupId>com.amazonaws</groupId>

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/DpsLogFactory.java

@@ -14,7 +14,7 @@
 
 package org.opengroup.osdu.indexer.aws.di;
 
-import org.opengroup.osdu.core.common.service.DpsLog;
+import org.opengroup.osdu.core.common.model.core.DpsLog;
 import org.opengroup.osdu.core.logging.Log;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.stereotype.Component;

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/EntitlementsServiceImpl.java

@@ -29,7 +29,7 @@ import org.opengroup.osdu.core.api.entitlements.models.Members;
 import org.opengroup.osdu.core.aws.entitlements.*;
 import org.opengroup.osdu.core.httpclient.HttpResponse;
 import org.opengroup.osdu.core.common.service.is.JaxRsDpsLog;
-import org.opengroup.osdu.core.common.service.is.AppException;
+import org.opengroup.osdu.core.common.model.coreis.AppException;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/TenantFactoryImpl.java

@@ -14,7 +14,7 @@
 
 package org.opengroup.osdu.indexer.aws.di;
 
-import org.opengroup.osdu.core.common.service.ICache;
+import org.opengroup.osdu.core.common.model.core.ICache;
 import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
 import org.springframework.stereotype.Component;

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/persistence/ElasticRepositoryImpl.java

@@ -14,8 +14,8 @@
 
 package org.opengroup.osdu.indexer.aws.persistence;
 
+import org.opengroup.osdu.core.common.model.core.ClusterSettings;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.common.model.ClusterSettings;
 import org.opengroup.osdu.is.core.provider.interfaces.persistence.ElasticRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/HeadersInfoAwsImpl.java

@@ -17,7 +17,7 @@ package org.opengroup.osdu.indexer.aws.util;
 import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.service.is.AppException;
+import org.opengroup.osdu.core.common.model.coreis.AppException;
 import org.opengroup.osdu.is.core.model.SlbHeaders;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IHeadersInfo;
 import org.opengroup.osdu.is.core.util.Preconditions;

provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java

@@ -17,7 +17,7 @@ package org.opengroup.osdu.indexer.aws.util;
 import lombok.extern.java.Log;
 import org.apache.http.HttpStatus;
 import org.opengroup.osdu.core.common.model.core.DpsHeaders;
-import org.opengroup.osdu.core.common.service.is.AppException;
+import org.opengroup.osdu.core.common.model.coreis.AppException;
 import org.opengroup.osdu.is.core.provider.interfaces.util.IRequestInfo;
 import org.opengroup.osdu.is.core.util.Preconditions;
 import org.springframework.context.annotation.Primary;

provider/indexer-azure/pom.xml

@@ -24,7 +24,7 @@
         <groupId>org.opengroup.osdu.indexer</groupId>
         <artifactId>indexer-service</artifactId>
         <version>1.0.1</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <artifactId>indexer-azure</artifactId>