diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-19 16:03:20 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-19 16:03:20 +0200 |
| commit | 7876045545dada821b7f391398849089a0603cf5 (patch) | |
| tree | fba51c54773608fba66ed51421e3b005c8fee5e3 /application | |
| parent | e8d627cd40ee17afb238a766c3254be3f68d2e07 (diff) | |
Fix warning and enable warning-as-error
Diffstat (limited to 'application')
| -rw-r--r-- | application/pom.xml | 7 | ||||
| -rw-r--r-- | application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/application/pom.xml b/application/pom.xml index 9cba1de0047..f58e16a0341 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -117,13 +117,6 @@ <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> - <configuration> - <args> - <arg>-unchecked</arg> - <arg>-deprecation</arg> - <arg>-feature</arg> - </args> - </configuration> <executions> <execution> <id>compile</id> 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 58f14961e7c..a199c28a4b2 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.DefaultHttpClient +import org.apache.http.impl.client.HttpClientBuilder import org.apache.http.util.EntityUtils import org.hamcrest.CoreMatchers.is import org.junit.Assert._ @@ -121,9 +121,9 @@ class JerseyTest { </services>, Networking.enable)) { jdisc => - val client = new DefaultHttpClient() def httpGetter(path: HttpPath) = { + val client = HttpClientBuilder.create().build() client.execute(new HttpGet(s"http://localhost:$getListenPort/rest-api/${path.stripPrefix("/")}")) } |