Merge branch 'develop-v2.1.1' into issue-15 (ee8c7451) · Commits · SAREF / saref4envi

.gitlab-ci.yml

+69 −69

Original line number	Diff line number	Diff line
		image: openjdk:8-jdk
		# image: openjdk:8-jdk

		variables:
		SAREF_DEV_KEY: <my_private_key>
		SAREF_PORTAL_KEY: <my_private_key>
		# variables:
		# SAREF_DEV_KEY: <my_private_key>
		# SAREF_PORTAL_KEY: <my_private_key>

		before_script:
		- eval $(ssh-agent -s)
		- ssh-add <(echo "$SAREF_DEV_KEY")
		- mkdir -p ~/.ssh
		- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
		# before_script:
		# - eval $(ssh-agent -s)
		# - ssh-add <(echo "$SAREF_DEV_KEY")
		# - mkdir -p ~/.ssh
		# - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'

		stages:
		- test
		- build
		- deploy
		# stages:
		# - test
		# - build
		# - deploy

		test-develop:
		stage: test
		script:
		- curl -L -o saref-pipeline.jar "https://saref.etsi.org/downloads/saref-pipeline.jar"
		- java -jar saref-pipeline.jar develop -s && touch target/success
		allow_failure: true
		except:
		- /^prerelease-v/
		- /^release-v/
		artifacts:
		when: always
		paths:
		- target/site
		- target/success
		reports:
		junit: target/report_output.xml
		# test-develop:
		# stage: test
		# script:
		# - curl -L -o saref-pipeline.jar "https://saref.etsi.org/downloads/saref-pipeline.jar"
		# - java -jar saref-pipeline.jar develop -s && touch target/success
		# allow_failure: true
		# except:
		# - /^prerelease-v/
		# - /^release-v/
		# artifacts:
		# when: always
		# paths:
		# - target/site
		# - target/success
		# reports:
		# junit: target/report_output.xml

		test-prerelease:
		stage: test
		script:
		- curl -L -o saref-pipeline.jar "https://saref.etsi.org/downloads/saref-pipeline.jar"
		- java -jar saref-pipeline.jar release -t && touch target/success
		allow_failure: true
		only:
		- /^prerelease-v/
		artifacts:
		when: always
		paths:
		- target/site
		- target/success
		reports:
		junit: target/report_output.xml
		# test-prerelease:
		# stage: test
		# script:
		# - curl -L -o saref-pipeline.jar "https://saref.etsi.org/downloads/saref-pipeline.jar"
		# - java -jar saref-pipeline.jar release -t && touch target/success
		# allow_failure: true
		# only:
		# - /^prerelease-v/
		# artifacts:
		# when: always
		# paths:
		# - target/site
		# - target/success
		# reports:
		# junit: target/report_output.xml

		deploy-report:
		stage: deploy
		script:
		- scp -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
		- echo "SAREF pipeline report https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html"
		- exit $(test -f target/success) $?
		except:
		- /^release-v/
		# deploy-report:
		# stage: deploy
		# script:
		# - scp -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
		# - echo "SAREF pipeline report https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html"
		# - exit $(test -f target/success) $?
		# except:
		# - /^release-v/

		test-release:
		stage: test
		script:
		- curl -L -o saref-pipeline.jar "https://saref.etsi.org/downloads/saref-pipeline.jar"
		- java -jar saref-pipeline.jar release -t
		only:
		- /^release-v/
		# test-release:
		# stage: test
		# script:
		# - curl -L -o saref-pipeline.jar "https://saref.etsi.org/downloads/saref-pipeline.jar"
		# - java -jar saref-pipeline.jar release -t
		# only:
		# - /^release-v/

		trigger-release:
		stage: deploy
		only:
		- /^release-v/
		variables:
		SAREF_DEV_KEY: $SAREF_DEV_KEY
		SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY
		trigger:
		project: saref/saref-portal
		branch: master
		# trigger-release:
		# stage: deploy
		# only:
		# - /^release-v/
		# variables:
		# SAREF_DEV_KEY: $SAREF_DEV_KEY
		# SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY
		# trigger:
		# project: saref/saref-portal
		# branch: master

ontology/saref4envi.ttl

+2 −102

Original line number	Diff line number	Diff line
		@@ -103,11 +103,6 @@ saref:relatesToProperty rdf:type owl:ObjectProperty ;
		rdfs:label "relates to property"@en .


		### https://saref.etsi.org/saref4envi/affectsProperty
		:affectsProperty rdf:type owl:ObjectProperty ;
		rdfs:comment "A relation between an actuator with the property or properties it can act on"@en ;
		rdfs:label "affects property"@en .


		### https://saref.etsi.org/saref4envi/contains
		:contains rdf:type owl:ObjectProperty ;
		@@ -283,13 +278,6 @@ saref:hasValue rdf:type owl:DatatypeProperty ;
		rdfs:label "has flash"@en .


		### https://saref.etsi.org/saref4envi/hasIdentifier
		:hasIdentifier rdf:type owl:DatatypeProperty ;
		rdfs:range xsd:string ;
		rdfs:comment "A relationship providing the identifier of an entity (e.g., digital representation)"@en ;
		rdfs:label "has identifier"@en .


		### https://saref.etsi.org/saref4envi/hasProjectionAngle
		:hasProjectionAngle rdf:type owl:DatatypeProperty ,
		owl:FunctionalProperty ;
		@@ -450,17 +438,6 @@ saref:UnitOfMeasure rdf:type owl:Class ;
		rdfs:label "Unit of measure"@en .


		### https://saref.etsi.org/saref4envi/Actuator
		:Actuator rdf:type owl:Class ;
		rdfs:subClassOf :Device ,
		[ rdf:type owl:Restriction ;
		owl:onProperty :affectsProperty ;
		owl:allValuesFrom saref:Property
		] ;
		rdfs:comment "Device that can act over at least one property."@en ;
		rdfs:label "Actuator"@en .


		### https://saref.etsi.org/saref4envi/Color
		:Color rdf:type owl:Class ;
		owl:disjointWith :CommunicationInterface ,
		@@ -576,10 +553,6 @@ saref:UnitOfMeasure rdf:type owl:Class ;
		owl:onProperty :hasCreationDate ;
		owl:allValuesFrom xsd:dateTime
		] ,
		[ rdf:type owl:Restriction ;
		owl:onProperty :hasIdentifier ;
		owl:allValuesFrom xsd:string
		] ,
		[ rdf:type owl:Restriction ;
		owl:onProperty :hasTag ;
		owl:allValuesFrom xsd:string
		@@ -590,9 +563,8 @@ saref:UnitOfMeasure rdf:type owl:Class ;
		owl:onDataRange xsd:dateTime
		] ,
		[ rdf:type owl:Restriction ;
		owl:onProperty :hasIdentifier ;
		owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
		owl:onDataRange xsd:string
		owl:onProperty saref:hasIdentifier ;
		owl:maxCardinality "1"^^xsd:nonNegativeInteger
		] ;
		owl:disjointWith :Geometry ,
		:Light ;
		@@ -808,78 +780,6 @@ saref:UnitOfMeasure rdf:type owl:Class ;
		# Individuals
		#################################################################

		### http://www.wurvoc.org/vocabularies/om-1.8/centimetre
		<http://www.wurvoc.org/vocabularies/om-1.8/centimetre> rdf:type owl:NamedIndividual ,
		:LengthUnit ;
		rdfs:label "Centimetre"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/decametre
		<http://www.wurvoc.org/vocabularies/om-1.8/decametre> rdf:type owl:NamedIndividual ,
		:LengthUnit ;
		rdfs:label "Decametre"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/decimetre
		<http://www.wurvoc.org/vocabularies/om-1.8/decimetre> rdf:type owl:NamedIndividual ,
		:LengthUnit ;
		rdfs:label "Decimetre"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/hectometre
		<http://www.wurvoc.org/vocabularies/om-1.8/hectometre> rdf:type owl:NamedIndividual ,
		:LengthUnit ;
		rdfs:label "Hectometre"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/hertz
		<http://www.wurvoc.org/vocabularies/om-1.8/hertz> rdf:type owl:NamedIndividual ,
		:FrequencyUnit ;
		rdfs:label "Hertz"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/kilometre
		<http://www.wurvoc.org/vocabularies/om-1.8/kilometre> rdf:type owl:NamedIndividual ,
		:LengthUnit ;
		rdfs:label "Kilometre"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/metre
		<http://www.wurvoc.org/vocabularies/om-1.8/metre> rdf:type owl:NamedIndividual ,
		:LengthUnit ;
		rdfs:label "Metre"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/millimetre
		<http://www.wurvoc.org/vocabularies/om-1.8/millimetre> rdf:type owl:NamedIndividual ,
		:LengthUnit ;
		rdfs:label "Milimetre"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_day
		<http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_day> rdf:type owl:NamedIndividual ,
		:FrequencyUnit ;
		rdfs:label "Reciprocal day"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_hour
		<http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_hour> rdf:type owl:NamedIndividual ,
		:FrequencyUnit ;
		rdfs:label "Reciprocal hour"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_second-time
		<http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_second-time> rdf:type owl:NamedIndividual ,
		:FrequencyUnit ;
		rdfs:label "Reciprocal second"@en .


		### http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_year
		<http://www.wurvoc.org/vocabularies/om-1.8/reciprocal_year> rdf:type owl:NamedIndividual ,
		:FrequencyUnit ;
		rdfs:label "Reciprocal year"@en .


		### https://saref.etsi.org/saref4envi/Fluorescence
		:Fluorescence rdf:type owl:NamedIndividual ,
		:LightProperty ;