Skip to content

Commit

Permalink
Update version numbers and other content for 2.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
pmai committed Oct 25, 2024
1 parent 2520192 commit f577563
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 27 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2016-2022 Modelica Association Project "SSP"
Copyright (C) 2016-2024 Modelica Association Project "SSP"
All rights reserved.

Source code or other data, such as C-header and XML-schema files, that
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ https://ssp-standard.org/[Releases] and the https://ssp-standard.org/docs/main/[

== Copyright and License

XML schemas and documentation copyright (C) 2016 - 2023 the Modelica Association Project SSP.
XML schemas and documentation copyright (C) 2016 - 2024 the Modelica Association Project SSP.
XML schemas released under the https://opensource.org/licenses/BSD-2-Clause[2-Clause BSD License].
Documentation released under https://creativecommons.org/licenses/by-sa/4.0/[Attribution-ShareAlike 4.0 International].
10 changes: 6 additions & 4 deletions docs/0___preamble.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
This document is a current working draft of the System Structure and Parameterization Standard (SSP).
Document version: 2.0-rc.1

October 25, 2024

This document is a release candidate of the System Structure and Parameterization Standard (SSP) 2.0.
*It is unreleased, and does not constitute a standard of the Modelica Association.*

// On the Downloads page (https://ssp-standard.org/downloads), this specification, as well as supporting XML schema files are provided.
Expand All @@ -14,7 +18,7 @@ History / Road Map
|Version |Date |Remarks
|1.0 |2019-03-05 |First Public Release of SSP
|1.0.1 |2022-07-25 |Public Release of SSP 1.0.1
|2.0 | |Current Working Draft
|2.0-rc.1 |2024-10-25 |First Release Candidate of SSP 2.0
|===

Please report issues that you find with this specification to map-ssp_projectlead@googlegroups.com.
Expand Down Expand Up @@ -74,8 +78,6 @@ The standard is comprised of a set of XML-based formats to describe a network of

<<<

*About SSP*

*Conventions used in this Document*

* The key words *MUST*, *MUST NOT*, *REQUIRED*, *SHALL*, *SHALL NOT*, *SHOULD*, *SHOULD NOT*, *RECOMMENDED*, *MAY*, and *OPTIONAL* in this document are to be interpreted as described in RFC 2119 [RFC2119].
Expand Down
2 changes: 1 addition & 1 deletion docs/5___ssd.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The root element of an SSD file *MUST* be a SystemStructureDescription element,
|Attribute |Description
|version |This required attribute specifies the version of this specification that the system description conforms to.
Only major and minor version number are included, the patch version number *MUST NOT* be included in this attribute.
For the current release this *MUST* be either 1.0 or 2.0.
For the current release this *MUST* be either 1.0 or 2.0-rc.1.
If it is 1.0 the file *MUST* also conform fully to the 1.0 standard.
|name |This required attribute provides a name, which can be used for purposes of presenting the system structure to the user, for example when selecting individual variant SSDs from an SSP.
|===
Expand Down
2 changes: 1 addition & 1 deletion docs/6___ssv.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ If the SSV is provided as a separate file, the root element *MUST* be a Paramete
|Attribute |Description
|version |This required attribute specifies the version of this specification that the parameter set conforms to.
Only major and minor version number are included, the patch version number *MUST NOT* be included in this attribute.
For the current release this *MUST* be either 1.0 or 2.0.
For the current release this *MUST* be either 1.0 or 2.0-rc.1.
If it is 1.0 the file *MUST* also conform fully to the 1.0 standard.
|name |This required attribute provides a name which can be used for purposes of presenting the parameter set to the user.
|===
Expand Down
2 changes: 1 addition & 1 deletion docs/7___ssm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Implementations *CAN* map the same parameter to multiple names.
|Attribute |Description
|version |This required attribute specifies the version of this specification that the parameter mapping conforms to.
Only major and minor version number are included, the patch version number *MUST NOT* be included in this attribute.
For the current release this *MUST* be either 1.0 or 2.0.
For the current release this *MUST* be either 1.0 or 2.0-rc.1.
If it is 1.0 the file *MUST* also conform fully to the 1.0 standard.
|===

Expand Down
2 changes: 1 addition & 1 deletion docs/8___ssb.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This element describes a signal dictionary, which consists of one or more dictio
|Attribute |Description
|version |This required attribute specifies the version of this specification that the parameter mapping conforms to.
Only major and minor version number are included, the patch version number *MUST NOT* be included in this attribute.
For the current release this *MUST* be either 1.0 or 2.0.
For the current release this *MUST* be either 1.0 or 2.0-rc.1.
If it is 1.0 the file *MUST* also conform fully to the 1.0 standard.
|===

Expand Down
4 changes: 2 additions & 2 deletions schema/SystemStructureCommon.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
This is the normative XML Schema 1.0 schema for the MAP SSP
SystemStructure 2.0 common content across formats.

Version: 2.0-alpha
Version: 2.0-rc.1

Copyright 2016 -- 2019 Modelica Association Project "SSP"
Copyright 2016 -- 2024 Modelica Association Project "SSP"

Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the
Expand Down
6 changes: 3 additions & 3 deletions schema/SystemStructureDescription.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
This is the normative XML Schema 1.0 schema for the MAP SSP
SystemStructureDescription 2.0 format.

Version: 2.0-alpha
Version: 2.0-rc.1

Copyright 2016 -- 2024 Modelica Association Project "SSP"

Expand Down Expand Up @@ -57,13 +57,13 @@
<xs:attribute name="version" use="required">
<xs:annotation>
<xs:documentation xml:lang="en">
Version of SSD format, 1.0 or 2.0-alpha for this release.
Version of SSD format, 1.0 or 2.0-rc.1 for this release.
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:normalizedString">
<xs:pattern value="1[.]0"/>
<xs:pattern value="2[.][0-9]+(-.+)"/>
<xs:pattern value="2[.]0-rc[.]1"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down
6 changes: 3 additions & 3 deletions schema/SystemStructureDescription11.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
as a non-normative alternative to the XML Schema 1.0 schema
to support simpler cross-namespace validation of SSD files.

Version: 2.0-alpha
Version: 2.0-rc.1

Copyright 2016 -- 2024 Modelica Association Project "SSP"

Expand Down Expand Up @@ -66,13 +66,13 @@
<xs:attribute name="version" use="required">
<xs:annotation>
<xs:documentation xml:lang="en">
Version of SSD format, 1.0 or 2.0-alpha for this release.
Version of SSD format, 1.0 or 2.0-rc.1 for this release.
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:normalizedString">
<xs:pattern value="1[.]0"/>
<xs:pattern value="2[.][0-9]+(-.+)"/>
<xs:pattern value="2[.]0-rc[.]1"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down
6 changes: 3 additions & 3 deletions schema/SystemStructureParameterMapping.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
This is the normative XML Schema 1.0 schema for the MAP SSP
SystemStructureParameterMapping 2.0 format.

Version: 2.0-alpha
Version: 2.0-rc.1

Copyright 2016 -- 2024 Modelica Association Project "SSP"

Expand Down Expand Up @@ -54,13 +54,13 @@
<xs:attribute name="version" use="required">
<xs:annotation>
<xs:documentation xml:lang="en">
Version of SSM format, 1.0 or 2.0-alpha for this release.
Version of SSM format, 1.0 or 2.0-rc.1 for this release.
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:normalizedString">
<xs:pattern value="1[.]0"/>
<xs:pattern value="2[.][0-9]+(-.+)"/>
<xs:pattern value="2[.]0-rc[.]1"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down
6 changes: 3 additions & 3 deletions schema/SystemStructureParameterValues.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
This is the normative XML Schema 1.0 schema for the MAP SSP
SystemStructureParameterValues 2.0 format.

Version: 2.0-alpha
Version: 2.0-rc.1

Copyright 2016 -- 2024 Modelica Association Project "SSP"

Expand Down Expand Up @@ -56,13 +56,13 @@
<xs:attribute name="version" use="required">
<xs:annotation>
<xs:documentation xml:lang="en">
Version of SSV format, 1.0 or 2.0-alpha for this release.
Version of SSV format, 1.0 or 2.0-rc.1 for this release.
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:normalizedString">
<xs:pattern value="1[.]0"/>
<xs:pattern value="2[.][0-9]+(-.+)"/>
<xs:pattern value="2[.]0-rc[.]1"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down
6 changes: 3 additions & 3 deletions schema/SystemStructureSignalDictionary.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
This is the normative XML Schema 1.0 schema for the MAP SSP
SystemStructureSignalDictionary 2.0 format.

Version: 2.0-alpha
Version: 2.0-rc.1

Copyright 2016 -- 2024 Modelica Association Project "SSP"

Expand Down Expand Up @@ -56,13 +56,13 @@
<xs:attribute name="version" use="required">
<xs:annotation>
<xs:documentation xml:lang="en">
Version of SSB format, 1.0 or 2.0-alpha for this release.
Version of SSB format, 1.0 or 2.0-rc.1 for this release.
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:normalizedString">
<xs:pattern value="1[.]0"/>
<xs:pattern value="2[.][0-9]+(-.+)"/>
<xs:pattern value="2[.]0-rc[.]1"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
Expand Down

0 comments on commit f577563

Please sign in to comment.