Merge branch 'master' into 'haaggarw/ind/7618485'

# Conflicts:
#   provider/legal-azure/pom.xml

provider/legal-azure/pom.xml

@@ -40,6 +40,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-common</artifactId>
+            <version>0.3.4</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu.legal</groupId>
@@ -66,6 +67,16 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -78,12 +89,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>core-lib-azure</artifactId>
-            <version>0.0.10</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>applicationinsights-logging-logback</artifactId>
-            <version>[2.0,)</version>
+            <version>0.0.11</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

provider/legal-azure/src/main/resources/application.properties

@@ -45,4 +45,8 @@ azure.keyvault.url=${KEYVAULT_URI}
 
 #Azure App Insights configuration
 azure.application-insights.instrumentation-key=${appinsights_key}
-spring.application.name=legal-azure
\ No newline at end of file
+spring.application.name=legal-azure
+
+#logging configuration
+logging.transaction.enabled=true
+logging.slf4jlogger.enabled=true
\ No newline at end of file