mathieucarbou · mathieucarbou · Mar 28, 2022 · Mar 28, 2022
diff --git a/...plugin-git/src/main/java/com/mycila/maven/plugin/license/git/CopyrightAuthorProvider.java b/...plugin-git/src/main/java/com/mycila/maven/plugin/license/git/CopyrightAuthorProvider.java
@@ -18,7 +18,6 @@
 import com.mycila.maven.plugin.license.AbstractLicenseMojo;
 import com.mycila.maven.plugin.license.PropertiesProvider;
 import com.mycila.maven.plugin.license.document.Document;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/CopyrightRangeProvider.java b/...-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/CopyrightRangeProvider.java
@@ -18,7 +18,6 @@
 import com.mycila.maven.plugin.license.AbstractLicenseMojo;
 import com.mycila.maven.plugin.license.PropertiesProvider;
 import com.mycila.maven.plugin.license.document.Document;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/license-maven-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitLookup.java b/license-maven-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitLookup.java
@@ -15,6 +15,13 @@
  */
 package com.mycila.maven.plugin.license.git;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.TimeZone;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -32,14 +39,6 @@
 import org.eclipse.jgit.treewalk.filter.PathFilter;
 import org.eclipse.jgit.treewalk.filter.TreeFilter;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.TimeZone;
-
 /**
  * A jGit library wrapper to query the date of the last commit.
  *

diff --git a/...n-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitPropertiesProvider.java b/...n-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitPropertiesProvider.java
@@ -15,14 +15,13 @@
  */
 package com.mycila.maven.plugin.license.git;
 
+import com.mycila.maven.plugin.license.AbstractLicenseMojo;
 import java.io.File;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.TimeZone;
 
-import com.mycila.maven.plugin.license.AbstractLicenseMojo;
-
 /**
  * @author <a href="mailto:ppalaga@redhat.com">Peter Palaga</a>
  */

diff --git a/...in-git/src/test/java/com/mycila/maven/plugin/license/git/CopyrightAuthorProviderTest.java b/...in-git/src/test/java/com/mycila/maven/plugin/license/git/CopyrightAuthorProviderTest.java
@@ -17,7 +17,6 @@
 
 import com.mycila.maven.plugin.license.LicenseCheckMojo;
 import com.mycila.maven.plugin.license.document.Document;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -26,7 +25,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

diff --git a/...gin-git/src/test/java/com/mycila/maven/plugin/license/git/CopyrightRangeProviderTest.java b/...gin-git/src/test/java/com/mycila/maven/plugin/license/git/CopyrightRangeProviderTest.java
@@ -17,7 +17,6 @@
 
 import com.mycila.maven.plugin.license.LicenseCheckMojo;
 import com.mycila.maven.plugin.license.document.Document;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -26,7 +25,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;

diff --git a/...nse-maven-plugin-git/src/test/java/com/mycila/maven/plugin/license/git/GitLookupTest.java b/...nse-maven-plugin-git/src/test/java/com/mycila/maven/plugin/license/git/GitLookupTest.java
@@ -16,12 +16,6 @@
 package com.mycila.maven.plugin.license.git;
 
 import com.mycila.maven.plugin.license.git.GitLookup.DateSource;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -35,6 +29,11 @@
 import java.util.TimeZone;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 /**
  * @author <a href="mailto:ppalaga@redhat.com">Peter Palaga</a>

diff --git a/...n-plugin-svn/src/main/java/com/mycila/maven/plugin/license/svn/SVNPropertiesProvider.java b/...n-plugin-svn/src/main/java/com/mycila/maven/plugin/license/svn/SVNPropertiesProvider.java
@@ -19,6 +19,12 @@
 import com.mycila.maven.plugin.license.Credentials;
 import com.mycila.maven.plugin.license.PropertiesProvider;
 import com.mycila.maven.plugin.license.document.Document;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 import org.tmatesoft.svn.core.ISVNLogEntryHandler;
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
@@ -28,13 +34,6 @@
 import org.tmatesoft.svn.core.wc.SVNInfo;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
 /**
  * An implementation of {@link PropertiesProvider} that uses SVN to retrieve
  * year information of last modification of files.

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/AbstractLicenseMojo.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/AbstractLicenseMojo.java
@@ -15,6 +15,12 @@
  */
 package com.mycila.maven.plugin.license;
 
+import static com.mycila.maven.plugin.license.document.DocumentType.defaultMapping;
+import static com.mycila.maven.plugin.license.util.FileUtils.asPath;
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+import static java.util.Arrays.deepToString;
+
 import com.mycila.maven.plugin.license.dependencies.LicenseMessage;
 import com.mycila.maven.plugin.license.dependencies.LicensePolicy;
 import com.mycila.maven.plugin.license.document.Document;
@@ -29,25 +35,6 @@
 import com.mycila.maven.plugin.license.util.Selection;
 import com.mycila.maven.plugin.license.util.resource.ResourceFinder;
 import com.mycila.xmltool.XMLDoc;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Organization;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.settings.Server;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
-import org.apache.maven.settings.crypto.SettingsDecrypter;
-import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
-import org.apache.maven.settings.crypto.SettingsDecryptionResult;
-import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
-import org.xml.sax.InputSource;
-
 import java.io.File;
 import java.io.IOException;
 import java.time.Clock;
@@ -68,12 +55,24 @@
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
-import static com.mycila.maven.plugin.license.document.DocumentType.defaultMapping;
-import static com.mycila.maven.plugin.license.util.FileUtils.asPath;
-import static java.lang.String.format;
-import static java.util.Arrays.asList;
-import static java.util.Arrays.deepToString;
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Organization;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuilder;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
+import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
+import org.apache.maven.settings.crypto.SettingsDecryptionResult;
+import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
+import org.xml.sax.InputSource;
 
 /**
  * <b>Date:</b> 18-Feb-2008<br> <b>Author:</b> Mathieu Carbou

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/LicenseCheckMojo.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/LicenseCheckMojo.java
@@ -22,19 +22,18 @@
 import com.mycila.maven.plugin.license.dependencies.MavenProjectLicenses;
 import com.mycila.maven.plugin.license.document.Document;
 import com.mycila.maven.plugin.license.header.Header;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
 import java.io.File;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.stream.Collectors;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
 /**
  * Check if the source files of the project have a valid license header

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/LicenseFormatMojo.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/LicenseFormatMojo.java
@@ -17,12 +17,11 @@
 
 import com.mycila.maven.plugin.license.document.Document;
 import com.mycila.maven.plugin.license.header.Header;
+import java.io.File;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 
-import java.io.File;
-
 /**
  * Reformat files with a missing header to add it
  *
@@ -78,4 +77,4 @@ public void onExistingHeader(Document document, Header header) {
     callback.checkUnknown();
   }
 
-}
+}
diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/LicenseRemoveMojo.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/LicenseRemoveMojo.java
@@ -17,12 +17,11 @@
 
 import com.mycila.maven.plugin.license.document.Document;
 import com.mycila.maven.plugin.license.header.Header;
+import java.io.File;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
 
-import java.io.File;
-
 /**
  * Remove the specified header from source files
  *

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/LicenseSet.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/LicenseSet.java
@@ -15,11 +15,10 @@
  */
 package com.mycila.maven.plugin.license;
 
-import org.apache.maven.plugins.annotations.Parameter;
-
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.maven.plugins.annotations.Parameter;
 
 public class LicenseSet {
 

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Multi.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Multi.java
@@ -15,9 +15,8 @@
  */
 package com.mycila.maven.plugin.license;
 
-import org.apache.maven.plugins.annotations.Parameter;
-
 import java.util.Arrays;
+import org.apache.maven.plugins.annotations.Parameter;
 
 public class Multi {
 

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/PropertiesProvider.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/PropertiesProvider.java
@@ -16,7 +16,6 @@
 package com.mycila.maven.plugin.license;
 
 import com.mycila.maven.plugin.license.document.Document;
-
 import java.util.Map;
 import java.util.Properties;
 

diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Report.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Report.java
@@ -15,15 +15,15 @@
  */
 package com.mycila.maven.plugin.license;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.mycila.xmltool.XMLDoc;
 import com.mycila.xmltool.XMLTag;
-import org.apache.maven.project.MavenProject;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -33,8 +33,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
+import org.apache.maven.project.MavenProject;
 
 /**
  * @author Mathieu Carbou

diff --git a/...ain/java/com/mycila/maven/plugin/license/dependencies/AggregateLicensePolicyEnforcer.java b/...ain/java/com/mycila/maven/plugin/license/dependencies/AggregateLicensePolicyEnforcer.java
@@ -15,14 +15,13 @@
  */
 package com.mycila.maven.plugin.license.dependencies;
 
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.License;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.License;
 
 /**
  * Aggregate license policy enforcement with default enforcer bindings based on {@link LicensePolicy.Type}.
@@ -188,4 +187,4 @@ public LicensePolicyEnforcer<?> getDefaultPolicy() {
   public void setDefaultPolicy(final LicensePolicyEnforcer defaultPolicy) {
     this.defaultPolicy = defaultPolicy;
   }
-}
+}
diff --git a/...main/java/com/mycila/maven/plugin/license/dependencies/ArtifactLicensePolicyEnforcer.java b/...main/java/com/mycila/maven/plugin/license/dependencies/ArtifactLicensePolicyEnforcer.java
@@ -15,12 +15,11 @@
  */
 package com.mycila.maven.plugin.license.dependencies;
 
+import java.util.Collections;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.shared.artifact.filter.StrictPatternIncludesArtifactFilter;
 
-import java.util.Collections;
-
 /**
  * Make policy decisions on a {@link Artifact} based on an {@link ArtifactFilter}.
  *
@@ -49,4 +48,4 @@ public boolean apply(final Artifact target) {
   public Class<?> getType() {
     return Artifact.class;
   }
-}
+}