Skip to content

Commit bfd216f

Browse files
authored
Update Schemas to V3.0RC02 (#207)
Major changes include: * Update of all schema files to the AAS metamodel version 3.0RC02 * Replacement of most (manually created) examples by new (automatically generated) ones * Extensive extensions to the explanations in the Readme files * Introducing YAML files for the AAS Part 2 API definitions
1 parent 7e05fd2 commit bfd216f

File tree

7,655 files changed

+169363
-27136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,655 files changed

+169363
-27136
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
unit test
2+
integration test
3+
rewrap
4+
unwrap
5+
re-wrap
6+
undo
7+
re-do
8+
inline
9+
in-line
10+
assign
11+
standardize
12+
verbosify
13+
log
14+
integrate
15+
enhance
16+
untrack
17+
refine
18+
dispatch
19+
export
20+
skip
21+
redirect
22+
deduplicate
23+
re-order
24+
position
25+
restrict

.github/workflows/check-title-and-description-of-pull-request.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ jobs:
1111
- uses: actions/checkout@master
1212

1313
- name: Check the title and description of the pull request
14-
uses: mristin/[email protected]
14+
uses: mristin/[email protected]
15+
with:
16+
path-to-additional-verbs: .github/workflows/AdditionalVerbsInImperativeMood.txt
1517

1618
- name: READ HERE ON FAILURE FOR MORE INSTRUCTIONS
1719
if: ${{ failure() }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.idea/
2+
deleteme*.py

CONTRIBUTING.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,14 @@ The commit messages follow the guidelines from https://chris.beams.io/posts/git-
3737
* Use the body to explain *what* and *why* (instead of *how*)
3838

3939
## Create Pull Request
40-
After all changes have been committed to your feature branch, a [pull request] has to be created. See [this Github tutorial] for more guidance.
40+
After all changes have been committed to your feature branch, a [pull request] (PR) has to be created.
41+
Every PR should be linked to an issue for tracking.
42+
See [this Github tutorial] for more guidance.
4143

4244
[pull request]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request
4345

46+
[link PR to issue]: https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
47+
4448
## Pre-Merge Checks
4549
**Continuous Integration.**
4650
Github will run the continuous integration (CI) automatically through Github actions to verify that the submitted changes are valid.
@@ -83,13 +87,16 @@ Major changes must first be reviewed and approved by the joint working group "As
8387
[Platform Industrie 4.0]: http://www.plattform-i40.de
8488
[IDTA]: https://industrialdigitaltwin.org/
8589

90+
91+
## Merge into Master Branch
92+
8693
After the approval the pull request can be merged into the repository. This is done by one of the maintainers.
8794

8895

8996
## Post-Merge Cleanup
9097
**Congratulation.**
9198
You successfully contributed to the aas-spec repository.
9299

93-
If you are a member of the development team, pleas delete the feature branch you directly created within the aas-specs repository.
100+
If you are a member of the development team, please delete the feature branch you directly created within the aas-specs repository.
94101

95-
Otherwise, if you are not part of the team and you forked the repository, feel free to delete your fork.
102+
Otherwise, if you are not part of the team and you forked the repository, feel free to delete your fork.

README.md

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# aas-specs (V3.x)
1+
# This is the repository of the Asset Administration Shell
22

33
[![Check](
44
https://github.com/admin-shell-io/aas-specs/workflows/Check/badge.svg
@@ -11,15 +11,15 @@ https://licensebuttons.net/l/by/4.0/88x31.png
1111
https://creativecommons.org/licenses/by/4.0/
1212
)
1313

14-
This repository provides the specifications of Asset Administration Shell.
14+
This repository contains specifications of the Asset Administration Shell, including the normative schemas of the serializations, the rules applied to create them, how the specification is mapped into the serializations, and examples of how to use the schemas.
1515

1616
## Schemas
1717

18-
We provide schemas of the Asset Administration Shell for JSON, RDF and XML.
18+
The schemas of the Asset Administration Shell for JSON, RDF and XML as well as a XMI and YAML representation of the metmodel are provided in the respective directories.
1919
These schemas are derived from the document series, part 1,
2020
["Details of the Asset Administration Shell"](
2121
https://www.plattform-i40.de/PI40/Redaktion/EN/Standardartikel/specification-administrationshell.html
22-
) published by [Platform Industrie 4.0](http://www.plattform-i40.de).
22+
) published by the [Platform Industrie 4.0](http://www.plattform-i40.de) and [IDTA](https://industrialdigitaltwin.org/en/).
2323

2424
### JSON
2525

@@ -36,13 +36,26 @@ The XML schema, mapping rules and examples are available at [schemas/xml/](schem
3636

3737
### XMI
3838

39-
The XMI file for the UML metamodel [schemas/xmi/](schemas/xmi/).
39+
The XMI file for the UML metamodel is available at [schemas/xmi/](schemas/xmi/).
4040

41+
### YAML
42+
43+
The YAML files for the API definitions are available at [schemas/yaml/](schemas/yaml/).
44+
45+
4146
## Releases
4247

43-
Currently, the following releases are available (see also the [releases](https://github.com/admin-shell-io/aas-specs/releases) section of this repository):
44-
* [3.0.2.RC01](https://github.com/admin-shell-io/aas-specs/releases/tag/v3.0.2.RC01) is a pre-release that solves several typos and bugs of `3.0.1.RC01`
45-
* [3.0.1.RC01](https://github.com/admin-shell-io/aas-specs/releases/tag/v3.0.1.RC01) is a pre-release that solves a bug in the JSON schema of `3.0.RC01`
48+
The following versioning scheme is applied: 'V\<major>.\<minor>.\<patch>'.
49+
Major versions indicate breaking changes while minor updates are backward compatible.
50+
The patch position is increased whenever bugfixes need to be applied. Note that, as long as the UML-based metamodel has the state of a "Release Candidate", the acronym 'RC' followed by the number of the corresponding release candidate is added to the patch position.
51+
The following release contains the latest version of the AAS schemas (see also the [releases](https://github.com/admin-shell-io/aas-specs/releases) section of this repository):
52+
* [3.0.5RC02](https://github.com/admin-shell-io/aas-specs/releases/tag/V3.0.5RC02) is the corresponding release for the `V3.0RC02` version of the AAS metamodel, containing the normative schemas for the published document "Part 1: Details of the Asset Administration Shell - The exchange of information between partners in the value chain of Industrie 4.0 - **Version 3.0RC02**". *Use this release if you want to work with the latest specified AAS version.*
53+
54+
Previous releases (deprecated by [3.0.5RC02](https://github.com/admin-shell-io/aas-specs/releases/tag/V3.0.5RC02)):
55+
* [3.0.4RC01](https://github.com/admin-shell-io/aas-specs/releases/tag/V3.0.4RC01) is the final release for the `V3.0RC01` version of the AAS metamodel, containing the normative schemas for the published document "Part 1: Details of the Asset Administration Shell - The exchange of information between partners in the value chain of Industrie 4.0 - Version 3.0RC01". *No additional bugfix or patch releases for the metamodel version `V3.0RC01` shall be expected.*
56+
* [3.0.3RC01](https://github.com/admin-shell-io/aas-specs/tree/V3.0.3RC01) is a pre-release of the schemas for the published document "Part 1: Details of the Asset Administration Shell - The exchange of information between partners in the value chain of Industrie 4.0 - Version 3.0RC01" that solves several typos and bugs of `3.0.2.RC01`
57+
* [3.0.2.RC01](https://github.com/admin-shell-io/aas-specs/releases/tag/v3.0.2.RC01) is a pre-release of the schemas for the published document "Part 1: Details of the Asset Administration Shell - The exchange of information between partners in the value chain of Industrie 4.0 - Version 3.0RC01" that solves several typos and bugs of `3.0.1.RC01`
58+
* [3.0.1.RC01](https://github.com/admin-shell-io/aas-specs/releases/tag/v3.0.1.RC01) is a pre-release of the schemas for the published document "Part 1: Details of the Asset Administration Shell - The exchange of information between partners in the value chain of Industrie 4.0 - Version 3.0RC01" that solves a bug in the JSON schema of `3.0.RC01`
4659
* [3.0.RC01](https://github.com/admin-shell-io/aas-specs/releases/tag/v3.0.RC01) is a pre-release containing the schemes as contained by the document 'Details of the Asset Administration Shell - Part 1 - Version 3.0.RC01' [download](https://www.plattform-i40.de/PI40/Redaktion/EN/Downloads/Publikation/Details_of_the_Asset_Administration_Shell_Part1_V3.html)
4760

4861

@@ -58,6 +71,5 @@ If you want to contribute, see [CONTRIBUTING.md](CONTRIBUTING.md).
5871
## License
5972

6073
This work is licensed under a [Creative Commons Attribution 4.0 International License](
61-
https://creativecommons.org/licenses/by/4.0/). The implementation uses the concepts of the
62-
document "Details of the Asset Administration Shell" published on www.plattform-i40.de
63-
which is licensed under Creative Commons CC BY 4.0.
74+
https://creativecommons.org/licenses/by/4.0/). The implementation is based on the specifications of the "Details of the Asset Administration Shell" published on https://www.plattform-i40.de and https://industrialdigitaltwin.org/en/
75+
which is licensed under Creative Commons CC-BY-4.0.

schemas/Validate.ps1

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ function Main
2424
throw "JSON validation failed."
2525
}
2626

27+
Write-Host "Validating XML ..."
28+
& $(Join-Path $schemaValidationDir "ValidateXml") --inputs 'xml\examples\*.xml' --schema 'xml\AAS.xsd'
29+
if($LASTEXITCODE -ne 0)
30+
{
31+
throw "XML validation failed."
32+
}
2733

2834
Write-Host "Validating RDF ..."
2935
& $(Join-Path $schemaValidationDir "ValidateRdf") --model 'rdf\rdf-ontology.ttl'
@@ -38,14 +44,6 @@ function Main
3844
throw "RDF validation failed."
3945
}
4046

41-
42-
Write-Host "Validating XML ..."
43-
& $(Join-Path $schemaValidationDir "ValidateXml") --inputs 'xml\examples\*.xml' --schema 'xml\AAS.xsd'
44-
if($LASTEXITCODE -ne 0)
45-
{
46-
throw "XML validation failed."
47-
}
48-
4947
Pop-Location
5048
}
5149
Main

0 commit comments

Comments
 (0)