From 9d60d50d0b4c174d273bfe01d775f9a92bbb4b9a Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 8 Feb 2019 16:46:29 +0100 Subject: [PATCH] Fix #244 Move LicenseDownloader to org.codehaus.mojo.license.download --- .../codehaus/mojo/license/AbstractDownloadLicensesMojo.java | 4 ++-- src/main/java/org/codehaus/mojo/license/download/Cache.java | 2 +- .../mojo/license/{utils => download}/LicenseDownloader.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/org/codehaus/mojo/license/{utils => download}/LicenseDownloader.java (99%) diff --git a/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java b/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java index d18ae0344..cb577ffce 100644 --- a/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java +++ b/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java @@ -37,12 +37,12 @@ import org.codehaus.mojo.license.api.ResolvedProjectDependencies; import org.codehaus.mojo.license.download.Cache; import org.codehaus.mojo.license.download.FileNameEntry; +import org.codehaus.mojo.license.download.LicenseDownloader; import org.codehaus.mojo.license.download.PreferredFileNames; +import org.codehaus.mojo.license.download.LicenseDownloader.LicenseDownloadResult; import org.codehaus.mojo.license.model.ProjectLicense; import org.codehaus.mojo.license.model.ProjectLicenseInfo; import org.codehaus.mojo.license.utils.FileUtil; -import org.codehaus.mojo.license.utils.LicenseDownloader; -import org.codehaus.mojo.license.utils.LicenseDownloader.LicenseDownloadResult; import org.codehaus.mojo.license.utils.LicenseSummaryReader; import org.codehaus.mojo.license.utils.LicenseSummaryWriter; import org.codehaus.mojo.license.utils.MojoHelper; diff --git a/src/main/java/org/codehaus/mojo/license/download/Cache.java b/src/main/java/org/codehaus/mojo/license/download/Cache.java index b97c57198..7bbe5b199 100644 --- a/src/main/java/org/codehaus/mojo/license/download/Cache.java +++ b/src/main/java/org/codehaus/mojo/license/download/Cache.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.codehaus.mojo.license.utils.LicenseDownloader.LicenseDownloadResult; +import org.codehaus.mojo.license.download.LicenseDownloader.LicenseDownloadResult; /** * A simple {@link HashMap} based in-memory cache for storing {@link LicenseDownloadResult}s. diff --git a/src/main/java/org/codehaus/mojo/license/utils/LicenseDownloader.java b/src/main/java/org/codehaus/mojo/license/download/LicenseDownloader.java similarity index 99% rename from src/main/java/org/codehaus/mojo/license/utils/LicenseDownloader.java rename to src/main/java/org/codehaus/mojo/license/download/LicenseDownloader.java index 1166df01a..acaedddeb 100644 --- a/src/main/java/org/codehaus/mojo/license/utils/LicenseDownloader.java +++ b/src/main/java/org/codehaus/mojo/license/download/LicenseDownloader.java @@ -1,4 +1,4 @@ -package org.codehaus.mojo.license.utils; +package org.codehaus.mojo.license.download; /* * #%L @@ -63,7 +63,7 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.settings.Proxy; -import org.codehaus.mojo.license.download.FileNameEntry; +import org.codehaus.mojo.license.utils.FileUtil; /** * Utilities for downloading remote license files.