From 46e5b6761d696b202a45db04120561c9ddbdfb42 Mon Sep 17 00:00:00 2001 From: Alessandro Ballarin Date: Mon, 25 Feb 2019 15:54:11 +0100 Subject: [PATCH] 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 --- .../aggregate-third-party-report-merge-licences/license.merges | 1 + .../org/codehaus/mojo/license/AbstractAddThirdPartyMojo.java | 2 +- .../org/codehaus/mojo/license/AbstractThirdPartyReportMojo.java | 2 +- 3 files changed, 3 insertions(+), 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 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]+" ) ); } } }