Update dependencies

TheHive-Project · Jun 8, 2020 · 7306b1e · 7306b1e
1 parent 0c7bc08
commit 7306b1e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/build.sbt b/build.sbt
@@ -61,8 +61,8 @@ libraryDependencies in ThisBuild ++= {
   }
 }
 dependencyOverrides in ThisBuild ++= Seq(
-  "org.locationtech.spatial4j" % "spatial4j"                 % "0.6",
-  "org.elasticsearch.client"   % "elasticsearch-rest-client" % "6.7.2"
+//  "org.locationtech.spatial4j" % "spatial4j"                 % "0.6",
+  "org.elasticsearch.client" % "elasticsearch-rest-client" % "6.7.2"
 )
 PlayKeys.includeDocumentationInBinary := false
 milestoneFilter := ((milestone: Milestone) => milestone.title.startsWith("4"))
@@ -310,7 +310,7 @@ lazy val thehiveMigration = (project in file("migration"))
       elastic4sCore,
       elastic4sHttpStreams,
       elastic4sHttp,
-      jts,
+//      jts,
       ehcache,
       scopt,
       specs % Test

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -15,13 +15,15 @@ object Dependencies {
   lazy val akkaClusterTyped        = "com.typesafe.akka"        %% "akka-cluster-typed"                 % akkaVersion
   lazy val akkaHttp                = "com.typesafe.akka"        %% "akka-http"                          % "10.1.11"
   lazy val akkaHttpXml             = "com.typesafe.akka"        %% "akka-http-xml"                      % "10.1.11"
-  lazy val janusGraph              = "org.janusgraph"           % "janusgraph-core"                     % janusVersion
+  lazy val janusGraph              = "org.janusgraph"           % "janusgraph"                          % janusVersion
+  lazy val janusGraphCore          = "org.janusgraph"           % "janusgraph-core"                     % janusVersion
   lazy val janusGraphBerkeleyDB    = "org.janusgraph"           % "janusgraph-berkeleyje"               % janusVersion
   lazy val janusGraphHBase         = "org.janusgraph"           % "janusgraph-hbase"                    % janusVersion
   lazy val janusGraphLucene        = "org.janusgraph"           % "janusgraph-lucene"                   % janusVersion
   lazy val janusGraphElasticSearch = "org.janusgraph"           % "janusgraph-es"                       % janusVersion
   lazy val janusGraphCassandra     = "org.janusgraph"           % "janusgraph-cql"                      % janusVersion
   lazy val janusGraphInMemory      = "org.janusgraph"           % "janusgraph-inmemory"                 % janusVersion
+  lazy val janusGraphDriver        = "org.janusgraph"           % "janusgraph-driver"                   % janusVersion
   lazy val gremlinScala            = "com.michaelpollmeier"     %% "gremlin-scala"                      % "3.4.4.5"
   lazy val gremlinOrientdb         = "com.orientechnologies"    % "orientdb-gremlin"                    % "3.0.18"
   lazy val hbaseClient             = "org.apache.hbase"         % "hbase-shaded-client"                 % "1.4.9" exclude ("org.slf4j", "slf4j-log4j12")
@@ -36,7 +38,6 @@ object Dependencies {
   lazy val apacheConfiguration     = "commons-configuration"    % "commons-configuration"               % "1.10"
   lazy val macroParadise           = "org.scalamacros"          % "paradise"                            % "2.1.1" cross CrossVersion.full
   lazy val chimney                 = "io.scalaland"             %% "chimney"                            % "0.4.0"
-  lazy val elastic4play            = "org.thehive-project"      %% "elastic4play"                       % "1.11.5" /*exclude ("org.apache.logging.log4j", "log4j-core") exclude("org.apache.logging.log4j", "log4j-api") exclude("org.apache.logging.log4j", "log4j-1.2-api") */
   lazy val elastic4sCore           = "com.sksamuel.elastic4s"   %% "elastic4s-core"                     % elastic4sVersion
   lazy val elastic4sHttpStreams    = "com.sksamuel.elastic4s"   %% "elastic4s-http-streams"             % elastic4sVersion
   lazy val elastic4sHttp           = "com.sksamuel.elastic4s"   %% "elastic4s-http"                     % elastic4sVersion

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.typesafe.play"   % "sbt-plugin"           % "2.8.1")
+addSbtPlugin("com.typesafe.play"   % "sbt-plugin"           % "2.8.2")
 addSbtPlugin("org.scalameta"       % "sbt-scalafmt"         % "2.3.0")
 addSbtPlugin("org.thehive-project" % "sbt-github-changelog" % "0.3.0")
+4 −2		build.sbt
+89 −44		core-test/src/test/scala/org/thp/scalligraph/models/PerformanceTest.scala
+3 −1		core/src/main/scala/org/thp/scalligraph/auth/OAuth2Srv.scala
+51 −43		database/janusgraph/src/main/scala/org/thp/scalligraph/janus/JanusDatabase.scala
+3 −2		project/Dependencies.scala
+1 −1		project/plugins.sbt