Skip to content

Commit 9cc6904

Browse files
committed
Removed not required context
1 parent d915151 commit 9cc6904

File tree

5 files changed

+19
-47
lines changed
  • modules
    • atlas/src/main/resources/schemas/neurosciencegraph/atlas/imagestack
    • commons/src/main/resources/contexts/neurosciencegraph/core/data
    • simulation/src/test/resources/data/neurosciencegraph/simulation/reconstructedcellreleasegen/v0.1.0
  • project

5 files changed

+19
-47
lines changed

build.sbt

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ scalafmt: {
2727
val commonsVersion = "0.7.6"
2828
val provVersion = "1.1.1"
2929
val kgVersion = "0.9.4"
30+
val jenaVersion = "3.8.0"
3031

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

3537
lazy val core = project
3638
.in(file("modules/core"))
@@ -50,13 +52,10 @@ lazy val nexusschema = project
5052
.settings(common, noPublish)
5153
.settings(
5254
noPublish,
53-
name := "kg-nsg-schemas",
54-
moduleName := "kg-nsg-schemas",
55-
resolvers += Resolver.bintrayRepo("bogdanromanx", "maven"),
56-
libraryDependencies ++= Seq(
57-
commonsSchemas,
58-
kgSchemas
59-
)
55+
name := "kg-nsg-schemas",
56+
moduleName := "kg-nsg-schemas",
57+
resolvers += Resolver.bintrayRepo("bogdanromanx", "maven"),
58+
libraryDependencies ++= Seq(commonsSchemas, kgSchemas, jena)
6059
)
6160

6261
lazy val experiment = project
@@ -134,8 +133,9 @@ lazy val root = project
134133

135134
lazy val common = Seq(
136135
scalacOptions in (Compile, console) ~= (_ filterNot (_ == "-Xfatal-warnings")),
137-
autoScalaLibrary := false,
138-
workbenchVersion := "0.3.2"
136+
autoScalaLibrary := false,
137+
workbenchVersion := "0.3.2",
138+
bintrayOmitLicense := true
139139
)
140140

141141
inThisBuild(

modules/atlas/src/main/resources/schemas/neurosciencegraph/atlas/imagestack/v0.1.0.json

+3-24
Original file line numberDiff line numberDiff line change
@@ -100,29 +100,15 @@
100100
"path": "nsg:widthResolution",
101101
"name": "Width resolution",
102102
"description": "Slice resolution in width",
103-
"or" : [
104-
{
105-
"datatype": "xsd:float"
106-
},
107-
{
108-
"datatype": "xsd:double"
109-
}
110-
],
103+
"datatype": "xsd:double",
111104
"minCount": 1,
112105
"maxCount": 1
113106
},
114107
{
115108
"path": "nsg:heightResolution",
116109
"name": "Height resolution",
117110
"description": "Slice height",
118-
"or" : [
119-
{
120-
"datatype": "xsd:float"
121-
},
122-
{
123-
"datatype": "xsd:double"
124-
}
125-
],
111+
"datatype": "xsd:double",
126112
"minCount": 1,
127113
"maxCount": 1
128114
}
@@ -143,14 +129,7 @@
143129
"path": "nsg:sliceIntervalValue",
144130
"name": "Slice interval value",
145131
"description": "Slice interval value",
146-
"or" : [
147-
{
148-
"datatype": "xsd:float"
149-
},
150-
{
151-
"datatype": "xsd:double"
152-
}
153-
],
132+
"datatype": "xsd:double",
154133
"minCount": 1,
155134
"maxCount": 1
156135
}

modules/commons/src/main/resources/contexts/neurosciencegraph/core/data/v0.1.0.json

+3-10
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,7 @@
197197
"@id": "nsg:reconstructionRequester"
198198
},
199199
"reconstructionSentDate": {
200-
"@id": "nsg:reconstructionSentDate",
201-
"@type": "xsd:dateTime"
202-
},
203-
"atTime": {
204-
"@id": "prov:atTime",
205-
"@type": "xsd:dateTime"
200+
"@id": "nsg:reconstructionSentDate"
206201
},
207202
"reconstructionDate": {
208203
"@id": "nsg:reconstructionDate"
@@ -264,8 +259,7 @@
264259
"@type": "@id"
265260
},
266261
"releaseDate": {
267-
"@id": "nsg:releaseDate",
268-
"@type": "xsd:date"
262+
"@id": "nsg:releaseDate"
269263
},
270264
"radius": {
271265
"@id": "nsg:radius",
@@ -379,8 +373,7 @@
379373
"@type": "@id"
380374
},
381375
"retrievalDate": {
382-
"@id": "nsg:retrievalDate",
383-
"@type": "xsd:dateTime"
376+
"@id": "nsg:retrievalDate"
384377
},
385378
"timeStep": {
386379
"@id": "nsg:timeStep",

modules/simulation/src/test/resources/data/neurosciencegraph/simulation/reconstructedcellreleasegen/v0.1.0/min-fields.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"prov:Activity"
1616
]
1717
},
18-
"atTime": "2018-02-27T00:00:00",
18+
"prov:atTime": "2018-02-27T00:00:00",
1919
"description": "Context for the generation"
2020
}

project/plugins.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
resolvers += Resolver.bintrayRepo("bogdanromanx", "maven") // required until sbt-bintray is released
22
resolvers += Resolver.bintrayRepo("bbp", "nexus-releases")
33

4-
addSbtPlugin("ch.epfl.bluebrain.nexus" % "sbt-nexus" % "0.10.9")
5-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
6-
addSbtPlugin("ch.epfl.bluebrain.nexus" % "sbt-nexus-workbench" % "0.3.2")
4+
addSbtPlugin("ch.epfl.bluebrain.nexus" % "sbt-nexus" % "0.10.9")
5+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
6+
addSbtPlugin("ch.epfl.bluebrain.nexus" % "sbt-nexus-workbench" % "0.3.2")

0 commit comments

Comments
 (0)