From f8dfe5278dc08654ef094e44f905bca6bc7e05c5 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Tue, 22 Jul 2025 14:11:50 +0200 Subject: [PATCH 1/7] Upgrade maven central deployment plugins and settings --- pom.xml | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index dfe94d3d..7130111b 100644 --- a/pom.xml +++ b/pom.xml @@ -124,6 +124,15 @@ org.apache.maven.plugins maven-deploy-plugin 3.0.0 + + + default-deploy + none + + + + true + org.apache.maven.plugins @@ -160,22 +169,6 @@ wagon-maven-plugin 2.0.0 - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://s01.oss.sonatype.org/ - true - - @@ -282,6 +275,24 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true + + ossrh + + + + publish-to-central + deploy + + publish + + + + org.apache.maven.plugins maven-gpg-plugin @@ -341,11 +352,11 @@ ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + https://ossrh-staging-api.central.sonatype.com/content/repositories/snapshots ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/ From 0506a5641c0074de8c8a34ce9d4c4b559f1e016d Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Tue, 22 Jul 2025 14:33:59 +0200 Subject: [PATCH 2/7] Update workflow to use org secrets --- .github/workflows/release-and-deploy.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/release-and-deploy.yml b/.github/workflows/release-and-deploy.yml index cf5636d8..a9d42f0e 100644 --- a/.github/workflows/release-and-deploy.yml +++ b/.github/workflows/release-and-deploy.yml @@ -19,10 +19,6 @@ on: description: 'Next SNAPSHOT version (such as 2.4-SNAPSHOT)' required: true type: string - environment: - description: 'Environment to run tests against' - type: environment - required: true secrets: QUDTLIB_BOT_GITHUB_TOKEN: required: true @@ -35,8 +31,6 @@ on: jobs: build: - # setting the environment on the job is mandatory, otherwise it cannot access environment secrets. - environment: ${{ inputs.environment }} runs-on: ubuntu-latest steps: From 0b853a0796377287b4891b46820e1cbe0d8a411e Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Tue, 22 Jul 2025 14:59:03 +0200 Subject: [PATCH 3/7] Update dependents query --- .../src/main/resources/update-units-by-query1.rq | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qudtlib-data-gen/src/main/resources/update-units-by-query1.rq b/qudtlib-data-gen/src/main/resources/update-units-by-query1.rq index bd8494c2..798dec3e 100644 --- a/qudtlib-data-gen/src/main/resources/update-units-by-query1.rq +++ b/qudtlib-data-gen/src/main/resources/update-units-by-query1.rq @@ -9,10 +9,7 @@ INSERT { WHERE { { - ?other - qudt:hasFactorUnit [ - qudt:hasUnit ?unit ; - ] ; + ?other ( qudt:hasFactorUnit/qudt:hasUnit )+ ?unit ; } UNION { ?other qudt:scalingOf ?unit From ad9567999ee5a1e503c1fd025873303cc28e16e7 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Tue, 22 Jul 2025 15:00:16 +0200 Subject: [PATCH 4/7] Update release workflow --- .github/workflows/release-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-and-deploy.yml b/.github/workflows/release-and-deploy.yml index a9d42f0e..7b76f24a 100644 --- a/.github/workflows/release-and-deploy.yml +++ b/.github/workflows/release-and-deploy.yml @@ -5,7 +5,7 @@ name: Release and deploy to Sonatype staging repo env: GITHUB_PAT: ${{ secrets.QUDTLIB_BOT_GITHUB_TOKEN }} - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} on: From 905b53f50089b0c84807592a2b425d111ad10972 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Tue, 22 Jul 2025 15:41:28 +0200 Subject: [PATCH 5/7] Add name properties to pom --- qudtlib-common-codegen/pom.xml | 1 + qudtlib-common-rdf/pom.xml | 2 +- qudtlib-constants-gen/pom.xml | 2 +- qudtlib-data-gen/pom.xml | 1 + qudtlib-data/pom.xml | 1 + qudtlib-example/pom.xml | 3 +-- qudtlib-hardcoded-model-gen/pom.xml | 1 + qudtlib-ingest-qudt/pom.xml | 1 + qudtlib-init-hardcoded/pom.xml | 1 + qudtlib-init-rdf/pom.xml | 2 +- qudtlib-js-gen/pom.xml | 3 +-- qudtlib-main-rdf/pom.xml | 2 +- qudtlib-main/pom.xml | 1 + qudtlib-model/pom.xml | 1 + qudtlib-test/pom.xml | 1 + qudtlib-tools/pom.xml | 3 +-- qudtlib-vocab/pom.xml | 4 +--- qudtlib/pom.xml | 1 + 18 files changed, 18 insertions(+), 13 deletions(-) diff --git a/qudtlib-common-codegen/pom.xml b/qudtlib-common-codegen/pom.xml index 117739fc..4ee1dd67 100644 --- a/qudtlib-common-codegen/pom.xml +++ b/qudtlib-common-codegen/pom.xml @@ -5,6 +5,7 @@ io.github.qudtlib 6.8.2-SNAPSHOT + qudtlib-common-codegen 4.0.0 qudtlib-common-codegen diff --git a/qudtlib-common-rdf/pom.xml b/qudtlib-common-rdf/pom.xml index 2f4663b9..f41ca6dd 100644 --- a/qudtlib-common-rdf/pom.xml +++ b/qudtlib-common-rdf/pom.xml @@ -6,7 +6,7 @@ 6.8.2-SNAPSHOT 4.0.0 - + qudtlib-common-rdf qudtlib-common-rdf diff --git a/qudtlib-constants-gen/pom.xml b/qudtlib-constants-gen/pom.xml index 63c6117d..b621fd2f 100644 --- a/qudtlib-constants-gen/pom.xml +++ b/qudtlib-constants-gen/pom.xml @@ -8,7 +8,7 @@ 4.0.0 qudtlib-constants-gen jar - + qudtlib-constants-gen io.github.qudtlib diff --git a/qudtlib-data-gen/pom.xml b/qudtlib-data-gen/pom.xml index 47d41d56..4e8b64aa 100644 --- a/qudtlib-data-gen/pom.xml +++ b/qudtlib-data-gen/pom.xml @@ -8,6 +8,7 @@ 4.0.0 qudtlib-data-gen jar + qudtlib-data-gen io.github.qudtlib diff --git a/qudtlib-data/pom.xml b/qudtlib-data/pom.xml index 43527fca..a9303ac9 100644 --- a/qudtlib-data/pom.xml +++ b/qudtlib-data/pom.xml @@ -8,6 +8,7 @@ 4.0.0 qudtlib-data jar + qudtlib-data ${project.build.directory}/generated-resources/qudtlib diff --git a/qudtlib-example/pom.xml b/qudtlib-example/pom.xml index 3a9a25d4..e6f6c87d 100644 --- a/qudtlib-example/pom.xml +++ b/qudtlib-example/pom.xml @@ -6,9 +6,8 @@ 6.8.2-SNAPSHOT 4.0.0 - + qudtlib-example qudtlib-example - io.github.qudtlib diff --git a/qudtlib-hardcoded-model-gen/pom.xml b/qudtlib-hardcoded-model-gen/pom.xml index 291fdf7d..fa821a2d 100644 --- a/qudtlib-hardcoded-model-gen/pom.xml +++ b/qudtlib-hardcoded-model-gen/pom.xml @@ -8,6 +8,7 @@ 4.0.0 qudtlib-hardcoded-model-gen jar + qudtlib-hardcoded-model-gen io.github.qudtlib diff --git a/qudtlib-ingest-qudt/pom.xml b/qudtlib-ingest-qudt/pom.xml index f8c96373..9bf39469 100644 --- a/qudtlib-ingest-qudt/pom.xml +++ b/qudtlib-ingest-qudt/pom.xml @@ -8,6 +8,7 @@ 4.0.0 qudtlib-ingest-qudt jar + qudtlib-ingest-qudt ${project.build.directory}/generated-resources/qudt ${project.build.directory}/generated-resources/qudtlib diff --git a/qudtlib-init-hardcoded/pom.xml b/qudtlib-init-hardcoded/pom.xml index f50a76ab..a76d0332 100644 --- a/qudtlib-init-hardcoded/pom.xml +++ b/qudtlib-init-hardcoded/pom.xml @@ -8,6 +8,7 @@ 4.0.0 qudtlib-init-hardcoded jar + qudtlib-init-hardcoded io.github.qudtlib diff --git a/qudtlib-init-rdf/pom.xml b/qudtlib-init-rdf/pom.xml index 50aee240..ae51a095 100644 --- a/qudtlib-init-rdf/pom.xml +++ b/qudtlib-init-rdf/pom.xml @@ -8,7 +8,7 @@ 4.0.0 qudtlib-init-rdf jar - + qudtlib-init-rdf io.github.qudtlib diff --git a/qudtlib-js-gen/pom.xml b/qudtlib-js-gen/pom.xml index c3a5a204..bc38b481 100644 --- a/qudtlib-js-gen/pom.xml +++ b/qudtlib-js-gen/pom.xml @@ -6,9 +6,8 @@ 6.8.2-SNAPSHOT 4.0.0 - + qudtlib-js-gen qudtlib-js-gen - io.github.qudtlib diff --git a/qudtlib-main-rdf/pom.xml b/qudtlib-main-rdf/pom.xml index 16592dfa..cd7f1d65 100644 --- a/qudtlib-main-rdf/pom.xml +++ b/qudtlib-main-rdf/pom.xml @@ -6,7 +6,7 @@ 6.8.2-SNAPSHOT 4.0.0 - + qudtlib-main-rdf> qudtlib-main-rdf jar diff --git a/qudtlib-main/pom.xml b/qudtlib-main/pom.xml index 774bf12c..bfad389e 100644 --- a/qudtlib-main/pom.xml +++ b/qudtlib-main/pom.xml @@ -8,6 +8,7 @@ 4.0.0 qudtlib-main jar + qudtlib-main io.github.qudtlib diff --git a/qudtlib-model/pom.xml b/qudtlib-model/pom.xml index e14f323c..02a47c91 100644 --- a/qudtlib-model/pom.xml +++ b/qudtlib-model/pom.xml @@ -5,6 +5,7 @@ io.github.qudtlib 6.8.2-SNAPSHOT + qudtlib-model 4.0.0 jar qudtlib-model diff --git a/qudtlib-test/pom.xml b/qudtlib-test/pom.xml index c5328107..3cf4371e 100644 --- a/qudtlib-test/pom.xml +++ b/qudtlib-test/pom.xml @@ -8,6 +8,7 @@ 4.0.0 qudtlib-test jar + qudtlib-test io.github.qudtlib diff --git a/qudtlib-tools/pom.xml b/qudtlib-tools/pom.xml index b082185c..894504a6 100644 --- a/qudtlib-tools/pom.xml +++ b/qudtlib-tools/pom.xml @@ -6,10 +6,9 @@ 6.8.2-SNAPSHOT 4.0.0 - qudtlib-tools jar - + qudtlib-tools io.github.qudtlib diff --git a/qudtlib-vocab/pom.xml b/qudtlib-vocab/pom.xml index 24f6e4af..d0946e38 100644 --- a/qudtlib-vocab/pom.xml +++ b/qudtlib-vocab/pom.xml @@ -6,17 +6,15 @@ 6.8.2-SNAPSHOT 4.0.0 - qudtlib-vocab jar - + qudtlib-vocab org.eclipse.rdf4j rdf4j-model - diff --git a/qudtlib/pom.xml b/qudtlib/pom.xml index fdd3fec4..855eb955 100644 --- a/qudtlib/pom.xml +++ b/qudtlib/pom.xml @@ -8,6 +8,7 @@ 4.0.0 jar qudtlib + qudtlib io.github.qudtlib From 7f9095fd408086caf7efcc8195cf201e87616abf Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Tue, 22 Jul 2025 15:53:09 +0200 Subject: [PATCH 6/7] Change type to pom --- qudtlib-main-rdf/pom.xml | 2 +- qudtlib/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qudtlib-main-rdf/pom.xml b/qudtlib-main-rdf/pom.xml index cd7f1d65..9b808d9c 100644 --- a/qudtlib-main-rdf/pom.xml +++ b/qudtlib-main-rdf/pom.xml @@ -8,7 +8,7 @@ 4.0.0 qudtlib-main-rdf> qudtlib-main-rdf - jar + pom diff --git a/qudtlib/pom.xml b/qudtlib/pom.xml index 855eb955..73ac9605 100644 --- a/qudtlib/pom.xml +++ b/qudtlib/pom.xml @@ -6,7 +6,7 @@ 6.8.2-SNAPSHOT 4.0.0 - jar + pom qudtlib qudtlib From a69a04032fc5ee057a6bf121849fd376ef38099b Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Tue, 22 Jul 2025 16:48:21 +0200 Subject: [PATCH 7/7] Add type in dependents of pom-typed dependencies --- CHANGELOG.md | 2 ++ README.md | 1 + qudtlib-example/README.md | 1 + qudtlib-example/pom.xml | 1 + qudtlib-hardcoded-model-gen/pom.xml | 1 + 5 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd3b2d9d..b5e5d2c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- when using `qudtlib` as a dependency, you have to add `pom` (see updatede [`README.md`](README.md)). This is due to more rigorous + artifact checks by sonatype that prevent jar artifacts without sources. - Upgrade to QUDT 3.1.4 - Calculation of scalings and factor units now happens in QUDT (see PR [1129](https://github.com/qudt/qudt-public-repo/pull/1129)) However, a few things have changed: diff --git a/README.md b/README.md index a36cde7f..0e47f29c 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Maven dependency: io.github.qudtlib qudtlib ${project.version} + pom ``` diff --git a/qudtlib-example/README.md b/qudtlib-example/README.md index 5499e633..f094fd5c 100644 --- a/qudtlib-example/README.md +++ b/qudtlib-example/README.md @@ -9,6 +9,7 @@ Here are the important bits: io.github.qudtlib qudtlib ${project.version} + pom ``` diff --git a/qudtlib-example/pom.xml b/qudtlib-example/pom.xml index e6f6c87d..f9a9f597 100644 --- a/qudtlib-example/pom.xml +++ b/qudtlib-example/pom.xml @@ -13,6 +13,7 @@ io.github.qudtlib qudtlib ${project.version} + pom diff --git a/qudtlib-hardcoded-model-gen/pom.xml b/qudtlib-hardcoded-model-gen/pom.xml index fa821a2d..a24f41cb 100644 --- a/qudtlib-hardcoded-model-gen/pom.xml +++ b/qudtlib-hardcoded-model-gen/pom.xml @@ -14,6 +14,7 @@ io.github.qudtlib qudtlib-main-rdf ${project.version} + pom io.github.qudtlib