From 477d1b80e1e0468732470a46b82b2f08542f21d2 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@yahoo-inc.com>
Date: Wed, 12 Jul 2017 14:47:34 +0200
Subject: Treat Scala warnings as errors. Remove use of deprecated Scala APIs

---
 bundle-plugin/pom.xml                                                 | 4 ++++
 .../com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'bundle-plugin')

diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml
index cda5a64d050..31355ff21d2 100644
--- a/bundle-plugin/pom.xml
+++ b/bundle-plugin/pom.xml
@@ -77,6 +77,10 @@
             <artifactId>scalalib</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>
diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala
index 795a0eaf86e..4104e349208 100644
--- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala
+++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala
@@ -14,7 +14,7 @@ import org.apache.maven.plugins.annotations.{Mojo, Parameter, ResolutionScope}
 import org.apache.maven.project.MavenProject
 import org.codehaus.plexus.archiver.jar.JarArchiver
 
-import scala.collection.convert.wrapAsScala._
+import scala.collection.JavaConverters._
 
 /**
  * @author  tonytv
@@ -91,7 +91,7 @@ class AssembleContainerPluginMojo extends AbstractMojo {
   private def copyConfigDefinitions(file: File, jarArchiver: JarArchiver) {
     JarFiles.withJarFile(file) { jarFile =>
       for {
-        entry <- jarFile.entries()
+        entry <- jarFile.entries().asScala
         name = entry.getName
         if name.startsWith("configdefinitions/") && name.endsWith(".def")
 
-- 
cgit v1.2.3