Merge pull request #4909 from Monits:fix-4388

[pom] Properly navigate dependencyManagement node #4909
pmd · Apr 2, 2024 · a28943a · a28943a
2 parents 34c3ec6 + 5fbf7a2
commit a28943a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 29 deletions.
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
@@ -27,6 +27,8 @@ This is a {{ site.pmd.release_type }} release.
   * [#3845](https://github.com/pmd/pmd/issues/3845): \[java] InsufficientStringBufferDeclaration should consider literal expression
   * [#4874](https://github.com/pmd/pmd/issues/4874): \[java] StringInstantiation: False-positive when using `new String(charArray)`
   * [#4886](https://github.com/pmd/pmd/issues/4886): \[java] BigIntegerInstantiation: False Positive with Java 17 and BigDecimal.TWO
+* pom-errorprone
+  * [#4388](https://github.com/pmd/pmd/issues/4388): \[pom] InvalidDependencyTypes doesn't consider dependencies at all
 
 ### 🚨 API Changes
 

diff --git a/pmd-dist/src/test/resources/sample-source/pom/pom.xml.pom b/pmd-dist/src/test/resources/sample-source/pom/pom.xml.pom
@@ -5,13 +5,15 @@
     <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>
+      <dependencies>
+          <dependency>
+              <groupId>org.jboss.arquillian</groupId>
+              <artifactId>arquillian-bom</artifactId>
+              <version>${arquillian.version}</version>
+              <type>bom</type>
+              <scope>import</scope>
+          </dependency>
+      </dependencies>
   </dependencyManagement>
 
 </project>
diff --git a/pmd-xml/src/main/resources/category/pom/errorprone.xml b/pmd-xml/src/main/resources/category/pom/errorprone.xml
@@ -26,7 +26,7 @@ The following types are considered valid: pom, jar, maven-plugin, ejb, war, ear,
             <property name="xpath">
                 <value>
 <![CDATA[
-//dependencyManagement/dependency/type/text[not(@Text = $validTypes)]
+//dependencyManagement/dependencies/dependency/type/text[not(@Text = $validTypes)]
 ]]>
                 </value>
             </property>

diff --git a/...resources/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/xml/InvalidDependencyTypes.xml b/...resources/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/xml/InvalidDependencyTypes.xml
@@ -15,13 +15,15 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <dependencyManagement>
-        <dependency>
-            <groupId>org.jboss.arquillian</groupId>
-            <artifactId>arquillian-bom</artifactId>
-            <version>${arquillian.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${arquillian.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
 </project>
         ]]></code>
@@ -38,13 +40,15 @@
     <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>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${arquillian.version}</version>
+                <type>bom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
 </project>
         ]]></code>
@@ -62,13 +66,15 @@
     <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>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${arquillian.version}</version>
+                <type>bom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
 </project>
         ]]></code>