Fix merging of dependencies and dependency management

poms/org.slf4j-slf4j-parent-2.0.6/pom.xml

@@ -79,6 +79,31 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.reload4j</groupId>
+      <artifactId>reload4j</artifactId>
+      <version>${reload4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.cal10n</groupId>
+      <artifactId>cal10n-api</artifactId>
+      <version>${cal10n.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-parent</artifactId>
@@ -409,31 +434,4 @@
       <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
     </repository>
   </distributionManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.reload4j</groupId>
-      <artifactId>reload4j</artifactId>
-      <version>${reload4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.cal10n</groupId>
-      <artifactId>cal10n-api</artifactId>
-      <version>${cal10n.version}</version>
-    </dependency>
-  </dependencies>
 </project>

update-poms.py

@@ -96,9 +96,12 @@ class PackagePOM:
 
         if self.packaging == 'pom':
             root_copy = copy.deepcopy(self.raw_root)
+            dependencies = root_copy.find('dependencies', ns) or ET.SubElement(root_copy, 'dependencies')
+
             depman = root_copy.find('dependencyManagement', ns)
             if depman is not None:
-                root_copy.extend(depman.findall('*'))
+                tmp_deps = depman.findall('dependencies/*', ns)
+                dependencies.extend(tmp_deps)
                 root_copy.remove(depman)
 
             tmpGroupId = f'tmp.{package.groupId}'
@@ -124,7 +127,6 @@ class PackagePOM:
                 ET.SubElement(root_copy, 'version').text = tmpVersion
 
             # Add a dependency for the pom itself
-            dependencies = root_copy.find('dependencies', ns) or ET.SubElement(root_copy, 'dependencies')
             self_dep = ET.SubElement(dependencies, 'dependency')
             ET.SubElement(self_dep, 'groupId').text = package.groupId
             ET.SubElement(self_dep, 'artifactId').text = package.artifactId