diff --git a/.classpath b/.classpath index e5053f4..5edd1b5 100644 --- a/.classpath +++ b/.classpath @@ -1,22 +1,23 @@ - - - - - - - - - + + + + + + + + + + - - + + + - - - - - + + + + @@ -36,8 +37,9 @@ - - + + + @@ -57,13 +59,25 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.settings/org.scala-ide.sdt.core.prefs b/.settings/org.scala-ide.sdt.core.prefs index 017ae82..d91edf3 100644 --- a/.settings/org.scala-ide.sdt.core.prefs +++ b/.settings/org.scala-ide.sdt.core.prefs @@ -1,5 +1,5 @@ #Generated by sbteclipse -#Wed Aug 13 14:18:15 EDT 2014 +#Fri Mar 06 16:37:54 EST 2015 scala.compiler.additionalParams=-encoding utf8 deprecation=true unchecked=true diff --git a/build.sbt b/build.sbt index 56d6309..3117fac 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ organization := "org.phenoscape" name := "owlery" -version := "0.9.1" +version := "0.10" packageArchetype.java_server @@ -23,26 +23,25 @@ daemonUser in Linux := normalizedName.value // user which will execute the appli daemonGroup in Linux := normalizedName.value // group which will execute the application -scalaVersion := "2.10.3" +scalaVersion := "2.11.6" scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8") resolvers += "Phenoscape Maven repository" at "http://phenoscape.svn.sourceforge.net/svnroot/phenoscape/trunk/maven/repository" libraryDependencies ++= { - val akkaV = "2.3.0" - val sprayV = "1.3.1" + val akkaV = "2.3.6" + val sprayV = "1.3.2" Seq( - "io.spray" % "spray-can" % sprayV, - "io.spray" % "spray-routing" % sprayV, - "io.spray" % "spray-json_2.10" % "1.2.6", - "io.spray" % "spray-testkit" % sprayV % "test", + "io.spray" %% "spray-can" % sprayV, + "io.spray" %% "spray-routing" % sprayV, + "io.spray" %% "spray-json" % "1.3.1", + "io.spray" %% "spray-testkit" % sprayV % "test", "com.typesafe.akka" %% "akka-actor" % akkaV, "com.typesafe.akka" %% "akka-testkit" % akkaV % "test", - "org.specs2" %% "specs2-core" % "2.3.7" % "test", "net.sourceforge.owlapi" % "owlapi-distribution" % "3.5.0", "org.semanticweb.elk" % "elk-owlapi" % "0.4.1", - "org.phenoscape" % "owlet" % "1.1.5", + "org.phenoscape" % "owlet" % "1.3", "commons-io" % "commons-io" % "2.4", "org.apache.jena" % "apache-jena-libs" % "2.11.2" ) diff --git a/src/main/scala/org/phenoscape/owlery/MarshallableOwlery.scala b/src/main/scala/org/phenoscape/owlery/MarshallableOwlery.scala index be6a5ce..419a87e 100644 --- a/src/main/scala/org/phenoscape/owlery/MarshallableOwlery.scala +++ b/src/main/scala/org/phenoscape/owlery/MarshallableOwlery.scala @@ -10,6 +10,6 @@ trait MarshallableOwlery { def kbs: Map[String, Knowledgebase] - implicit val OwleryMarshaller = Marshaller.delegate[MarshallableOwlery, JsArray](MediaTypes.`application/json`)(owlery => JsArray(owlery.kbs.keys.map(_.toJson).toList)) + implicit val OwleryMarshaller = Marshaller.delegate[MarshallableOwlery, JsArray](MediaTypes.`application/json`)(owlery => JsArray(owlery.kbs.keys.map(_.toJson).toVector)) } \ No newline at end of file