merge from master

.gitlab-ci.yml

@@ -5,6 +5,7 @@ variables:
   OSDU_GCP_HELM_CONFIG_DIR: "devops/gcp/configmap"
   OSDU_GCP_HELM_NAMESPACE: "default"
   OSDU_GCP_HELM_CONFIG_SERVICE_VARS: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.app_project=$OSDU_GCP_PROJECT --set data.app_googleaudience=$GOOGLE_AUDIENCE --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
+  OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.app_project=$OSDU_GCP_PROJECT --set data.app_googleaudience=$GOOGLE_AUDIENCE --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
   OSDU_GCP_HELM_CONFIG_SERVICE: "notification-config"
   OSDU_GCP_HELM_DEPLOYMENT_SERVICE: "notification-deploy"
@@ -59,3 +60,8 @@ osdu-gcp-test:
   variables:
     ENVIRONMENT: $OSDU_GCP_ENVIRONMENT
     REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL
+
+osdu-gcp-dev2-test:
+ variables:
+   ENVIRONMENT: $OSDU_GCP_ENVIRONMENT
+   REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL

devops/azure/chart/templates/auth.yaml

@@ -30,4 +30,4 @@ spec:
       to:
         - operation:
             notPaths: ["/","*/swagger-resources","*/swagger",
-                       "/api/notification/v1/swagger-resources/*","*/swagger-ui.html","*/actuator/health"]
\ No newline at end of file
+                       "/api/notification/v1/swagger-resources/*","*/swagger-ui.html","*/swagger-ui/index.html","*/actuator/health"]

devops/azure/chart/templates/authSB.yaml

@@ -30,4 +30,4 @@ spec:
       to:
         - operation:
             notPaths: ["/","*/swagger-resources","*/swagger",
-                       "/api/notification/v1/swagger-resources/*","*/swagger-ui.html","*/actuator/health"]
\ No newline at end of file
+                       "/api/notification/v1/swagger-resources/*","*/swagger-ui.html","*/swagger-ui/index.html","*/actuator/health"]

devops/azure/chart/templates/deployment.yaml

@@ -47,7 +47,7 @@ spec:
             - containerPort: 80
           readinessProbe:
             httpGet:
-              path: /api/notification/v1/swagger-ui.html
+              path: /api/notification/v1/swagger-ui/index.html
               port: 80
           volumeMounts:
             - name: azure-keyvault
@@ -106,4 +106,4 @@ spec:
             - name: event_grid_to_service_bus_enabled
               value: "false"
             - name: event_grid_enabled
-              value: "true"
\ No newline at end of file
+              value: "true"

devops/azure/chart/templates/deploymentSB.yaml

@@ -43,7 +43,7 @@ spec:
             - containerPort: 81
           readinessProbe:
             httpGet:
-              path: /api/notification/v1/swagger-ui.html
+              path: /api/notification/v1/swagger-ui/index.html
               port: 81
           volumeMounts:
             - name: azure-keyvault
@@ -102,4 +102,4 @@ spec:
             - name: event_grid_to_service_bus_enabled
               value: "false"
             - name: event_grid_enabled
-              value: "false"
\ No newline at end of file
+              value: "false"

devops/gcp/deploy/templates/deployment.yaml

@@ -20,6 +20,7 @@ spec:
       containers:
         - name: "{{ .Values.conf.app_name }}"
           image: "{{ .Values.data.image }}"
+          imagePullPolicy: "{{ .Values.data.imagePullPolicy }}"
           envFrom:
           - configMapRef:
               name: "{{ .Values.conf.configmap }}"

devops/gcp/deploy/values.yaml

@@ -4,6 +4,7 @@ data:
   limits_cpu: "1"
   limits_memory: "1G"
   serviceAccountName: ""
+  imagePullPolicy: "IfNotPresent"
   image: ""
 
 conf:

notification-core/pom.xml

@@ -35,34 +35,19 @@
         <java.version>8</java.version>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.source>${java.version}</maven.compiler.source>
-        <netty.version>4.1.65.Final</netty.version>
+        <springfox-version>2.7.0</springfox-version>
+        <netty.version>4.1.70.Final</netty.version>
         <undertow.version>2.1.7.Final</undertow.version>
-        <log4j2.version>2.16.0</log4j2.version>
-        <os-core-common.version>0.13.0-rc3</os-core-common.version>
+        <woodstox-core.version>5.3.0</woodstox-core.version>
+        <log4j.version>2.17.0</log4j.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opengroup.osdu</groupId>
-                <artifactId>os-core-common</artifactId>
-                <version>${os-core-common.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-to-slf4j</artifactId>
-                <version>${log4j2.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-api</artifactId>
-                <version>${log4j2.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <groupId>com.fasterxml.woodstox</groupId>
+                <artifactId>woodstox-core</artifactId>
+                <version>${woodstox-core.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -189,7 +174,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.9</version>
         </dependency>
 
          <dependency>

pom.xml

@@ -42,6 +42,13 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId> org.apache.logging.log4j</groupId>
+				<artifactId>log4j-bom</artifactId>
+				<version>${log4j2.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>

provider/notification-azure/pom.xml

@@ -49,17 +49,11 @@
     <reactor-core.version>3.4.6</reactor-core.version>
     <reactor-netty.version>1.0.7</reactor-netty.version>
     <oauth2-oidc-sdk.version>6.0</oauth2-oidc-sdk.version>
+    <woodstox-core.version>5.3.0</woodstox-core.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <!-- Inherit managed dependencies from core-lib-azure -->
       <dependency>
         <groupId>org.opengroup.osdu</groupId>
@@ -69,19 +63,9 @@
         <scope>import</scope>
       </dependency>
       <dependency>
-	      <groupId>org.apache.logging.log4j</groupId>
-	      <artifactId>log4j-core</artifactId>
-	      <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-	      <groupId>org.apache.logging.log4j</groupId>
-	      <artifactId>log4j-slf4j-impl</artifactId>
-	      <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-	      <groupId>org.apache.logging.log4j</groupId>
-	      <artifactId>log4j-jul</artifactId>
-	      <version>${log4j2.version}</version>
+        <groupId>com.fasterxml.woodstox</groupId>
+        <artifactId>woodstox-core</artifactId>
+        <version>${woodstox-core.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -254,4 +238,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
+</project>
\ No newline at end of file