diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-12 14:47:34 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-13 14:35:28 +0200 |
| commit | 477d1b80e1e0468732470a46b82b2f08542f21d2 (patch) | |
| tree | cfda3279472f0d8eface617fa5caec1513b53b52 /bundle-plugin | |
| parent | 87afc48aa6742cf65571cbea860e6a04e2df45a5 (diff) | |
Treat Scala warnings as errors. Remove use of deprecated Scala APIs
Diffstat (limited to 'bundle-plugin')
| -rw-r--r-- | bundle-plugin/pom.xml | 4 | ||||
| -rw-r--r-- | bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala | 4 |
2 files changed, 6 insertions, 2 deletions
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") |