Skip to content

Commit 0be6975

Browse files
juileetikekarjuileetikekar
authored
Merge pull request #612 from admin-shell-io/IDTA-01001-3-1-1_Working
BugFix 3.1.1
2 parents 6fd399c + 6f38c9b commit 0be6975

Some content is hidden

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

53 files changed

+194
-161
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ The following release contains the latest version of the AAS schemas
6464
(see also the [releases](https://github.com/admin-shell-io/aas-specs-metamodel/releases)
6565
section of this repository):
6666

67-
* [3.1.0](https://github.com/admin-shell-io/aas-specs-metamodel/releases/tag/v3.1.0)
68-
is the latest release for the `V3.1.0` version of the AAS metamodel,
69-
containing the normative schemas for the published document
70-
"Specification of the Asset Administration Shell: Part 1 - **Version 3.1.0**".
67+
* [3.1.1](https://github.com/admin-shell-io/aas-specs-metamodel/releases/tag/v3.1.1)
68+
is the latest release for the `V3.1.1` version of the AAS metamodel,
69+
containing the normative specification as well as the schemas in xml, JSON and rdf
7170
*Use this release if you want to work with the latest specified AAS version.*
7271

7372
Previous releases:
73+
* [3.1.0](https://github.com/admin-shell-io/aas-specs-metamodel/releases/tag/v3.1.0) is the release for the `V3.1` version of the AAS metamodel as published in May 2025
7474
* [3.0.8](https://github.com/admin-shell-io/aas-specs-metamodel/releases/tag/V3.0.8) minor schema bugfixes for `V3.0` version of the AAS metamodel
7575
* [3.0.7](https://github.com/admin-shell-io/aas-specs-metamodel/releases/tag/V3.0.7) minor schema bugfixes for `V3.0` version of the AAS metamodel
7676
* [3.0.6](https://github.com/admin-shell-io/aas-specs-metamodel/releases/tag/v3.0.6) is the release for the `V3.0` version of the AAS metamodel as published in April 2023, 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.0**". *Note that [3.0.7](https://github.com/admin-shell-io/aas-specs-metamodel/releases/tag/V3.0.7) fixes a number of known bugs in this version.*

‎documentation/IDTA-01001/antora.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: IDTA-01001
22
title: 'Part 1: Metamodel'
3-
version: 'v3.1'
3+
version: 'v3.1.1'
44
start_page: ROOT:index.adoc
55
nav:
66
- modules/ROOT/nav.adoc

‎documentation/IDTA-01001/modules/ROOT/pages/changelog.adoc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ Note: before V3.0, the security metamodel (now IDTA-01004) and the predefined da
3535
They had separate sections and tables documenting the changes.
3636
====
3737

38+
== Changes V3.1.1 vs. V3.1
39+
40+
Bugfixes:
41+
42+
* CHANGED: fix xml schema w.r.t. ordering of attributes (https://github.com/admin-shell-io/aas-specs-metamodel/issues/585[#585])
43+
44+
45+
3846

3947
== Changes V3.1 vs. V3.0.2
4048

‎documentation/IDTA-01001/modules/ROOT/pages/index.adoc‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,35 @@ This specification is part of the https://industrialdigitaltwin.org/en/content-h
1616

1717
== Version
1818

19-
This is version 3.1 of the specification IDTA-01001.
19+
This is version 3.1.1 of the specification IDTA-01001.
2020

21-
Previous version: 3.0.2
21+
Previous version: 3.1
2222

2323
[#metamodel-versions]
2424
== Dependencies
2525

26-
For the schemas derived from this document (version 3.1) there is a dependency to the following parts of the “Specification of the Asset Administration Shell” series:
26+
For the schemas derived from this document there is a dependency to the following parts of the “Specification of the Asset Administration Shell” series:
2727

2828
* IDTA-01003-a Part 3a: Data Specification – IEC 61360 in version 3.1 xref:bibliography.adoc#bib46[[46\]]
2929

30+
If there is a bugfix of this parts, this shall be used.
3031

3132
== Notice
3233

3334
Copyright: Industrial Digital Twin Association e.V. (IDTA)
3435

35-
IDTA Document Number: IDTA-01001-3-1
36+
IDTA Number: IDTA-01001
3637

37-
DOI: https://doi.org/10.62628/IDTA.01001-3-1
38+
Version: 3.1.1
39+
40+
DOI: https://doi.org/10.62628/IDTA.01001-3-1-1
3841

3942
This work is licensed under a
4043
https://creativecommons.org/licenses/by/4.0/[Creative Commons Attribution 4.0 International License].
4144

4245
SPDX-License-Identifier: CC-BY-4.0
4346

44-
May 2025
47+
July 2025
4548

4649
== How to Get in Contact
4750

‎documentation/IDTA-01001/modules/ROOT/pages/mappings/encodings/valueonly.adoc‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,15 @@ The protected elements shall not be serialized.
342342

343343
In the following examples for Value-Only serializations for all submodel element types are given.
344344

345+
===== Property
346+
345347
For a single _Property_ named "MaxRotationSpeed", the value-Only payload is minimized to the following (assuming its value is 5000):
346348

347349
[source,json,linenums]
348350
----
349351
5000
350352
----
353+
===== SubmodelElementCollection
351354

352355
For a _SubmodelElementCollection_ named "ProductClassification" or being part of a list "ProductionClassifications", the Value-Only payload is minimized to the following, i.e. the name of the SubmodelElementCollection or its index in the list is not part of the Value-Only serialization:
353356

@@ -360,7 +363,9 @@ For a _SubmodelElementCollection_ named "ProductClassification" or being part of
360363
}
361364
----
362365

363-
For a _SubmodelElementList_ named "Authors" with string Properties as its value, the Value-Only payload is minimized to the following (values within a SubmodelElementList do not have idShort values)footnote:[The Value-Only serialization of the product classification example can be seen above]:
366+
===== SubmodelElementList
367+
368+
For a _SubmodelElementList_ named "Authors" with string Properties as its value, the Value-Only payload is minimized to the following (idShort of values within a SubmodelElementList are ignored):footnote:[The Value-Only serialization of the product classification example can be seen above]:
364369

365370
[source,json,linenums]
366371
----
@@ -371,6 +376,8 @@ For a _SubmodelElementList_ named "Authors" with string Properties as its value,
371376
]
372377
----
373378

379+
===== MultiLanguageProperty
380+
374381
For a _MultiLanguageProperty_ the Value-Only payload is minimized to the following:
375382

376383
[source,json,linenums]
@@ -381,6 +388,7 @@ For a _MultiLanguageProperty_ the Value-Only payload is minimized to the followi
381388
]
382389
383390
----
391+
===== Range
384392

385393
For a _Range_ named "TorqueRange", the Value-Only payload is minimized to the following:
386394

@@ -392,6 +400,8 @@ For a _Range_ named "TorqueRange", the Value-Only payload is minimized to the fo
392400
}
393401
----
394402

403+
===== ReferenceElement
404+
395405
For a _ReferenceElement_ named "MaxRotationSpeedReference", the Value-Only payload is minimized to the following:
396406

397407
[source,json,linenums]
@@ -407,6 +417,8 @@ For a _ReferenceElement_ named "MaxRotationSpeedReference", the Value-Only paylo
407417
}
408418
----
409419

420+
===== File
421+
410422
For a _File_ named "Document", the Value-Only payload is minimized to the following:
411423

412424
[source,json,linenums]
@@ -415,7 +427,9 @@ For a _File_ named "Document", the Value-Only payload is minimized to the follow
415427
"contentType": "application/pdf",
416428
"value": "SafetyInstructions.pdf"
417429
}
430+
418431
----
432+
===== Blob
419433

420434
For a _Blob_ named "Library", there are two possibilities for the Value-Only payload.
421435
In case the Blob value - that can be very large - shall not be part of the payload, the payload is minimized to the followingfootnote:[
@@ -438,6 +452,8 @@ In the second case the Blob value is part of the payload.footnote:[in this case
438452
}
439453
----
440454

455+
===== RelationshipElement
456+
441457
For a _RelationshipElement_ named "CurrentFlowsFrom", the Value-Only payload is minimized to the following:
442458

443459
[source,json,linenums]
@@ -472,6 +488,8 @@ For a _RelationshipElement_ named "CurrentFlowsFrom", the Value-Only payload is
472488
}
473489
----
474490

491+
===== AnnotatedRelationshipElement
492+
475493
For an _AnnotatedRelationshipElement_ named "CurrentFlowFrom", with an annotated _Property_-DataElement "AppliedRule", the Value-Only-payload is minimized to the following:
476494

477495
[source,json,linenums]
@@ -511,6 +529,8 @@ For an _AnnotatedRelationshipElement_ named "CurrentFlowFrom", with an annotated
511529
}
512530
----
513531

532+
===== Entity
533+
514534
For an _Entity_ named "MySubAssetEntity", the Value-Only-payload is minimized to the following:
515535

516536
[source,json,linenums]
@@ -532,6 +552,8 @@ For an _Entity_ named "MySubAssetEntity", the Value-Only-payload is minimized to
532552
}
533553
----
534554

555+
===== BasicEventElement
556+
535557
For a BasicEventElement named "MyBasicEvent", the Value-Only-payload is minimized to the following:
536558

537559
[source,json,linenums]

‎documentation/IDTA-01001/modules/ROOT/pages/mappings/links.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:git-repo: https://github.com/admin-shell-io/aas-specs-metamodel/tree/IDTA-01001-3-1_working
1+
:git-repo: https://github.com/admin-shell-io/aas-specs-metamodel/tree/master
22

33
// JSON schema links
44
:json-folder: {git-repo}/schemas/json

‎documentation/IDTA-01001/modules/ROOT/partials/diagrams/11-asset-administration-shell.puml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@startuml
22

3-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/asset-administration-shell.puml
4-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/asset-information.puml
5-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/enum-asset-kind.puml
6-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/specific-asset-id.puml
7-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/submodel.puml
8-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/qualifier.puml
9-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/submodel-element.puml
10-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/property.puml
3+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/asset-administration-shell.puml
4+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/asset-information.puml
5+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/enum-asset-kind.puml
6+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/specific-asset-id.puml
7+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/submodel.puml
8+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/qualifier.puml
9+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/submodel-element.puml
10+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/property.puml
1111

1212
note left of Property
1313
Exemplary Submodel Element

‎documentation/IDTA-01001/modules/ROOT/partials/diagrams/12-environment.puml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@startuml
22

3-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/environment.puml
4-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/asset-administration-shell.puml
5-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/submodel.puml
6-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/concept-description.puml
3+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/environment.puml
4+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/asset-administration-shell.puml
5+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/submodel.puml
6+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/concept-description.puml
77

88
AssetAdministrationShell --->"submodel\n0..*" Submodel : Reference
99
AssetAdministrationShell -->"derivedFrom\n0..1" AssetAdministrationShell : Reference

‎documentation/IDTA-01001/modules/ROOT/partials/diagrams/14-administrative-information.puml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@startuml
2-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/administrative-information.puml
2+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/administrative-information.puml
33
@enduml

‎documentation/IDTA-01001/modules/ROOT/partials/diagrams/15-has-data-specification.puml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@startuml
2-
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/IDTA-01001-3-1_working/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/has-data-specification.puml
2+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/has-data-specification.puml
33
@enduml

0 commit comments

Comments
 (0)