From 41589b6c8c384f3fca435daa1e0de17c2de7d1fd Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 29 Dec 2021 11:09:08 +0100 Subject: [PATCH] Remove parent. --- .github/workflows/lint.yaml | 24 ++ .../workflows/{release.yml => release.yaml} | 2 +- .../workflows/{snapshot.yml => snapshot.yaml} | 27 +- .yamllint | 3 + lombok.config | 18 -- pom.xml | 259 ++++++++++++++++-- pom.xml.versionsBackup | 169 ------------ .../micronaut/logging/AbstractTest.java | 3 - 8 files changed, 261 insertions(+), 244 deletions(-) create mode 100644 .github/workflows/lint.yaml rename .github/workflows/{release.yml => release.yaml} (93%) rename .github/workflows/{snapshot.yml => snapshot.yaml} (58%) delete mode 100644 lombok.config delete mode 100644 pom.xml.versionsBackup diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 0000000..84f2e57 --- /dev/null +++ b/.github/workflows/lint.yaml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yaml similarity index 93% rename from .github/workflows/release.yml rename to .github/workflows/release.yaml index 9108d8a..35cff56 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yaml @@ -25,7 +25,7 @@ jobs: gpg-passphrase: GPG_PASSPHRASE - run: mvn -B dependency:go-offline -q - run: mvn -B release:prepare - - run: mvn -B release:perform -DreleaseProfiles=oss-release + - run: mvn -B release:perform env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yaml similarity index 58% rename from .github/workflows/snapshot.yml rename to .github/workflows/snapshot.yaml index c980708..e10a080 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yaml @@ -5,29 +5,8 @@ name: Snapshot push: {} 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: runs-on: ubuntu-latest - needs: - - lint-markdown - - lint-yaml steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 @@ -40,9 +19,9 @@ jobs: server-password: SERVER_PASSWORD - run: mvn -B dependency:go-offline -q - run: mvn -B verify - if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/3.x' - - run: mvn -B deploy -Poss - if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/3.x' + if: github.ref != 'refs/heads/main' + - run: mvn -B deploy + if: github.ref == 'refs/heads/main' env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} diff --git a/.yamllint b/.yamllint index c9f12ef..9d1b12e 100644 --- a/.yamllint +++ b/.yamllint @@ -5,3 +5,6 @@ rules: # no need for document start document-start: disable + + # line length is not important + line-length: disable diff --git a/lombok.config b/lombok.config deleted file mode 100644 index 4fc0545..0000000 --- a/lombok.config +++ /dev/null @@ -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 diff --git a/pom.xml b/pom.xml index 2db9c48..d641a9f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,21 +2,18 @@ 4.0.0 - - io.kokuwa - maven-parent - 0.5.5 - - - io.kokuwa.micronaut micronaut-logging 3.0.0-SNAPSHOT - Logging support for Micronaut + Logging Support for Micronaut Enhanced logging using MDC or request header. https://github.com/kokuwaio/micronaut-logging 2020 + + Kokuwa.io + http://kokuwa.io + Apache License 2.0 @@ -26,8 +23,12 @@ + stephanschnabel Stephan Schnabel https://github.com/stephanschnabel + stephan@grayc.de + GrayC GmbH + http://grayc.de @@ -41,16 +42,62 @@ github https://github.com/kokuwaio/micronaut-logging/issues + + github + https://github.com/kokuwaio/micronaut-logging/actions + + + + sonatype-nexus + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + - + + UTF-8 + ISO-8859-1 + UTF-8 + + 11 + 11 + true + true + + + + + + + 1.2.8 0.1.5 3.2.3 + 1.18.22 + + + + 3.1.0 + 3.8.1 + 3.0.0-M1 + 3.0.1 + 3.0.0-M1 + 3.3.1 + 3.2.0 + 3.0.0-M4 + 3.2.0 + 3.2.1 + 3.0.0-M5 + 1.1.0 + 1.6.8 @@ -124,14 +171,14 @@ test - + - com.google.code.findbugs - jsr305 + org.projectlombok + lombok provided - + ch.qos.logback logback-classic @@ -148,28 +195,182 @@ + + + + org.apache.maven.plugins + maven-clean-plugin + ${version.org.apache.maven.plugins.clean} + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.org.apache.maven.plugins.compiler} + + + + org.projectlombok + lombok + ${version.org.projectlombok} + + + io.micronaut + micronaut-inject-java + ${version.io.micronaut} + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.org.apache.maven.plugins.deploy} + + + org.apache.maven.plugins + maven-gpg-plugin + ${version.org.apache.maven.plugins.gpg} + + + org.apache.maven.plugins + maven-install-plugin + ${version.org.apache.maven.plugins.install} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.org.apache.maven.plugins.javadoc} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.org.apache.maven.plugins.jar} + + + org.apache.maven.plugins + maven-release-plugin + ${version.org.apache.maven.plugins.release} + + @{project.version} + release + true + + + + org.apache.maven.plugins + maven-resources-plugin + ${version.org.apache.maven.plugins.resources} + + + org.apache.maven.plugins + maven-source-plugin + ${version.org.apache.maven.plugins.source} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.org.apache.maven.plugins.surefire} + + true + true + + + + org.codehaus.mojo + tidy-maven-plugin + ${version.org.codehaus.mojo.tidy} + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${version.org.sonatype.plugins.nexus-staging} + + + - + org.apache.maven.plugins - maven-compiler-plugin - - - - org.projectlombok - lombok - ${version.org.projectlombok} - - - io.micronaut - micronaut-inject-java - ${version.io.micronaut} - - - + maven-source-plugin + + + + jar-no-fork + + + + + + + + org.codehaus.mojo + tidy-maven-plugin + + + + check + + + + + + + release + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + jar + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + sign + + + + + --pinentry-mode + loopback + + + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + sonatype-nexus + https://oss.sonatype.org/ + true + + + + + + + diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup deleted file mode 100644 index 5a30895..0000000 --- a/pom.xml.versionsBackup +++ /dev/null @@ -1,169 +0,0 @@ - - - 4.0.0 - - - io.kokuwa - maven-parent - 0.5.4 - - - - io.kokuwa.micronaut - micronaut-logging - 3.0.0-SNAPSHOT - - Logging support for Micronaut - Enhanced logging using MDC or request header. - https://github.com/kokuwaio/micronaut-logging - 2020 - - - Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - - - - - - Stephan Schnabel - https://github.com/stephanschnabel - - - - - https://github.com/kokuwaio/micronaut-logging - scm:git:https://github.com/kokuwaio/micronaut-logging.git - scm:git:https://github.com/kokuwaio/micronaut-logging.git - HEAD - - - github - https://github.com/kokuwaio/micronaut-logging/issues - - - - - - - - - 0.1.5 - 3.2.0 - - - - - - - - - io.micronaut - micronaut-bom - ${version.io.micronaut} - pom - import - - - - - ch.qos.logback.contrib - logback-json-classic - ${version.ch.qos.logback.contrib} - - - ch.qos.logback.contrib - logback-json-core - ${version.ch.qos.logback.contrib} - - - ch.qos.logback.contrib - logback-jackson - ${version.ch.qos.logback.contrib} - - - - - - - - - io.micronaut - micronaut-runtime - provided - - - io.micronaut.security - micronaut-security - provided - - - io.micronaut.test - micronaut-test-junit5 - test - - - io.micronaut - micronaut-http-client - test - - - io.micronaut - micronaut-http-server-netty - test - - - io.micronaut.security - micronaut-security-jwt - test - - - - - com.google.code.findbugs - jsr305 - provided - - - - - ch.qos.logback - logback-classic - - - ch.qos.logback.contrib - logback-jackson - - - ch.qos.logback.contrib - logback-json-classic - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.projectlombok - lombok - ${version.org.projectlombok} - - - io.micronaut - micronaut-inject-java - ${version.io.micronaut} - - - - - - - - diff --git a/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java b/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java index 366ba0c..ebcc5e7 100644 --- a/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java +++ b/src/test/java/io/kokuwa/micronaut/logging/AbstractTest.java @@ -2,9 +2,7 @@ package io.kokuwa.micronaut.logging; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.ClassOrderer; import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.TestClassOrder; import org.junit.jupiter.api.TestMethodOrder; import org.slf4j.MDC; @@ -16,7 +14,6 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest; * @author Stephan Schnabel */ @MicronautTest -@TestClassOrder(ClassOrderer.DisplayName.class) @TestMethodOrder(MethodOrderer.DisplayName.class) public abstract class AbstractTest {