Use the library name from the POM file of the dependency

oss-licenses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy

@@ -55,6 +55,7 @@ class LicensesTask extends DefaultTask {
     protected int start = 0
     protected Set<String> googleServiceLicenses = []
     protected Map<String, String> licensesMap = [:]
+    protected Map<String, String> licenseOffsets = [:]
 
     @InputFile
     File dependenciesJson
@@ -165,7 +166,7 @@ class LicensesTask extends DefaultTask {
                     licensesZip.getInputStream(txtFile),
                     startValue,
                     lengthValue)
-                appendLicense(key, content)
+                appendDependency(key, content)
             }
         }
     }
@@ -216,16 +217,19 @@ class LicensesTask extends DefaultTask {
             return
         }
 
-        String licenseKey = "${group}:${name}"
+        String libraryName = rootNode.name
+        if (libraryName == null || libraryName.trim() == "") {
+            libraryName = "${group}:${name}"
+        }
         if (rootNode.licenses.license.size() > 1) {
-            rootNode.licenses.license.each { node ->
-                String nodeName = node.name
-                String nodeUrl = node.url
-                appendLicense("${licenseKey} ${nodeName}", nodeUrl.getBytes(UTF_8))
+            rootNode.licenses.license.each { license ->
+                String licenseName = license.name
+                String licenseUrl = license.url
+                appendDependency("${libraryName} ${licenseName}", licenseUrl.getBytes(UTF_8))
             }
         } else {
             String nodeUrl = rootNode.licenses.license.url
-            appendLicense(licenseKey, nodeUrl.getBytes(UTF_8))
+            appendDependency(libraryName, nodeUrl.getBytes(UTF_8))
         }
     }
 
@@ -255,14 +259,22 @@ class LicensesTask extends DefaultTask {
         return ((ResolvedArtifactResult) artifacts[0]).getFile()
     }
 
-    protected void appendLicense(String key, byte[] content) {
-        if (licensesMap.containsKey(key)) {
+    protected void appendDependency(String dependency, byte[] license) {
+        String licenseText = new String(license, UTF_8)
+        if (licensesMap.containsKey(dependency)) {
             return
         }
 
-        licensesMap.put(key, "${start}:${content.length}")
-        appendLicenseContent(content)
-        appendLicenseContent(LINE_SEPARATOR)
+        String offsets
+        if (licenseOffsets.containsKey(licenseText)) {
+            offsets = licenseOffsets.get(licenseText)
+        } else {
+            offsets = "${start}:${license.length}"
+            licenseOffsets.put(licenseText, offsets)
+            appendLicenseContent(license)
+            appendLicenseContent(LINE_SEPARATOR)
+        }
+        licensesMap.put(dependency, offsets)
     }
 
     protected void appendLicenseContent(byte[] content) {
@@ -280,5 +292,4 @@ class LicensesTask extends DefaultTask {
     private static ModuleComponentIdentifier createModuleComponentIdentifier(String group, String name, String version) {
         return new DefaultModuleComponentIdentifier(DefaultModuleIdentifier.newId(group, name), version)
     }
-
 }

oss-licenses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/LicensesTaskTest.java

@@ -128,7 +128,7 @@ public void testAddLicensesFromPom() throws IOException {
 
     String content = new String(Files.readAllBytes(licensesTask.getLicenses().toPath()), UTF_8);
     String expected = "http://www.opensource.org/licenses/mit-license.php" + LINE_BREAK;
-    assertTrue(licensesTask.licensesMap.containsKey("groupA:deps1"));
+    assertTrue(licensesTask.licensesMap.containsKey("groupA deps1"));
     assertEquals(expected, content);
   }
 
@@ -152,8 +152,8 @@ public void testAddLicensesFromPom_withoutDuplicate() throws IOException {
             + LINE_BREAK;
 
     assertThat(licensesTask.licensesMap.size(), is(2));
-    assertTrue(licensesTask.licensesMap.containsKey("groupA:deps1"));
-    assertTrue(licensesTask.licensesMap.containsKey("groupB:deps2"));
+    assertTrue(licensesTask.licensesMap.containsKey("groupA deps1"));
+    assertTrue(licensesTask.licensesMap.containsKey("groupB deps2"));
     assertEquals(expected, content);
   }
 
@@ -172,16 +172,14 @@ public void testAddLicensesFromPom_withMultiple() throws IOException {
     String content = new String(Files.readAllBytes(licensesTask.getLicenses().toPath()), UTF_8);
     String expected =
         "http://www.opensource.org/licenses/mit-license.php"
-            + LINE_BREAK
-            + "http://www.opensource.org/licenses/mit-license.php"
             + LINE_BREAK
             + "https://www.apache.org/licenses/LICENSE-2.0"
             + LINE_BREAK;
 
     assertThat(licensesTask.licensesMap.size(), is(3));
-    assertTrue(licensesTask.licensesMap.containsKey("groupA:deps1"));
-    assertTrue(licensesTask.licensesMap.containsKey("groupE:deps5 MIT License"));
-    assertTrue(licensesTask.licensesMap.containsKey("groupE:deps5 Apache License 2.0"));
+    assertTrue(licensesTask.licensesMap.containsKey("groupA deps1"));
+    assertTrue(licensesTask.licensesMap.containsKey("groupE deps5 MIT License"));
+    assertTrue(licensesTask.licensesMap.containsKey("groupE deps5 Apache License 2.0"));
     assertEquals(expected, content);
   }
 
@@ -201,7 +199,7 @@ public void testAddLicensesFromPom_withDuplicate() throws IOException {
     String expected = "http://www.opensource.org/licenses/mit-license.php" + LINE_BREAK;
 
     assertThat(licensesTask.licensesMap.size(), is(1));
-    assertTrue(licensesTask.licensesMap.containsKey("groupA:deps1"));
+    assertTrue(licensesTask.licensesMap.containsKey("groupA deps1"));
     assertEquals(expected, content);
   }
 
@@ -284,7 +282,7 @@ public void testAddGooglePlayServiceLicenses_withoutDuplicate() throws IOExcepti
 
   @Test
   public void testAppendLicense() throws IOException {
-    licensesTask.appendLicense("license1", "test".getBytes(UTF_8));
+    licensesTask.appendDependency("license1", "test".getBytes(UTF_8));
 
     String expected = "test" + LINE_BREAK;
     String content = new String(Files.readAllBytes(licensesTask.getLicenses().toPath()), UTF_8);

oss-licenses-plugin/src/test/resources/dependencies/groupB/bcd/deps2.pom

@@ -1,11 +1,11 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>groupA</groupId>
-  <artifactId>groupA-deps1</artifactId>
+  <groupId>groupB</groupId>
+  <artifactId>groupB-deps2</artifactId>
   <version>1</version>
-  <name>groupA deps1</name>
-  <description>groupA deps1</description>
+  <name>groupB deps2</name>
+  <description>groupB deps2</description>
 
   <licenses>
     <license>