From fd3c181c2183e6b55f01cd33c4ad58d8558cdef3 Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Tue, 28 Nov 2017 17:41:34 +1300 Subject: [PATCH] update everything to the latest versions * scala * gs version * sbt * graph db version --- dse-graph/build.sbt | 8 ++++---- dse-graph/project/build.properties | 2 +- dse-graph/src/test/scala/SimpleSpec.scala | 3 +-- janusgraph/build.sbt | 10 +++------- janusgraph/project/build.properties | 2 +- neo4j-bolt/build.sbt | 10 +++++----- neo4j-bolt/project/build.properties | 2 +- neo4j-bolt/src/test/scala/SimpleSpec.scala | 12 ++++++------ neo4j/build.sbt | 8 ++++---- neo4j/project/build.properties | 2 +- orientdb/build.sbt | 2 +- orientdb/project/build.properties | 2 +- sqlg/build.sbt | 10 +++++----- sqlg/project/build.properties | 2 +- sqlg/src/test/scala/PostgresSpec.scala | 2 +- tinkergraph/build.sbt | 8 ++++---- tinkergraph/project/build.properties | 2 +- 17 files changed, 41 insertions(+), 46 deletions(-) diff --git a/dse-graph/build.sbt b/dse-graph/build.sbt index af0df7d..577580c 100644 --- a/dse-graph/build.sbt +++ b/dse-graph/build.sbt @@ -1,16 +1,16 @@ name := "gremlin-scala-examples-dse-graph" organization := "com.michaelpollmeier" -scalaVersion := "2.12.2" +scalaVersion := "2.12.4" // Note: This is needed to work around an issue with the DataStax driver and the Scala Compiler. // See: https://datastax-oss.atlassian.net/browse/JAVA-1252 for more details. scalacOptions += "-Ybreak-cycles" libraryDependencies ++= Seq( - "com.michaelpollmeier" %% "gremlin-scala" % "3.2.5.0", - "com.datastax.dse" % "dse-java-driver-graph" % "1.3.0", + "com.michaelpollmeier" %% "gremlin-scala" % "3.3.0.5", + "com.datastax.dse" % "dse-java-driver-graph" % "1.4.2", "ch.qos.logback" % "logback-classic" % "1.1.9" % Test, - "org.scalatest" %% "scalatest" % "3.0.1" % Test + "org.scalatest" %% "scalatest" % "3.0.3" % Test ) fork in Test := true diff --git a/dse-graph/project/build.properties b/dse-graph/project/build.properties index 3e8bd1a..394cb75 100644 --- a/dse-graph/project/build.properties +++ b/dse-graph/project/build.properties @@ -1 +1 @@ -sbt.version = 0.13.15 +sbt.version=1.0.4 diff --git a/dse-graph/src/test/scala/SimpleSpec.scala b/dse-graph/src/test/scala/SimpleSpec.scala index 7b57ddc..2308959 100644 --- a/dse-graph/src/test/scala/SimpleSpec.scala +++ b/dse-graph/src/test/scala/SimpleSpec.scala @@ -14,9 +14,8 @@ import shapeless.HNil import scala.concurrent.duration._ import scala.concurrent.{Await, Future} - // to start dse, first run: -// docker run --name dseg51 -p 9042:9042 -d luketillman/datastax-enterprise:5.1.1 -g +// `docker run -p 9042:9042 -d luketillman/datastax-enterprise:5.1.1 -g` // TODO: Automate creation/teardown of container class SimpleSpec extends WordSpec with Matchers { lazy val logger = LoggerFactory.getLogger(SimpleSpec.getClass) diff --git a/janusgraph/build.sbt b/janusgraph/build.sbt index 7fc20fc..000d96a 100644 --- a/janusgraph/build.sbt +++ b/janusgraph/build.sbt @@ -1,10 +1,10 @@ name := "gremlin-scala-examples-janusgraph" organization := "com.michaelpollmeier" -scalaVersion := "2.12.2" +scalaVersion := "2.12.4" libraryDependencies ++= Seq( - "com.michaelpollmeier" %% "gremlin-scala" % "3.2.4.15", - "org.janusgraph" % "janusgraph-core" % "0.1.1", + "com.michaelpollmeier" %% "gremlin-scala" % "3.3.0.5", + "org.janusgraph" % "janusgraph-core" % "0.2.0", "ch.qos.logback" % "logback-classic" % "1.2.3" % Test, "org.scalatest" %% "scalatest" % "3.0.3" % Test ) @@ -13,9 +13,5 @@ fork in Test := true resolvers ++= Seq( Resolver.mavenLocal, - // Note: This is needed to resolve jBcrypt which TinkerPop depends on. This will no longer - // be needed when 3.2.5 comes out as it adjusts it's jBCrypt dependency to something in maven - // central. - "jitpack" at "https://jitpack.io", "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public" ) diff --git a/janusgraph/project/build.properties b/janusgraph/project/build.properties index 3e8bd1a..394cb75 100644 --- a/janusgraph/project/build.properties +++ b/janusgraph/project/build.properties @@ -1 +1 @@ -sbt.version = 0.13.15 +sbt.version=1.0.4 diff --git a/neo4j-bolt/build.sbt b/neo4j-bolt/build.sbt index 143b21a..a608e3e 100644 --- a/neo4j-bolt/build.sbt +++ b/neo4j-bolt/build.sbt @@ -1,12 +1,12 @@ -name := "gremlin-scala-examples-neo4j" +name := "gremlin-scala-examples-neo4j-bolt" organization := "com.michaelpollmeier" -scalaVersion := "2.12.1" +scalaVersion := "2.12.4" libraryDependencies ++= Seq( - "com.michaelpollmeier" %% "gremlin-scala" % "3.2.4.8", - "com.steelbridgelabs.oss" % "neo4j-gremlin-bolt" % "0.2.23", + "com.michaelpollmeier" %% "gremlin-scala" % "3.3.0.5", + "com.steelbridgelabs.oss" % "neo4j-gremlin-bolt" % "0.2.27", "org.slf4j" % "slf4j-nop" % "1.7.25" % Test, - "org.scalatest" %% "scalatest" % "3.0.1" % Test + "org.scalatest" %% "scalatest" % "3.0.3" % Test ) fork in Test := true diff --git a/neo4j-bolt/project/build.properties b/neo4j-bolt/project/build.properties index 5f32afe..394cb75 100644 --- a/neo4j-bolt/project/build.properties +++ b/neo4j-bolt/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 \ No newline at end of file +sbt.version=1.0.4 diff --git a/neo4j-bolt/src/test/scala/SimpleSpec.scala b/neo4j-bolt/src/test/scala/SimpleSpec.scala index 30b9ee1..ad54ccf 100644 --- a/neo4j-bolt/src/test/scala/SimpleSpec.scala +++ b/neo4j-bolt/src/test/scala/SimpleSpec.scala @@ -8,21 +8,21 @@ import org.scalatest._ import scala.util.Random // to start neo4j with bolt protocol first run: -// docker run --publish=7474:7474 --publish=7687:7687 --volume=/tmp/neo4j/data:/data --volume=/tmp/neo4j/logs:/logs neo4j:3.0 +// `docker run --env=NEO4J_AUTH=none --publish=7474:7474 --publish=7687:7687 --volume=/tmp/neo4j/data:/data --volume=/tmp/neo4j/logs:/logs neo4j:3.0` // then go to http://localhost:7474/ and change the password from `neo4j` to `admin` // TODO: add to travis run - would have to make the password change part of the test setup... class SimpleSpec extends WordSpec with Matchers { "Gremlin-Scala with neo4j-bolt" should { "create some vertices with properties" in new Fixture { - val Number = Key[Int]("number") - graph + ("thing", Number → 1) - graph + ("thing", Number → 2) + val Name = Key[String]("name") + graph + ("thing", Name → "name 1") + graph + ("thing", Name → "name 2") graph.graph.tx.commit() - val vertices = graph.V.has(label = "thing", key = Number, predicate = P.eq(2)).toList + val vertices = graph.V.has(label = "thing", key = Name, predicate = P.eq[String]("name 2")).toList vertices.size shouldBe 1 - vertices.head.property(Number).value shouldBe 2 + vertices.head.property(Name).value shouldBe "name 2" graph.close() } diff --git a/neo4j/build.sbt b/neo4j/build.sbt index 6844647..781fac8 100644 --- a/neo4j/build.sbt +++ b/neo4j/build.sbt @@ -1,11 +1,11 @@ name := "gremlin-scala-examples-neo4j" organization := "com.michaelpollmeier" -scalaVersion := "2.12.2" +scalaVersion := "2.12.4" libraryDependencies ++= Seq( - "com.michaelpollmeier" %% "gremlin-scala" % "3.2.4.15", - "org.apache.tinkerpop" % "neo4j-gremlin" % "3.2.4" exclude("com.github.jeremyh", "jBCrypt"), // travis can't find jBCrypt... - "org.neo4j" % "neo4j-tinkerpop-api-impl" % "0.4-3.0.3", + "com.michaelpollmeier" %% "gremlin-scala" % "3.3.0.5", + "org.apache.tinkerpop" % "neo4j-gremlin" % "3.3.0" exclude("com.github.jeremyh", "jBCrypt"), // travis can't find jBCrypt... + "org.neo4j" % "neo4j-tinkerpop-api-impl" % "0.7-3.2.3", "org.slf4j" % "slf4j-nop" % "1.7.25" % Test, "org.scalatest" %% "scalatest" % "3.0.3" % Test ) diff --git a/neo4j/project/build.properties b/neo4j/project/build.properties index 5f32afe..394cb75 100644 --- a/neo4j/project/build.properties +++ b/neo4j/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 \ No newline at end of file +sbt.version=1.0.4 diff --git a/orientdb/build.sbt b/orientdb/build.sbt index 0abb4ec..b982d69 100644 --- a/orientdb/build.sbt +++ b/orientdb/build.sbt @@ -1,6 +1,6 @@ name := "gremlin-scala-examples-orientdb" organization := "com.michaelpollmeier" -scalaVersion := "2.12.2" +scalaVersion := "2.12.4" libraryDependencies ++= Seq( "com.michaelpollmeier" %% "gremlin-scala" % "3.2.4.15", diff --git a/orientdb/project/build.properties b/orientdb/project/build.properties index 27e88aa..394cb75 100644 --- a/orientdb/project/build.properties +++ b/orientdb/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=1.0.4 diff --git a/sqlg/build.sbt b/sqlg/build.sbt index aab86d5..254fd72 100644 --- a/sqlg/build.sbt +++ b/sqlg/build.sbt @@ -1,13 +1,13 @@ name := "gremlin-scala-examples-sqlg" organization := "com.michaelpollmeier" -scalaVersion := "2.12.1" +scalaVersion := "2.12.4" libraryDependencies ++= Seq( - "com.michaelpollmeier" %% "gremlin-scala" % "3.2.4.8", - "org.umlg" % "sqlg-hsqldb" % "1.3.3", - "org.umlg" % "sqlg-postgres" % "1.3.3", + "com.michaelpollmeier" %% "gremlin-scala" % "3.2.5.2", + "org.umlg" % "sqlg-hsqldb" % "1.4.0", + "org.umlg" % "sqlg-postgres" % "1.4.0", "org.slf4j" % "slf4j-nop" % "1.7.25" % Test, - "org.scalatest" %% "scalatest" % "3.0.1" % Test + "org.scalatest" %% "scalatest" % "3.0.3" % Test ) fork in Test := true diff --git a/sqlg/project/build.properties b/sqlg/project/build.properties index 5f32afe..394cb75 100644 --- a/sqlg/project/build.properties +++ b/sqlg/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 \ No newline at end of file +sbt.version=1.0.4 diff --git a/sqlg/src/test/scala/PostgresSpec.scala b/sqlg/src/test/scala/PostgresSpec.scala index 5418e50..694de07 100644 --- a/sqlg/src/test/scala/PostgresSpec.scala +++ b/sqlg/src/test/scala/PostgresSpec.scala @@ -9,7 +9,7 @@ import org.umlg.sqlg.structure.SqlgGraph import scala.util.Random // to start postgres with first run: -// docker run -e POSTGRESQL_PASSWORD=pass -p 9096:5432 postgres` +// `docker run -e POSTGRESQL_PASSWORD=pass -p 9096:5432 postgres` class PostgresSpec extends WordSpec with Matchers { "Gremlin-Scala with Sqlg over PostgreSQL" should { diff --git a/tinkergraph/build.sbt b/tinkergraph/build.sbt index f10ef9e..94f0e03 100644 --- a/tinkergraph/build.sbt +++ b/tinkergraph/build.sbt @@ -1,12 +1,12 @@ name := "gremlin-scala-examples-tinkergraph" organization := "com.michaelpollmeier" -scalaVersion := "2.12.1" +scalaVersion := "2.12.4" libraryDependencies ++= Seq( - "com.michaelpollmeier" %% "gremlin-scala" % "3.2.4.8", - "org.apache.tinkerpop" % "tinkergraph-gremlin" % "3.2.4", + "com.michaelpollmeier" %% "gremlin-scala" % "3.3.0.5", + "org.apache.tinkerpop" % "tinkergraph-gremlin" % "3.3.0", "org.slf4j" % "slf4j-nop" % "1.7.25" % Test, - "org.scalatest" %% "scalatest" % "3.0.1" % Test + "org.scalatest" %% "scalatest" % "3.0.3" % Test ) fork in Test := true diff --git a/tinkergraph/project/build.properties b/tinkergraph/project/build.properties index 27e88aa..394cb75 100644 --- a/tinkergraph/project/build.properties +++ b/tinkergraph/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=1.0.4