From 4455cabf1bd5073556fcf8437682938f498c5adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Va=C5=BEan?= Date: Mon, 13 Nov 2023 00:04:31 +0000 Subject: [PATCH] Standalone workflows, upgraded dependencies, updated link to Maven Central --- .github/workflows/build.yml | 21 +++++++++++++++++---- .github/workflows/release.yml | 27 ++++++++++++++++++++------- README.md | 2 +- pom.xml | 30 +++++++++++++++--------------- scripts/configure.py | 4 ++-- 5 files changed, 55 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c45586..80fd69f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,20 @@ on: workflow_dispatch: jobs: build: - uses: robertvazan/rvscaffold/.github/workflows/java-build.yml@master - with: - java-version: 11 - test-coverage: true + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 + cache: maven + - name: Maven + run: | + # GPG must be skipped, because CI server does not have release GPG key. + # Failure on javadoc warnings is enabled only in CI builds, + # so that warnings specific to one JDK version do not break independent builds. + # Printing maven version (-V) helps diagnose CI-specific build behavior. + # JaCoCo phase is needed to create code coverage report that will be later uploaded to Codecov. + mvn install jacoco:report -Dgpg.skip=true -Dmaven.javadoc.failOnWarnings=true -B -V + - uses: codecov/codecov-action@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a7df61..4e32a55 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,10 +3,23 @@ name: release on: workflow_dispatch jobs: release: - uses: robertvazan/rvscaffold/.github/workflows/java-release.yml@master - with: - java-version: 11 - secrets: - server-password: ${{ secrets.MAVEN_SERVER_PASSWORD }} - signing-key: ${{ secrets.MAVEN_SIGNING_KEY }} - signing-password: ${{ secrets.MAVEN_SIGNING_PASSWORD }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 11 + server-id: ossrh + server-username: MAVEN_SERVER_USERNAME + server-password: MAVEN_SERVER_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_SIGNING_KEY }} + gpg-passphrase: MAVEN_SIGNING_PASSWORD + cache: maven + - name: Maven + # Printing maven version (-V) helps diagnose GitHub-specific build behavior. + run: mvn -B -V deploy + env: + MAVEN_SERVER_USERNAME: robertvazan + MAVEN_SERVER_PASSWORD: ${{ secrets.MAVEN_SERVER_PASSWORD }} + MAVEN_SIGNING_PASSWORD: ${{ secrets.MAVEN_SIGNING_PASSWORD }} diff --git a/README.md b/README.md index fca5e1c..2b88005 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # SourceAFIS for Java -[![Maven Central](https://img.shields.io/maven-central/v/com.machinezoo.sourceafis/sourceafis)](https://search.maven.org/artifact/com.machinezoo.sourceafis/sourceafis) +[![Maven Central](https://img.shields.io/maven-central/v/com.machinezoo.sourceafis/sourceafis)](https://central.sonatype.com/artifact/com.machinezoo.sourceafis/sourceafis) [![Build status](https://github.com/robertvazan/sourceafis-java/workflows/build/badge.svg)](https://github.com/robertvazan/sourceafis-java/actions/workflows/build.yml) [![Test coverage](https://codecov.io/gh/robertvazan/sourceafis-java/branch/master/graph/badge.svg)](https://codecov.io/gh/robertvazan/sourceafis-java) diff --git a/pom.xml b/pom.xml index a448b8c..50bf98b 100644 --- a/pom.xml +++ b/pom.xml @@ -52,27 +52,27 @@ com.machinezoo.closeablescope closeablescope - 1.0.0 + 1.0.1 com.machinezoo.noexception noexception - 1.9.0 + 1.9.1 com.machinezoo.fingerprintio fingerprintio - 1.3.0 + 1.3.1 it.unimi.dsi fastutil - 8.5.6 + 8.5.12 commons-io commons-io - 2.11.0 + 2.15.0 com.google.code.gson @@ -82,22 +82,22 @@ com.fasterxml.jackson.core jackson-databind - 2.14.2 + 2.15.3 com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.14.2 + 2.15.3 com.github.mhshams jnbis - 2.1.1 + 2.1.2 org.junit.jupiter junit-jupiter - 5.8.2 + 5.10.1 test @@ -118,16 +118,16 @@ maven-compiler-plugin - 3.8.1 + 3.11.0 maven-surefire-plugin - 3.1.2 + 3.2.2 org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.11 prepare-agent @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.6.2 true @@ -172,7 +172,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.3.0 attach-sources @@ -196,7 +196,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.1.0 --pinentry-mode diff --git a/scripts/configure.py b/scripts/configure.py index 91c16a3..c4b646c 100644 --- a/scripts/configure.py +++ b/scripts/configure.py @@ -18,12 +18,12 @@ def dependencies(self): yield from super().dependencies() yield self.use_closeablescope() yield self.use_noexception() - yield self.use('com.machinezoo.fingerprintio:fingerprintio:1.3.0') + yield self.use('com.machinezoo.fingerprintio:fingerprintio:1.3.1') yield self.use_fastutil() yield self.use_commons_io() yield self.use_gson() yield from self.use_jackson_cbor() - yield self.use('com.github.mhshams:jnbis:2.1.1') + yield self.use('com.github.mhshams:jnbis:2.1.2') yield self.use_junit() yield self.use_hamcrest()