Merge pull request #10130 from famod/issue-9721-devmode-resource-config

Dev-mode: respect configuration when running resources:resource

Author: geoand

devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java

@@ -416,7 +416,7 @@ private void handleResources() throws MojoExecutionException {
                             MojoExecutor.version(resourcesPlugin.getVersion()),
                             resourcesPlugin.getDependencies()),
                     MojoExecutor.goal("resources"),
-                    MojoExecutor.configuration(),
+                    getPluginConfig(resourcesPlugin),
                     MojoExecutor.executionEnvironment(
                             project,
                             session,
@@ -425,30 +425,34 @@ private void handleResources() throws MojoExecutionException {
     }
 
     private void executeCompileGoal(Plugin plugin, String groupId, String artifactId) throws MojoExecutionException {
-        Xpp3Dom configuration = MojoExecutor.configuration();
-        Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
-        if (pluginConfiguration != null) {
-            //Filter out `test*` configurations
-            for (Xpp3Dom child : pluginConfiguration.getChildren()) {
-                if (!child.getName().startsWith("test")) {
-                    configuration.addChild(child);
-                }
-            }
-        }
         MojoExecutor.executeMojo(
                 MojoExecutor.plugin(
                         MojoExecutor.groupId(groupId),
                         MojoExecutor.artifactId(artifactId),
                         MojoExecutor.version(plugin.getVersion()),
                         plugin.getDependencies()),
                 MojoExecutor.goal("compile"),
-                configuration,
+                getPluginConfig(plugin),
                 MojoExecutor.executionEnvironment(
                         project,
                         session,
                         pluginManager));
     }
 
+    private Xpp3Dom getPluginConfig(Plugin plugin) {
+        Xpp3Dom configuration = MojoExecutor.configuration();
+        Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
+        if (pluginConfiguration != null) {
+            //Filter out `test*` configurations
+            for (Xpp3Dom child : pluginConfiguration.getChildren()) {
+                if (!child.getName().startsWith("test")) {
+                    configuration.addChild(child);
+                }
+            }
+        }
+        return configuration;
+    }
+
     private Map<Path, Long> readPomFileTimestamps(DevModeRunner runner) throws IOException {
         Map<Path, Long> ret = new HashMap<>();
         for (Path i : runner.getPomFiles()) {

integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java

@@ -6,6 +6,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -15,6 +16,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.IntStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.shared.invoker.MavenInvocationException;
@@ -74,12 +78,29 @@ public void testThatResteasyWithoutUndertowCanRun() throws MavenInvocationExcept
     @Test
     public void testThatInitialMavenResourceFilteringWorks() throws MavenInvocationException, IOException {
         testDir = initProject("projects/classic-resource-filtering", "projects/project-classic-resource-filtering");
+
+        //also test that a zipfile must not be filtered because of nonFilteredFileExtensions configuration
+        //as initProject() would already corrupt the zipfile, it has to be created _after_ initProject()
+        try (ZipOutputStream zipOut = new ZipOutputStream(
+                new FileOutputStream(new File(testDir, "src/main/resources/test.zip")))) {
+            ZipEntry zipEntry = new ZipEntry("test.txt");
+            zipOut.putNextEntry(zipEntry);
+            zipOut.write("test".getBytes());
+        }
+
         run(false);
 
         //make sure that a simple HTTP GET request always works
         IntStream.range(0, 10).forEach(i -> {
             assertThat(DevModeTestUtils.getStrictHttpResponse("/hello", 200)).isTrue();
         });
+
+        //try to open the copied test.zip (which will fail if it was filtered)
+        File copiedTestZipFile = new File(testDir, "target/classes/test.zip");
+        assertThat(copiedTestZipFile).exists();
+        try (ZipFile zipFile = new ZipFile(copiedTestZipFile)) {
+            //everything is fine once we get here (ZipFile is still readable)
+        }
     }
 
     @Test

integration-tests/maven/src/test/resources/projects/classic-resource-filtering/pom.xml

@@ -50,6 +50,15 @@
       </resource>
     </resources>
     <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+            <nonFilteredFileExtensions>
+                <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+            </nonFilteredFileExtensions>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-maven-plugin</artifactId>