From ed4bf692cfbe6bfb346dcffccfe02d21293937d7 Mon Sep 17 00:00:00 2001
From: Kishore Battula <Kishore.Battula@microsoft.com>
Date: Thu, 23 Jul 2020 13:34:39 +0530
Subject: [PATCH] Enabled transaction logger and slf4jlogger

---
 integration-tests/pom.xml                 |  2 +-
 pom.xml                                   | 20 ++++++++++++++++++--
 src/main/resources/application.properties |  6 +++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1efd0e5..b4cfd76 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-common</artifactId>
-            <version>0.0.10-SNAPSHOT</version>
+            <version>0.3.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/pom.xml b/pom.xml
index 1f481dd..7b77740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<springfox-version>2.7.0</springfox-version>
 		<reactor.netty.version>0.9.0.RELEASE</reactor.netty.version>
 		<reactor.core.version>3.3.0.RELEASE</reactor.core.version>
-		<osdu.azurecore.version>0.0.6-SNAPSHOT</osdu.azurecore.version>
+		<osdu.azurecore.version>0.0.11</osdu.azurecore.version>
 	</properties>
 
 	<licenses>
@@ -75,11 +75,17 @@
 		<dependency>
 			<groupId>org.opengroup.osdu</groupId>
 			<artifactId>os-core-common</artifactId>
-			<version>0.0.10-SNAPSHOT</version>
+			<version>0.3.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -114,6 +120,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>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b6bc550..dd15604 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -55,4 +55,8 @@ azure.graph-api.uri=https://graph.windows.net
 azure.graph-api.appid=00000002-0000-0000-c000-000000000000
 
 # Azure Graph Api Version
-azure.graph-api.version=1.6
\ No newline at end of file
+azure.graph-api.version=1.6
+
+#logging configuration
+logging.transaction.enabled=true
+logging.slf4jlogger.enabled=true
\ No newline at end of file
-- 
GitLab