resolving merge conflicts

devops/azure/chart/templates/deployment.yaml

@@ -43,6 +43,10 @@ spec:
         - name: {{ .Chart.Name }}
           image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: Always
+          lifecycle:
+            preStop:
+              exec:
+                command: ["sleep","90"]
           ports:
             - containerPort: 80
           readinessProbe:
@@ -132,5 +136,6 @@ spec:
             {{- end }}
             - name: SPRING_CONFIG_NAME
               value: "common,application"
+      terminationGracePeriodSeconds: 101 
 
 

provider/schema-ibm/pom.xml

@@ -12,7 +12,7 @@
 	
 	<properties>
 		<start-class>org.opengroup.osdu.schema.provider.ibm.app.SchemaIBMApplication</start-class>
-		<os-core-lib-ibm.version>0.15.2</os-core-lib-ibm.version>
+		<os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version>
 		<spring-webmvc.version>5.3.22</spring-webmvc.version>
 	</properties>