Skip to content

Commit 6f38c9b

Browse files
juileetikekarjuileetikekar
authored
Merge pull request #602 from admin-shell-io/jtikekar/antoraWorkaround_AbsolutePaths
Changing absolute paths from branch to master
2 parents 2d954c9 + 052da66 commit 6f38c9b

Some content is hidden

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

51 files changed

+162
-152
lines changed

‎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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ If there is a bugfix of this parts, this shall be used.
3333

3434
Copyright: Industrial Digital Twin Association e.V. (IDTA)
3535

36-
IDTA Document Number: IDTA-01001-3-1
36+
IDTA Number: IDTA-01001
3737

38-
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
3941

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

‎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

‎documentation/IDTA-01001/modules/ROOT/partials/diagrams/16-has-extensions.puml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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/has-extension.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/referable.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/extension.puml
3+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/has-extension.puml
4+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/referable.puml
5+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/extension.puml
66

77
Extension -> "+refersTo" Referable:Reference
88
HasExtensions ..> Extension

‎documentation/IDTA-01001/modules/ROOT/partials/diagrams/17-has-kind.puml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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-kind.puml
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/enum-modelling-kind.puml
2+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/has-kind.puml
3+
!include https://raw.githubusercontent.com/admin-shell-io/aas-specs-metamodel/master/documentation/IDTA-01001/modules/ROOT/partials/diagrams/classes/enum-modelling-kind.puml
44
HasKind .> ModellingKind
55
@enduml

0 commit comments

Comments
 (0)