International-Data-Spaces-Association · clange · Aug 1, 2022 · Sep 9, 2021 · Sep 9, 2021 · Sep 9, 2021
diff --git a/.github/PULL_REQUEST_TEMPLATES/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATES/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,27 @@
+## Type of change
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Formatting / Refactoring / Other change (non-breaking, non-functional changes)
+- [ ] Release
+
+## Checklist:
+- [ ] Provide complete validation shapes for the new ontology terms; remove shapes for the old ones
+
+### Checklist for releases:
+
+#### Before a release:
+- [ ] Ensure that the respective [GitHub milestone](https://github.com/International-Data-Spaces-Association/InformationModel/milestones) has no more open issues (i.e., close these or move these to subsequent milestones)
+- [ ] Update changelogs
+- [ ] Rerun ontology creation script (`create-ontology-ttl.sh`) with the version number of the release. E.g., `create-ontology-ttl.sh 4.2.0`
+- [ ] Update and validate the examples against the latest ontology version and SHACL shapes
+- [ ] Make sure that the manually authored parts of the documentation are in sync with the rest of the implementation and documentation
+- [ ] Check whether the [IDS-G-pre](https://github.com/International-Data-Spaces-Association/IDS-G-pre/tree/main/Infomodel) documentation is up to date
+- [ ] Check whether the [IDS Information Model Readme.md](https://github.com/International-Data-Spaces-Association/InformationModel/#readme) is up to date
+
+### After a release:
+- [ ] Generate human-readable documentation and single-file serializations using Widoco
+- [ ] Generate Java library
+- [ ] Update the message table
+- [ ] Announce new version via mailing lists
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,5 @@ artifacts
 /IDSInformationModelAll.ttl
 /catalog-v001.xml
 *.project
+references/.DS_Store
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.2.0] 2022-05-13
+Version 4.2.0 of the IDS Information Model
+
+### Added
+
+* Class `ids:PaymentModality` and property `ids:paymentModality` to document pricing modalities (free/ fixed price/ negotiation basis). Property is directly attached to the `ids:Resource`.
+* Class `ids:IdsProtocolSpecification` and property `ids:apiSpecification` to describe `ids:Endpoint`s with their supported protocols
+* New individuals of `ids:Action`: `ADD`, `DIVIDE`, `HASH`, `INCREMENT_COUNTER`, `MULTIPLY`, `REPLACE`, `SHUFFLE`
+* New individuals of `ids:Frequency`: `TWO_TIMES_A_DAY`, `EVERY_THREE_HOURS`, `BIHOURLY`, `HOURLY`, `EVERY_30_MINUTES`, `EVERY_15_MINUTES`, `EVERY_10_MINUTES`, `EVERY_5_MINUTES`, `EVERY_1_MINUTE`
+* New individuals of `ids:IdsProtocolSpecification`: `IDS-REST`, `IDS-CP`, `QUERY`, `MULTIPART`
+* New individuals of `ids:LeftOperand`: `DATE_TIME`, `HASH_ALGORITHM`, `JSON_PATH`, `XPATH`, `REPLACE_WITH`, `OPERAND`, `ROLE`, `RECIPIENT`, `TARGET_POLICY`, `ARTIFACT_STATE`, `SYSTEM_DEVICE`, `APPLICATION`, `CONNECTOR`, `LOG_LEVEL`, `NOTIFICATION_LEVEL`
+* New individuals of `ids:CustomMediaType`: `OTHER_MEDIATYPE`
+* Title (`ids:title`) and description (`ids:description`) properties for `ids:Representation`.
+* Shapes for AppResources
+* Class UsageControlComponent and Shape
+* `ids:Representation` is now additionally subclass of `ids:Described` giving instances a title- and description label.
 
 ## [4.1.0] 2021-05-26
 Version 4.1.0 of the IDS Information Model

diff --git a/Ontology.ttl b/Ontology.ttl
@@ -34,13 +34,14 @@ ids:
        <https://github.com/HaydarAk> ,
        <https://github.com/jlangkau> ,
        <https://github.com/JohannesLipp> ,
-       <https://github.com/lcomet> ,
-       <https://github.com/mkollenstart> ;
+       <https://github.com/mkollenstart> ,
+       <https://github.com/PHochmann> ,
+       <https://github.com/lcomet> ;
     dct:publisher ids:IDSA ;
     dct:created "2017-09-26"^^xsd:date ;
-    dct:modified "2021-06-17"^^xsd:date ;
-    owl:versionInfo "4.1.0" ;
-    owl:versionIRI <https://w3id.org/idsa/core/4.1.0> ;
+    dct:modified "2022-06-01"^^xsd:date ;
+    owl:versionInfo "4.2.0" ;
+    owl:versionIRI <https://w3id.org/idsa/core/4.2.0> ;
     vann:preferredNamespaceUri "https://w3id.org/idsa/core/" ;
     vann:preferredNamespacePrefix "ids" ;
     rdfs:seeAlso <https://international-data-spaces-association.github.io/InformationModel/> ;
@@ -102,90 +103,98 @@ _:AnnaKasprzik a dct:Agent, foaf:Person ;
 <https://github.com/mkollenstart> a dct:Agent, foaf:Person ;
     foaf:name "Maarten Kollenstart" ;
 .
+<https://github.com/JohannesLipp> a dct:Agent, foaf:Person ;
+    foaf:name "Johannes Lipp" ;
+.
 <https://github.com/lcomet> a dct:Agent, foaf:Person ;
-                                  foaf:name "Lina Molinas Comet" ;
+    foaf:name "Lina Molinas Comet" ;
 .
 # ----------------------------
 # Imports of class files
 ids:
-    owl:imports <model/communication/AppRoute.ttl> ;
-    owl:imports <model/communication/Endpoint.ttl> ;
     owl:imports <model/communication/Message.ttl> ;
     owl:imports <model/communication/Proxy.ttl> ;
-    owl:imports <model/content/Artifact.ttl> ;
+    owl:imports <model/communication/AppRoute.ttl> ;
+    owl:imports <model/communication/Endpoint.ttl> ;
+    owl:imports <model/content/UsageControlObject.ttl> ;
     owl:imports <model/content/ArtifactState.ttl> ;
-    owl:imports <model/content/Asset.ttl> ;
+    owl:imports <model/content/Resource.ttl> ;
+    owl:imports <model/content/Representation.ttl> ;
     owl:imports <model/content/Concept.ttl> ;
-    owl:imports <model/content/ContentType.ttl> ;
+    owl:imports <model/content/Artifact.ttl> ;
     owl:imports <model/content/DataApp.ttl> ;
-    owl:imports <model/content/DigitalContent.ttl> ;
+    owl:imports <model/content/PaymentModalities.ttl> ;
     owl:imports <model/content/Language.ttl> ;
+    owl:imports <model/content/Asset.ttl> ;
     owl:imports <model/content/MediaType.ttl> ;
-    owl:imports <model/content/Representation.ttl> ;
-    owl:imports <model/content/Resource.ttl> ;
-    owl:imports <model/content/UsageControlObject.ttl> ;
-    owl:imports <model/context/Event.ttl> ;
-    owl:imports <model/context/SpatialEntity.ttl> ;
+    owl:imports <model/content/ContentType.ttl> ;
+    owl:imports <model/content/DigitalContent.ttl> ;
     owl:imports <model/context/TemporalEntity.ttl> ;
-    owl:imports <model/contract/Action.ttl> ;
-    owl:imports <model/contract/BinaryOperator.ttl> ;
+    owl:imports <model/context/SpatialEntity.ttl> ;
+    owl:imports <model/context/Event.ttl> ;
+    owl:imports <model/contract/UsageControlComponent.ttl> ;
     owl:imports <model/contract/Constraint.ttl> ;
-    owl:imports <model/contract/Contract.ttl> ;
-    owl:imports <model/contract/LeftOperand.ttl> ;
     owl:imports <model/contract/Rule.ttl> ;
     owl:imports <model/contract/UsagePolicyClass.ttl> ;
+    owl:imports <model/contract/BinaryOperator.ttl> ;
+    owl:imports <model/contract/Action.ttl> ;
+    owl:imports <model/contract/LeftOperand.ttl> ;
+    owl:imports <model/contract/Contract.ttl> ;
     owl:imports <model/governance/Certification.ttl> ;
     owl:imports <model/governance/License.ttl> ;
-    owl:imports <model/infrastructure/AppStore.ttl> ;
     owl:imports <model/infrastructure/Broker.ttl> ;
-    owl:imports <model/infrastructure/Catalog.ttl> ;
     owl:imports <model/infrastructure/ClearingHouse.ttl> ;
+    owl:imports <model/infrastructure/InfrastructureComponent.ttl> ;
+    owl:imports <model/infrastructure/DAPS.ttl> ;
     owl:imports <model/infrastructure/ConfigurationModel.ttl> ;
     owl:imports <model/infrastructure/Connector.ttl> ;
-    owl:imports <model/infrastructure/DAPS.ttl> ;
-    owl:imports <model/infrastructure/IdentityProvider.ttl> ;
-    owl:imports <model/infrastructure/InfrastructureComponent.ttl> ;
+    owl:imports <model/infrastructure/Catalog.ttl> ;
+    owl:imports <model/infrastructure/AppStore.ttl> ;
     owl:imports <model/infrastructure/ParIS.ttl> ;
+    owl:imports <model/infrastructure/IdentityProvider.ttl> ;
     owl:imports <model/infrastructure/PublicKey.ttl> ;
-    owl:imports <model/participant/BusinessIdentifier.ttl> ;
     owl:imports <model/participant/Participant.ttl> ;
-    owl:imports <model/security/AuthInfo.ttl> ;
-    owl:imports <model/security/AuthStandard.ttl> ;
-    owl:imports <model/security/SecurityProfile.ttl> ;
+    owl:imports <model/participant/BusinessIdentifier.ttl> ;
     owl:imports <model/security/Token.ttl> ;
+    owl:imports <model/security/AuthStandard.ttl> ;
+    owl:imports <model/security/AuthInfo.ttl> ;
     owl:imports <model/security/UserAuthentication.ttl> ;
+    owl:imports <model/security/SecurityProfile.ttl> ;
     owl:imports <model/shared/Described.ttl> ;
     owl:imports <model/shared/DescribedSemantically.ttl> ;
     owl:imports <model/shared/Named.ttl> ;
-    owl:imports <model/traceability/ConnectorDeployMode.ttl> ;
-    owl:imports <model/traceability/ConnectorStatus.ttl> ;
     owl:imports <model/traceability/LogLevel.ttl> ;
+    owl:imports <model/traceability/ConnectorStatus.ttl> ;
+    owl:imports <model/traceability/ConnectorDeployMode.ttl> ;
     owl:imports <model/traceability/ManagedEntity.ttl> ;
     owl:imports <taxonomies/Certification.ttl> ;
-    owl:imports <taxonomies/Contract.ttl> ;
     owl:imports <taxonomies/Message.ttl> ;
-    owl:imports <taxonomies/Representation.ttl> ;
     owl:imports <taxonomies/Resource.ttl> ;
-    owl:imports <codes/Action.ttl> ;
-    owl:imports <codes/AppEndpointType.ttl> ;
+    owl:imports <taxonomies/Representation.ttl> ;
+    owl:imports <taxonomies/Contract.ttl> ;
+    owl:imports <codes/Frequency.ttl> ;
+    owl:imports <codes/LogLevel.ttl> ;
     owl:imports <codes/ArtifactState.ttl> ;
+    owl:imports <codes/SecurityGuarantee.ttl> ;
+    owl:imports <codes/RequestTemplate.ttl> ;
+    owl:imports <codes/CertificationLevel.ttl> ;
+    owl:imports <codes/TokenFormat.ttl> ;
+    owl:imports <codes/RejectionReason.ttl> ;
     owl:imports <codes/Audience.ttl> ;
     owl:imports <codes/BinaryOperators.ttl> ;
-    owl:imports <codes/CertificationLevel.ttl> ;
-    owl:imports <codes/ConnectorDeployMode.ttl> ;
+    owl:imports <codes/IdsProtocolSpecification.ttl> ;
     owl:imports <codes/ConnectorStatus.ttl> ;
-    owl:imports <codes/ContentType.ttl> ;
-    owl:imports <codes/Frequency.ttl> ;
-    owl:imports <codes/KeyType.ttl> ;
-    owl:imports <codes/Language.ttl> ;
+    owl:imports <codes/ConnectorDeployMode.ttl> ;
+    owl:imports <codes/QueryScope.ttl> ;
+    owl:imports <codes/AppEndpointType.ttl> ;
+    owl:imports <codes/UsagePolicyClass.ttl> ;
+    owl:imports <codes/Action.ttl> ;
     owl:imports <codes/LeftOperand.ttl> ;
-    owl:imports <codes/LogLevel.ttl> ;
     owl:imports <codes/QueryLanguage.ttl> ;
-    owl:imports <codes/QueryScope.ttl> ;
+    owl:imports <codes/KeyType.ttl> ;
+    owl:imports <codes/Language.ttl> ;
+    owl:imports <codes/PaymentModality.ttl> ;
+    owl:imports <codes/QualityMetrics.ttl> ;
+    owl:imports <codes/ContentType.ttl> ;
     owl:imports <codes/QueryTarget.ttl> ;
-    owl:imports <codes/RejectionReason.ttl> ;
-    owl:imports <codes/RequestTemplate.ttl> ;
-    owl:imports <codes/SecurityGuarantee.ttl> ;
-    owl:imports <codes/TokenFormat.ttl> ;
-    owl:imports <codes/UsagePolicyClass.ttl> ;
 . 
diff --git a/README.md b/README.md
@@ -16,13 +16,14 @@ The Information Model was originally created by
 with significant contributions, comments and support by (in alphabetical order):
 
 - Haydar Akyürek, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
-- Sebastian Bader, [Fraunhofer IAIS](https://www.iais.fraunhofer.de/en)
+- Dr. Sebastian Bader, [Fraunhofer IAIS](https://www.iais.fraunhofer.de/en), now SAP
 - Matthias Böckmann, [Fraunhofer IAIS](https://www.iais.fraunhofer.de/en) 
-- Dr. Sandra Geisler, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
+- Prof. Sandra Geisler, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
+- Philipp Hochmann, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
 - Dr. Anna Kasprzik, [TIB](https://www.tib.eu/en)
 - Dr. Christoph Lange, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en) (see above)
 - Jörg Langkau, [nicos AG](http://www.nicos-ag.com)
-- Johannes Lipp, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
+- Johannes Theissen-Lipp, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
 - Lina Molinas Comet, [Fraunhofer FIT](https://www.fit.fraunhofer.de/en)
 - Andreas W. Müller, [Schaeffler](https://www.schaeffler.de/content.schaeffler.de/en/)
 - Dr. Michael Theß, [Signal Cruncher GmbH](https://signal-cruncher.com/)
@@ -94,7 +95,9 @@ For automated validation of the Information Model POJOs (via the builder classes
 
 - A high-level conceptual specification is given as a part of the IDS Reference Architecture Model ([current version 3.0](https://www.internationaldataspaces.org/publications/reference-architecture-model-3-0/) of 2019; see section 3.4).
 
-- [Webinar of November 2018, giving a technical overview of the Information Model](https://www.internationaldataspaces.org/wp-content/uploads/2019/07/IDS-Information-Model.pdf)
+- Webinars
+  - IDSA Tech Talk of September 2020, giving a high-level intro to version 4.0: [slides](https://www.internationaldataspaces.org/wp-content/uploads/2020/09/2020-09-03-Tech-Talk-Infomodel.pdf), [video](https://www.youtube.com/watch?v=V1WvJkaHQJ0&feature=emb_title)
+  - [Webinar of November 2018, giving a technical overview of the Information Model](https://www.internationaldataspaces.org/wp-content/uploads/2019/07/IDS-Information-Model.pdf)
 
 For members of the International Data Spaces Association only:
 - [Working document](https://industrialdataspace.jiveon.com/docs/DOC-1817), explaining

diff --git a/Shacl.ttl b/Shacl.ttl
@@ -30,9 +30,9 @@ shapes:
        <https://github.com/HaydarAk> ;
     dct:publisher ids:IDSA ;
     dct:created "2019-10-14"^^xsd:date ;
-    dct:modified "2021-06-17"^^xsd:date ;
-    owl:versionInfo "4.1.0" ;
-    owl:versionIRI <https://github.com/International-Data-Spaces-Association/InformationModel/tree/master/testing/4.1.0> ;
+    dct:modified "2022-07-28"^^xsd:date ;
+    owl:versionInfo "4.2.0" ;
+    owl:versionIRI <https://github.com/International-Data-Spaces-Association/InformationModel/tree/master/testing/4.2.0> ;
     vann:preferredNamespaceUri "https://github.com/International-Data-Spaces-Association/InformationModel/tree/master/testing" ;
     vann:preferredNamespacePrefix "shapes" ;
     rdfs:seeAlso <https://international-data-spaces-association.github.io/InformationModel/> ;
@@ -66,61 +66,62 @@ ids:IDSA
 # ----------------------------
 # Imports of class files
 shapes:
-    owl:imports <testing/communication/ApiDocumentTypeShape.ttl> ;
-    owl:imports <testing/communication/AppRouteShape.ttl> ;
+    owl:imports <testing/communication/InterfaceShape.ttl> ;
     owl:imports <testing/communication/EndpointShape.ttl> ;
+    owl:imports <testing/communication/ParameterGroupShape.ttl> ;
+    owl:imports <testing/communication/ApiDocumentTypeShape.ttl> ;
     owl:imports <testing/communication/HostShape.ttl> ;
-    owl:imports <testing/communication/InterfaceShape.ttl> ;
     owl:imports <testing/communication/MessageExchangePatternShape.ttl> ;
     owl:imports <testing/communication/MessageShape.ttl> ;
-    owl:imports <testing/communication/OperationBindingShape.ttl> ;
     owl:imports <testing/communication/ParameterAssignmentShape.ttl> ;
-    owl:imports <testing/communication/ParameterGroupShape.ttl> ;
     owl:imports <testing/communication/ParameterShape.ttl> ;
+    owl:imports <testing/communication/OperationBindingShape.ttl> ;
+    owl:imports <testing/communication/AppRouteShape.ttl> ;
     owl:imports <testing/communication/ProxyShape.ttl> ;
-    owl:imports <testing/content/ArtifactShape.ttl> ;
     owl:imports <testing/content/AssetShape.ttl> ;
-    owl:imports <testing/content/ConceptShape.ttl> ;
+    owl:imports <testing/content/ArtifactShape.ttl> ;
     owl:imports <testing/content/DataAppShape.ttl> ;
-    owl:imports <testing/content/MediaTypeShape.ttl> ;
     owl:imports <testing/content/RepresentationShape.ttl> ;
-    owl:imports <testing/content/ResourceShape.ttl> ;
+    owl:imports <testing/content/ConceptShape.ttl> ;
     owl:imports <testing/content/UsageControlObjectShape.ttl> ;
+    owl:imports <testing/content/ResourceShape.ttl> ;
     owl:imports <testing/context/SpatialEntityShape.ttl> ;
     owl:imports <testing/context/TemporalEntityShape.ttl> ;
-    owl:imports <testing/contract/ActionShape.ttl> ;
+    owl:imports <testing/contract/PricingModelShape.ttl> ;
+    owl:imports <testing/contract/RuleShape.ttl> ;
     owl:imports <testing/contract/ConstraintShape.ttl> ;
     owl:imports <testing/contract/ContractShape.ttl> ;
+    owl:imports <testing/contract/ActionShape.ttl> ;
     owl:imports <testing/contract/LeftOperandShape.ttl> ;
-    owl:imports <testing/contract/PricingModelShape.ttl> ;
-    owl:imports <testing/contract/RuleShape.ttl> ;
+    owl:imports <testing/contract/UsageControlComponentShape.ttl> ;
     owl:imports <testing/governance/CertificationShape.ttl> ;
-    owl:imports <testing/infrastructure/BrokerShape.ttl> ;
-    owl:imports <testing/infrastructure/CatalogShape.ttl> ;
-    owl:imports <testing/infrastructure/ComponentShape.ttl> ;
+    owl:imports <testing/infrastructure/InfrastructureComponentShape.ttl> ;
     owl:imports <testing/infrastructure/ConfigurationModelShape.ttl> ;
+    owl:imports <testing/infrastructure/ComponentShape.ttl> ;
     owl:imports <testing/infrastructure/ConnectorShape.ttl> ;
-    owl:imports <testing/infrastructure/InfrastructureComponentShape.ttl> ;
+    owl:imports <testing/infrastructure/ParISShape.ttl> ;
     owl:imports <testing/infrastructure/ParISSHape.ttl> ;
+    owl:imports <testing/infrastructure/CatalogShape.ttl> ;
     owl:imports <testing/infrastructure/PublicKeyShape.ttl> ;
-    owl:imports <testing/participant/BusinessIdentifierShape.ttl> ;
+    owl:imports <testing/infrastructure/BrokerShape.ttl> ;
     owl:imports <testing/participant/IndustrialClassificationShape.ttl> ;
+    owl:imports <testing/participant/BusinessIdentifierShape.ttl> ;
     owl:imports <testing/participant/ParticipantShape.ttl> ;
     owl:imports <testing/security/AuthInfoShape.ttl> ;
-    owl:imports <testing/security/SecurityProfileShape.ttl> ;
-    owl:imports <testing/security/TokenShape.ttl> ;
     owl:imports <testing/security/UserAuthentificationShape.ttl> ;
-    owl:imports <testing/shacl/abox-shapes.ttl> ;
+    owl:imports <testing/security/TokenShape.ttl> ;
+    owl:imports <testing/security/SecurityProfileShape.ttl> ;
     owl:imports <testing/shacl/tbox-shapes.ttl> ;
+    owl:imports <testing/shacl/abox-shapes.ttl> ;
     owl:imports <testing/shared/DescribedSemanticallyShape.ttl> ;
-    owl:imports <testing/shared/DescribedShape.ttl> ;
     owl:imports <testing/shared/NamedShape.ttl> ;
-    owl:imports <testing/taxonomies/CertificationShape.ttl> ;
+    owl:imports <testing/shared/DescribedShape.ttl> ;
     owl:imports <testing/taxonomies/DigitalContentShape.ttl> ;
+    owl:imports <testing/taxonomies/RepresentationShape.ttl> ;
+    owl:imports <testing/taxonomies/CertificationShape.ttl> ;
     owl:imports <testing/taxonomies/MessageShape.ttl> ;
     owl:imports <testing/taxonomies/OperationShape.ttl> ;
-    owl:imports <testing/taxonomies/RepresentationShape.ttl> ;
     owl:imports <testing/taxonomies/ResourceShape.ttl> ;
-    owl:imports <testing/traceability/ActivityShape.ttl> ;
     owl:imports <testing/traceability/ManagedEntityShape.ttl> ;
+    owl:imports <testing/traceability/ActivityShape.ttl> ;
 . 
diff --git a/codes/ArtifactState.ttl b/codes/ArtifactState.ttl
@@ -6,7 +6,7 @@
 @prefix geo: <http://www.opengis.net/ont/geosparql#> .
 @prefix wgs84: <https://www.w3.org/2003/01/geo/wgs84_pos#> .
 @prefix odrl: <http://www.w3.org/ns/odrl/2/> .
-@prefix time: <https://www.w3.org/TR/owl-time/#> .
+@prefix time: <http://www.w3.org/2006/time#> .
 @prefix org: <http://www.w3.org/ns/org#> .
 @prefix ids: <https://w3id.org/idsa/core/> .
 @prefix idsc: <https://w3id.org/idsa/code/> .