Unverified Commit b9dc684b authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'release-v1.2.1' into develop-v2.1.1

parents 3476b17e aa8fb945

.saref-repositories.yml

+1 −0
Original line number Diff line number Diff line 
labs.etsi.org/rep/:

  repos:

    - saref/saref-core

    - saref/saref4syst

examples/heatingSystemPowerProfile.ttl

+0 −1
Original line number Diff line number Diff line 
<<<<<<< HEAD

@prefix ex: <https://saref.etsi.org/saref4ener/v1.2.1/example/heatingSystemPowerProfile/> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

examples/incentiveTable.ttl

+0 −1
Original line number Diff line number Diff line
@@ -232,5 +232,4 @@ dcterms:abstract a owl:AnnotationProperty . 
saref:hasIdentifier a owl:DatatypeProperty .

time:hasBeginning a owl:DatatypeProperty .

time:hasEnd a owl:DatatypeProperty .

0db38bea6882a76096dc6

time:Interval a owl:Class .
 
 No newline at end of file

ontology/saref4ener.ttl

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ The additional key aspect captured in the ic-flex module is that a flex offer ca 
  owl:imports <https://saref.etsi.org/core/v3.1.1/> ;

  owl:versionIRI <https://saref.etsi.org/saref4ener/v1.2.1/> ;

  owl:versionInfo "v1.2.1" ;

  owl:priorVersion <https://saref.etsi.org/saref4ener/v1.1.2/> ;

  dcterms:issued "2024-04-25"^^xsd:date ;

  rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341001/01.02.01_60/ts_10341001v010201p.pdf> ;

.

s4ener:Aborted

  a owl:NamedIndividual ;