Fix maven pom resource assignment

src/packagedcode/maven.py

@@ -132,10 +132,21 @@ def assign_package_to_resources(cls, package, resource, codebase, package_adder)
         if resource.path.endswith(f'META-INF/maven/{package.namespace}/{package.name}/pom.xml'):
             # First case: a pom.xml inside a META-INF directory such as in
             # /META-INF/maven/log4j/log4j/pom.xml: This requires going up 5 times
-            upward_segments = 5
+            upward_segments = 4
             root = resource
             for _ in range(upward_segments):
                 root = root.parent(codebase)
+
+            number_poms = 0
+            for child in root.walk(codebase):
+                if 'pom.xml' in child.path:
+                    number_poms += 1
+
+            if number_poms > 1:
+                root = resource
+            else:
+                root = root.parent(codebase)
+
         else:
             # Second case: a pom.xml at the root of codebase tree
             # FIXME: handle the cases opf parent POMs and nested POMs

tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES

@@ -0,0 +1,23 @@
+// ------------------------------------------------------------------
+// Transitive dependencies of this project determined from the
+// maven pom organized by organization.
+// ------------------------------------------------------------------
+
+htrace-core
+
+
+From: 'FasterXML' (http://fasterxml.com/)
+  - Jackson-annotations (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-annotations:bundle:2.4.0
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Jackson-core (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-core:bundle:2.4.0
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - jackson-databind (http://wiki.fasterxml.com/JacksonHome) com.fasterxml.jackson.core:jackson-databind:bundle:2.4.0
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+From: 'The Apache Software Foundation' (http://www.apache.org/)
+  - Commons Logging (http://commons.apache.org/logging) commons-logging:commons-logging:jar:1.1.1
+    License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+
+
+

tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating/META-INF/LICENSE

@@ -0,0 +1,4 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/

tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating/META-INF/MANIFEST.MF

@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Title: htrace-core
+Implementation-Version: 4.0.0-incubating
+Implementation-Vendor-Id: org.apache.htrace
+Built-By: cmccabe
+Build-Jdk: 1.7.0_10
+Specification-Vendor: The Apache Software Foundation
+Specification-Title: htrace-core
+Created-By: Apache Maven 3.0.4
+Specification-Version: 4.0.0-incubating
+Archiver-Version: Plexus Archiver
+

tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating/META-INF/NOTICE

@@ -0,0 +1,8 @@
+
+htrace-core
+Copyright 2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating/META-INF/maven/com.fasterxml.jackson.core/jackson-annotations/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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> 
+  <parent>
+    <groupId>com.fasterxml.jackson</groupId>
+    <artifactId>jackson-parent</artifactId>
+    <version>2.4</version>
+  </parent>
+
+  <groupId>com.fasterxml.jackson.core</groupId>
+  <artifactId>jackson-annotations</artifactId>
+  <name>Jackson-annotations</name>
+  <version>2.4.0</version>
+  <packaging>bundle</packaging>
+  <description>Core annotations used for value types, used by Jackson data binding package.
+  </description>
+
+  <url>http://wiki.fasterxml.com/JacksonHome</url>
+  <scm>
+    <connection>scm:git:[email protected]:FasterXML/jackson-annotations.git</connection>
+    <developerConnection>scm:git:[email protected]:FasterXML/jackson-annotations.git</developerConnection>
+    <url>http://github.com/FasterXML/jackson-annotations</url>
+    <tag>jackson-annotations-2.4.0</tag>
+  </scm>
+
+  <properties>
+    <osgi.export>com.fasterxml.jackson.annotation.*;version=${project.version}</osgi.export>
+  </properties>
+</project>

tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating/META-INF/maven/com.fasterxml.jackson.core/jackson-core/pom.xml

@@ -0,0 +1,77 @@
+<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> 
+  <parent>
+    <groupId>com.fasterxml.jackson</groupId>
+    <artifactId>jackson-parent</artifactId>
+    <version>2.4</version>
+  </parent>
+
+  <groupId>com.fasterxml.jackson.core</groupId>
+  <artifactId>jackson-core</artifactId>
+  <name>Jackson-core</name>
+  <version>2.4.0</version>
+  <packaging>bundle</packaging>
+  <description>Core Jackson abstractions, basic JSON streaming API implementation
+  </description>
+
+  <url>http://wiki.fasterxml.com/JacksonHome</url>
+  <scm>
+    <connection>scm:git:[email protected]:FasterXML/jackson-core.git</connection>
+    <developerConnection>scm:git:[email protected]:FasterXML/jackson-core.git</developerConnection>
+    <url>http://github.com/FasterXML/jackson-core</url>    
+    <tag>jackson-core-2.4.0</tag>
+  </scm>
+
+  <properties>
+    <osgi.export>com.fasterxml.jackson.core;version=${project.version},
+com.fasterxml.jackson.core.*;version=${project.version}
+    </osgi.export>
+
+    <!-- Generate PackageVersion.java into this directory. -->
+    <packageVersion.dir>com/fasterxml/jackson/core/json</packageVersion.dir>
+    <packageVersion.package>${project.groupId}.json</packageVersion.package>
+  </properties>
+
+  <reporting>
+    <plugins>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.8.1</version>
+          <configuration>
+              <aggregate>true</aggregate>
+              <source>1.6</source>
+              <encoding>UTF-8</encoding>
+              <maxmemory>1g</maxmemory>
+              <links>
+                  <!-- JDK, other Jackson pkgs -->
+                  <link>http://docs.oracle.com/javase/6/docs/api/</link>
+              </links>
+              <excludePackageNames>${javadoc.package.exclude}</excludePackageNames>
+              <bootclasspath>${sun.boot.class.path}</bootclasspath>
+              <doclet>com.google.doclava.Doclava</doclet>
+              <useStandardDocletOptions>false</useStandardDocletOptions>
+              <additionalJOption>-J-Xmx1024m</additionalJOption>
+              <docletArtifact>
+                  <groupId>com.google.doclava</groupId>
+                  <artifactId>doclava</artifactId>
+                  <version>1.0.3</version>
+              </docletArtifact>
+              <additionalparam>
+                  -hdf project.name "${project.name} ${project.version}"
+                  -d ${project.reporting.outputDirectory}/apidocs
+              </additionalparam>
+          </configuration>
+          <reportSets>
+              <reportSet>
+                  <id>default</id>
+                  <reports>
+                      <report>javadoc</report>
+                  </reports>
+              </reportSet>
+          </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>

tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating/META-INF/maven/com.fasterxml.jackson.core/jackson-databind/pom.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+  <parent>
+    <groupId>com.fasterxml.jackson</groupId>
+    <artifactId>jackson-parent</artifactId>
+    <version>2.4</version>
+  </parent>
+
+  <groupId>com.fasterxml.jackson.core</groupId>
+  <artifactId>jackson-databind</artifactId>
+  <version>2.4.0</version>
+  <name>jackson-databind</name>
+  <packaging>bundle</packaging>
+  <description>General data-binding functionality for Jackson: works on core streaming API</description>
+  <url>http://wiki.fasterxml.com/JacksonHome</url>
+
+  <scm>
+    <connection>scm:git:[email protected]:FasterXML/jackson-databind.git</connection>
+    <developerConnection>scm:git:[email protected]:FasterXML/jackson-databind.git</developerConnection>
+    <url>http://github.com/FasterXML/jackson-databind</url>
+    <tag>jackson-databind-2.4.0</tag>
+  </scm>
+
+  <dependencies>
+    <!-- Builds on core streaming API; also needs core annotations -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.4.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.4.0</version>
+    </dependency>
+
+    <!-- and for testing we need a few libraries
+         libs for which we use reflection for code, but direct dep for testing
+      -->
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>2.2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>1.7.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency> <!--  from core we just test for repackaged cglib, not hibernate proper -->
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-cglib-repack</artifactId>
+      <version>2.1_3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>release</id>
+      <properties>
+        <maven.test.skip>true</maven.test.skip>
+        <skipTests>true</skipTests>
+      </properties>
+    </profile>
+  </profiles>
+
+</project>