Skip to content

Commit

Permalink
update everything to the latest versions
Browse files Browse the repository at this point in the history
* scala
* gs version
* sbt
* graph db version
  • Loading branch information
mpollmeier committed Nov 28, 2017
1 parent 845bbbb commit fd3c181
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 46 deletions.
8 changes: 4 additions & 4 deletions dse-graph/build.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion dse-graph/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 0.13.15
sbt.version=1.0.4
3 changes: 1 addition & 2 deletions dse-graph/src/test/scala/SimpleSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 3 additions & 7 deletions janusgraph/build.sbt
Original file line number Diff line number Diff line change
@@ -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
)
Expand All @@ -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"
)
2 changes: 1 addition & 1 deletion janusgraph/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 0.13.15
sbt.version=1.0.4
10 changes: 5 additions & 5 deletions neo4j-bolt/build.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion neo4j-bolt/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.0.4
12 changes: 6 additions & 6 deletions neo4j-bolt/src/test/scala/SimpleSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
8 changes: 4 additions & 4 deletions neo4j/build.sbt
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion neo4j/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.0.4
2 changes: 1 addition & 1 deletion orientdb/build.sbt
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion orientdb/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.0.4
10 changes: 5 additions & 5 deletions sqlg/build.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sqlg/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.0.4
2 changes: 1 addition & 1 deletion sqlg/src/test/scala/PostgresSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions tinkergraph/build.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tinkergraph/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.0.4

0 comments on commit fd3c181

Please sign in to comment.