Merge pull request #7 from gnodet/master

Fix bomClassifier used as type, deploy the artifact with the specified groupId/artifactId
maveniverse · Oct 17, 2024 · 9a58cb6 · 9a58cb6
2 parents 09f2669 + 96a7631
commit 9a58cb6
Showing 1 changed file with 38 additions and 1 deletion.
diff --git a/bom-builder3/src/main/java/eu/maneniverse/maven/plugins/bombuilder/BuildBomMojo.java b/bom-builder3/src/main/java/eu/maneniverse/maven/plugins/bombuilder/BuildBomMojo.java
@@ -12,6 +12,8 @@
 import java.util.Objects;
 import java.util.Properties;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Exclusion;
@@ -164,7 +166,10 @@ public void execute() throws MojoExecutionException {
         File outputFile = new File(mavenProject.getBuild().getDirectory(), outputFilename);
         modelWriter.writeModel(model, outputFile);
         if (attach) {
-            mavenProjectHelper.attachArtifact(mavenProject, bomClassifier, outputFile);
+            DefaultArtifact artifact = new DefaultArtifact(
+                    bomGroupId, bomArtifactId, bomVersion, null, "pom", bomClassifier, new PomArtifactHandler());
+            artifact.setFile(outputFile);
+            mavenProject.addAttachedArtifact(artifact);
         }
     }
 
@@ -306,4 +311,36 @@ void writeModel(Model pomModel, File outputFile) throws MojoExecutionException {
             }
         }
     }
+
+    static class PomArtifactHandler implements ArtifactHandler {
+        PomArtifactHandler() {}
+
+        public String getClassifier() {
+            return null;
+        }
+
+        public String getDirectory() {
+            return null;
+        }
+
+        public String getExtension() {
+            return "pom";
+        }
+
+        public String getLanguage() {
+            return "none";
+        }
+
+        public String getPackaging() {
+            return "pom";
+        }
+
+        public boolean isAddedToClasspath() {
+            return false;
+        }
+
+        public boolean isIncludesDependencies() {
+            return false;
+        }
+    }
 }