From b492818397bb352075ca0c9f200c447436838a79 Mon Sep 17 00:00:00 2001
From: Artem Dobrynin <Artem_Dobrynin@epam.com>
Date: Wed, 17 Feb 2021 12:01:40 +0400
Subject: [PATCH] GONRG-1776: Implement logic for CRS Conversion [publish]
https://jiraeu.epam.com/browse/GONRG-1776
https://jiraeu.epam.com/browse/GONRG-1735
* Added logback.xml
* Updated pom
---
.../crs-converter-gae/pom.xml | 12 +++++++
.../src/main/resources/logback.xml | 36 +++++++++++++++++++
.../crs-converter-gke/pom.xml | 12 +++++++
.../src/main/resources/logback.xml | 36 +++++++++++++++++++
4 files changed, 96 insertions(+)
create mode 100644 provider/crs-converter-gcp/crs-converter-gae/src/main/resources/logback.xml
create mode 100644 provider/crs-converter-gcp/crs-converter-gke/src/main/resources/logback.xml
diff --git a/provider/crs-converter-gcp/crs-converter-gae/pom.xml b/provider/crs-converter-gcp/crs-converter-gae/pom.xml
index 0aa2ebbf..3f331f09 100644
--- a/provider/crs-converter-gcp/crs-converter-gae/pom.xml
+++ b/provider/crs-converter-gcp/crs-converter-gae/pom.xml
@@ -43,6 +43,18 @@
<artifactId>spring-security-jwt</artifactId>
<version>1.0.10.RELEASE</version>
</dependency>
+
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>core-lib-gcp</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback.contrib</groupId>
+ <artifactId>logback-json-classic</artifactId>
+ <version>0.1.5</version>
+ </dependency>
</dependencies>
<build>
diff --git a/provider/crs-converter-gcp/crs-converter-gae/src/main/resources/logback.xml b/provider/crs-converter-gcp/crs-converter-gae/src/main/resources/logback.xml
new file mode 100644
index 00000000..e6bb61f9
--- /dev/null
+++ b/provider/crs-converter-gcp/crs-converter-gae/src/main/resources/logback.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+ <springProfile name="local">
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%yellow([%thread]) %highlight(| %-5level |) %green(%d) %cyan(| %logger{15} |) %highlight(%msg) %n</pattern>
+ <charset>utf8</charset>
+ </encoder>
+ </appender>
+ <root level="DEBUG">
+ <appender-ref ref="CONSOLE"/>
+ </root>
+ </springProfile>
+
+ <springProfile name="!local">
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
+ <timestampFormat>yyyy-MM-dd HH:mm:ss.SSS</timestampFormat>
+ <timestampFormatTimezoneId>Etc/UTC</timestampFormatTimezoneId>
+ <appendLineSeparator>true</appendLineSeparator>
+
+ <jsonFormatter class="org.opengroup.osdu.core.gcp.logging.formatter.GoogleJsonFormatter">
+ <prettyPrint>false</prettyPrint>
+ </jsonFormatter>
+ </layout>
+ </encoder>
+ </appender>
+
+ <root level="debug">
+ <appender-ref ref="stdout"/>
+ </root>
+ </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/provider/crs-converter-gcp/crs-converter-gke/pom.xml b/provider/crs-converter-gcp/crs-converter-gke/pom.xml
index eb415062..492dc02f 100644
--- a/provider/crs-converter-gcp/crs-converter-gke/pom.xml
+++ b/provider/crs-converter-gcp/crs-converter-gke/pom.xml
@@ -39,6 +39,18 @@
<artifactId>spring-security-jwt</artifactId>
<version>1.0.10.RELEASE</version>
</dependency>
+
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>core-lib-gcp</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback.contrib</groupId>
+ <artifactId>logback-json-classic</artifactId>
+ <version>0.1.5</version>
+ </dependency>
</dependencies>
<build>
diff --git a/provider/crs-converter-gcp/crs-converter-gke/src/main/resources/logback.xml b/provider/crs-converter-gcp/crs-converter-gke/src/main/resources/logback.xml
new file mode 100644
index 00000000..e6bb61f9
--- /dev/null
+++ b/provider/crs-converter-gcp/crs-converter-gke/src/main/resources/logback.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+ <springProfile name="local">
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%yellow([%thread]) %highlight(| %-5level |) %green(%d) %cyan(| %logger{15} |) %highlight(%msg) %n</pattern>
+ <charset>utf8</charset>
+ </encoder>
+ </appender>
+ <root level="DEBUG">
+ <appender-ref ref="CONSOLE"/>
+ </root>
+ </springProfile>
+
+ <springProfile name="!local">
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+ <layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
+ <timestampFormat>yyyy-MM-dd HH:mm:ss.SSS</timestampFormat>
+ <timestampFormatTimezoneId>Etc/UTC</timestampFormatTimezoneId>
+ <appendLineSeparator>true</appendLineSeparator>
+
+ <jsonFormatter class="org.opengroup.osdu.core.gcp.logging.formatter.GoogleJsonFormatter">
+ <prettyPrint>false</prettyPrint>
+ </jsonFormatter>
+ </layout>
+ </encoder>
+ </appender>
+
+ <root level="debug">
+ <appender-ref ref="stdout"/>
+ </root>
+ </springProfile>
+
+</configuration>
\ No newline at end of file
--
GitLab