diff options
Diffstat (limited to 'container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala')
| -rw-r--r-- | container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala b/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala index 8b4be3f5c10..f2120786579 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala @@ -7,19 +7,17 @@ import java.util.jar.{JarEntry, JarFile} import java.util.logging.{Level, Logger} import java.util.stream.Collectors +import com.google.common.io.Files.fileTreeTraverser import com.yahoo.component.ComponentSpecification import com.yahoo.container.di.Osgi.RelativePath import com.yahoo.vespa.scalalib.arm.Using.using +import com.yahoo.vespa.scalalib.java.function.FunctionConverters._ import com.yahoo.vespa.scalalib.osgi.maven.ProjectBundleClassPaths import com.yahoo.vespa.scalalib.osgi.maven.ProjectBundleClassPaths.BundleClasspathMapping import org.osgi.framework.Bundle import org.osgi.framework.wiring.BundleWiring -import com.google.common.io.Files.fileTreeTraverser - -import scala.collection.convert.decorateAsScala._ - -import com.yahoo.vespa.scalalib.java.function.FunctionConverters._ +import scala.collection.JavaConverters._ /** * Tested by com.yahoo.application.container.jersey.JerseyTest |