Merge pull request #276 from nfalco79/feature/134

Fix #134 when missingFileUrl contains more lines

src/it/add-third-party-missing-file/missing-licenses.properties

@@ -1 +1,2 @@
-org.json--json--20070829=The JSON License by file url
+org.json--json--20070829=The JSON License by file url
+javax.resource--connector-api--1.5=CDDL + GPLv2 with classpath exception by file url

src/it/add-third-party-missing-file/pom.xml

@@ -53,6 +53,11 @@
       <artifactId>json</artifactId>
       <version>20070829</version>
     </dependency>
+    <dependency>
+      <groupId>javax.resource</groupId>
+      <artifactId>connector-api</artifactId>
+      <version>1.5</version>
+    </dependency>
   </dependencies>
 
   <build>

src/it/add-third-party-missing-file/postbuild.groovy

@@ -24,8 +24,10 @@ file = new File(basedir, 'target/generated-sources/license/THIRD-PARTY-by-classp
 assert file.exists();
 content = file.text;
 assert content.contains('The JSON License by classpath url');
+assert content.contains('CDDL + GPLv2 with classpath exception by classpath url');
 
 file = new File(basedir, 'target/generated-sources/license/THIRD-PARTY-by-file.txt');
 assert file.exists();
 content = file.text;
-assert content.contains('The JSON License by file url');
+assert content.contains('The JSON License by file url');
+assert content.contains('CDDL + GPLv2 with classpath exception by file url');

src/it/add-third-party-missing-file/prebuild.groovy

@@ -27,10 +27,12 @@ import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 
-JarOutputStream licenseRepo = new JarOutputStream(new FileOutputStream(new File(basedir, "license-repo.jar")));
+String missingLicences = "org.json--json--20070829=The JSON License by classpath url\n" +
+                         "javax.resource--connector-api--1.5=CDDL + GPLv2 with classpath exception by classpath url";
 
+JarOutputStream licenseRepo = new JarOutputStream(new FileOutputStream(new File(basedir, "license-repo.jar")));
 licenseRepo.putNextEntry(new ZipEntry("missing-licenses.properties"));
-licenseRepo.write("org.json--json--20070829=The JSON License by classpath url".getBytes("UTF-8"));
+licenseRepo.write(missingLicences.getBytes("UTF-8"));
 licenseRepo.closeEntry();
 
 licenseRepo.close();

src/main/java/org/codehaus/mojo/license/AbstractAddThirdPartyMojo.java

@@ -695,7 +695,7 @@ else if ( licenseMergesUrl != null )
             getLog().warn( "" );
             if ( UrlRequester.isStringUrl( licenseMergesUrl ) )
             {
-                licenseMerges = Arrays.asList( UrlRequester.getFromUrl( licenseMergesUrl ) );
+                licenseMerges = Arrays.asList( UrlRequester.getFromUrl( licenseMergesUrl ).split( "\n" ) );
             }
         }