diff --git a/src/it/aggregate-third-party-report-merge-licences/license.merges b/src/it/aggregate-third-party-report-merge-licences/license.merges index 3d117998b..132ae1f06 100644 --- 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 index 6da06d781..001af2d06 100644 --- 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 index cd31e8fcd..3019b5157 100644 --- 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]+" ) ); } } }