INCF · umbreak · Jul 27, 2018 · Aug 8, 2018 · Aug 11, 2018
diff --git a/build.sbt b/build.sbt
@@ -1,3 +1,29 @@
+/*
+scalafmt: {
+  style = defaultWithAlign
+  maxColumn = 150
+  align.tokens = [
+    { code = "=>", owner = "Case" }
+    { code = "?", owner = "Case" }
+    { code = "extends", owner = "Defn.(Class|Trait|Object)" }
+    { code = "//", owner = ".*" }
+    { code = "{", owner = "Template" }
+    { code = "}", owner = "Template" }
+    { code = ":=", owner = "Term.ApplyInfix" }
+    { code = "++=", owner = "Term.ApplyInfix" }
+    { code = "+=", owner = "Term.ApplyInfix" }
+    { code = "%", owner = "Term.ApplyInfix" }
+    { code = "%%", owner = "Term.ApplyInfix" }
+    { code = "%%%", owner = "Term.ApplyInfix" }
+    { code = "->", owner = "Term.ApplyInfix" }
+    { code = "?", owner = "Term.ApplyInfix" }
+    { code = "<-", owner = "Enumerator.Generator" }
+    { code = "?", owner = "Enumerator.Generator" }
+    { code = "=", owner = "(Enumerator.Val|Defn.(Va(l|r)|Def|Type))" }
+  ]
+}
+ */
+
 val commonsVersion = "0.7.6"
 val provVersion    = "1.1.1"
 val kgVersion      = "0.9.4"
@@ -13,8 +39,8 @@ lazy val core = project
   .dependsOn(nsgcommons)
   .settings(common)
   .settings(
-    name                := "nsg-core-schemas",
-    moduleName          := "nsg-core-schemas"
+    name       := "nsg-core-schemas",
+    moduleName := "nsg-core-schemas"
   )
 
 lazy val nexusschema = project
@@ -24,13 +50,10 @@ lazy val nexusschema = project
   .settings(common, noPublish)
   .settings(
     noPublish,
-    name       := "kg-nsg-schemas",
-    moduleName := "kg-nsg-schemas",
-    resolvers  += Resolver.bintrayRepo("bogdanromanx", "maven"),
-    libraryDependencies ++= Seq(
-      commonsSchemas,
-      kgSchemas
-    )
+    name                := "kg-nsg-schemas",
+    moduleName          := "kg-nsg-schemas",
+    resolvers           += Resolver.bintrayRepo("bogdanromanx", "maven"),
+    libraryDependencies ++= Seq(commonsSchemas, kgSchemas)
   )
 
 lazy val experiment = project
@@ -51,8 +74,8 @@ lazy val nsgcommons = project
   .dependsOn(nexusschema)
   .settings(common)
   .settings(
-    name       := "nsg-commons-schemas",
-    moduleName := "nsg-commons-schemas",
+    name                := "nsg-commons-schemas",
+    moduleName          := "nsg-commons-schemas",
     libraryDependencies += prov
   )
 
@@ -100,27 +123,35 @@ lazy val simulation = project
     moduleName := "nsg-simulation-schemas"
   )
 
-
 lazy val root = project
   .in(file("."))
   .settings(name := "nsg-schemas", moduleName := "nsg-schemas")
   .settings(common, noPublish)
-  .aggregate(core, experiment, atlas, morphology, electrophysiology, simulation, nexusschema,nsgcommons)
+  .aggregate(core, experiment, atlas, morphology, electrophysiology, simulation, nexusschema, nsgcommons)
 
 lazy val common = Seq(
   scalacOptions in (Compile, console) ~= (_ filterNot (_ == "-Xfatal-warnings")),
   autoScalaLibrary   := false,
   workbenchVersion   := "0.3.2",
-  bintrayOmitLicense := true,
-  homepage           := Some(url("https://github.com/INCF/neuroshapes")),
-  licenses           := Seq("CC-4.0" -> url("https://github.com/INCF/neuroshapes/blob/master/LICENSE")),
-  scmInfo := Some(
-    ScmInfo(url("https://github.com/INCF/neuroshapes"), "scm:git:git@https://github.com/INCF/neuroshapes.git"))
+  bintrayOmitLicense := true
 )
 
+inThisBuild(
+  Seq(
+    homepage           := Some(new URL("https://github.com/INCF/neuroshapes")),
+    licenses           := Seq("CC-4.0" -> url("https://github.com/INCF/neuroshapes/blob/master/LICENSE")),
+    scmInfo            := Some(ScmInfo(url("https://github.com/INCF/neuroshapes"), "scm:git:git@https://github.com/INCF/neuroshapes.git")),
+    bintrayOmitLicense := true,
+    developers := List(
+      Developer("MFSY", "Mohameth François SY", "[email protected]", url("https://bluebrain.epfl.ch/")),
+      Developer("annakristinkaufmann", "anna-Kristin Kaufmann", "[email protected]", url("https://bluebrain.epfl.ch/")),
+      Developer("huanxiang", "Huanxiang", "[email protected]", url("https://bluebrain.epfl.ch/"))
+    )
+  )
+)
 
-
-lazy val noPublish = Seq(publishLocal := {}, publish := {})
+lazy val noPublish =
+  Seq(publishLocal := {}, publish := {}, publishArtifact := false)
 
 addCommandAlias("review", ";clean;test")
 addCommandAlias("rel", ";release with-defaults skip-tests")
diff --git a/modules/atlas/src/main/resources/schemas/neurosciencegraph/atlas/imagestack/v0.1.0.json b/modules/atlas/src/main/resources/schemas/neurosciencegraph/atlas/imagestack/v0.1.0.json
@@ -35,7 +35,7 @@
               "path": "nsg:sliceDirection",
               "name": "Slice Direction",
               "description": "Slice direction of the image stack",
-              "sh:in": [
+              "in": [
                   "Sagittal",
                   "Axial",
                   "Coronal"
@@ -100,15 +100,15 @@
               "path": "nsg:widthResolution",
               "name": "Width resolution",
               "description": "Slice resolution in width",
-              "datatype": "xsd:float",
+              "datatype": "xsd:double",
               "minCount": 1,
               "maxCount": 1
             },
             {
               "path": "nsg:heightResolution",
               "name": "Height resolution",
               "description": "Slice height",
-              "datatype": "xsd:float",
+              "datatype": "xsd:double",
               "minCount": 1,
               "maxCount": 1
             }
@@ -129,7 +129,7 @@
               "path": "nsg:sliceIntervalValue",
               "name": "Slice interval value",
               "description": "Slice interval value",
-              "datatype": "xsd:float",
+              "datatype": "xsd:double",
               "minCount": 1,
               "maxCount": 1
             }

diff --git a/modules/atlas/src/main/resources/schemas/neurosciencegraph/atlas/imagestack/v0.2.0.json b/modules/atlas/src/main/resources/schemas/neurosciencegraph/atlas/imagestack/v0.2.0.json
@@ -35,11 +35,11 @@
               "path": "nsg:sliceDirection",
               "name": "Slice Direction",
               "description": "Slice direction of the image stack",
-              "sh:in": [
-                  "Sagittal",
-                  "Axial",
-                  "Coronal"
-                ],
+              "in": [
+                "Sagittal",
+                "Axial",
+                "Coronal"
+              ],
               "minCount": 1,
               "maxCount": 1
             },
@@ -90,7 +90,7 @@
     {
       "@id": "this:SliceResolutionShape",
       "@type": "sh:NodeShape",
-      "and" : [
+      "and": [
         {
           "node": "{{base}}/schemas/neurosciencegraph/commons/quantitativevalue/v0.1.2/QuantitativeValueShape"
         },
@@ -119,7 +119,7 @@
     {
       "@id": "this:SliceIntervalShape",
       "@type": "sh:NodeShape",
-      "and" : [
+      "and": [
         {
           "node": "{{base}}/schemas/neurosciencegraph/commons/quantitativevalue/v0.1.2/QuantitativeValueShape"
         },

diff --git a/...es/commons/src/main/resources/schemas/neurosciencegraph/commons/brainlocation/v0.1.0.json b/...es/commons/src/main/resources/schemas/neurosciencegraph/commons/brainlocation/v0.1.0.json
@@ -11,13 +11,13 @@
     "{{base}}/schemas/neurosciencegraph/commons/labeledontologyentity/v0.1.0"
   ],
   "@type": "nxv:Schema",
-  "owl:deprecated":true,
+  "owl:deprecated": true,
   "shapes": [
     {
       "@id": "this:BrainLocationShape",
       "@type": "sh:NodeShape",
       "label": "Brain location shape definition",
-      "owl:deprecated":true,
+      "owl:deprecated": true,
       "property": [
         {
           "path": "nsg:brainRegion",
@@ -50,23 +50,19 @@
           "path": "nsg:positionInLayer",
           "name": "Position in layer",
           "description": "Position in layer (deep / superficial)",
-          "sh:in": {
-            "@list": [
-              "Deep",
-              "Superficial"
-            ]
-          },
+          "in": [
+            "Deep",
+            "Superficial"
+          ],
           "maxCount": 1
         },
         {
           "path": "nsg:longitudinalAxis",
           "name": "Longitudinal axis (dorsal / ventral)",
-          "sh:in": {
-            "@list": [
-              "Dorsal",
-              "Ventral"
-            ]
-          },
+          "in": [
+            "Dorsal",
+            "Ventral"
+          ],
           "maxCount": 1
         },
         {
@@ -92,7 +88,7 @@
       "@id": "this:CoordinatesInSliceShape",
       "@type": "sh:NodeShape",
       "label": "Coordinates in slice shape definition",
-      "owl:deprecated":true,
+      "owl:deprecated": true,
       "property": [
         {
           "path": "nsg:valueX",
@@ -130,7 +126,7 @@
       "@id": "this:DistanceToBoundaryShape",
       "@type": "sh:NodeShape",
       "label": "Distance to boundary shape definition",
-      "owl:deprecated":true,
+      "owl:deprecated": true,
       "property": [
         {
           "path": "nsg:boundary",

diff --git a/...es/commons/src/main/resources/schemas/neurosciencegraph/commons/brainlocation/v0.1.1.json b/...es/commons/src/main/resources/schemas/neurosciencegraph/commons/brainlocation/v0.1.1.json
@@ -48,23 +48,19 @@
           "path": "nsg:positionInLayer",
           "name": "Position in layer",
           "description": "Position in layer (deep / superficial)",
-          "sh:in": {
-            "@list": [
-              "Deep",
-              "Superficial"
-            ]
-          },
+          "in": [
+            "Deep",
+            "Superficial"
+          ],
           "maxCount": 1
         },
         {
           "path": "nsg:longitudinalAxis",
           "name": "Longitudinal axis (dorsal / ventral)",
-          "sh:in": {
-            "@list": [
-              "Dorsal",
-              "Ventral"
-            ]
-          },
+          "in": [
+            "Dorsal",
+            "Ventral"
+          ],
           "maxCount": 1
         },
         {

diff --git a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v0.1.0.json b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v0.1.0.json
@@ -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
         },
         {

diff --git a/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v1.0.0.json b/modules/commons/src/main/resources/schemas/neurosciencegraph/commons/entity/v1.0.0.json
@@ -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
         },
         {