summaryrefslogtreecommitdiffstats
path: root/application/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-07-13 16:51:11 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-07-13 16:51:11 +0200
commitd319cf3f6310237e021b6d1f90d9e10c721b8f71 (patch)
tree751790627e7f401ac73ac68e6fdf8d8ed6068f67 /application/src
parente7d625c96b84c8f318dfd37b90a1213167845ae9 (diff)
Revert back to using deprecated http client
Diffstat (limited to 'application/src')
-rw-r--r--application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala b/application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala
index cdf2d9ee1c6..58f14961e7c 100644
--- a/application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala
+++ b/application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala
@@ -12,7 +12,7 @@ import com.yahoo.vespa.scalalib.osgi.maven.ProjectBundleClassPaths
import com.yahoo.vespa.scalalib.osgi.maven.ProjectBundleClassPaths.BundleClasspathMapping
import org.apache.http.HttpResponse
import org.apache.http.client.methods.HttpGet
-import org.apache.http.impl.client.HttpClientBuilder
+import org.apache.http.impl.client.DefaultHttpClient
import org.apache.http.util.EntityUtils
import org.hamcrest.CoreMatchers.is
import org.junit.Assert._
@@ -121,7 +121,7 @@ class JerseyTest {
</services>,
Networking.enable)) { jdisc =>
- val client = HttpClientBuilder.create().build()
+ val client = new DefaultHttpClient()
def httpGetter(path: HttpPath) = {
client.execute(new HttpGet(s"http://localhost:$getListenPort/rest-api/${path.stripPrefix("/")}"))