Refactor dependencyManagement
to enable includes, added it for this #141
25 changed files with 526 additions and 9 deletions
7
.github/dependabot.yml
vendored
7
.github/dependabot.yml
vendored
|
@ -11,9 +11,14 @@ updates:
|
|||
time: "09:00"
|
||||
timezone: Europe/Berlin
|
||||
ignore:
|
||||
# logback 1.3 and 1.4 are compatible with slf4j 2.x only
|
||||
# logback 1.3 and 1.4 are compatible with slf4j 2.x only and not supported right now
|
||||
- dependency-name: ch.qos.logback:logback-classic
|
||||
update-types: [version-update:semver-major, version-update:semver-minor]
|
||||
- dependency-name: org.slf4j:slf4j-api
|
||||
update-types: [version-update:semver-major]
|
||||
# micronaut 4 will ship logback 1.4
|
||||
- dependency-name: io.micronaut:*
|
||||
update-types: [version-update:semver-major]
|
||||
- package-ecosystem: github-actions
|
||||
directory: /
|
||||
open-pull-requests-limit: 10
|
||||
|
|
23
README.md
23
README.md
|
@ -16,6 +16,29 @@ Include in your `pom.xml`:
|
|||
</dependency>
|
||||
```
|
||||
|
||||
Or use in `dependencyManagement` in `pom.xml`:
|
||||
|
||||
```xml
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.kokuwa.micronaut</groupId>
|
||||
<artifactId>micronaut-logging</artifactId>
|
||||
<version>${version.io.kokuwa.micronaut.logging}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micronaut</groupId>
|
||||
<artifactId>micronaut-bom</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
```
|
||||
|
||||
## Features
|
||||
|
||||
* Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 1.7 & Logback 1.2
|
||||
|
|
62
pom.xml
62
pom.xml
|
@ -4,7 +4,7 @@
|
|||
|
||||
<groupId>io.kokuwa.micronaut</groupId>
|
||||
<artifactId>micronaut-logging</artifactId>
|
||||
<version>3.0.7-SNAPSHOT</version>
|
||||
<version>3.1.0-SNAPSHOT</version>
|
||||
|
||||
<name>Logging Support for Micronaut</name>
|
||||
<description>Enhanced logging using MDC or request header.</description>
|
||||
|
@ -86,6 +86,7 @@
|
|||
<version.org.apache.maven.plugins.deploy>3.1.1</version.org.apache.maven.plugins.deploy>
|
||||
<version.org.apache.maven.plugins.gpg>3.0.1</version.org.apache.maven.plugins.gpg>
|
||||
<version.org.apache.maven.plugins.install>3.1.1</version.org.apache.maven.plugins.install>
|
||||
<version.org.apache.maven.plugins.invoker>3.5.1</version.org.apache.maven.plugins.invoker>
|
||||
<version.org.apache.maven.plugins.javadoc>3.5.0</version.org.apache.maven.plugins.javadoc>
|
||||
<version.org.apache.maven.plugins.jar>3.3.0</version.org.apache.maven.plugins.jar>
|
||||
<version.org.apache.maven.plugins.release>3.0.0</version.org.apache.maven.plugins.release>
|
||||
|
@ -101,20 +102,28 @@
|
|||
|
||||
<version.ch.qos.logback>1.2.12</version.ch.qos.logback>
|
||||
<version.ch.qos.logback.contrib>0.1.5</version.ch.qos.logback.contrib>
|
||||
<version.io.kokuwa.micronaut.logging>${project.version}</version.io.kokuwa.micronaut.logging>
|
||||
<version.io.micronaut>3.9.1</version.io.micronaut>
|
||||
<version.io.micronaut.security> 3.11.0</version.io.micronaut.security>
|
||||
<version.org.slf4j.api>1.7.36</version.org.slf4j.api>
|
||||
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
|
||||
<!-- micronaut -->
|
||||
<!-- this library -->
|
||||
<dependency>
|
||||
<groupId>io.micronaut</groupId>
|
||||
<artifactId>micronaut-bom</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
<groupId>io.kokuwa.micronaut</groupId>
|
||||
<artifactId>micronaut-logging</artifactId>
|
||||
<version>${version.io.kokuwa.micronaut.logging}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- slf4j -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>${version.org.slf4j.api}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- logback -->
|
||||
|
@ -123,6 +132,11 @@
|
|||
<artifactId>logback-classic</artifactId>
|
||||
<version>${version.ch.qos.logback}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
<artifactId>logback-core</artifactId>
|
||||
<version>${version.ch.qos.logback}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback.contrib</groupId>
|
||||
<artifactId>logback-json-classic</artifactId>
|
||||
|
@ -147,31 +161,37 @@
|
|||
<dependency>
|
||||
<groupId>io.micronaut</groupId>
|
||||
<artifactId>micronaut-runtime</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micronaut.security</groupId>
|
||||
<artifactId>micronaut-security</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micronaut.test</groupId>
|
||||
<artifactId>micronaut-test-junit5</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micronaut</groupId>
|
||||
<artifactId>micronaut-http-client</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micronaut</groupId>
|
||||
<artifactId>micronaut-http-server-netty</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micronaut.security</groupId>
|
||||
<artifactId>micronaut-security-jwt</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
|
@ -258,6 +278,11 @@
|
|||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>${version.org.apache.maven.plugins.install}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-invoker-plugin</artifactId>
|
||||
<version>${version.org.apache.maven.plugins.invoker}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
|
@ -276,6 +301,7 @@
|
|||
<tagNameFormat>@{project.version}</tagNameFormat>
|
||||
<releaseProfiles>release</releaseProfiles>
|
||||
<localCheckout>true</localCheckout>
|
||||
<scmReleaseCommitComment>@{prefix} prepare release @{releaseLabel} [no ci]</scmReleaseCommitComment>
|
||||
<signTag>true</signTag>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
@ -311,6 +337,28 @@
|
|||
</pluginManagement>
|
||||
<plugins>
|
||||
|
||||
<!-- run invoker tests -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-invoker-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>install</goal>
|
||||
<goal>integration-test</goal>
|
||||
<goal>verify</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
|
||||
<parallelThreads>1C</parallelThreads>
|
||||
<streamLogs>false</streamLogs>
|
||||
<streamLogsOnFailures>true</streamLogsOnFailures>
|
||||
<writeJunitReport>true</writeJunitReport>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- fail if any pom is dirty -->
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
|
|
1
src/it/level-from-micronaut/invoker.properties
Normal file
1
src/it/level-from-micronaut/invoker.properties
Normal file
|
@ -0,0 +1 @@
|
|||
invoker.environmentVariables.LOGGER_LEVELS_IO_KOKUWA_MICRONAUT_LOGGING=DEBUG
|
12
src/it/level-from-micronaut/pom.xml
Normal file
12
src/it/level-from-micronaut/pom.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@-it</artifactId>
|
||||
<version>LOCAL-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>@project.artifactId@-it-level-from-micronaut</artifactId>
|
||||
</project>
|
21
src/it/level-from-micronaut/postbuild.bsh
Normal file
21
src/it/level-from-micronaut/postbuild.bsh
Normal file
|
@ -0,0 +1,21 @@
|
|||
// verify log
|
||||
|
||||
String expected = "^[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3} main DEBUG i.k.m.logging.LoggingTest test-output-marker$";
|
||||
String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n");
|
||||
|
||||
for (String log : logs) {
|
||||
if (!log.contains("test-output-marker")) {
|
||||
continue;
|
||||
}
|
||||
if (java.util.regex.Pattern.matches(expected, log)) {
|
||||
return true;
|
||||
} else {
|
||||
System.out.println("marker found, but formatting invalid:");
|
||||
System.out.println("[EXPECTED] " + expected);
|
||||
System.out.println("[ACTUAL] " + log);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("marker not found");
|
||||
return false;
|
1
src/it/log-gcp-from-env/invoker.properties
Normal file
1
src/it/log-gcp-from-env/invoker.properties
Normal file
|
@ -0,0 +1 @@
|
|||
invoker.environmentVariables.LOGBACK_APPENDER=GCP
|
12
src/it/log-gcp-from-env/pom.xml
Normal file
12
src/it/log-gcp-from-env/pom.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@-it</artifactId>
|
||||
<version>LOCAL-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>@project.artifactId@-it-log-gcp-from-env</artifactId>
|
||||
</project>
|
21
src/it/log-gcp-from-env/postbuild.bsh
Normal file
21
src/it/log-gcp-from-env/postbuild.bsh
Normal file
|
@ -0,0 +1,21 @@
|
|||
// verify log
|
||||
|
||||
String expected = "^\\{\"time\":\"202[3-9]-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3}Z\",\"severity\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$";
|
||||
String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n");
|
||||
|
||||
for (String log : logs) {
|
||||
if (!log.contains("test-output-marker")) {
|
||||
continue;
|
||||
}
|
||||
if (java.util.regex.Pattern.matches(expected, log)) {
|
||||
return true;
|
||||
} else {
|
||||
System.out.println("marker found, but formatting invalid:");
|
||||
System.out.println("[EXPECTED] " + expected);
|
||||
System.out.println("[ACTUAL] " + log);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("marker not found");
|
||||
return false;
|
1
src/it/log-gcp-from-gcloud/invoker.properties
Normal file
1
src/it/log-gcp-from-gcloud/invoker.properties
Normal file
|
@ -0,0 +1 @@
|
|||
invoker.environmentVariables.GOOGLE_CLOUD_PROJECT=value
|
12
src/it/log-gcp-from-gcloud/pom.xml
Normal file
12
src/it/log-gcp-from-gcloud/pom.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@-it</artifactId>
|
||||
<version>LOCAL-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>@project.artifactId@-it-log-gcp-from-gcloud</artifactId>
|
||||
</project>
|
21
src/it/log-gcp-from-gcloud/postbuild.bsh
Normal file
21
src/it/log-gcp-from-gcloud/postbuild.bsh
Normal file
|
@ -0,0 +1,21 @@
|
|||
// verify log
|
||||
|
||||
String expected = "^\\{\"time\":\"202[3-9]-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3}Z\",\"severity\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$";
|
||||
String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n");
|
||||
|
||||
for (String log : logs) {
|
||||
if (!log.contains("test-output-marker")) {
|
||||
continue;
|
||||
}
|
||||
if (java.util.regex.Pattern.matches(expected, log)) {
|
||||
return true;
|
||||
} else {
|
||||
System.out.println("marker found, but formatting invalid:");
|
||||
System.out.println("[EXPECTED] " + expected);
|
||||
System.out.println("[ACTUAL] " + log);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("marker not found");
|
||||
return false;
|
1
src/it/log-json-from-env/invoker.properties
Normal file
1
src/it/log-json-from-env/invoker.properties
Normal file
|
@ -0,0 +1 @@
|
|||
invoker.environmentVariables.LOGBACK_APPENDER=JSON
|
12
src/it/log-json-from-env/pom.xml
Normal file
12
src/it/log-json-from-env/pom.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@-it</artifactId>
|
||||
<version>LOCAL-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>@project.artifactId@-it-log-json-from-env</artifactId>
|
||||
</project>
|
21
src/it/log-json-from-env/postbuild.bsh
Normal file
21
src/it/log-json-from-env/postbuild.bsh
Normal file
|
@ -0,0 +1,21 @@
|
|||
// verify log
|
||||
|
||||
String expected = "^\\{\"timestamp\":\"[0-9]{13}\",\"level\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$";
|
||||
String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n");
|
||||
|
||||
for (String log : logs) {
|
||||
if (!log.contains("test-output-marker")) {
|
||||
continue;
|
||||
}
|
||||
if (java.util.regex.Pattern.matches(expected, log)) {
|
||||
return true;
|
||||
} else {
|
||||
System.out.println("marker found, but formatting invalid:");
|
||||
System.out.println("[EXPECTED] " + expected);
|
||||
System.out.println("[ACTUAL] " + log);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("marker not found");
|
||||
return false;
|
1
src/it/log-json-from-kubernetes/invoker.properties
Normal file
1
src/it/log-json-from-kubernetes/invoker.properties
Normal file
|
@ -0,0 +1 @@
|
|||
invoker.environmentVariables.KUBERNETES_SERVICE_HOST=value
|
12
src/it/log-json-from-kubernetes/pom.xml
Normal file
12
src/it/log-json-from-kubernetes/pom.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@-it</artifactId>
|
||||
<version>LOCAL-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>@project.artifactId@-it-log-json-from-kubernetes</artifactId>
|
||||
</project>
|
21
src/it/log-json-from-kubernetes/postbuild.bsh
Normal file
21
src/it/log-json-from-kubernetes/postbuild.bsh
Normal file
|
@ -0,0 +1,21 @@
|
|||
// verify log
|
||||
|
||||
String expected = "^\\{\"timestamp\":\"[0-9]{13}\",\"level\":\"INFO\",\"thread\":\"main\",\"logger\":\"io.kokuwa.micronaut.logging.LoggingTest\",\"message\":\"test-output-marker\",\"raw-message\":\"test-output-marker\"}$";
|
||||
String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n");
|
||||
|
||||
for (String log : logs) {
|
||||
if (!log.contains("test-output-marker")) {
|
||||
continue;
|
||||
}
|
||||
if (java.util.regex.Pattern.matches(expected, log)) {
|
||||
return true;
|
||||
} else {
|
||||
System.out.println("marker found, but formatting invalid:");
|
||||
System.out.println("[EXPECTED] " + expected);
|
||||
System.out.println("[ACTUAL] " + log);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("marker not found");
|
||||
return false;
|
12
src/it/log-text/pom.xml
Normal file
12
src/it/log-text/pom.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@-it</artifactId>
|
||||
<version>LOCAL-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>@project.artifactId@-it-log-text</artifactId>
|
||||
</project>
|
21
src/it/log-text/postbuild.bsh
Normal file
21
src/it/log-text/postbuild.bsh
Normal file
|
@ -0,0 +1,21 @@
|
|||
// verify log
|
||||
|
||||
String expected = "^[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{0,3} main INFO i.k.m.logging.LoggingTest test-output-marker$";
|
||||
String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n");
|
||||
|
||||
for (String log : logs) {
|
||||
if (!log.contains("test-output-marker")) {
|
||||
continue;
|
||||
}
|
||||
if (java.util.regex.Pattern.matches(expected, log)) {
|
||||
return true;
|
||||
} else {
|
||||
System.out.println("marker found, but formatting invalid:");
|
||||
System.out.println("[EXPECTED] " + expected);
|
||||
System.out.println("[ACTUAL] " + log);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("marker not found");
|
||||
return false;
|
12
src/it/logback-xml-custom/pom.xml
Normal file
12
src/it/logback-xml-custom/pom.xml
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@-it</artifactId>
|
||||
<version>LOCAL-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>@project.artifactId@-it-log-text</artifactId>
|
||||
</project>
|
21
src/it/logback-xml-custom/postbuild.bsh
Normal file
21
src/it/logback-xml-custom/postbuild.bsh
Normal file
|
@ -0,0 +1,21 @@
|
|||
// verify log
|
||||
|
||||
String expected = "^TRACE io.kokuwa.micronaut.logging.LoggingTest test-output-marker$";
|
||||
String[] logs = org.codehaus.plexus.util.FileUtils.fileRead(basedir + "/build.log").split("\n");
|
||||
|
||||
for (String log : logs) {
|
||||
if (!log.contains("test-output-marker")) {
|
||||
continue;
|
||||
}
|
||||
if (java.util.regex.Pattern.matches(expected, log)) {
|
||||
return true;
|
||||
} else {
|
||||
System.out.println("marker found, but formatting invalid:");
|
||||
System.out.println("[EXPECTED] " + expected);
|
||||
System.out.println("[ACTUAL] " + log);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("marker not found");
|
||||
return false;
|
13
src/it/logback-xml-custom/src/test/resources/logback.xml
Normal file
13
src/it/logback-xml-custom/src/test/resources/logback.xml
Normal file
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>%-5level %logger{40} %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
<logger name="io.kokuwa.micronaut.logging" level="TRACE" />
|
||||
<root level="WARN">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
|
179
src/it/pom.xml
Normal file
179
src/it/pom.xml
Normal file
|
@ -0,0 +1,179 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@-it</artifactId>
|
||||
<version>LOCAL-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>log-text</module>
|
||||
<module>log-json-from-env</module>
|
||||
<module>log-json-from-kubernetes</module>
|
||||
<module>log-gcp-from-env</module>
|
||||
<module>log-gcp-from-gcloud</module>
|
||||
<module>level-from-micronaut</module>
|
||||
<module>logback-xml-custom</module>
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
|
||||
<!-- ===================================================================== -->
|
||||
<!-- ============================== Build ================================ -->
|
||||
<!-- ===================================================================== -->
|
||||
|
||||
<project.build.sourceEncoding>@project.build.sourceEncoding@</project.build.sourceEncoding>
|
||||
|
||||
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
|
||||
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
|
||||
<maven.compiler.parameters>true</maven.compiler.parameters>
|
||||
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
|
||||
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
|
||||
<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
|
||||
<maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
|
||||
|
||||
<!-- ===================================================================== -->
|
||||
<!-- ============================= Libaries ============================== -->
|
||||
<!-- ===================================================================== -->
|
||||
|
||||
<!-- plugins -->
|
||||
|
||||
<version.org.apache.maven.plugins.compiler>@version.org.apache.maven.plugins.compiler@</version.org.apache.maven.plugins.compiler>
|
||||
<version.org.apache.maven.plugins.install>@version.org.apache.maven.plugins.install@</version.org.apache.maven.plugins.install>
|
||||
<version.org.apache.maven.plugins.jar>@version.org.apache.maven.plugins.jar@</version.org.apache.maven.plugins.jar>
|
||||
<version.org.apache.maven.plugins.resources>@version.org.apache.maven.plugins.resources@</version.org.apache.maven.plugins.resources>
|
||||
<version.org.apache.maven.plugins.surefire>@version.org.apache.maven.plugins.surefire@</version.org.apache.maven.plugins.surefire>
|
||||
|
||||
<!-- dependencies -->
|
||||
|
||||
<version.io.kokuwa.micronaut.logging>@version.io.kokuwa.micronaut.logging@</version.io.kokuwa.micronaut.logging>
|
||||
<version.io.micronaut>@version.io.micronaut@</version.io.micronaut>
|
||||
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.kokuwa.micronaut</groupId>
|
||||
<artifactId>micronaut-logging</artifactId>
|
||||
<version>${version.io.kokuwa.micronaut.logging}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micronaut</groupId>
|
||||
<artifactId>micronaut-bom</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<dependencies>
|
||||
|
||||
<!-- micronaut -->
|
||||
<dependency>
|
||||
<groupId>io.micronaut</groupId>
|
||||
<artifactId>micronaut-runtime</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micronaut.test</groupId>
|
||||
<artifactId>micronaut-test-junit5</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.kokuwa.micronaut</groupId>
|
||||
<artifactId>micronaut-logging</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<testSourceDirectory>${project.basedir}/../src/test/java</testSourceDirectory>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>${version.org.apache.maven.plugins.compiler}</version>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>io.micronaut</groupId>
|
||||
<artifactId>micronaut-inject-java</artifactId>
|
||||
<version>${version.io.micronaut}</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>${version.org.apache.maven.plugins.install}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>${version.org.apache.maven.plugins.jar}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>${version.org.apache.maven.plugins.resources}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>${version.org.apache.maven.plugins.surefire}</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
<plugins>
|
||||
|
||||
<!-- remove default invocations -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-resources</id>
|
||||
<phase />
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-compile</id>
|
||||
<phase />
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-jar</id>
|
||||
<phase />
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-install</id>
|
||||
<phase />
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
|
@ -0,0 +1,13 @@
|
|||
package io.kokuwa.micronaut.logging;
|
||||
|
||||
@io.micronaut.test.extensions.junit5.annotation.MicronautTest
|
||||
public class LoggingTest {
|
||||
|
||||
@org.junit.jupiter.api.Test
|
||||
void log() {
|
||||
var log = org.slf4j.LoggerFactory.getLogger(LoggingTest.class);
|
||||
log.trace("test-output-marker");
|
||||
log.debug("test-output-marker");
|
||||
log.info("test-output-marker");
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue