From b7439a9e408f4db5cfde7de4bd43ab4b78736916 Mon Sep 17 00:00:00 2001 From: Alessandro Ballarin Date: Mon, 25 Feb 2019 15:54:11 +0100 Subject: [PATCH] Fix #253 Add licenseMergesUrl also in report goals There is still something missing in this fix #253. It should be included in next release because licenseMergeUrl in not reliable if there is more then one raw in content of file linked by licenseMergeUrl --- .../aggregate-third-party-report-merge-licences/license.merges | 3 ++- .../codehaus/mojo/license/AbstractThirdPartyReportMojo.java | 2 +- 2 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..1182b6200 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 @@ -APACHE|The Apache Software License, Version 2.0|Apache License, Version 2.0|Apache Public License 2.0 +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/AbstractThirdPartyReportMojo.java b/src/main/java/org/codehaus/mojo/license/AbstractThirdPartyReportMojo.java index cd31e8fcd..4982c1834 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" ) ); } } }