From fe3d67c208740b28324dc6866895c4fb9c9d0049 Mon Sep 17 00:00:00 2001 From: Vitalij Berdinskih Date: Tue, 22 Oct 2024 22:31:08 +0300 Subject: [PATCH 1/6] Remove the libraries.io badge, add some version badges --- readme.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/readme.md b/readme.md index 55a52e2..ad67d8d 100644 --- a/readme.md +++ b/readme.md @@ -4,10 +4,13 @@ JDK Platform Logging Service with mock loggers backed by [Mockito][]. [![Codacy Badge][codacy-badge]][codacy-badge-link] [![Codacy Coverage][codacy-coverage]][codacy-coverage-link] -[![Libraries.io dependency status for GitHub repo][dependency-status]][dependencies] -[![Java Version][java-version]][jdk-download] +![Maven Central Last Update](https://img.shields.io/maven-central/last-update/io.github.vitalijr2.logging/mock-jdk-platform-logging) [![Maven Central](https://img.shields.io/maven-central/v/io.github.vitalijr2.logging/mock-jdk-platform-logging)](https://search.maven.org/artifact/io.github.vitalijr2.logging/mock-jdk-platform-logging) -[![Javadoc](https://javadoc.io/badge2/io.github.vitalijr2.logging/mock-jdk-platform-logging/javadoc.svg)](https://javadoc.io/doc/io.github.vitalijr2.logging/mock-jdk-platform-logging) +[![Javadoc](https://javadoc.io/badge2/io.github.vitalijr2.logging/mock-jdk-platform-logging/javadoc.svg)](https://javadoc.io/doc/io.github.vitalijr2.logging/mock-jdk-platform-logging) +[![Java Version][java-version]][jdk-download] +![jUnit Jupiter Version][junit-jupiter-version] +![jUnit Platform Version][junit-platform-version] +![Mockito Version][mockito-version] ## How to use @@ -143,13 +146,15 @@ limitations under the License. [codacy-coverage-link]: https://app.codacy.com/gh/vitalijr2/mock-jdk-platform-logging/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage -[dependency-status]: https://img.shields.io/librariesio/github/vitalijr2/mock-jdk-platform-logging +[java-version]: https://img.shields.io/static/v1?label=java&message=11&color=blue&logoColor=E23D28 -[dependencies]: https://libraries.io/github/vitalijr2/mock-jdk-platform-logging +[jdk-download]: https://www.oracle.com/java/technologies/downloads/#java11 -[java-version]: https://img.shields.io/static/v1?label=java&message=11&color=blue&logo=java&logoColor=E23D28 +[junit-jupiter-version]: https://img.shields.io/static/v1?label=jUnit+Jupiter&message=5.11.3&color=blue&logo=junit5&logoColor=E23D28 -[jdk-download]: https://www.oracle.com/java/technologies/downloads/#java11 +[junit-platform-version]: https://img.shields.io/static/v1?label=jUnit+Platform&message=1.11.3&color=blue&logo=junit5&logoColor=E23D28 + +[mockito-version]: https://img.shields.io/static/v1?label=Mockito&message=5.14.2&color=blue&logoColor=E23D28 [slf4j-mock]: https://github.com/s4u/slf4j-mock From c28b10101fd086f8442c285f7a60714af3534b0c Mon Sep 17 00:00:00 2001 From: Vitalij Berdinskih Date: Tue, 22 Oct 2024 22:32:56 +0300 Subject: [PATCH 2/6] Capitalize Java --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ad67d8d..a786783 100644 --- a/readme.md +++ b/readme.md @@ -146,7 +146,7 @@ limitations under the License. [codacy-coverage-link]: https://app.codacy.com/gh/vitalijr2/mock-jdk-platform-logging/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage -[java-version]: https://img.shields.io/static/v1?label=java&message=11&color=blue&logoColor=E23D28 +[java-version]: https://img.shields.io/static/v1?label=Java&message=11&color=blue&logoColor=E23D28 [jdk-download]: https://www.oracle.com/java/technologies/downloads/#java11 From 7ec8cfae80cc8575f45ba467b643d1708b493528 Mon Sep 17 00:00:00 2001 From: Vitalij Berdinskih Date: Tue, 22 Oct 2024 22:46:47 +0300 Subject: [PATCH 3/6] Fix the CodeQL workflow --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e7688fd..885c315 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: include: - - language: java-kotlin + - language: java build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too. steps: - name: Checkout repository From 6f76cc3a58d7a5d1572585fb1ccbc4dbd10afdf1 Mon Sep 17 00:00:00 2001 From: Vitalij Berdinskih Date: Tue, 22 Oct 2024 22:55:09 +0300 Subject: [PATCH 4/6] Fix the CodeQL workflow --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 885c315..755d536 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: include: - - language: java + - language: [ 'java' ] build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too. steps: - name: Checkout repository From 0f7c68b2075c64ce02e5bda99f2bb9e198bd7379 Mon Sep 17 00:00:00 2001 From: Vitalij Berdinskih Date: Tue, 22 Oct 2024 23:00:31 +0300 Subject: [PATCH 5/6] Revert changes for CodeQL --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 755d536..c823a09 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: include: - - language: [ 'java' ] + - language: java-kotlin build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too. steps: - name: Checkout repository @@ -33,8 +33,8 @@ jobs: - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: - languages: ${{ matrix.language }} - build-mode: ${{ matrix.build-mode }} + languages: ${{matrix.language}} + build-mode: ${{matrix.build-mode}} - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 with: From df496188f930f7d4cf18bdb64ab5d3dbc8863751 Mon Sep 17 00:00:00 2001 From: Vitalij Berdinskih Date: Tue, 22 Oct 2024 23:11:14 +0300 Subject: [PATCH 6/6] Fix an workflow artifact --- .github/workflows/codacy.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml index 42451d1..3bbf32e 100644 --- a/.github/workflows/codacy.yml +++ b/.github/workflows/codacy.yml @@ -26,9 +26,8 @@ jobs: - name: Temporarily save target and test requests uses: actions/upload-artifact@master with: - name: tests-and-target - path: | - target + name: target + path: target/ retention-days: 1 codacy-security-scan: name: Codacy Security Scan @@ -61,7 +60,7 @@ jobs: - name: Retrieve saved test requests and target uses: actions/download-artifact@master with: - name: tests-and-target + name: target path: target - name: Run codacy-coverage-reporter uses: codacy/codacy-coverage-reporter-action@a38818475bb21847788496e9f0fddaa4e84955ba