From 6fffb88707d1210546f75a4ed19291d68e8aa7f1 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 10 Oct 2024 17:06:06 +0200 Subject: [PATCH 01/36] change groupId from fairdevkit to fairdatateam see e.g. https://maven.apache.org/repository/guide-central-repository-upload.html#faq-and-common-mistakes --- CHANGELOG.md | 2 +- pom.xml | 2 +- rdf-resource-resolver-api/pom.xml | 2 +- .../fairdevkit/rdf/resolver/api/ResolverStrategy.java | 2 +- .../fairdevkit/rdf/resolver/api/ResourceResolver.java | 2 +- .../github/fairdevkit/rdf/resolver/api/package-info.java | 2 +- rdf-resource-resolver-core/pom.xml | 2 +- .../rdf/resolver/core/AbstractResolverStrategy.java | 4 ++-- .../rdf/resolver/core/ContentNegotiationStrategy.java | 2 +- .../fairdevkit/rdf/resolver/core/CoreResourceResolver.java | 6 +++--- .../fairdevkit/rdf/resolver/core/PathExtensionStrategy.java | 2 +- .../github/fairdevkit/rdf/resolver/core/package-info.java | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27992d7..be28053 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,4 +6,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -[Unreleased]: https://github.com/fairdevkit/rdf-resource-resolver/compare/master...HEAD +[Unreleased]: https://github.com/fairdatateam/rdf-resource-resolver/compare/master...HEAD diff --git a/pom.xml b/pom.xml index 0ac20c6..acbde14 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - com.github.fairdevkit + com.github.fairdatateam rdf-resource-resolver 0.1.2-SNAPSHOT pom diff --git a/rdf-resource-resolver-api/pom.xml b/rdf-resource-resolver-api/pom.xml index 98d2a25..e74a2c9 100644 --- a/rdf-resource-resolver-api/pom.xml +++ b/rdf-resource-resolver-api/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - com.github.fairdevkit + com.github.fairdatateam rdf-resource-resolver 0.1.2-SNAPSHOT diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResolverStrategy.java b/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResolverStrategy.java index a7fbf12..a622f37 100644 --- a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResolverStrategy.java +++ b/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResolverStrategy.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdevkit.rdf.resolver.api; +package com.github.fairdatateam.rdf.resolver.api; import java.io.IOException; import java.io.InputStream; diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResourceResolver.java b/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResourceResolver.java index efde756..edb71ca 100644 --- a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResourceResolver.java +++ b/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResourceResolver.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdevkit.rdf.resolver.api; +package com.github.fairdatateam.rdf.resolver.api; import java.io.IOException; import java.io.InputStream; diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/package-info.java b/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/package-info.java index ad33839..3a99725 100644 --- a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/package-info.java +++ b/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/package-info.java @@ -26,4 +26,4 @@ * API types for the RDF resolver library. */ @javax.annotation.ParametersAreNonnullByDefault -package com.github.fairdevkit.rdf.resolver.api; +package com.github.fairdatateam.rdf.resolver.api; diff --git a/rdf-resource-resolver-core/pom.xml b/rdf-resource-resolver-core/pom.xml index 8d21a3d..5616375 100644 --- a/rdf-resource-resolver-core/pom.xml +++ b/rdf-resource-resolver-core/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - com.github.fairdevkit + com.github.fairdatateam rdf-resource-resolver 0.1.2-SNAPSHOT diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/AbstractResolverStrategy.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/AbstractResolverStrategy.java index 170e614..494db6b 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/AbstractResolverStrategy.java +++ b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/AbstractResolverStrategy.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdevkit.rdf.resolver.core; +package com.github.fairdatateam.rdf.resolver.core; -import com.github.fairdevkit.rdf.resolver.api.ResolverStrategy; +import com.github.fairdatateam.rdf.resolver.api.ResolverStrategy; import java.io.IOException; import java.io.InputStream; import java.net.http.HttpClient; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/ContentNegotiationStrategy.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/ContentNegotiationStrategy.java index 34ab2ee..31d978f 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/ContentNegotiationStrategy.java +++ b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/ContentNegotiationStrategy.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdevkit.rdf.resolver.core; +package com.github.fairdatateam.rdf.resolver.core; import java.io.InputStream; import java.net.URI; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/CoreResourceResolver.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/CoreResourceResolver.java index 4ddf0e1..fbf5cc4 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/CoreResourceResolver.java +++ b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/CoreResourceResolver.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdevkit.rdf.resolver.core; +package com.github.fairdatateam.rdf.resolver.core; -import com.github.fairdevkit.rdf.resolver.api.ResolverStrategy; -import com.github.fairdevkit.rdf.resolver.api.ResourceResolver; +import com.github.fairdatateam.rdf.resolver.api.ResolverStrategy; +import com.github.fairdatateam.rdf.resolver.api.ResourceResolver; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/PathExtensionStrategy.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/PathExtensionStrategy.java index 90d5a58..f8a8359 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/PathExtensionStrategy.java +++ b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/PathExtensionStrategy.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdevkit.rdf.resolver.core; +package com.github.fairdatateam.rdf.resolver.core; import java.io.InputStream; import java.net.URI; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/package-info.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/package-info.java index 4cb14d2..24c2e84 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/package-info.java +++ b/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/package-info.java @@ -26,4 +26,4 @@ * Core implementations of the RDF Resolver APIs. */ @javax.annotation.ParametersAreNonnullByDefault -package com.github.fairdevkit.rdf.resolver.core; +package com.github.fairdatateam.rdf.resolver.core; From 9696e566bfacca13751b3b287cf2344d1a28a141 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:04:26 +0200 Subject: [PATCH 02/36] rename fairdevkit subfolder to fairdatateam to match groupId --- .../rdf/resolver/api/ResolverStrategy.java | 0 .../rdf/resolver/api/ResourceResolver.java | 0 .../rdf/resolver/api/package-info.java | 0 .../rdf/resolver/core/AbstractResolverStrategy.java | 0 .../rdf/resolver/core/ContentNegotiationStrategy.java | 0 .../rdf/resolver/core/CoreResourceResolver.java | 0 .../rdf/resolver/core/PathExtensionStrategy.java | 0 .../rdf/resolver/core/package-info.java | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename rdf-resource-resolver-api/src/main/java/com/github/{fairdevkit => fairdatateam}/rdf/resolver/api/ResolverStrategy.java (100%) rename rdf-resource-resolver-api/src/main/java/com/github/{fairdevkit => fairdatateam}/rdf/resolver/api/ResourceResolver.java (100%) rename rdf-resource-resolver-api/src/main/java/com/github/{fairdevkit => fairdatateam}/rdf/resolver/api/package-info.java (100%) rename rdf-resource-resolver-core/src/main/java/com/github/{fairdevkit => fairdatateam}/rdf/resolver/core/AbstractResolverStrategy.java (100%) rename rdf-resource-resolver-core/src/main/java/com/github/{fairdevkit => fairdatateam}/rdf/resolver/core/ContentNegotiationStrategy.java (100%) rename rdf-resource-resolver-core/src/main/java/com/github/{fairdevkit => fairdatateam}/rdf/resolver/core/CoreResourceResolver.java (100%) rename rdf-resource-resolver-core/src/main/java/com/github/{fairdevkit => fairdatateam}/rdf/resolver/core/PathExtensionStrategy.java (100%) rename rdf-resource-resolver-core/src/main/java/com/github/{fairdevkit => fairdatateam}/rdf/resolver/core/package-info.java (100%) diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResolverStrategy.java b/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResolverStrategy.java similarity index 100% rename from rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResolverStrategy.java rename to rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResolverStrategy.java diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResourceResolver.java b/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResourceResolver.java similarity index 100% rename from rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/ResourceResolver.java rename to rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResourceResolver.java diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/package-info.java b/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/package-info.java similarity index 100% rename from rdf-resource-resolver-api/src/main/java/com/github/fairdevkit/rdf/resolver/api/package-info.java rename to rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/package-info.java diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/AbstractResolverStrategy.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java similarity index 100% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/AbstractResolverStrategy.java rename to rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/ContentNegotiationStrategy.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java similarity index 100% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/ContentNegotiationStrategy.java rename to rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/CoreResourceResolver.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/CoreResourceResolver.java similarity index 100% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/CoreResourceResolver.java rename to rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/CoreResourceResolver.java diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/PathExtensionStrategy.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java similarity index 100% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/PathExtensionStrategy.java rename to rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/package-info.java b/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/package-info.java similarity index 100% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdevkit/rdf/resolver/core/package-info.java rename to rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/package-info.java From e7d2543c78ab688bed1128410233192900c068cb Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:05:45 +0200 Subject: [PATCH 03/36] remove nexus deployment from ci.yml workflow and adapt worflow with - explicit temurin distribution - java version matrix (temurin LTS versions) - latest versions of actions (v4) --- .github/workflows/ci.yml | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6df50b..ee644b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,32 +6,23 @@ jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + # temurin LTS versions + version: [17, 21] + steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: 17 + java-version: ${{ matrix.version }} + distribution: 'temurin' - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Maven build run: mvn -B -U -ff tidy:check com.mycila:license-maven-plugin:check com.github.spotbugs:spotbugs-maven-plugin:check verify - - - name: Setup settings.xml - if: github.event_name == 'push' && github.ref == 'refs/heads/develop' - uses: s4u/maven-settings-action@v2.4.0 - with: - servers: | - [{ - "id": "nexus-snapshots", - "username": "${{ secrets.NEXUS_USERNAME }}", - "password": "${{ secrets.NEXUS_PASSWORD }}" - }] - - - name: Deploy snapshot - if: github.event_name == 'push' && github.ref == 'refs/heads/develop' - run: mvn -B package javadoc:jar source:jar deploy From 964213dcc24321627049d4a96a19191abf241801 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:08:17 +0200 Subject: [PATCH 04/36] add maven-publish workflow and rename ci.yml to maven-ci.yml for consistency --- .github/workflows/{ci.yml => maven-ci.yml} | 0 .github/workflows/maven-publish.yml | 33 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) rename .github/workflows/{ci.yml => maven-ci.yml} (100%) create mode 100644 .github/workflows/maven-publish.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/maven-ci.yml similarity index 100% rename from .github/workflows/ci.yml rename to .github/workflows/maven-ci.yml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml new file mode 100644 index 0000000..acd662d --- /dev/null +++ b/.github/workflows/maven-publish.yml @@ -0,0 +1,33 @@ +# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created +# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path + +name: Maven Package + +on: + release: + types: [created] + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + # https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-java-with-maven + # https://github.com/actions/setup-java + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + # using java 17 for now, to match original + # todo: migrate to java 21 (LTS) + java-version: 17 + distribution: 'temurin' + # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#extra-setup-for-pomxml + - name: Build with Maven + run: mvn -B package --file pom.xml + - name: Publish to GitHub Packages Apache Maven + run: mvn deploy + env: + GITHUB_TOKEN: ${{ github.token }} From 964c3f3d26d53a3778752de97b0df51cb08f546a Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:19:50 +0200 Subject: [PATCH 05/36] tidy poms --- pom.xml | 2 +- rdf-resource-resolver-api/pom.xml | 2 +- rdf-resource-resolver-core/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index acbde14..ca70062 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ SOFTWARE. --> - + 4.0.0 com.github.fairdatateam diff --git a/rdf-resource-resolver-api/pom.xml b/rdf-resource-resolver-api/pom.xml index e74a2c9..fa9b352 100644 --- a/rdf-resource-resolver-api/pom.xml +++ b/rdf-resource-resolver-api/pom.xml @@ -24,7 +24,7 @@ SOFTWARE. --> - + 4.0.0 diff --git a/rdf-resource-resolver-core/pom.xml b/rdf-resource-resolver-core/pom.xml index 5616375..e02b487 100644 --- a/rdf-resource-resolver-core/pom.xml +++ b/rdf-resource-resolver-core/pom.xml @@ -24,7 +24,7 @@ SOFTWARE. --> - + 4.0.0 From 44034e7a0d643a445ccf9df4ac666abd9e74425e Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:30:16 +0200 Subject: [PATCH 06/36] switch pom distributionManagement repo back to github packages temporarily using dennisvang account for dev convenience --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ca70062..b9e6d97 100644 --- a/pom.xml +++ b/pom.xml @@ -47,9 +47,10 @@ - nexus-snapshots - Nexus Snapshots - https://nexus.internal.fairdatapoint.org/repository/maven-snapshots/ + + github + GitHub dennisvang Apache Maven Packages + https://maven.pkg.github.com/dennisvang/temp-packages-maven From 4944b4f23edf9efefcd74b07ed2daa852c6b062b Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:08:53 +0200 Subject: [PATCH 07/36] replace shorthand mvn options in workflows by verbose options --- .github/workflows/maven-ci.yml | 2 +- .github/workflows/maven-publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index ee644b4..6d24d84 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -25,4 +25,4 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Maven build - run: mvn -B -U -ff tidy:check com.mycila:license-maven-plugin:check com.github.spotbugs:spotbugs-maven-plugin:check verify + run: mvn --batch-mode --update-snapshots --fail-fast tidy:check com.mycila:license-maven-plugin:check com.github.spotbugs:spotbugs-maven-plugin:check verify diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index acd662d..7d514df 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -26,7 +26,7 @@ jobs: distribution: 'temurin' # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#extra-setup-for-pomxml - name: Build with Maven - run: mvn -B package --file pom.xml + run: mvn --batch-mode package --file pom.xml - name: Publish to GitHub Packages Apache Maven run: mvn deploy env: From 56ca12e5f51cd43c59cd216dfe6d19e34bbd6b69 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 16:04:59 +0200 Subject: [PATCH 08/36] DRY project version using `revision` property, as defined in [maven docs][1] [1]: https://maven.apache.org/maven-ci-friendly.html#multi-module-setup --- pom.xml | 6 +++++- rdf-resource-resolver-api/pom.xml | 2 +- rdf-resource-resolver-core/pom.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b9e6d97..6e8239c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ com.github.fairdatateam rdf-resource-resolver - 0.1.2-SNAPSHOT + ${revision} pom @@ -55,6 +55,10 @@ + + + 0.1.2-SNAPSHOT + UTF-8 UTF-8 diff --git a/rdf-resource-resolver-api/pom.xml b/rdf-resource-resolver-api/pom.xml index fa9b352..dfdbf52 100644 --- a/rdf-resource-resolver-api/pom.xml +++ b/rdf-resource-resolver-api/pom.xml @@ -30,7 +30,7 @@ com.github.fairdatateam rdf-resource-resolver - 0.1.2-SNAPSHOT + ${revision} rdf-resource-resolver-api diff --git a/rdf-resource-resolver-core/pom.xml b/rdf-resource-resolver-core/pom.xml index e02b487..8722399 100644 --- a/rdf-resource-resolver-core/pom.xml +++ b/rdf-resource-resolver-core/pom.xml @@ -30,7 +30,7 @@ com.github.fairdatateam rdf-resource-resolver - 0.1.2-SNAPSHOT + ${revision} rdf-resource-resolver-core From 3cf544b3a3a5ab492e55144038f5f89ba9882ba9 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 16:18:37 +0200 Subject: [PATCH 09/36] add flatten-maven-plugin to parent pom required when using project versioning based on `revision` property, as in [CI friendly versions][1] [1]: https://maven.apache.org/maven-ci-friendly.html#install-deploy --- pom.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pom.xml b/pom.xml index 6e8239c..4613eae 100644 --- a/pom.xml +++ b/pom.xml @@ -154,6 +154,35 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + true + resolveCiFriendliesOnly + + + + + flatten + process-resources + + flatten + + + + + flatten.clean + clean + + clean + + + + From f9e5af6625e33e199ec0cdafd63bf55f434a6a58 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 16:31:55 +0200 Subject: [PATCH 10/36] gitignore .flattened-pom.xml files generated by flatten-maven-plugin --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0e13eeb..efd4118 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ buildNumber.properties .mvn/timing.properties # https://github.com/takari/maven-wrapper#usage-without-binary-jar .mvn/wrapper/maven-wrapper.jar +.flattened-pom.xml From d32bbcce862628cb045670507dcd1cae1d7d3f2d Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 16:50:16 +0200 Subject: [PATCH 11/36] tidy pom... --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4613eae..b08c58f 100644 --- a/pom.xml +++ b/pom.xml @@ -154,8 +154,7 @@ - - + org.codehaus.mojo From 979fe7b499bd3bbc877d23e6511f33aac357557e Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:19:47 +0200 Subject: [PATCH 12/36] fix temporary repo url in pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b08c58f..6d36436 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ github GitHub dennisvang Apache Maven Packages - https://maven.pkg.github.com/dennisvang/temp-packages-maven + https://maven.pkg.github.com/dennisvang/rdf-resource-resolver-fork From 8a1060caa7d618c2e9606a2c678b03654e8fbff1 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:11:32 +0200 Subject: [PATCH 13/36] generic Maven repository url based on environment variable using [default environment variable][1] `GITHUB_REPOSITORY` [1]: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#default-environment-variables --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6d36436..a8eb973 100644 --- a/pom.xml +++ b/pom.xml @@ -49,8 +49,9 @@ github - GitHub dennisvang Apache Maven Packages - https://maven.pkg.github.com/dennisvang/rdf-resource-resolver-fork + GitHub Apache Maven Packages + + https://maven.pkg.github.com/${env.GITHUB_REPOSITORY} From d74606d3cfb0801f5d617ef22a17cb093cbfc4c0 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:05:37 +0200 Subject: [PATCH 14/36] explicit version for flatten-maven-plugin --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index a8eb973..2b16883 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,7 @@ 1.7.30 3.7.0 + 1.6.0 4.2.3 @@ -160,6 +161,7 @@ org.codehaus.mojo flatten-maven-plugin + ${flatten.version} true resolveCiFriendliesOnly From 78010f7515fbdb8245e45423cfb71dcf70d78ffd Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 14 Oct 2024 17:42:36 +0200 Subject: [PATCH 15/36] simplify maven-ci workflow using setup-java cache --- .github/workflows/maven-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 6d24d84..3638ba3 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -17,12 +17,8 @@ jobs: - uses: actions/setup-java@v4 with: java-version: ${{ matrix.version }} - distribution: 'temurin' - - - uses: actions/cache@v4 - with: - path: ~/.m2 - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + distribution: 'temurin' + cache: maven - name: Maven build run: mvn --batch-mode --update-snapshots --fail-fast tidy:check com.mycila:license-maven-plugin:check com.github.spotbugs:spotbugs-maven-plugin:check verify From 460483510ede4728ab9eb77bc4b61fec8d481f79 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 22 Oct 2024 15:37:44 +0200 Subject: [PATCH 16/36] rename packages according to org.fairdatateam namespace --- .../fairdatateam/rdf/resolver/api/ResolverStrategy.java | 2 +- .../fairdatateam/rdf/resolver/api/ResourceResolver.java | 2 +- .../fairdatateam/rdf/resolver/api/package-info.java | 2 +- .../rdf/resolver/core/AbstractResolverStrategy.java | 4 ++-- .../rdf/resolver/core/ContentNegotiationStrategy.java | 2 +- .../rdf/resolver/core/CoreResourceResolver.java | 6 +++--- .../rdf/resolver/core/PathExtensionStrategy.java | 2 +- .../fairdatateam/rdf/resolver/core/package-info.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename rdf-resource-resolver-api/src/main/java/{com/github => org}/fairdatateam/rdf/resolver/api/ResolverStrategy.java (97%) rename rdf-resource-resolver-api/src/main/java/{com/github => org}/fairdatateam/rdf/resolver/api/ResourceResolver.java (98%) rename rdf-resource-resolver-api/src/main/java/{com/github => org}/fairdatateam/rdf/resolver/api/package-info.java (96%) rename rdf-resource-resolver-core/src/main/java/{com/github => org}/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java (96%) rename rdf-resource-resolver-core/src/main/java/{com/github => org}/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java (97%) rename rdf-resource-resolver-core/src/main/java/{com/github => org}/fairdatateam/rdf/resolver/core/CoreResourceResolver.java (93%) rename rdf-resource-resolver-core/src/main/java/{com/github => org}/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java (97%) rename rdf-resource-resolver-core/src/main/java/{com/github => org}/fairdatateam/rdf/resolver/core/package-info.java (96%) diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResolverStrategy.java b/rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/ResolverStrategy.java similarity index 97% rename from rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResolverStrategy.java rename to rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/ResolverStrategy.java index a622f37..09714bc 100644 --- a/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResolverStrategy.java +++ b/rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/ResolverStrategy.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdatateam.rdf.resolver.api; +package org.fairdatateam.rdf.resolver.api; import java.io.IOException; import java.io.InputStream; diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResourceResolver.java b/rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/ResourceResolver.java similarity index 98% rename from rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResourceResolver.java rename to rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/ResourceResolver.java index edb71ca..4f7b1bf 100644 --- a/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/ResourceResolver.java +++ b/rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/ResourceResolver.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdatateam.rdf.resolver.api; +package org.fairdatateam.rdf.resolver.api; import java.io.IOException; import java.io.InputStream; diff --git a/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/package-info.java b/rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/package-info.java similarity index 96% rename from rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/package-info.java rename to rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/package-info.java index 3a99725..11b2202 100644 --- a/rdf-resource-resolver-api/src/main/java/com/github/fairdatateam/rdf/resolver/api/package-info.java +++ b/rdf-resource-resolver-api/src/main/java/org/fairdatateam/rdf/resolver/api/package-info.java @@ -26,4 +26,4 @@ * API types for the RDF resolver library. */ @javax.annotation.ParametersAreNonnullByDefault -package com.github.fairdatateam.rdf.resolver.api; +package org.fairdatateam.rdf.resolver.api; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java similarity index 96% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java rename to rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java index 494db6b..ff9de92 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java +++ b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/AbstractResolverStrategy.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdatateam.rdf.resolver.core; +package org.fairdatateam.rdf.resolver.core; -import com.github.fairdatateam.rdf.resolver.api.ResolverStrategy; +import org.fairdatateam.rdf.resolver.api.ResolverStrategy; import java.io.IOException; import java.io.InputStream; import java.net.http.HttpClient; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java similarity index 97% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java rename to rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java index 31d978f..7280277 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java +++ b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/ContentNegotiationStrategy.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdatateam.rdf.resolver.core; +package org.fairdatateam.rdf.resolver.core; import java.io.InputStream; import java.net.URI; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/CoreResourceResolver.java b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/CoreResourceResolver.java similarity index 93% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/CoreResourceResolver.java rename to rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/CoreResourceResolver.java index fbf5cc4..e7dde19 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/CoreResourceResolver.java +++ b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/CoreResourceResolver.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdatateam.rdf.resolver.core; +package org.fairdatateam.rdf.resolver.core; -import com.github.fairdatateam.rdf.resolver.api.ResolverStrategy; -import com.github.fairdatateam.rdf.resolver.api.ResourceResolver; +import org.fairdatateam.rdf.resolver.api.ResolverStrategy; +import org.fairdatateam.rdf.resolver.api.ResourceResolver; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java similarity index 97% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java rename to rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java index f8a8359..77193f4 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java +++ b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/PathExtensionStrategy.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.github.fairdatateam.rdf.resolver.core; +package org.fairdatateam.rdf.resolver.core; import java.io.InputStream; import java.net.URI; diff --git a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/package-info.java b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/package-info.java similarity index 96% rename from rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/package-info.java rename to rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/package-info.java index 24c2e84..043ddfb 100644 --- a/rdf-resource-resolver-core/src/main/java/com/github/fairdatateam/rdf/resolver/core/package-info.java +++ b/rdf-resource-resolver-core/src/main/java/org/fairdatateam/rdf/resolver/core/package-info.java @@ -26,4 +26,4 @@ * Core implementations of the RDF Resolver APIs. */ @javax.annotation.ParametersAreNonnullByDefault -package com.github.fairdatateam.rdf.resolver.core; +package org.fairdatateam.rdf.resolver.core; From 01afd70d9564c1168350f2d44ce8b0bbbc2bbfc6 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:47:56 +0200 Subject: [PATCH 17/36] DRY groupId and artifactId in pom files --- pom.xml | 21 +++++++++++++++++++-- rdf-resource-resolver-api/pom.xml | 4 ++-- rdf-resource-resolver-core/pom.xml | 6 +++--- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 2b16883..6dd144e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ 4.0.0 - com.github.fairdatateam - rdf-resource-resolver + ${groupId} + ${artifactId} ${revision} pom @@ -56,6 +56,9 @@ + + org.fairdatateam.rdf + rdf-resource-resolver 0.1.2-SNAPSHOT @@ -187,4 +190,18 @@ + + + + + + + env.GROUP_ID + + + + ${env.GROUP_ID} + + + diff --git a/rdf-resource-resolver-api/pom.xml b/rdf-resource-resolver-api/pom.xml index dfdbf52..b5d0ed8 100644 --- a/rdf-resource-resolver-api/pom.xml +++ b/rdf-resource-resolver-api/pom.xml @@ -28,8 +28,8 @@ 4.0.0 - com.github.fairdatateam - rdf-resource-resolver + ${groupId} + ${artifactId} ${revision} diff --git a/rdf-resource-resolver-core/pom.xml b/rdf-resource-resolver-core/pom.xml index 8722399..9e2a3e8 100644 --- a/rdf-resource-resolver-core/pom.xml +++ b/rdf-resource-resolver-core/pom.xml @@ -28,8 +28,8 @@ 4.0.0 - com.github.fairdatateam - rdf-resource-resolver + ${groupId} + ${artifactId} ${revision} @@ -38,7 +38,7 @@ - ${project.groupId} + ${groupId} rdf-resource-resolver-api ${project.version} From d626b8923c8e9e82ef1fbb1e6f77eae5ac61bb7d Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:33:17 +0200 Subject: [PATCH 18/36] add pom plugins for publishing, javadoc, sources, and gpg --- pom.xml | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6dd144e..a1592d0 100644 --- a/pom.xml +++ b/pom.xml @@ -47,10 +47,12 @@ - + github GitHub Apache Maven Packages - + https://maven.pkg.github.com/${env.GITHUB_REPOSITORY} @@ -112,6 +114,7 @@ src/test/groovy + @@ -188,6 +191,72 @@ + + + + + org.sonatype.central + central-publishing-maven-plugin + 0.6.0 + true + + central + false + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.7 + + + sign-artifacts + verify + + sign + + + ${gpg.keyname} + ${gpg.keyname} + + --pinentry-mode + loopback + + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.10.1 + + + attach-javadocs + + jar + + + + From 9075ef9b1483c98eb60ecaefed6acf2e6d60910b Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:27:30 +0200 Subject: [PATCH 19/36] simplify maven-gpg-plugin config in pom this is a test, because docs are conflicting w.r.t. the need for --pinentry-mode etc. --- pom.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a1592d0..a4e6e34 100644 --- a/pom.xml +++ b/pom.xml @@ -218,12 +218,8 @@ sign - ${gpg.keyname} - ${gpg.keyname} - - --pinentry-mode - loopback - + true + From ade17c39a2c9d554c2c8991112bb7d8b5e1d16a8 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:28:17 +0200 Subject: [PATCH 20/36] add gpg variables to maven-ci workflow --- .github/workflows/maven-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 3638ba3..fe52869 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -19,6 +19,10 @@ jobs: java-version: ${{ matrix.version }} distribution: 'temurin' cache: maven + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Maven build run: mvn --batch-mode --update-snapshots --fail-fast tidy:check com.mycila:license-maven-plugin:check com.github.spotbugs:spotbugs-maven-plugin:check verify + env: + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} From b1da66fce8daf095b4cdfed02656600f22d481c9 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:49:29 +0200 Subject: [PATCH 21/36] add scm, developers, name, description, and url to pom as required for publication to maven central --- pom.xml | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index a4e6e34..de2b258 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,9 @@ ${revision} pom + rdf-resource-resolver + Takes a resource identifier and attempts to resolve the resource's content. + https://github.com/${env.GITHUB_REPOSITORY} MIT License @@ -40,22 +43,31 @@ + + + dennisvang + https://github.com/dennisvang + + + Kees Burger + https://github.com/kburger + + + Marek Suchánek + https://github.com/MarekSuchanek + + + rdf-resource-resolver-api rdf-resource-resolver-core - - - - github - GitHub Apache Maven Packages - - https://maven.pkg.github.com/${env.GITHUB_REPOSITORY} - - + + scm:git:https://github.com/${env.GITHUB_REPOSITORY}.git + scm:git:ssh://github.com/${env.GITHUB_REPOSITORY}.git + https://github.com/${env.GITHUB_REPOSITORY} + @@ -219,7 +231,7 @@ true - + From ccb149fb81debaf6b6af7b5d2c59f21db8136989 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:51:02 +0200 Subject: [PATCH 22/36] adapt maven-publish workflow to use maven central portal --- .github/workflows/maven-publish.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 7d514df..bf44592 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -23,11 +23,17 @@ jobs: # using java 17 for now, to match original # todo: migrate to java 21 (LTS) java-version: 17 - distribution: 'temurin' + distribution: 'temurin' + server-id: central + server-username: MAVEN_CENTRAL_USERNAME + server-password: MAVEN_CENTRAL_TOKEN + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#extra-setup-for-pomxml - - name: Build with Maven - run: mvn --batch-mode package --file pom.xml - - name: Publish to GitHub Packages Apache Maven + - name: Publish to Maven Central via Portal run: mvn deploy env: - GITHUB_TOKEN: ${{ github.token }} + # https://central.sonatype.org/publish/generate-portal-token/ + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} From 28a31c416245bfaabb8c6fad0cfa7998a71a4c51 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:15:56 +0200 Subject: [PATCH 23/36] remove workflow permissions and use server-id maven --- .github/workflows/maven-publish.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index bf44592..8666fc5 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -1,7 +1,7 @@ # This workflow will build a package using Maven and then publish it to GitHub packages when a release is created # For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path -name: Maven Package +name: Maven Publish on: release: @@ -10,9 +10,6 @@ on: jobs: build: runs-on: ubuntu-latest - permissions: - contents: read - packages: write steps: # https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-java-with-maven # https://github.com/actions/setup-java @@ -24,7 +21,7 @@ jobs: # todo: migrate to java 21 (LTS) java-version: 17 distribution: 'temurin' - server-id: central + server-id: maven server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} From ffd1b6933b2781191f2c1deffd864cf3797e762e Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:19:11 +0200 Subject: [PATCH 24/36] use mvn batch mode in publish workflow --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 8666fc5..0e46dce 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -28,7 +28,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#extra-setup-for-pomxml - name: Publish to Maven Central via Portal - run: mvn deploy + run: mvn --batch-mode deploy env: # https://central.sonatype.org/publish/generate-portal-token/ MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} From ad8201c7a710d849e293e0a370cffdab55b60c89 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:28:52 +0200 Subject: [PATCH 25/36] revert workflow server-id to central --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 0e46dce..56039bf 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -21,7 +21,7 @@ jobs: # todo: migrate to java 21 (LTS) java-version: 17 distribution: 'temurin' - server-id: maven + server-id: central server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} From 9bbff861397f2299e9b776642d76c2b43dc8b197 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:50:55 +0200 Subject: [PATCH 26/36] override groupId using env var in workflow --- .github/workflows/maven-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 56039bf..ae92ae5 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -30,6 +30,7 @@ jobs: - name: Publish to Maven Central via Portal run: mvn --batch-mode deploy env: + GROUP_ID: ${{ var.GROUP_ID }} # https://central.sonatype.org/publish/generate-portal-token/ MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} From d9519243aa67e38b86cdd2084f1d88651e59b5df Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:52:29 +0200 Subject: [PATCH 27/36] remove -SNAPSHOT from version and bump to 0.1.3dev0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de2b258..76296e0 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ rdf-resource-resolver - 0.1.2-SNAPSHOT + 0.1.3dev0 UTF-8 From c4dac50d9a37503d839287abc0b596eee29e00c9 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Wed, 23 Oct 2024 18:29:40 +0200 Subject: [PATCH 28/36] fix typo in workflow --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index ae92ae5..ec7d060 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -30,7 +30,7 @@ jobs: - name: Publish to Maven Central via Portal run: mvn --batch-mode deploy env: - GROUP_ID: ${{ var.GROUP_ID }} + GROUP_ID: ${{ vars.GROUP_ID }} # https://central.sonatype.org/publish/generate-portal-token/ MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} From 62862a724b1db8edf97b5471c79a2e37df2e99b1 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:24:51 +0200 Subject: [PATCH 29/36] hardcode groupid for fork trying to debug the maven central validation process --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76296e0..fc131a4 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - org.fairdatateam.rdf + io.github.dennisvang rdf-resource-resolver From 0d15eeba635316e9e382494f1cb63534ef449194 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:13:49 +0200 Subject: [PATCH 30/36] note about maven central validation --- .github/workflows/maven-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index ec7d060..cba2114 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -26,8 +26,8 @@ jobs: server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - # https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#extra-setup-for-pomxml - - name: Publish to Maven Central via Portal + - name: Publish to Maven Central Portal + # visit https://central.sonatype.com/publishing/deployments in case of validation issues run: mvn --batch-mode deploy env: GROUP_ID: ${{ vars.GROUP_ID }} From 789a46e4b73cf74a0389d20279c0bd7304f0f09c Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:18:28 +0200 Subject: [PATCH 31/36] remove dry groupid and artifactid because this may complicate publication --- pom.xml | 7 ++----- rdf-resource-resolver-api/pom.xml | 4 ++-- rdf-resource-resolver-core/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index fc131a4..b1c7402 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ 4.0.0 - ${groupId} - ${artifactId} + io.github.dennisvang + rdf-resource-resolver ${revision} pom @@ -70,9 +70,6 @@ - - io.github.dennisvang - rdf-resource-resolver 0.1.3dev0 diff --git a/rdf-resource-resolver-api/pom.xml b/rdf-resource-resolver-api/pom.xml index b5d0ed8..a2089c0 100644 --- a/rdf-resource-resolver-api/pom.xml +++ b/rdf-resource-resolver-api/pom.xml @@ -28,8 +28,8 @@ 4.0.0 - ${groupId} - ${artifactId} + io.github.dennisvang + rdf-resource-resolver ${revision} diff --git a/rdf-resource-resolver-core/pom.xml b/rdf-resource-resolver-core/pom.xml index 9e2a3e8..6434bd4 100644 --- a/rdf-resource-resolver-core/pom.xml +++ b/rdf-resource-resolver-core/pom.xml @@ -28,8 +28,8 @@ 4.0.0 - ${groupId} - ${artifactId} + io.github.dennisvang + rdf-resource-resolver ${revision} From dd52fb36e85f513267566114a175f44a19674596 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:31:55 +0200 Subject: [PATCH 32/36] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be28053..79ca01f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,4 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- changed package namespace from `nl.dtls` to `org.fairdatateam` +- changed `groupId` to `org.fairdatateam.rdf` + [Unreleased]: https://github.com/fairdatateam/rdf-resource-resolver/compare/master...HEAD From 251931f2f5fb01ccb6d8c8052211d21caaf2836b Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:35:02 +0200 Subject: [PATCH 33/36] fix orphan groupid reference --- rdf-resource-resolver-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdf-resource-resolver-core/pom.xml b/rdf-resource-resolver-core/pom.xml index 6434bd4..0738be6 100644 --- a/rdf-resource-resolver-core/pom.xml +++ b/rdf-resource-resolver-core/pom.xml @@ -38,7 +38,7 @@ - ${groupId} + io.github.dennisvang rdf-resource-resolver-api ${project.version} From fa2638b414e014448314e2dcdbb68c15df6c3821 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:48:47 +0200 Subject: [PATCH 34/36] bump version to 0.2.0dev0 the changes are backward incompatible, but we are still in major 0, so we only increment minor --- CHANGELOG.md | 10 ++++++++-- pom.xml | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79ca01f..7a23a08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,18 @@ # Changelog All notable changes to this project will be documented in this file. -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [0.2.0dev0] - 2024 Oct 25 + +### Changed (backward incompatible) + - changed package namespace from `nl.dtls` to `org.fairdatateam` -- changed `groupId` to `org.fairdatateam.rdf` +- changed `groupId` to `io.github.dennisvang` (TODO: change to `org.fairdatateam.rdf` before merge with upstream) [Unreleased]: https://github.com/fairdatateam/rdf-resource-resolver/compare/master...HEAD +[0.2.0dev0]: https://github.com/dennisvang/rdf-resource-resolver-fork/releases/tag/0.2.0dev0 diff --git a/pom.xml b/pom.xml index b1c7402..1f78bfc 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ - 0.1.3dev0 + 0.2.0dev0 UTF-8 From de311f3c3440cc996f96a738524ea7d553e33a14 Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:15:58 +0100 Subject: [PATCH 35/36] change groupId to org.fairdatateam.rdf, hardcode github repo url, and remove version modifier Use hardcoded urls because variables are not expanded during publication, resulting in broken urls in package metadata on maven central. --- CHANGELOG.md | 6 +++--- pom.xml | 12 ++++++------ rdf-resource-resolver-api/pom.xml | 2 +- rdf-resource-resolver-core/pom.xml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a23a08..87deec6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.2.0dev0] - 2024 Oct 25 +## [0.2.0] - 2024 Oct 28 ### Changed (backward incompatible) - changed package namespace from `nl.dtls` to `org.fairdatateam` -- changed `groupId` to `io.github.dennisvang` (TODO: change to `org.fairdatateam.rdf` before merge with upstream) +- changed `groupId` to `org.fairdatateam.rdf` [Unreleased]: https://github.com/fairdatateam/rdf-resource-resolver/compare/master...HEAD -[0.2.0dev0]: https://github.com/dennisvang/rdf-resource-resolver-fork/releases/tag/0.2.0dev0 +[0.2.0]: https://github.com/fairdatateam/rdf-resource-resolver-fork/releases/tag/0.2.0 diff --git a/pom.xml b/pom.xml index 1f78bfc..4ae85ca 100644 --- a/pom.xml +++ b/pom.xml @@ -27,14 +27,14 @@ 4.0.0 - io.github.dennisvang + org.fairdatateam.rdf rdf-resource-resolver ${revision} pom rdf-resource-resolver Takes a resource identifier and attempts to resolve the resource's content. - https://github.com/${env.GITHUB_REPOSITORY} + https://github.com/FAIRDataTeam/rdf-resource-resolver MIT License @@ -64,15 +64,15 @@ - scm:git:https://github.com/${env.GITHUB_REPOSITORY}.git - scm:git:ssh://github.com/${env.GITHUB_REPOSITORY}.git - https://github.com/${env.GITHUB_REPOSITORY} + scm:git:https://github.com/FAIRDataTeam/rdf-resource-resolver.git + scm:git:ssh://github.com/FAIRDataTeam/rdf-resource-resolver.git + https://github.com/FAIRDataTeam/rdf-resource-resolver - 0.2.0dev0 + 0.2.0 UTF-8 diff --git a/rdf-resource-resolver-api/pom.xml b/rdf-resource-resolver-api/pom.xml index a2089c0..f19bed9 100644 --- a/rdf-resource-resolver-api/pom.xml +++ b/rdf-resource-resolver-api/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - io.github.dennisvang + org.fairdatateam.rdf rdf-resource-resolver ${revision} diff --git a/rdf-resource-resolver-core/pom.xml b/rdf-resource-resolver-core/pom.xml index 0738be6..4ebfd21 100644 --- a/rdf-resource-resolver-core/pom.xml +++ b/rdf-resource-resolver-core/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - io.github.dennisvang + org.fairdatateam.rdf rdf-resource-resolver ${revision} @@ -38,7 +38,7 @@ - io.github.dennisvang + org.fairdatateam.rdf rdf-resource-resolver-api ${project.version} From 188e93a797c50a51e4c624fea76bf812201b9a6a Mon Sep 17 00:00:00 2001 From: dennisvang <29799340+dennisvang@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:22:03 +0100 Subject: [PATCH 36/36] skip GPG signing in maven-ci workflow Signing is only required in maven-publish. Moreover, it causes the maven-ci workflow to fail if triggered by PR from fork, because I does not have access to github secrets. --- .github/workflows/maven-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index fe52869..126313c 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -19,10 +19,6 @@ jobs: java-version: ${{ matrix.version }} distribution: 'temurin' cache: maven - gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE - - name: Maven build - run: mvn --batch-mode --update-snapshots --fail-fast tidy:check com.mycila:license-maven-plugin:check com.github.spotbugs:spotbugs-maven-plugin:check verify - env: - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + - name: Maven build (skip gpg signing) + run: mvn --batch-mode --update-snapshots --fail-fast -Dgpg.skip tidy:check com.mycila:license-maven-plugin:check com.github.spotbugs:spotbugs-maven-plugin:check verify