diff --git a/jsoup/build.sbt b/jsoup/build.sbt index 06677aa..d57b36b 100644 --- a/jsoup/build.sbt +++ b/jsoup/build.sbt @@ -3,4 +3,4 @@ name := "dispatch-jsoup" description := "Dispatch module providing jsoup html parsing support" -libraryDependencies += "org.jsoup" % "jsoup" % "1.12.1" +libraryDependencies += "org.jsoup" % "jsoup" % "1.18.1" diff --git a/jsoup/src/main/scala/as/soup.scala b/jsoup/src/main/scala/as/soup.scala index 85ec21f..ee57919 100644 --- a/jsoup/src/main/scala/as/soup.scala +++ b/jsoup/src/main/scala/as/soup.scala @@ -16,7 +16,7 @@ object Query { } object Clean { - import org.jsoup.safety.Whitelist - def apply(wl: Whitelist): Response => String = + import org.jsoup.safety.Safelist + def apply(wl: Safelist): Response => String = { r => Jsoup.clean(dispatch.as.String(r), r.getUri().toString, wl) } } diff --git a/jsoup/src/test/scala/soup.scala b/jsoup/src/test/scala/soup.scala index 6041abd..493c6cf 100644 --- a/jsoup/src/test/scala/soup.scala +++ b/jsoup/src/test/scala/soup.scala @@ -1,7 +1,7 @@ package dispatch.spec import org.scalacheck._ -import org.jsoup.safety.Whitelist +import org.jsoup.safety.Safelist object JsoupSpecification extends Properties("Basic") @@ -54,7 +54,7 @@ with DispatchCleanup { property("handle Cleaning") = forAll(Gen.alphaStr) { (sample: String) => val clean = Http.default( localhost / "unclean" < sample) > as.jsoup.Clean( - Whitelist.basic) + Safelist.basic) ) clean() == (SafeFormat format sample) }