Fix #291 licenseMergeUrl parameter produces unreliable result in all …

…report goals licenseMergeUrl parameter produces unreliable result in report goals if there is more then one raw in the content of linked file
mojohaus · Feb 25, 2019 · 46e5b67 · 46e5b67
1 parent 9e343a3
commit 46e5b67
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/it/aggregate-third-party-report-merge-licences/license.merges b/src/it/aggregate-third-party-report-merge-licences/license.merges
@@ -1 +1,2 @@
+MIT - MIT License|The MIT License|MIT License
 APACHE|The Apache Software License, Version 2.0|Apache License, Version 2.0|Apache Public License 2.0
diff --git a/src/main/java/org/codehaus/mojo/license/AbstractAddThirdPartyMojo.java b/src/main/java/org/codehaus/mojo/license/AbstractAddThirdPartyMojo.java
@@ -777,7 +777,7 @@ else if ( licenseMergesUrl != null )
             getLog().warn( "" );
             if ( UrlRequester.isStringUrl( licenseMergesUrl ) )
             {
-                licenseMerges = Arrays.asList( UrlRequester.getFromUrl( licenseMergesUrl ).split( "\n" ) );
+                licenseMerges = Arrays.asList( UrlRequester.getFromUrl( licenseMergesUrl ).split( "[\n\r]+" ) );
             }
         }
 

diff --git a/src/main/java/org/codehaus/mojo/license/AbstractThirdPartyReportMojo.java b/src/main/java/org/codehaus/mojo/license/AbstractThirdPartyReportMojo.java
@@ -392,7 +392,7 @@ protected void init()
             getLog().warn( "" );
             if ( UrlRequester.isStringUrl( licenseMergesUrl ) )
             {
-                licenseMerges = Arrays.asList( UrlRequester.getFromUrl( licenseMergesUrl ) );
+                licenseMerges = Arrays.asList( UrlRequester.getFromUrl( licenseMergesUrl ).split( "[\n\r]+" ) );
             }
         }
     }