Skip to content

Commit 4da2c3f

Browse files
authored
chore: update LinkML Compiler and regerenerate gx/openlabelv2 (#43)
Signed-off-by: Carlo van Driesten <carlo.van-driesten@bmw.de>
1 parent 0d4bfc5 commit 4da2c3f

13 files changed

Lines changed: 6330 additions & 6321 deletions

File tree

artifacts/gx/PROPERTIES.md

Lines changed: 702 additions & 702 deletions
Large diffs are not rendered by default.

artifacts/gx/README.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@
44
55
## Overview
66

7-
This folder contains the **Gaia-X Trust Framework ontology and SHACL shapes** (version 25.11+fix.2).
7+
This folder contains the **Gaia-X Trust Framework ontology and SHACL shapes** (version 25.11+fix.5).
88

99
- The **Gaia-X model** (ontology) defines concepts for the Gaia-X Trust Framework including Participants, Services, Credentials, and Compliance.
1010
- The **SHACL shapes** automatically verify that Gaia-X instances conform to the Trust Framework specifications.
1111
- The core Gaia-X ontologies are integrated as a **Git submodule** to ensure version consistency with upstream.
1212
- The **VERSION file** in this directory tracks the Gaia-X release label used in OMB tooling and documentation.
1313
- The **UPSTREAM_REF** and **UPSTREAM_COMMIT** files record the exact `service-characteristics` checkout used to generate the copied artifacts.
1414

15-
### Current Version: 25.11+fix.2
15+
### Current Version: 25.11+fix.5
1616

1717
This version is based on the official **25.11 release** with the following additional fixes:
1818

19-
- **Commit c41d423**: Fix double hash fragments in IRIs (fixes enum IRI generation)
20-
- **Commit 711b6d4**: Replace the non-standard `httpsschema` prefix with LinkML-compatible `schema` mappings
19+
- **Commit eea7ae71**: Fix double hash fragments in IRIs (fixes enum IRI generation)
20+
- **Commit 32394e25**: fix(linkml): rename httpsschema using LinkML-compatible schema URI
21+
- **Commit 33e9e75c**: fix(ci): use patched LinkML for correct any_of type coercion
22+
- **Commit 74e03101**: fix(linkml): rename waterUsageEffectiveness value slot to avoid collision
23+
- **Commit bfb9c620**: chore: switch to ASCS-eV/linkml.git@main
2124

22-
The `+fix.2` suffix indicates this is a post-release patch on top of 25.11. When the upstream releases a later version that includes these fixes, we will update to the official release tag.
25+
The `+fix.5` suffix indicates this is a post-release patch on top of 25.11. When the upstream releases a later version that includes these fixes, we will update to the official release tag.
2326

2427
## IRI Notes (Enum Values)
2528

@@ -51,7 +54,7 @@ keeps IRIs valid.
5154
- **`gx.shacl.ttl`** – SHACL validation shapes for Gaia-X instances.
5255
- **`gx.context.jsonld`** – JSON-LD context for GX terms.
5356
- **`PROPERTIES.md`** – An auto-generated summary of SHACL properties.
54-
- **`VERSION`** – Current Gaia-X release label (e.g., `25.11+fix.2`).
57+
- **`VERSION`** – Current Gaia-X release label (e.g., `25.11+fix.5`).
5558
- **`UPSTREAM_REF`** – Human-readable `service-characteristics` ref used for generation.
5659
- **`UPSTREAM_COMMIT`** – Exact `service-characteristics` commit used for generation.
5760
- **`VERSIONING.md`** – Detailed versioning scheme and post-release patch documentation.
@@ -66,7 +69,7 @@ keeps IRIs valid.
6669
The core Gaia-X ontologies are maintained in an upstream GitLab repository:
6770

6871
- **Upstream Source:** [Gaia-X Service Characteristics](https://gitlab.com/gaia-x/technical-committee/service-characteristics-working-group/service-characteristics)
69-
- **Current Gaia-X Label:** `25.11+fix.2`
72+
- **Current Gaia-X Label:** `25.11+fix.5`
7073
- **Submodule Location:** `submodules/service-characteristics`
7174

7275
> **Note:** The `gx/` directory contains copies of the ontology and shapes for local examples and validation. The actual submodule is located at `submodules/service-characteristics`.
@@ -119,6 +122,7 @@ make generate gx GX_REF=25.12
119122
```
120123

121124
This command invokes `artifacts/gx/update-from-submodule.sh`, which will:
125+
122126
1. Check out the specified submodule ref (if provided)
123127
2. Rebuild GX artifacts using the `service-characteristics` build commands
124128
3. Copy artifacts (OWL, SHACL, context) from the submodule to `artifacts/gx/`
@@ -199,7 +203,7 @@ cd artifacts/gx
199203
```
200204

201205
!!! warning "VERSION and provenance metadata matter"
202-
The `VERSION` file is used as the Gaia-X release label in OMB documentation, while `UPSTREAM_COMMIT` is the source of truth for submodule synchronization. Keep both up to date when refreshing `artifacts/gx/`.
206+
The `VERSION` file is used as the Gaia-X release label in OMB documentation, while `UPSTREAM_COMMIT` is the source of truth for submodule synchronization. Keep both up to date when refreshing `artifacts/gx/`.
203207

204208
---
205209

artifacts/gx/UPSTREAM_COMMIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
74e03101cc9dc7dc449ce8d6aae9e867c857a7c8
1+
bfb9c62035178f97f8814bc184f0ad4de8918767

artifacts/gx/UPSTREAM_REF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.1.1-4-g74e0310
1+
v2.1.1-5-gbfb9c62

artifacts/gx/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
25.11+fix.3
1+
25.11+fix.5

artifacts/gx/VERSIONING.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,27 @@ The `VERSION` file uses semantic-like versioning with post-release patches:
1111
```
1212

1313
Examples:
14+
1415
- `25.11` - Official 25.11 release label
1516
- `25.11+fix.1` - Official 25.11 plus one additional fix commit
16-
- `25.11+fix.2` - Official 25.11 plus two additional fix commits
17+
- `25.11+fix.5` - Official 25.11 plus two additional fix commits
1718

1819
The `VERSION` file is the Gaia-X release label used in OMB docs. Exact
1920
`service-characteristics` provenance is stored separately in `UPSTREAM_REF`
2021
and `UPSTREAM_COMMIT`.
2122

22-
## Current Version: 25.11+fix.2
23+
## Current Version: 25.11+fix.5
2324

2425
### Base Version
26+
2527
- **Upstream Tag**: 25.11
2628
- **Submodule URL**: https://gitlab.com/ascs-ev/service-characteristics
2729
- **Tag Commit**: 3051644
2830

2931
### Post-Release Fixes
3032

3133
#### +fix.1: Double Hash Fragment Fix (c41d423)
34+
3235
- **Commit**: [c41d4230](https://gitlab.com/ascs-ev/service-characteristics/-/commit/c41d4230bded3b362cf57e7ff190eba59dd1078e)
3336
- **Branch**: fix/envited-ontologies
3437
- **Author**: Carlo van Driesten
@@ -37,7 +40,8 @@ and `UPSTREAM_COMMIT`.
3740
- **Files Changed**: `merge_schemas.sh`
3841
- **Reason**: Critical fix for OWL enum IRI generation that was causing invalid IRIs like `https://w3id.org/gaia-x/development##Value` instead of `https://w3id.org/gaia-x/development#/Value`
3942

40-
#### +fix.2: LinkML-Compatible schema.org Prefix Fix (711b6d4)
43+
#### +fix.5: LinkML-Compatible schema.org Prefix Fix (711b6d4)
44+
4145
- **Commit**: [711b6d4](https://gitlab.com/gaia-x/technical-committee/service-characteristics-working-group/service-characteristics/-/commit/711b6d4aee19667f7c6ed8b3a33ab0444d3c4c68)
4246
- **Branch**: fix/354-rename-httpsschema-prefix
4347
- **Description**: Replaces the non-standard `httpsschema` prefix with `schema` and uses `http://schema.org/` to remain compatible with `linkml:types`
@@ -62,6 +66,7 @@ Check if recorded upstream provenance matches the submodule:
6266
```
6367

6468
Expected output for synchronized post-release patches:
69+
6570
```
6671
✓ Upstream metadata matches the checked-out submodule.
6772
```
@@ -81,5 +86,5 @@ When upstream releases 25.12 (or later) that includes these fixes:
8186

8287
- [Submodule Repository](https://gitlab.com/ascs-ev/service-characteristics)
8388
- [Fix Commit (+fix.1)](https://gitlab.com/ascs-ev/service-characteristics/-/commit/c41d4230bded3b362cf57e7ff190eba59dd1078e)
84-
- [Fix Commit (+fix.2)](https://gitlab.com/gaia-x/technical-committee/service-characteristics-working-group/service-characteristics/-/commit/711b6d4aee19667f7c6ed8b3a33ab0444d3c4c68)
89+
- [Fix Commit (+fix.5)](https://gitlab.com/gaia-x/technical-committee/service-characteristics-working-group/service-characteristics/-/commit/711b6d4aee19667f7c6ed8b3a33ab0444d3c4c68)
8590
- [artifacts/gx/README.md](README.md) - General GX documentation

artifacts/gx/gx.context.jsonld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"comments": {
33
"description": "Auto generated by LinkML jsonld context generator",
4-
"generation_date": "2026-03-16T16:15:53",
4+
"generation_date": "2026-03-17T11:15:29",
55
"source": "gaia-x.yaml"
66
},
77
"@context": {

0 commit comments

Comments
 (0)