Skip to content

Commit

Permalink
Fixes detected from TopBrain schema validation against SHACL
Browse files Browse the repository at this point in the history
  • Loading branch information
@umbreak
umbreak committed Aug 11, 2018
1 parent d34682c commit 39813d1
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 86 deletions.
4 changes: 1 addition & 3 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ scalafmt: {
val commonsVersion = "0.7.6"
val provVersion = "1.1.1"
val kgVersion = "0.9.4"
val jenaVersion = "3.8.0"

lazy val prov = "ch.epfl.bluebrain.nexus" %% "nexus-prov" % provVersion
lazy val commonsSchemas = "ch.epfl.bluebrain.nexus" %% "commons-schemas" % commonsVersion
lazy val kgSchemas = "ch.epfl.bluebrain.nexus" %% "kg-schemas" % kgVersion
lazy val jena = "org.apache.jena" % "jena-arq" % jenaVersion

lazy val core = project
.in(file("modules/core"))
Expand All @@ -55,7 +53,7 @@ lazy val nexusschema = project
name := "kg-nsg-schemas",
moduleName := "kg-nsg-schemas",
resolvers += Resolver.bintrayRepo("bogdanromanx", "maven"),
libraryDependencies ++= Seq(commonsSchemas, kgSchemas, jena)
libraryDependencies ++= Seq(commonsSchemas, kgSchemas)
)

lazy val experiment = project
Expand Down
4 changes: 2 additions & 2 deletions modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v0.1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@
"path": "schema:dateCreated",
"name": "Creation date",
"description": "Date at which this entity created.",
"nodeKind": "xsd:dateTime",
"datatype": "xsd:dateTime",
"maxCount": 1
},
{
"path": "prov:wasRevisionOf",
"name": "Revision of",
"description": "The entity for which this entity is a revision of.",
"nodeKind": "xsd:dateTime",
"datatype": "xsd:dateTime",
"maxCount": 1
},
{
Expand Down
2 changes: 1 addition & 1 deletion modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v1.0.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"path": "schema:dateCreated",
"name": "Creation date",
"description": "Date at which this entity created.",
"nodeKind": "xsd:dateTime",
"datatype": "xsd:dateTime",
"maxCount": 1
},
{
Expand Down
76 changes: 38 additions & 38 deletions modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.1.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,27 @@
"node": "{{base}}/schemas/nexus/schemaorg/propertyvalue/v0.1.0/shapes/PropertyValueShape"
},
{
"property": [
"or": [
{
"or": [
{
"path": "schema:propertyID",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "http//orcid.org",
"maxCount": 1
},
{
"path": "schema:name",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "orcid",
"maxCount": 1
}
]
"path": "schema:propertyID",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "http//orcid.org",
"maxCount": 1
},
{
"path": "schema:name",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "orcid",
"maxCount": 1
}
]
},
{
"property": [
{
"path": "schema:value",
"name": "Orcid",
Expand All @@ -75,27 +75,27 @@
"node": "{{base}}/schemas/nexus/schemaorgsh/propertyvalue/v0.1.0/shapes/PropertyValueShape"
},
{
"property": [
"or": [
{
"or": [
{
"path": "schema:propertyID",
"name": "GRID ID property",
"description": "The GRID property identifier.",
"datatype": "xsd:string",
"hasValue": "http//orcid.org",
"maxCount": 1
},
{
"path": "schema:name",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "grid",
"maxCount": 1
}
]
"path": "schema:propertyID",
"name": "GRID ID property",
"description": "The GRID property identifier.",
"datatype": "xsd:string",
"hasValue": "http//orcid.org",
"maxCount": 1
},
{
"path": "schema:name",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "grid",
"maxCount": 1
}
]
},
{
"property": [
{
"path": "schema:value",
"name": "GRID ID",
Expand Down
76 changes: 38 additions & 38 deletions modules/commons/src/main/resources/schemas/neurosciencegraph/commons/identifier/v0.2.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,27 @@
"node": "{{base}}/schemas/nexus/schemaorg/propertyvalue/v0.1.0/shapes/PropertyValueShape"
},
{
"property": [
"or": [
{
"or": [
{
"path": "schema:propertyID",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "http//orcid.org",
"maxCount": 1
},
{
"path": "schema:name",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "orcid",
"maxCount": 1
}
]
"path": "schema:propertyID",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "http//orcid.org",
"maxCount": 1
},
{
"path": "schema:name",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "orcid",
"maxCount": 1
}
]
},
{
"property": [
{
"path": "schema:value",
"name": "Orcid",
Expand All @@ -83,27 +83,27 @@
"node": "{{base}}/schemas/nexus/schemaorgsh/propertyvalue/v0.1.0/shapes/PropertyValueShape"
},
{
"property": [
"or": [
{
"or": [
{
"path": "schema:propertyID",
"name": "GRID ID property",
"description": "The GRID property identifier.",
"datatype": "xsd:string",
"hasValue": "http//orcid.org",
"maxCount": 1
},
{
"path": "schema:name",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "grid",
"maxCount": 1
}
]
"path": "schema:propertyID",
"name": "GRID ID property",
"description": "The GRID property identifier.",
"datatype": "xsd:string",
"hasValue": "http//orcid.org",
"maxCount": 1
},
{
"path": "schema:name",
"name": "Orcid ID",
"description": "The property name.",
"datatype": "xsd:string",
"hasValue": "grid",
"maxCount": 1
}
]
},
{
"property": [
{
"path": "schema:value",
"name": "GRID ID",
Expand Down
5 changes: 1 addition & 4 deletions modules/nexus-schemas/src/main/resources/contexts/nexus/core/schemaorg/v3.3.0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
"@type": "@id",
"@id": "schema:affiliation"
},
"size": {
"@type": "@id",
"@id": "schema:size"
}
"size": "schema:size"
}
}

0 comments on commit 39813d1

Please sign in to comment.