Skip to content

Commit

Permalink
Merge bf27e7b into 8a57804
Browse files Browse the repository at this point in the history
  • Loading branch information
nextdude committed Aug 28, 2019
2 parents 8a57804 + bf27e7b commit 52387db
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 17 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ language: scala
scala:
- 2.11.12

dist: trusty

jdk:
oraclejdk8

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@

## Maven Dependency

`Flinkrunner` `v1.6.6` is now on maven central, built against Flink 1.7.2 with Scala 2.11 and JDK 8.
`Flinkrunner` `v1.6.7` is now on maven central, built against Flink 1.8.1 with Scala 2.11 and JDK 8.

```sbtshell
libraryDependencies += "io.epiphanous" %% "flinkrunner" % "1.6.6"
libraryDependencies += "io.epiphanous" %% "flinkrunner" % "1.6.7"
```

>The apache flink project doesn't include its AWS Kinesis connector on maven
Expand All @@ -68,14 +68,14 @@ Flink kinesis connector) from source. To do so,
```

* Checkout the tag of `FlinkRunner` you want to build. The most recent stable version is
`v1.6.6`, but you can ensure you have the most recent tags with `git fetch --tags` and
`v1.6.7`, but you can ensure you have the most recent tags with `git fetch --tags` and
list tags with `git tag -l`, then

```bash
git checkout tags/v1.6.6 -b my-build-v1.6.6
git checkout tags/v1.6.7 -b my-build-v1.6.7
```

This will create a new local branch `my-build-v1.6.6` based on the `v1.6.6` tag release.
This will create a new local branch `my-build-v1.6.7` based on the `v1.6.7` tag release.

* Build `FlinkRunner` and install it locally, using the `-Dwith.kinesis=true` option

Expand All @@ -92,7 +92,7 @@ Flink kinesis connector) from source. To do so,
resolvers += "Local Maven Repository" at "file://" +
Path.userHome.absolutePath + "/.m2/repository"
...
libraryDependencies += "io.epiphanous" %% "flinkrunner" % "1.6.6k"
libraryDependencies += "io.epiphanous" %% "flinkrunner" % "1.6.7k"
// notice no v here ---^^ ^^---k for kinesis
```

Expand Down
19 changes: 10 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,23 @@ Test / fork := true
resolvers += "Local Maven Repository" at "file://" + Path.userHome.absolutePath + "/.m2/repository"

val V = new {
val flink = "1.7.2"
val flink = "1.8.1"
val logback = "1.2.3"
val log4jOverSlf4j = "1.7.25"
val scalaLogging = "3.9.0"
val scalaTest = "3.0.5"
val rocksdb = "5.17.2"
val log4jOverSlf4j = "1.7.26"
val scalaLogging = "3.9.2"
val scalaTest = "3.0.8"
// val rocksdb = "5.17.2"
val circe = "0.11.1"
val http4s = "0.20.0-M5"
val http4s = "0.20.10"
val enumeratum = "1.5.13"
val typesafeConfig = "1.3.3"
// val guava = "27.0.1-jre"
val typesafeConfig = "1.3.4"
// val guava = "27.0.1-jre"
val guava = "24.1-jre"
val squants = "1.3.0"
val antlr4 = "4.7.1"
}


enablePlugins(Antlr4Plugin)
antlr4Version in Antlr4 := V.antlr4
antlr4PackageName in Antlr4 := Some("io.epiphanous.antlr4")
Expand All @@ -63,7 +64,7 @@ val flinkDeps = (
) ++
Seq(
"org.apache.flink" %% "flink-test-utils" % V.flink % Test,
"org.rocksdb" % "rocksdbjni" % V.rocksdb
// "org.rocksdb" % "rocksdbjni" % V.rocksdb
)
).map(
_.excludeAll(ExclusionRule(organization = "log4j"), ExclusionRule(organization = "org.slf4j", name = "slf4j-log4j12"))
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.1")
addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.2")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.6")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")

0 comments on commit 52387db

Please sign in to comment.