Merge pull request #132 from krrish175-byte/fix/issue-85-include-field-ignored

fix: respect includes/excludes in Maven resources configuration

Author: tgodzik

src/main/scala/bloop/integrations/maven/MojoImplementation.scala

@@ -20,6 +20,7 @@ import org.apache.maven.plugin.MojoExecution
 import org.apache.maven.plugin.logging.Log
 import org.apache.maven.project.MavenProject
 import org.codehaus.plexus.util.xml.Xpp3Dom
+import org.codehaus.plexus.util.DirectoryScanner
 import org.eclipse.aether.artifact.DefaultArtifact
 import org.eclipse.aether.artifact.DefaultArtifactType
 import org.eclipse.aether.resolution.ArtifactRequest
@@ -307,8 +308,21 @@ object MojoImplementation {
         val jvmArgs = launcher.map(_.getJvmArgs.toList).getOrElse(List.empty)
         val mainClass = launcher.map(_.getMainClass).filter(_.nonEmpty)
         val platform = Some(Config.Platform.Jvm(Config.JvmConfig(javaHome, jvmArgs), mainClass, None, None, None))
-        val resources = Some(resources0.asScala.toList.flatMap{
-          case a: Resource => Option(Paths.get(a.getDirectory()))
+        val resources = Some(resources0.asScala.toList.flatMap {
+          case a: Resource =>
+            val dir = Paths.get(a.getDirectory())
+            if (Files.exists(dir)) {
+              if (a.getIncludes().isEmpty() && a.getExcludes().isEmpty()) {
+                Some(dir)
+              } else {
+                val scanner = new DirectoryScanner()
+                scanner.setBasedir(a.getDirectory())
+                scanner.setIncludes(a.getIncludes().toArray(new Array[String](0)))
+                scanner.setExcludes(a.getExcludes().toArray(new Array[String](0)))
+                scanner.scan()
+                scanner.getIncludedFiles().map(f => dir.resolve(f))
+              }
+            } else None
           case _ => None
         })
         val project = Config.Project(name, baseDirectory, Some(root.toPath), sourceDirs, None, None, fullDependencies, classpath, out, classesDir, resources, `scala`, java, sbt, test, platform, resolution, Some(tags), None)

src/test/resources/issue_85/pom.xml

@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>bloop.test</groupId>
+  <artifactId>issue_85</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>issue-85-test</name>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>${project.basedir}</directory>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+</project>

src/test/scala/bloop/integrations/maven/MavenConfigGenerationTest.scala

@@ -8,7 +8,6 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
 
-import scala.sys.process.ProcessLogger
 import scala.util.Try
 import scala.util.control.NonFatal
 
@@ -281,20 +280,20 @@ class MavenConfigGenerationTest extends BaseConfigSuite {
     }
   }
 
-  private def check(testProject: String, submodules: List[String] = Nil)(
+  private def check(testProject: String, submodules: List[String] = Nil, extraContent: Map[String, String] = Map.empty)(
       checking: (Config.File, String, List[Config.File]) => Unit
   ): Unit = {
     println(s"Checking $testProject")
-    def nameFromDirectory(projectString: String) =
-      Paths.get(projectString).getParent().getFileName().toString()
     val tempDir = Files.createTempDirectory("mavenBloop")
     val outFile = copyFromResource(tempDir, testProject)
+    extraContent.foreach { case (relativePath, content) =>
+      val p = tempDir.resolve(relativePath)
+      Files.createDirectories(p.getParent)
+      Files.write(p, content.getBytes("UTF-8"))
+    }
     submodules.foreach(copyFromResource(tempDir, _))
     val wrapperJar = copyFromResource(tempDir, s"maven-wrapper.jar")
-    val wrapperPropertiesFile = copyFromResource(tempDir, s"maven-wrapper.properties")
-
-    //    val all = Files.list(tempDir).collect(Collectors.toList())
-    import sys.process._
+    copyFromResource(tempDir, s"maven-wrapper.properties")
 
     val javaHome = Paths.get(System.getProperty("java.home"))
     val javaArgs = List[String](
@@ -360,8 +359,6 @@ class MavenConfigGenerationTest extends BaseConfigSuite {
 
   private def exec(cmd: Seq[String], cwd: File): Try[String] = {
     Try {
-      val lastError = new StringBuilder
-      val swallowStderr = ProcessLogger(_ => (), err => { lastError.append(err); () })
       val processBuilder = new ProcessBuilder()
       val out = new StringBuilder()
       processBuilder.directory(cwd)
@@ -380,4 +377,28 @@ class MavenConfigGenerationTest extends BaseConfigSuite {
     }
   }
 
+
+
+  @Test
+  def issue85() = {
+    check(
+      "issue_85/pom.xml",
+      extraContent = Map(
+        "issue_85/LICENSE" -> "LICENSE CONTENT",
+        "issue_85/NOTICE" -> "NOTICE CONTENT"
+      )
+    ) { (configFile, projectName, subprojects) =>
+      assert(subprojects.isEmpty)
+      val resources = configFile.project.resources.getOrElse(Nil)
+      val license = resources.find(_.toString.endsWith("LICENSE"))
+      val notice = resources.find(_.toString.endsWith("NOTICE"))
+      assert(license.isDefined, "LICENSE file should be included in resources")
+      assert(notice.isDefined, "NOTICE file should be included in resources")
+
+      val baseDirectory = configFile.project.directory.toAbsolutePath
+      val hasBaseDir = resources.exists(_.toAbsolutePath == baseDirectory)
+      assert(!hasBaseDir, s"Base directory $baseDirectory should NOT be in resources when includes are specified")
+    }
+  }
+
 }