From 0adbe477392a93f2b2602feeb4896ff157f1f4a7 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Mon, 13 Dec 2021 09:02:32 +0100 Subject: [PATCH] Bump versions. --- .github/workflows/ci.yml | 34 ---------------------------------- .github/workflows/release.yml | 21 --------------------- .github/workflows/snapshot.yml | 17 +++++++++++++---- pom.xml | 8 +++++++- 4 files changed, 20 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index dec1718..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: PullRequest - -"on": [pull_request] - -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 - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 - with: - distribution: temurin - java-version: 11 - cache: maven - - run: mvn -B dependency:go-offline -q - - run: mvn -B verify diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f13993..9108d8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,29 +4,8 @@ name: Release workflow_dispatch: {} 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 with: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index ab9bf69..c980708 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -2,10 +2,7 @@ name: Snapshot "on": workflow_dispatch: {} - push: - branches: - - main - - '*.x' + push: {} jobs: @@ -42,7 +39,19 @@ jobs: server-username: SERVER_USERNAME 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' env: SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + - uses: dorny/test-reporter@v1 + if: failure() + with: + name: surefire + path: '*/target/surefire-reports/*.xml' + reporter: java-junit + list-suites: failed + list-tests: failed + fail-on-error: false diff --git a/pom.xml b/pom.xml index ed38ada..8107e02 100644 --- a/pom.xml +++ b/pom.xml @@ -48,8 +48,9 @@ + 1.2.7 0.1.5 - 3.2.0 + 3.2.1 @@ -66,6 +67,11 @@ + + ch.qos.logback + logback-classic + ${version.ch.qos.logback} + ch.qos.logback.contrib logback-json-classic