modified

Author: akash-manna-sky

src/it/JENKINS-58771-packaged-plugins-3/verify.groovy

@@ -1,5 +1,7 @@
 assert !new File(basedir, 'target/JENKINS-58771-packaged-plugins/WEB-INF/lib/jsr305-3.0.2.jar').exists()
-assert new File(basedir, 'target/JENKINS-58771-packaged-plugins/WEB-INF/lib').listFiles().length == 1
+def libDir = new File(basedir, 'target/JENKINS-58771-packaged-plugins/WEB-INF/lib')
+def libFiles = libDir.listFiles()
+assert libFiles != null && libFiles.length == 1
 assert new File(basedir, 'target/JENKINS-58771-packaged-plugins/WEB-INF/lib/JENKINS-58771-packaged-plugins.jar').exists()
 
 return true

src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsMojo.java

@@ -132,7 +132,8 @@ private Artifact resolveJenkinsCore() throws MojoExecutionException {
             groupId = "org.jenkins-ci.main";
             artifactId = "jenkins-core";
         }
-        Artifact artifact = artifactFactory.createArtifact(groupId, artifactId, findJenkinsVersion(), null, "jar");
+        Artifact artifact =
+                artifactFactory.createArtifactWithClassifier(groupId, artifactId, findJenkinsVersion(), "jar", null);
         return MavenArtifact.resolveArtifact(artifact, project, session, repositorySystem);
     }
 

src/main/java/org/jenkinsci/maven/plugins/hpi/AssembleDependenciesMojo.java

@@ -70,8 +70,9 @@ protected boolean accept(DependencyNode g) {
         org.eclipse.aether.artifact.Artifact a = g.getArtifact();
 
         // Convert Aether artifact to Maven artifact using the artifactFactory
-        Artifact mavenArtifact = artifactFactory.createArtifact(
-                a.getGroupId(), a.getArtifactId(), a.getVersion(), getNodeScope(g), a.getExtension());
+        Artifact mavenArtifact = artifactFactory.createArtifactWithClassifier(
+                a.getGroupId(), a.getArtifactId(), a.getVersion(), a.getExtension(), null);
+        mavenArtifact.setScope(getNodeScope(g));
 
         // Create a MavenArtifact wrapper
         MavenArtifact ma =

src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java

@@ -209,12 +209,8 @@ static Artifact resolveArtifact(
      * Returns {@link MavenArtifact} for the hpi variant of this artifact.
      */
     public MavenArtifact getHpi() throws IOException {
-        Artifact a = artifactFactory.createArtifact(
-                artifact.getGroupId(),
-                artifact.getArtifactId(),
-                artifact.getVersion(),
-                Artifact.SCOPE_COMPILE,
-                getResolvedType());
+        Artifact a = artifactFactory.createArtifactWithClassifier(
+                artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), getResolvedType(), null);
         return new MavenArtifact(a, repositorySystem, artifactFactory, builder, session, project);
     }
 

src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java

@@ -388,8 +388,8 @@ protected ClassLoader configureClassLoader(ClassLoader loader) {
                 }
 
                 // find corresponding .hpi file
-                Artifact hpi =
-                        artifactFactory.createArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion(), null, "hpi");
+                Artifact hpi = artifactFactory.createArtifactWithClassifier(
+                        a.getGroupId(), a.getArtifactId(), a.getVersion(), "hpi", null);
                 hpi = MavenArtifact.resolveArtifact(hpi, project, session, repositorySystem);
 
                 // check recursive dependency. this is a rare case that happens when we split out some things from the
@@ -489,6 +489,7 @@ private static List<String> unavailableRequiredPackages() {
         return packages;
     }
 
+    @SuppressWarnings("removal")
     private static void openPackages(Collection<String> packagesToOpen) throws Throwable {
         final Collection<?> modules = allModules();
         if (modules == null) {

src/main/java/org/jenkinsci/maven/plugins/hpi/TestRuntimeMojo.java

@@ -70,8 +70,8 @@ private void setAddOpensProperty() throws MojoExecutionException {
 
     @NonNull
     private Artifact resolveJenkinsWar() throws MojoExecutionException {
-        Artifact artifact =
-                artifactFactory.createArtifact("org.jenkins-ci.main", "jenkins-war", findJenkinsVersion(), null, "war");
+        Artifact artifact = artifactFactory.createArtifactWithClassifier(
+                "org.jenkins-ci.main", "jenkins-war", findJenkinsVersion(), "war", null);
         return MavenArtifact.resolveArtifact(artifact, project, session, repositorySystem);
     }
 

src/main/java/org/jenkinsci/maven/plugins/hpi/WarMojo.java

@@ -83,8 +83,8 @@ public void execute() throws MojoExecutionException {
             }
 
             // find corresponding .hpi file
-            Artifact hpi =
-                    artifactFactory.createArtifact(a.getGroupId(), a.getArtifactId(), a.getVersion(), null, "hpi");
+            Artifact hpi = artifactFactory.createArtifactWithClassifier(
+                    a.getGroupId(), a.getArtifactId(), a.getVersion(), "hpi", null);
             hpi = MavenArtifact.resolveArtifact(hpi, project, session, repositorySystem);
 
             if (hpi.getFile().isDirectory()) {