Skip to content

Commit

Permalink
minor update
Browse files Browse the repository at this point in the history
  • Loading branch information
workingDog committed Jan 5, 2019
1 parent d994058 commit 3c4c981
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

name := "taxii2lib"

scalaVersion := "2.12.6"
scalaVersion := "2.12.8"

version := (version in ThisBuild).value

libraryDependencies ++= Seq(
"com.typesafe.play" %% "play-ahc-ws-standalone" % "1.1.8",
"com.typesafe.play" %% "play-ws-standalone-json" % "1.1.8",
"com.typesafe.play" %% "play-json" % "2.6.9",
"com.typesafe.play" %% "play-ahc-ws-standalone" % "2.0.0-RC2",
"com.typesafe.play" %% "play-ws-standalone-json" % "2.0.0-RC2",
"com.typesafe.play" %% "play-json" % "2.7.0-RC2",
"com.github.workingDog" %% "scalastix" % "0.7",
// "ch.qos.logback" % "logback-classic" % "1.2.3",
// "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
Expand Down
2 changes: 1 addition & 1 deletion project/assembly.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.1.5
sbt.version = 1.2.8
9 changes: 6 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import sbt.Resolver

resolvers += Resolver.sonatypeRepo("public")

resolvers += Resolver.sonatypeRepo("snapshots")

resolvers += Resolver.sonatypeRepo("releases")

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
6 changes: 3 additions & 3 deletions src/main/scala/com/kodekutters/taxii/TaxiiConnection.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ import reflect.runtime.universe._
import scala.concurrent.ExecutionContext.Implicits._



/**
* an https connection to a Taxii-2.0 server
*/
object TaxiiConnection {
var taxiiVersion = "2.0"

Expand All @@ -47,7 +49,6 @@ object TaxiiConnection {
/**
* an https connection to a Taxii-2.0 server
*
* for example: https://test.freetaxii.com:8000
*
* @param host the host string
* @param port the port number, as an Integer
Expand Down Expand Up @@ -114,7 +115,6 @@ case class TaxiiConnection(host: String,
.withRequestTimeout(timeout second)
.withQueryStringParameters(filter.getOrElse(Seq.empty): _*)
.get().map { response =>
println("------> response: "+response)
response.status match {
// partial content
case 206 => getTaxiiObject[T](response)
Expand Down

0 comments on commit 3c4c981

Please sign in to comment.