From 5a3e1941d0bbc85fd8af80b673eb992a23096d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 3 Feb 2018 14:30:11 +0100
Subject: [PATCH] Use multi valued property as a PoC

---
 .../resources/category/pom/errorprone.xml     | 13 ++++++----
 .../errorprone/xml/InvalidDependencyTypes.xml | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/pmd-xml/src/main/resources/category/pom/errorprone.xml b/pmd-xml/src/main/resources/category/pom/errorprone.xml
index 1d238a882b..090edd7261 100644
--- a/pmd-xml/src/main/resources/category/pom/errorprone.xml
+++ b/pmd-xml/src/main/resources/category/pom/errorprone.xml
@@ -25,14 +25,17 @@ The following types are considered valid: pom, jar, maven-plugin, ejb, war, ear,
         <properties>
             <property name="xpath">
                 <value>
-<![CDATA[
-//dependencyManagement/dependency/type/text[not(contains('pom, jar, maven-plugin, ejb, war, ear, rar, par',@Image))]
+                    <![CDATA[
+//dependencyManagement/dependency/type/text[not(@Image = $validTypes)]
 ]]>
                 </value>
             </property>
-            <!-- FIXME: property injection seems to be failing with XML.... -->
-            <!-- property name="validTypes" value="pom, jar, maven-plugin, ejb, war, ear, rar, par" description="Set of valid types."-->
-            <!-- Then use as message: "By default, Maven only recognizes the following types: $validTypes." -->
+            <property name="version" value="2.0"/>
+            <property name="validTypes"
+                      value="pom,jar,maven-plugin,ejb,war,ear,rar,par"
+                      type="List[String]"
+                      delimiter=","
+                      description="Set of valid types."/>
         </properties>
         <example>
 <![CDATA[
diff --git a/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/pom/rule/errorprone/xml/InvalidDependencyTypes.xml b/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/pom/rule/errorprone/xml/InvalidDependencyTypes.xml
index b1b1fd9142..54a88ae274 100644
--- a/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/pom/rule/errorprone/xml/InvalidDependencyTypes.xml
+++ b/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/pom/rule/errorprone/xml/InvalidDependencyTypes.xml
@@ -47,6 +47,32 @@
     </dependency>
   </dependencyManagement>
 
+</project>
+     ]]></code>
+        <source-type>pom</source-type>
+    </test-code>
+
+    <test-code>
+        <description>Simple POM file with violation</description>
+        <rule-property name="validTypes">bom</rule-property>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+<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>net.sourceforge.pmd</groupId>
+    <artifactId>xml-pom</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+  <dependencyManagement>
+    <dependency>
+      <groupId>org.jboss.arquillian</groupId>
+      <artifactId>arquillian-bom</artifactId>
+      <version>${arquillian.version}</version>
+      <type>bom</type>
+      <scope>import</scope>
+    </dependency>
+  </dependencyManagement>
+
 </project>
      ]]></code>
         <source-type>pom</source-type>