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

Merge branch 'develop-v2.1.1' into issue-8

parents f8b33b5c 1481d188

.gitignore

+2 −1
Original line number Original line Diff line number Diff line
@@ -3,3 +3,4 @@ 
catalog-v001.xml

catalog-v001.xml

saref-pipeline.jar

saref-pipeline.jar

target

target

ts

.gitlab-ci.yml

+3 −1
Original line number Original line Diff line number Diff line 
include: 'https://saref.etsi.org/downloads/gitlab-ci.yml'
 
include:

 No newline at end of file
 
  - project: 'saref/saref-core'

    file: '.gitlab-ci.yml'

examples/example1.ttl

+4 −4
Original line number Original line Diff line number Diff line 
@prefix : <https://saref.etsi.org/saref4auto/v1.1.1/example/example1/> .

@prefix : <https://saref.etsi.org/saref4auto/v2.1.1/example/example1/> .

@prefix ex: <https://saref.etsi.org/saref4auto/v1.1.1/example/example1/> .

@prefix ex: <https://saref.etsi.org/saref4auto/v2.1.1/example/example1/> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

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

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

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

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -15,9 +15,9 @@ 
@prefix dcterms: <http://purl.org/dc/terms/> .

@prefix dcterms: <http://purl.org/dc/terms/> .









<https://saref.etsi.org/saref4auto/v1.1.1/example/example1#> a dctype:Dataset ;

<https://saref.etsi.org/saref4auto/v2.1.1/example/example1#> a dctype:Dataset ;

                                            dcterms:license <https://forge.etsi.org/etsi-software-license> ;

                                            dcterms:license <https://forge.etsi.org/etsi-software-license> ;

											dcterms:conformsTo <https://saref.etsi.org/saref4auto/v1.1.1/> ;

											dcterms:conformsTo <https://saref.etsi.org/saref4auto/v2.1.1/> ;

											dcterms:title "Example instances for SAREF extension to automotive"@en ;

											dcterms:title "Example instances for SAREF extension to automotive"@en ;

											dcterms:description "An example of SAREF4AUTO for the use cases Platooning, AVP and environment"@en .

											dcterms:description "An example of SAREF4AUTO for the use cases Platooning, AVP and environment"@en .

ontology/saref4auto.ttl

+3 −2
Original line number Original line Diff line number Diff line
@@ -29,8 +29,9 @@ 
                                     dcterms:title "SAREF extension for automotive"@en ;

                                     dcterms:title "SAREF extension for automotive"@en ;

                                     vann:preferredNamespacePrefix "s4auto" ;

                                     vann:preferredNamespacePrefix "s4auto" ;

                                     vann:preferredNamespaceUri "https://saref.etsi.org/saref4auto/" ;

                                     vann:preferredNamespaceUri "https://saref.etsi.org/saref4auto/" ;

                                     owl:versionIRI <https://saref.etsi.org/saref4auto/v1.1.1/> ;

                                     owl:versionIRI <https://saref.etsi.org/saref4auto/v2.1.1/> ;

                                     owl:versionInfo "v1.1.1" .

                                     owl:versionInfo "v2.1.1" ;

                                     owl:priorVersion <https://saref.etsi.org/saref4auto/v1.1.1/> .





#################################################################

#################################################################

#    Annotation properties

#    Annotation properties