diff --git a/NOTICE b/NOTICE index 13bc57473c88124e0802ccb7bf365c0e03452da5..e35049c15d088a51f6bbb0e994425bf44b7571ce 100644 --- a/NOTICE +++ b/NOTICE @@ -359,6 +359,9 @@ The following software have components provided under the terms of this license: - KeePassJava2 :: KDB (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-kdb) - KeePassJava2 :: KDBX (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-kdbx) - KeePassJava2 :: Simple (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-simple) +- Logback Contrib :: JSON :: Classic (from ) +- Logback Contrib :: JSON :: Core (from ) +- Logback Contrib :: Jackson (from ) - MapStruct Core (from ) - Maven Artifact (from ) - Maven Artifact Manager (from ) @@ -411,11 +414,15 @@ The following software have components provided under the terms of this license: - Netty/Transport (from http://netty.io/) - Netty/Transport/Native/Unix/Common (from ) - Netty/Transport/Native/Unix/Common (from ) +- Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type) - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt) - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt) +- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt) +- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags) - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags) - Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor) - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) +- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - Objenesis (from http://objenesis.org) - OkHttp (from ) - OkHttp (from ) @@ -722,6 +729,9 @@ EPL-1.0 The following software have components provided under the terms of this license: - Logback Classic Module (from ) +- Logback Contrib :: JSON :: Classic (from ) +- Logback Contrib :: JSON :: Core (from ) +- Logback Contrib :: Jackson (from ) - Logback Core Module (from ) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -833,6 +843,9 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) - Logback Classic Module (from ) +- Logback Contrib :: JSON :: Classic (from ) +- Logback Contrib :: JSON :: Core (from ) +- Logback Contrib :: Jackson (from ) - Logback Core Module (from ) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) diff --git a/provider/legal-gcp/pom.xml b/provider/legal-gcp/pom.xml index 608f947283525819cc480780d85fca4e742a5903..f1a19ef9a13c052f0c3f00b6f61db7146b29e667 100644 --- a/provider/legal-gcp/pom.xml +++ b/provider/legal-gcp/pom.xml @@ -34,7 +34,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gcp</artifactId> - <version>0.3.21</version> + <version>0.6.1-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -186,6 +186,16 @@ <groupId>org.springframework.security</groupId> <artifactId>spring-security-config</artifactId> </dependency> + <dependency> + <groupId>ch.qos.logback.contrib</groupId> + <artifactId>logback-json-classic</artifactId> + <version>0.1.5</version> + </dependency> + <dependency> + <groupId>ch.qos.logback.contrib</groupId> + <artifactId>logback-jackson</artifactId> + <version>0.1.5</version> + </dependency> </dependencies> diff --git a/provider/legal-gcp/src/main/resources/logback.xml b/provider/legal-gcp/src/main/resources/logback.xml new file mode 100644 index 0000000000000000000000000000000000000000..6b5168ec8550653c30f5d769e7ead39b0cdfaee0 --- /dev/null +++ b/provider/legal-gcp/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>