Remove parent.

This commit is contained in:
Stephan Schnabel 2021-12-29 11:09:08 +01:00
parent 3efda9d452
commit 41589b6c8c
Signed by: stephan.schnabel
GPG key ID: F74FE2422AA07290
8 changed files with 261 additions and 244 deletions

24
.github/workflows/lint.yaml vendored Normal file
View file

@ -0,0 +1,24 @@
name: Lint
"on":
workflow_dispatch: {}
push: {}
jobs:
yaml:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ibiqlik/action-yamllint@v3
with:
format: colored
strict: true
markdown:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: docker://avtodev/markdown-lint:v1
with:
args: /github/workspace

View file

@ -25,7 +25,7 @@ jobs:
gpg-passphrase: GPG_PASSPHRASE gpg-passphrase: GPG_PASSPHRASE
- run: mvn -B dependency:go-offline -q - run: mvn -B dependency:go-offline -q
- run: mvn -B release:prepare - run: mvn -B release:prepare
- run: mvn -B release:perform -DreleaseProfiles=oss-release - run: mvn -B release:perform
env: env:
SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}

View file

@ -5,29 +5,8 @@ name: Snapshot
push: {} push: {}
jobs: jobs:
lint-yaml:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ibiqlik/action-yamllint@v3
with:
format: colored
strict: true
lint-markdown:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: docker://avtodev/markdown-lint:v1
with:
args: /github/workspace
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs:
- lint-markdown
- lint-yaml
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-java@v2 - uses: actions/setup-java@v2
@ -40,9 +19,9 @@ jobs:
server-password: SERVER_PASSWORD server-password: SERVER_PASSWORD
- run: mvn -B dependency:go-offline -q - run: mvn -B dependency:go-offline -q
- run: mvn -B verify - run: mvn -B verify
if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/3.x' if: github.ref != 'refs/heads/main'
- run: mvn -B deploy -Poss - run: mvn -B deploy
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/3.x' if: github.ref == 'refs/heads/main'
env: env:
SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}

View file

@ -5,3 +5,6 @@ rules:
# no need for document start # no need for document start
document-start: disable document-start: disable
# line length is not important
line-length: disable

View file

@ -1,18 +0,0 @@
config.stopBubbling = true
lombok.addNullAnnotations = CUSTOM:io.micronaut.core.annotation.NonNull:io.micronaut.core.annotation.Nullable
lombok.addJavaxGeneratedAnnotation = true
lombok.addLombokGeneratedAnnotation = true
# adjust model
lombok.equalsAndHashCode.callSuper = call
lombok.toString.callSuper = call
lombok.accessors.chain = true
# use slf4j
lombok.log.apacheCommons.flagUsage = error
lombok.log.javaUtilLogging.flagUsage = error
lombok.log.jbosslog.flagUsage = error
lombok.log.log4j.flagUsage = error
lombok.log.log4j2.flagUsage = error
lombok.log.xslf4j.flagUsage = error

231
pom.xml
View file

@ -2,21 +2,18 @@
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.kokuwa</groupId>
<artifactId>maven-parent</artifactId>
<version>0.5.5</version>
<relativePath />
</parent>
<groupId>io.kokuwa.micronaut</groupId> <groupId>io.kokuwa.micronaut</groupId>
<artifactId>micronaut-logging</artifactId> <artifactId>micronaut-logging</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<name>Logging support for Micronaut</name> <name>Logging Support for Micronaut</name>
<description>Enhanced logging using MDC or request header.</description> <description>Enhanced logging using MDC or request header.</description>
<url>https://github.com/kokuwaio/micronaut-logging</url> <url>https://github.com/kokuwaio/micronaut-logging</url>
<inceptionYear>2020</inceptionYear> <inceptionYear>2020</inceptionYear>
<organization>
<name>Kokuwa.io</name>
<url>http://kokuwa.io</url>
</organization>
<licenses> <licenses>
<license> <license>
<name>Apache License 2.0</name> <name>Apache License 2.0</name>
@ -26,8 +23,12 @@
<developers> <developers>
<developer> <developer>
<id>stephanschnabel</id>
<name>Stephan Schnabel</name> <name>Stephan Schnabel</name>
<url>https://github.com/stephanschnabel</url> <url>https://github.com/stephanschnabel</url>
<email>stephan@grayc.de</email>
<organization>GrayC GmbH</organization>
<organizationUrl>http://grayc.de</organizationUrl>
</developer> </developer>
</developers> </developers>
@ -41,16 +42,62 @@
<system>github</system> <system>github</system>
<url>https://github.com/kokuwaio/micronaut-logging/issues</url> <url>https://github.com/kokuwaio/micronaut-logging/issues</url>
</issueManagement> </issueManagement>
<ciManagement>
<system>github</system>
<url>https://github.com/kokuwaio/micronaut-logging/actions</url>
</ciManagement>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
</distributionManagement>
<properties> <properties>
<!-- ===================================================================== --> <!-- ===================================================================== -->
<!-- ============================= Libaries ============================== --> <!-- ============================== Build ================================ -->
<!-- ===================================================================== --> <!-- ===================================================================== -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.propertiesEncoding>ISO-8859-1</project.build.propertiesEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<!-- ===================================================================== -->
<!-- ============================= Versions ============================== -->
<!-- ===================================================================== -->
<!-- dependencies -->
<version.ch.qos.logback>1.2.8</version.ch.qos.logback> <version.ch.qos.logback>1.2.8</version.ch.qos.logback>
<version.ch.qos.logback.contrib>0.1.5</version.ch.qos.logback.contrib> <version.ch.qos.logback.contrib>0.1.5</version.ch.qos.logback.contrib>
<version.io.micronaut>3.2.3</version.io.micronaut> <version.io.micronaut>3.2.3</version.io.micronaut>
<version.org.projectlombok>1.18.22</version.org.projectlombok>
<!-- plugins -->
<version.org.apache.maven.plugins.clean>3.1.0</version.org.apache.maven.plugins.clean>
<version.org.apache.maven.plugins.compiler>3.8.1</version.org.apache.maven.plugins.compiler>
<version.org.apache.maven.plugins.deploy>3.0.0-M1</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.0.0-M1</version.org.apache.maven.plugins.install>
<version.org.apache.maven.plugins.javadoc>3.3.1</version.org.apache.maven.plugins.javadoc>
<version.org.apache.maven.plugins.jar>3.2.0</version.org.apache.maven.plugins.jar>
<version.org.apache.maven.plugins.release>3.0.0-M4</version.org.apache.maven.plugins.release>
<version.org.apache.maven.plugins.resources>3.2.0</version.org.apache.maven.plugins.resources>
<version.org.apache.maven.plugins.source>3.2.1</version.org.apache.maven.plugins.source>
<version.org.apache.maven.plugins.surefire>3.0.0-M5</version.org.apache.maven.plugins.surefire>
<version.org.codehaus.mojo.tidy>1.1.0</version.org.codehaus.mojo.tidy>
<version.org.sonatype.plugins.nexus-staging>1.6.8</version.org.sonatype.plugins.nexus-staging>
</properties> </properties>
@ -124,14 +171,14 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- avoid compiler warning, see https://docs.micronaut.io/latest/guide/#_nullable_annotations --> <!-- build -->
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>org.projectlombok</groupId>
<artifactId>jsr305</artifactId> <artifactId>lombok</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- logging --> <!-- logback -->
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
@ -148,12 +195,17 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins> <plugins>
<plugin>
<!-- add compiler processors --> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${version.org.apache.maven.plugins.clean}</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${version.org.apache.maven.plugins.compiler}</version>
<configuration> <configuration>
<annotationProcessorPaths> <annotationProcessorPaths>
<path> <path>
@ -169,7 +221,156 @@
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${version.org.apache.maven.plugins.deploy}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${version.org.apache.maven.plugins.gpg}</version>
</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-javadoc-plugin</artifactId>
<version>${version.org.apache.maven.plugins.javadoc}</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-release-plugin</artifactId>
<version>${version.org.apache.maven.plugins.release}</version>
<configuration>
<tagNameFormat>@{project.version}</tagNameFormat>
<releaseProfiles>release</releaseProfiles>
<localCheckout>true</localCheckout>
</configuration>
</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-source-plugin</artifactId>
<version>${version.org.apache.maven.plugins.source}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.org.apache.maven.plugins.surefire}</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<failIfNoTests>true</failIfNoTests>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
<version>${version.org.codehaus.mojo.tidy}</version>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${version.org.sonatype.plugins.nexus-staging}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- add source for downstream projects -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- fail if any pom is dirty -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<!-- add javadoc for downstream projects -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- sign documents before upload -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<!-- Prevent `gpg` from using pinentry programs -->
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
<!-- autoclose sonatype nexus repo -->
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

View file

@ -1,169 +0,0 @@
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.kokuwa</groupId>
<artifactId>maven-parent</artifactId>
<version>0.5.4</version>
<relativePath />
</parent>
<groupId>io.kokuwa.micronaut</groupId>
<artifactId>micronaut-logging</artifactId>
<version>3.0.0-SNAPSHOT</version>
<name>Logging support for Micronaut</name>
<description>Enhanced logging using MDC or request header.</description>
<url>https://github.com/kokuwaio/micronaut-logging</url>
<inceptionYear>2020</inceptionYear>
<licenses>
<license>
<name>Apache License 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<developers>
<developer>
<name>Stephan Schnabel</name>
<url>https://github.com/stephanschnabel</url>
</developer>
</developers>
<scm>
<url>https://github.com/kokuwaio/micronaut-logging</url>
<connection>scm:git:https://github.com/kokuwaio/micronaut-logging.git</connection>
<developerConnection>scm:git:https://github.com/kokuwaio/micronaut-logging.git</developerConnection>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>github</system>
<url>https://github.com/kokuwaio/micronaut-logging/issues</url>
</issueManagement>
<properties>
<!-- ===================================================================== -->
<!-- ============================= Libaries ============================== -->
<!-- ===================================================================== -->
<version.ch.qos.logback.contrib>0.1.5</version.ch.qos.logback.contrib>
<version.io.micronaut>3.2.0</version.io.micronaut>
</properties>
<dependencyManagement>
<dependencies>
<!-- micronaut -->
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-bom</artifactId>
<version>${version.io.micronaut}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- logback -->
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
<artifactId>logback-json-classic</artifactId>
<version>${version.ch.qos.logback.contrib}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
<artifactId>logback-json-core</artifactId>
<version>${version.ch.qos.logback.contrib}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
<artifactId>logback-jackson</artifactId>
<version>${version.ch.qos.logback.contrib}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- micronaut -->
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.micronaut.security</groupId>
<artifactId>micronaut-security</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.micronaut.test</groupId>
<artifactId>micronaut-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http-server-netty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micronaut.security</groupId>
<artifactId>micronaut-security-jwt</artifactId>
<scope>test</scope>
</dependency>
<!-- avoid compiler warning, see https://docs.micronaut.io/latest/guide/#_nullable_annotations -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>
<!-- logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
<artifactId>logback-jackson</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
<artifactId>logback-json-classic</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<!-- add compiler processors -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${version.org.projectlombok}</version>
</path>
<path>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject-java</artifactId>
<version>${version.io.micronaut}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>

View file

@ -2,9 +2,7 @@ package io.kokuwa.micronaut.logging;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.ClassOrderer;
import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.TestClassOrder;
import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.TestMethodOrder;
import org.slf4j.MDC; import org.slf4j.MDC;
@ -16,7 +14,6 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
* @author Stephan Schnabel * @author Stephan Schnabel
*/ */
@MicronautTest @MicronautTest
@TestClassOrder(ClassOrderer.DisplayName.class)
@TestMethodOrder(MethodOrderer.DisplayName.class) @TestMethodOrder(MethodOrderer.DisplayName.class)
public abstract class AbstractTest { public abstract class AbstractTest {