Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/release-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<type>pom</type>` (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:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Maven dependency:
<groupId>io.github.qudtlib</groupId>
<artifactId>qudtlib</artifactId>
<version>${project.version}</version> <!-- remember to use the latest version -->
<type>pom</type>
</dependency>
```

Expand Down
47 changes: 29 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>none</phase>
</execution>
</executions>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -160,22 +169,6 @@
<artifactId>wagon-maven-plugin</artifactId>
<version>2.0.0</version>
</plugin>
<plugin>
<!--
configuring nexus plugin for manual deployment after
release with maven-release/deploy-plugin, see
https://central.sonatype.org/publish/publish-maven/#manually-releasing-the-deployment-to-the-central-repository
-->
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -282,6 +275,24 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>ossrh</publishingServerId>
</configuration>
<executions>
<execution>
<id>publish-to-central</id>
<phase>deploy</phase>
<goals>
<goal>publish</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down Expand Up @@ -341,11 +352,11 @@
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
<url>https://ossrh-staging-api.central.sonatype.com/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>
1 change: 1 addition & 0 deletions qudtlib-common-codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<groupId>io.github.qudtlib</groupId>
<version>6.8.2-SNAPSHOT</version>
</parent>
<name>qudtlib-common-codegen</name>
<modelVersion>4.0.0</modelVersion>

<artifactId>qudtlib-common-codegen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion qudtlib-common-rdf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<version>6.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<name>qudtlib-common-rdf</name>
<artifactId>qudtlib-common-rdf</artifactId>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion qudtlib-constants-gen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-constants-gen</artifactId>
<packaging>jar</packaging>

<name>qudtlib-constants-gen</name>
<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
1 change: 1 addition & 0 deletions qudtlib-data-gen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-data-gen</artifactId>
<packaging>jar</packaging>
<name>qudtlib-data-gen</name>
<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ INSERT {
WHERE
{
{
?other
qudt:hasFactorUnit [
qudt:hasUnit ?unit ;
] ;
?other ( qudt:hasFactorUnit/qudt:hasUnit )+ ?unit ;
} UNION {
?other
qudt:scalingOf ?unit
Expand Down
1 change: 1 addition & 0 deletions qudtlib-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-data</artifactId>
<packaging>jar</packaging>
<name>qudtlib-data</name>

<properties>
<qudtlib.generate.dir>${project.build.directory}/generated-resources/qudtlib</qudtlib.generate.dir>
Expand Down
1 change: 1 addition & 0 deletions qudtlib-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Here are the important bits:
<groupId>io.github.qudtlib</groupId>
<artifactId>qudtlib</artifactId>
<version>${project.version}</version> <!-- remember to use the latest version -->
<type>pom</type>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions qudtlib-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<version>6.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<name>qudtlib-example</name>
<artifactId>qudtlib-example</artifactId>

<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
<artifactId>qudtlib</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 2 additions & 0 deletions qudtlib-hardcoded-model-gen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-hardcoded-model-gen</artifactId>
<packaging>jar</packaging>
<name>qudtlib-hardcoded-model-gen</name>
<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
<artifactId>qudtlib-main-rdf</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
1 change: 1 addition & 0 deletions qudtlib-ingest-qudt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-ingest-qudt</artifactId>
<packaging>jar</packaging>
<name>qudtlib-ingest-qudt</name>
<properties>
<qudt.unpack.dir>${project.build.directory}/generated-resources/qudt</qudt.unpack.dir>
<qudtlib.generate.dir>${project.build.directory}/generated-resources/qudtlib</qudtlib.generate.dir>
Expand Down
1 change: 1 addition & 0 deletions qudtlib-init-hardcoded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-init-hardcoded</artifactId>
<packaging>jar</packaging>
<name>qudtlib-init-hardcoded</name>
<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
2 changes: 1 addition & 1 deletion qudtlib-init-rdf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-init-rdf</artifactId>
<packaging>jar</packaging>

<name>qudtlib-init-rdf</name>
<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
3 changes: 1 addition & 2 deletions qudtlib-js-gen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<version>6.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<name>qudtlib-js-gen</name>
<artifactId>qudtlib-js-gen</artifactId>

<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
4 changes: 2 additions & 2 deletions qudtlib-main-rdf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<version>6.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<name>qudtlib-main-rdf></name>
<artifactId>qudtlib-main-rdf</artifactId>
<packaging>jar</packaging>
<packaging>pom</packaging>

<dependencies>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions qudtlib-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-main</artifactId>
<packaging>jar</packaging>
<name>qudtlib-main</name>
<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
1 change: 1 addition & 0 deletions qudtlib-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<groupId>io.github.qudtlib</groupId>
<version>6.8.2-SNAPSHOT</version>
</parent>
<name>qudtlib-model</name>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>qudtlib-model</artifactId>
Expand Down
1 change: 1 addition & 0 deletions qudtlib-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>qudtlib-test</artifactId>
<packaging>jar</packaging>
<name>qudtlib-test</name>
<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
3 changes: 1 addition & 2 deletions qudtlib-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
<version>6.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>qudtlib-tools</artifactId>
<packaging>jar</packaging>

<name>qudtlib-tools</name>
<dependencies>
<dependency>
<groupId> io.github.qudtlib</groupId>
Expand Down
4 changes: 1 addition & 3 deletions qudtlib-vocab/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@
<version>6.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>qudtlib-vocab</artifactId>
<packaging>jar</packaging>

<name>qudtlib-vocab</name>
<dependencies>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
3 changes: 2 additions & 1 deletion qudtlib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
<version>6.8.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<packaging>pom</packaging>
<artifactId>qudtlib</artifactId>
<name>qudtlib</name>
<dependencies>
<dependency>
<groupId>io.github.qudtlib</groupId>
Expand Down
Loading