[ARCHETYPE-688] Allow hyphen in requiredProperty

apache · Oct 9, 2024 · 8c18050 · 8c18050
1 parent a7b91d8
commit 8c18050
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/...java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java b/...java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
@@ -50,8 +50,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.context.InternalContextAdapterImpl;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.velocity.runtime.RuntimeInstance;
 import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.node.ASTNegateNode;
 import org.apache.velocity.runtime.parser.node.ASTReference;
@@ -326,7 +325,10 @@ private Map<String, Set<String>> computePropertyReferences() {
             final InternalContextAdapterImpl velocityContextAdapter =
                     new InternalContextAdapterImpl(new VelocityContext());
 
-            final RuntimeServices velocityRuntime = RuntimeSingleton.getRuntimeServices();
+            final RuntimeInstance velocityRuntime = new RuntimeInstance();
+            Properties properties = new Properties();
+            properties.put("parser.allow_hyphen_in_identifiers", true);
+            velocityRuntime.setProperties(properties);
 
             for (String propertyName : requiredProperties) {
                 final Set<String> referencedPropertyNames = new LinkedHashSet<>();
@@ -336,7 +338,7 @@ private Map<String, Set<String>> computePropertyReferences() {
                     try {
                         Template template = new Template();
                         template.setName(propertyName + ".default");
-                        SimpleNode node = RuntimeSingleton.parse(new StringReader(defaultValue), template);
+                        SimpleNode node = velocityRuntime.parse(new StringReader(defaultValue), template);
 
                         node.init(velocityContextAdapter, velocityRuntime);
 

diff --git a/...rc/test/java/org/apache/maven/archetype/ui/generation/RequiredPropertyComparatorTest.java b/...rc/test/java/org/apache/maven/archetype/ui/generation/RequiredPropertyComparatorTest.java
@@ -77,4 +77,17 @@ public void testTransitivePropertyReferences() {
         requiredProperties.sort(requiredPropertyComparator);
         assertEquals(Arrays.asList("baz", "bar", "foo"), requiredProperties);
     }
+
+    @Test
+    public void testPropertiesWithHyphen() {
+        archetypeConfiguration.addRequiredProperty("description");
+        archetypeConfiguration.setDefaultProperty("description", "${acronym-app} project-arch: ${component-name}");
+        archetypeConfiguration.addRequiredProperty("component-name");
+        archetypeConfiguration.addRequiredProperty("acronym-app");
+
+        List<String> requiredProperties = archetypeConfiguration.getRequiredProperties();
+        assertEquals(Arrays.asList("description", "component-name", "acronym-app"), requiredProperties);
+        requiredProperties.sort(requiredPropertyComparator);
+        assertEquals(Arrays.asList("component-name", "acronym-app", "description"), requiredProperties);
+    }
 }