From 00afd6d0a9eb02352260e3ae47cd12926a194a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juan.sotuyo@pedidosya.com>
Date: Tue, 2 Apr 2024 12:50:56 -0300
Subject: [PATCH 1/4] Update test cases for #4388

---
 .../errorprone/xml/InvalidDependencyTypes.xml | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/xml/InvalidDependencyTypes.xml b/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/xml/InvalidDependencyTypes.xml
index 767bce4b1a4..e2ff0f01f4a 100644
--- a/pmd-xml/src/test/resources/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/xml/InvalidDependencyTypes.xml
+++ b/pmd-xml/src/test/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>

From 490775fb49e03f23e7cb3f0d8c789c8280c52fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juan.sotuyo@pedidosya.com>
Date: Tue, 2 Apr 2024 12:51:14 -0300
Subject: [PATCH 2/4] Fix incorrect XPath

---
 pmd-xml/src/main/resources/category/pom/errorprone.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-xml/src/main/resources/category/pom/errorprone.xml b/pmd-xml/src/main/resources/category/pom/errorprone.xml
index a9c5fb113e8..7032d07adc9 100644
--- 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>

From 58f5d816081e01984d71714c001e32cad0727494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juan.sotuyo@pedidosya.com>
Date: Tue, 2 Apr 2024 12:52:55 -0300
Subject: [PATCH 3/4] Update changelog, refs #4388

---
 docs/pages/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index fba5e1ebd8d..0e537282e2d 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -25,6 +25,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
 

From 5fbf7a26f101f0ce0dbb600b5c873942bc993309 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 2 Apr 2024 19:47:24 +0200
Subject: [PATCH 4/4] [xml] fix integration test for pom rule

---
 .../test/resources/sample-source/pom/pom.xml.pom | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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
index 291a0ad3e89..723240c873e 100644
--- 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>