Merge branch 'master' into master-dev-merge

NOTICE

@@ -90,6 +90,7 @@ The following software have components provided under the terms of this license:
 - ClassMate (from http://github.com/cowtowncoder/java-classmate)
 - Cloud Key Management Service (KMS) API v1-rev20220407-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
 - Cloud Key Management Service (KMS) API v1-rev20220617-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
+- Cloud Key Management Service (KMS) API v1-rev20220701-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
 - Cloud Storage JSON API v1-rev20220604-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
 - Cloud Storage JSON API v1-rev20220608-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
 - Cloud Storage JSON API v1-rev20220705-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
@@ -126,6 +127,7 @@ The following software have components provided under the terms of this license:
 - IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java)
 - IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java)
 - Identity and Access Management (IAM) API v2beta-rev20220421-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
+- Identity and Access Management (IAM) API v2beta-rev20220526-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
 - J2ObjC Annotations (from https://github.com/google/j2objc/)
 - JBoss Jakarta Annotations API (from https://github.com/jboss/jboss-jakarta-annotations-api_spec)
 - JBoss Logging 3 (from http://www.jboss.org)

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:
@@ -107,3 +111,4 @@ spec:
               value: "false"
             - name: event_grid_enabled
               value: "true"
+      terminationGracePeriodSeconds: 101

provider/notification-ibm/pom.xml

@@ -32,7 +32,7 @@
         <java.version>8</java.version>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.source>${java.version}</maven.compiler.source>
-        <undertow-websockets-jsr.version>2.2.10.Final</undertow-websockets-jsr.version>
+        <undertow-websockets-jsr.version>2.2.11.Final</undertow-websockets-jsr.version>
         <jackson-dataformat-cbor.version>2.13.0</jackson-dataformat-cbor.version>
     </properties>
 
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-lib-ibm</artifactId>
-            <version>0.15.2</version>
+            <version>0.16.0-rc1</version>
             <exclusions>
             	<exclusion>
             		<groupId>org.apache.lucene</groupId>
@@ -60,6 +60,10 @@
             		<groupId>com.fasterxml.jackson.dataformat</groupId>
             		<artifactId>jackson-dataformat-cbor</artifactId>
             	</exclusion>
+            	<exclusion>
+            		<groupId>org.springframework.security</groupId>
+    				<artifactId>spring-security-web</artifactId>
+            	</exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -94,8 +98,32 @@
             		<groupId>io.undertow</groupId>
             		<artifactId>undertow-core</artifactId>
             	</exclusion>
+            	<exclusion>
+            		<groupId>org.springframework.security</groupId>
+    				<artifactId>spring-security-web</artifactId>
+            	</exclusion>
+            	<exclusion>
+					<groupId>org.springframework.security</groupId>
+					<artifactId>spring-security-core</artifactId>
+				</exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+    		<groupId>org.springframework.security</groupId>
+    		<artifactId>spring-security-web</artifactId>
+    		<version>5.3.8.RELEASE</version>
+    		<exclusions>
+    		<exclusion>
+					<groupId>org.springframework.security</groupId>
+					<artifactId>spring-security-core</artifactId>
+				</exclusion>
+            </exclusions>
+		</dependency>
+		 <dependency>
+        	<groupId>org.springframework.security</groupId>
+        	<artifactId>spring-security-core</artifactId>
+        	<version>5.3.8.RELEASE</version>
+   		</dependency>
         <dependency>
         	<groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>