Remove usage of deprecated ArtifactFactory

Author: slawekjaranowski

src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java

@@ -33,7 +33,7 @@
 import java.util.List;
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.AbstractMojo;
@@ -368,7 +368,7 @@ public abstract class AbstractWarMojo extends AbstractMojo {
      */
     private final JarArchiver jarArchiver;
 
-    private final ArtifactFactory artifactFactory;
+    private final ArtifactHandlerManager artifactHandlerManager;
 
     /**
      * To look up Archiver/UnArchiver implementations.
@@ -380,11 +380,11 @@ public abstract class AbstractWarMojo extends AbstractMojo {
     private final MavenResourcesFiltering mavenResourcesFiltering;
 
     protected AbstractWarMojo(
-            ArtifactFactory artifactFactory,
+            ArtifactHandlerManager artifactHandlerManager,
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
             MavenResourcesFiltering mavenResourcesFiltering) {
-        this.artifactFactory = artifactFactory;
+        this.artifactHandlerManager = artifactHandlerManager;
         this.archiverManager = archiverManager;
         this.mavenFileFilter = mavenFileFilter;
         this.mavenResourcesFiltering = mavenResourcesFiltering;
@@ -531,7 +531,7 @@ public void buildWebapp(MavenProject mavenProject, File webapplicationDirectory)
                 defaultFilterWrappers,
                 getNonFilteredFileExtensions(),
                 filteringDeploymentDescriptors,
-                this.artifactFactory,
+                artifactHandlerManager,
                 resourceEncoding,
                 propertiesEncoding,
                 failOnMissingWebXml,
@@ -575,7 +575,7 @@ private List<WarPackagingTask> getPackagingTasks(OverlayManager overlayManager)
      * WarPackagingContext default implementation.
      */
     private class DefaultWarPackagingContext implements WarPackagingContext {
-        private final ArtifactFactory artifactFactory;
+        private final ArtifactHandlerManager artifactHandlerManager;
 
         private final String resourceEncoding;
 
@@ -606,7 +606,7 @@ private class DefaultWarPackagingContext implements WarPackagingContext {
          * @param filterWrappers the filter wrappers
          * @param nonFilteredFileExtensions the non filtered file extensions
          * @param filteringDeploymentDescriptors the filtering deployment descriptors
-         * @param artifactFactory the artifact factory
+         * @param artifactHandlerManager the artifact handler manager
          * @param resourceEncoding the resource encoding
          * @param propertiesEncoding the encoding to use for properties files
          * @param failOnMissingWebXml flag to check whether we should ignore missing web.xml or not
@@ -620,7 +620,7 @@ private class DefaultWarPackagingContext implements WarPackagingContext {
                 List<FilterWrapper> filterWrappers,
                 List<String> nonFilteredFileExtensions,
                 boolean filteringDeploymentDescriptors,
-                ArtifactFactory artifactFactory,
+                ArtifactHandlerManager artifactHandlerManager,
                 String resourceEncoding,
                 String propertiesEncoding,
                 final Boolean failOnMissingWebXml,
@@ -629,7 +629,7 @@ private class DefaultWarPackagingContext implements WarPackagingContext {
             this.webappStructure = webappStructure;
             this.overlayManager = overlayManager;
             this.filterWrappers = filterWrappers;
-            this.artifactFactory = artifactFactory;
+            this.artifactHandlerManager = artifactHandlerManager;
             this.filteringDeploymentDescriptors = filteringDeploymentDescriptors;
             this.nonFilteredFileExtensions =
                     nonFilteredFileExtensions == null ? Collections.emptyList() : nonFilteredFileExtensions;
@@ -792,8 +792,8 @@ public boolean isFilteringDeploymentDescriptors() {
         }
 
         @Override
-        public ArtifactFactory getArtifactFactory() {
-            return this.artifactFactory;
+        public ArtifactHandlerManager getArtifactHandlerManager() {
+            return this.artifactHandlerManager;
         }
 
         @Override
@@ -1042,13 +1042,6 @@ public List<String> getNonFilteredFileExtensions() {
         return nonFilteredFileExtensions;
     }
 
-    /**
-     * @return {@link #artifactFactory}
-     */
-    public ArtifactFactory getArtifactFactory() {
-        return this.artifactFactory;
-    }
-
     /**
      * @return {@link #session}
      */

src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java

@@ -20,7 +20,7 @@
 
 import javax.inject.Inject;
 
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -41,11 +41,11 @@
 public class WarExplodedMojo extends AbstractWarMojo {
     @Inject
     public WarExplodedMojo(
-            ArtifactFactory artifactFactory,
+            ArtifactHandlerManager artifactHandlerManager,
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
             MavenResourcesFiltering mavenResourcesFiltering) {
-        super(artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
+        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering);
     }
 
     @Override

src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java

@@ -20,7 +20,7 @@
 
 import javax.inject.Inject;
 
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -37,11 +37,11 @@ public class WarInPlaceMojo extends AbstractWarMojo {
 
     @Inject
     public WarInPlaceMojo(
-            ArtifactFactory artifactFactory,
+            ArtifactHandlerManager artifactHandlerManager,
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
             MavenResourcesFiltering mavenResourcesFiltering) {
-        super(artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
+        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering);
     }
 
     @Override

src/main/java/org/apache/maven/plugins/war/WarMojo.java

@@ -31,7 +31,7 @@
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -132,12 +132,12 @@ public class WarMojo extends AbstractWarMojo {
 
     @Inject
     public WarMojo(
-            ArtifactFactory artifactFactory,
+            ArtifactHandlerManager artifactHandlerManager,
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
             MavenResourcesFiltering mavenResourcesFiltering,
             MavenProjectHelper projectHelper) {
-        super(artifactFactory, archiverManager, mavenFileFilter, mavenResourcesFiltering);
+        super(artifactHandlerManager, archiverManager, mavenFileFilter, mavenResourcesFiltering);
         this.projectHelper = projectHelper;
     }
 

src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java

@@ -22,7 +22,8 @@
 import java.io.IOException;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.war.Overlay;
 import org.apache.maven.plugins.war.util.ClassesPackager;
@@ -85,9 +86,15 @@ public void performPackaging(WarPackagingContext context) throws MojoExecutionEx
      */
     protected void generateJarArchive(WarPackagingContext context) throws MojoExecutionException {
         MavenProject project = context.getProject();
-        ArtifactFactory factory = context.getArtifactFactory();
-        Artifact artifact =
-                factory.createBuildArtifact(project.getGroupId(), project.getArtifactId(), project.getVersion(), "jar");
+        ArtifactHandlerManager artifactHandlerManager = context.getArtifactHandlerManager();
+        Artifact artifact = new DefaultArtifact(
+                project.getGroupId(),
+                project.getArtifactId(),
+                project.getVersion(),
+                null,
+                "jar",
+                "",
+                artifactHandlerManager.getArtifactHandler("jar"));
         String archiveName;
         try {
             archiveName = getArtifactFinalName(context, artifact);

src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java

@@ -22,7 +22,7 @@
 import java.util.List;
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
-import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.war.util.WebappStructure;
@@ -186,9 +186,11 @@ public interface WarPackagingContext {
     boolean isFilteringDeploymentDescriptors();
 
     /**
-     * @return {@link ArtifactFactory}
+     * Returns the artifact handler manager.
+     *
+     * @return the artifact handler manager
      */
-    ArtifactFactory getArtifactFactory();
+    ArtifactHandlerManager getArtifactHandlerManager();
 
     /**
      * Returns the Maven session.