Commit fd24055c authored by Dania Kodeih (Microsoft)'s avatar Dania Kodeih (Microsoft)
Browse files

Merge branch 'kibattul/ind/7466583' into 'master'

Enabled transaction logger and slf4jlogger

See merge request !13
parents c9291761 ed4bf692
Pipeline #4165 failed with stages
in 16 minutes and 6 seconds
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId> <artifactId>os-core-common</artifactId>
<version>0.0.10-SNAPSHOT</version> <version>0.3.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<springfox-version>2.7.0</springfox-version> <springfox-version>2.7.0</springfox-version>
<reactor.netty.version>0.9.0.RELEASE</reactor.netty.version> <reactor.netty.version>0.9.0.RELEASE</reactor.netty.version>
<reactor.core.version>3.3.0.RELEASE</reactor.core.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> </properties>
<licenses> <licenses>
...@@ -75,11 +75,17 @@ ...@@ -75,11 +75,17 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId> <artifactId>os-core-common</artifactId>
<version>0.0.10-SNAPSHOT</version> <version>0.3.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
...@@ -114,6 +120,16 @@ ...@@ -114,6 +120,16 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <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>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
......
...@@ -56,3 +56,7 @@ azure.graph-api.appid=00000002-0000-0000-c000-000000000000 ...@@ -56,3 +56,7 @@ azure.graph-api.appid=00000002-0000-0000-c000-000000000000
# Azure Graph Api Version # Azure Graph Api Version
azure.graph-api.version=1.6 azure.graph-api.version=1.6
#logging configuration
logging.transaction.enabled=true
logging.slf4jlogger.enabled=true
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment