Fix merge conflicts with schema and example files #578
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Minor editorial changes + V3.0 published by IDTA
* Update CONTRIBUTING.md - add chapter about issue handling - make text generic so that it fits to all specification repos - for specifics for IDA-01001 etc. special comments/sections are introduced - specifications now handled by IDTA * Update CONTRIBUTING.md - new section on naming of github repositories starting with "aas-specs" * Update CONTRIBUTING.md - add section on license headers & Licensing * Update CONTRIBUTING.md fix typo * Incorporate findings from review
* WIP: Adapt the schema files to v3.0.1 This adapts the schema files to version 3.0.1 of the specification. However, this is not an official release yet and may be subject to change. * Schema Remove Pattern for PathType Currently, the regex for Path type is non-compliant to the specification v3.0, as it does not allow for AASX packages to be written. As a temporary bugfix in v3.0.1, it was decided to remove the invariant check, as changing the pattern would result in a breaking change. This is of course no final solution, there will be a better fix for version 3.1. See #299 * Update schema files to newest version of aas-core * Update JSON Examples to v3.0.1 * Update RDF Examples to v3.0.1 * Update XML examples to v3.0.1 * Specify metamodel version in JSON Schema Previously, the metamodel version was not clear from the generated JSON schema. We adapt the title to include the version.
* xmi Export for V3.0.1 Bugfix Release as norma and Enterprise Architect Specific xmi format * Readme update
- new bugfix version 3.0.8
We included the regex pattern as-is from the input which caused problems
with the regex engines as the patterns in the meta-model are written in
a Python dialect (and assuming that the regex engine works on UTF-32
characters). However, most regex engines in the wild operating on SHACL
(*e.g.*, Java SHACL validators) use UTF-16 to represent the text and do
not support some parts of the Python regex dialect. For example, in
the input meta-model specification, we omit the minimum bound 0
(*e.g.*, ``{,4}``), which breaks with the Java regex engine beneath
the SHACL validator.
Instead, with this patch, we parse the pattern from the specification
and re-render it into the form that we also use in JSON Schema. We pick
JSON Schema regex dialect as most SHACL validators in the wild can deal
with it, in particular those based on Java as a platform. Hence, we
decide to serve this user base with priority.
Discovered in [aas-core-meta issue 342].
Fixed in [aas-core-codegen commit e22cc].
[aas-core-meta issue 342]: aas-core-works/aas-core-meta#342
[aas-core-codegen commit e22cc]: aas-core-works/aas-core-codegen@e22ccae
Previously we did not define `aas:environment` directly via an `xs:element` tag, rather only provided it directly as `xs:complexType`. This created issues with several XML Schema validator engines. This commit fixes this problem, discovered in #457.
Previously, the order of the attributes in class `EmbeddedDataSpecification` got mixed up, making the schemas of Release 3.0.8 not backward compatible, as found out in #477. This reverts the change of the order of attributes back to the state of v3.0, so that the schemas are properly backward compatible. Fixes #477
We document in the JSON and RDF schema `README` files, that we deviate from the pattern in the specification of AASd-130, due to the fact that most schema engines test UTF-16, instead of the used UTF-32. For the full discussion, refer to #362
Co-authored-by: Marko Ristin <marko@ristin.ch>
This extends the description for the `README.md` inside the example folders of the XML, JSON and RDF schemas. Furthrmore, it fixes some broken links in the `README.md`s.
Previously, we used an older version of [mristin/opinionated-commit-message] in our `check_title_and_description` workflow, which lead to erroneous failing of some PR pipelines. This updates our CI workflow to use the newest available version of this checker. Fixes #442 [mristin/opinionated-commit-message]: https://github.com/mristin/opinionated-commit-message
* Update README.md * Update README.md
juileetikekar
approved these changes
May 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since the changes for schema and example files are generated, we follow this pattern:
This PR merges the changes from
masterintoIDTA-01001-3-1_working.Conflicts are treated the following way:
IDTA-01001-3-1_working, we chose these changesmaster, we chose these changesIDTA-01001-3-1_workingandmaster, we choseIDTA-01001-3-1_workingIDTA-01001-3-1_workingwe deleted itmasterbut notIDTA-01001-3-1_working, we keep it.This should ensure that
IDTA-01001-3-1_workingcan now be merged intomasterwithout conflicts.