summaryrefslogtreecommitdiffstats
path: root/bundle-plugin-test
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-07-11 19:27:43 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-07-13 14:35:25 +0200
commitebd47ebba08d9d8d06ddb1ee4de5fdeb5ab035bd (patch)
tree0305583a8cf1294aba5fec4b172cae263fa1db19 /bundle-plugin-test
parent8d13e14a7edad735e89887f1fabb5c919a8dbb2a (diff)
Remove use of deprecated JavaConversions API
Diffstat (limited to 'bundle-plugin-test')
-rw-r--r--bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java5
1 files changed, 2 insertions, 3 deletions
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<String> mainBundleClassPaths =
- JavaConversions.asJavaCollection(bundleClassPaths.mainBundle().classPathElements());
+ JavaConverters.asJavaCollectionConverter(bundleClassPaths.mainBundle().classPathElements()).asJavaCollection();
assertThat(mainBundleClassPaths,
hasItems(