[ARCHETYPE-274] Log different debug message and remove temp test files

apache · Nov 22, 2024 · 8c2bbd1 · 8c2bbd1
1 parent 72c05af
commit 8c2bbd1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/...type-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java b/...type-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
@@ -178,8 +178,9 @@ public void createArchetype(ArchetypeCreationRequest request, ArchetypeCreationR
             Model pom = pomManager.readPom(project.getFile());
 
             List<String> excludePatterns = configurationProperties.getProperty(Constants.EXCLUDE_PATTERNS) != null
-                    ? Arrays.asList(
-                            StringUtils.split(configurationProperties.getProperty(Constants.EXCLUDE_PATTERNS), ","))
+                    ? Arrays.asList(configurationProperties
+                            .getProperty(Constants.EXCLUDE_PATTERNS)
+                            .split(","))
                     : Collections.emptyList();
 
             List<String> fileNames = resolveFileNames(pom, basedir, excludePatterns);

diff --git a/.../src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java b/.../src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
@@ -773,11 +773,12 @@ private void processTemplates(
             count++;
 
             // Evaluate the includeCondition attribute
-            String includeCondition = fileSet.getIncludeCondition();
+            final String includeCondition = fileSet.getIncludeCondition();
             if (includeCondition != null && !includeCondition.isEmpty()) {
                 String evaluatedCondition = evaluateExpression(context, "includeCondition", includeCondition);
                 if (!Boolean.parseBoolean(evaluatedCondition)) {
-                    LOGGER.debug("Skipping fileset " + fileSet + " due to includeCondition: " + includeCondition);
+                    LOGGER.debug("Skipping fileset " + fileSet + " due to includeCondition: " + includeCondition
+                            + " being: " + evaluatedCondition);
                     continue;
                 }
             }

diff --git a/tmp/test/pom.xml b/tmp/test/pom.xml
diff --git a/tmp/test/src/main/resources/example.json b/tmp/test/src/main/resources/example.json