From ebd47ebba08d9d8d06ddb1ee4de5fdeb5ab035bd Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 11 Jul 2017 19:27:43 +0200 Subject: Remove use of deprecated JavaConversions API --- bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'bundle-plugin-test') diff --git a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java index aab918a910f..a7d27a449e6 100644 --- a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java +++ b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java @@ -5,7 +5,7 @@ import com.yahoo.vespa.scalalib.osgi.maven.ProjectBundleClassPaths; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import scala.collection.JavaConversions; +import scala.collection.JavaConverters; import java.io.File; import java.io.FilenameFilter; @@ -28,7 +28,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; /** * Verifies the bundle jar file built and its manifest. @@ -144,7 +143,7 @@ public class BundleIT { assertThat(bundleClassPaths.mainBundle().bundleSymbolicName(), is("bundle-plugin-test")); Collection mainBundleClassPaths = - JavaConversions.asJavaCollection(bundleClassPaths.mainBundle().classPathElements()); + JavaConverters.asJavaCollectionConverter(bundleClassPaths.mainBundle().classPathElements()).asJavaCollection(); assertThat(mainBundleClassPaths, hasItems( -- cgit v1.2.3