rework push goal

eitco · Jun 7, 2024 · 013a957 · 013a957
1 parent 9d6e814
commit 013a957
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/src/main/java/de/eitco/cicd/dotnet/AbstractDotnetMojo.java b/src/main/java/de/eitco/cicd/dotnet/AbstractDotnetMojo.java
@@ -23,10 +23,21 @@ public abstract class AbstractDotnetMojo extends AbstractMojo {
     @Parameter(defaultValue = "${project.build.directory}")
     protected File targetDirectory;
 
+    @Parameter(defaultValue = "${project.version}")
+    protected String projectVersion;
+
+    @Parameter
+    protected String assemblyVersion;
+
+    @Parameter(defaultValue = "${project.organization.name}")
+    protected String vendor;
+
     @Parameter
     protected Map<String, String> nugetSources = Map.of();
+
     @Parameter(defaultValue = "${settings}", readonly = true)
     protected Settings settings;
+
     @Component(hint = "dotnet-security")
     private SecDispatcher securityDispatcher;
 

diff --git a/src/main/java/de/eitco/cicd/dotnet/BuildMojo.java b/src/main/java/de/eitco/cicd/dotnet/BuildMojo.java
@@ -11,6 +11,6 @@ public class BuildMojo extends AbstractDotnetMojo {
     @Override
     public void execute() throws MojoExecutionException {
 
-        newExecutor().build();
+        newExecutor().build(projectVersion, assemblyVersion, vendor);
     }
 }
diff --git a/src/main/java/de/eitco/cicd/dotnet/DotnetExecutor.java b/src/main/java/de/eitco/cicd/dotnet/DotnetExecutor.java
@@ -106,22 +106,47 @@ private List<String> buildCommand(List<String> parameters) {
         return command;
     }
 
-    public void build() throws MojoExecutionException {
+    private void retry(int times, String... parameters) throws MojoExecutionException {
 
-        int returnCode = execute(defaultOptions().ignoreResult(), List.of("build"), Set.of());
+        retry(times, List.of(parameters));
+    }
+
+    private void retry(int times, List<String> parameters) throws MojoExecutionException {
+
+        for (int index = 0; index < times; index++) {
 
-        if (returnCode != 0) {
+            int returnCode = execute(defaultOptions().ignoreResult(), parameters, Set.of());
 
-            execute("build");
+            if (returnCode == 0) {
+
+                return;
+            }
         }
+
+        execute(defaultOptions(), parameters, Set.of());
+    }
+
+    public void build(String version, String assemblyVersion, String vendor) throws MojoExecutionException {
+
+        List<String> parameters = new ArrayList<>(List.of("build", "-p:Version=" + version));
+
+        if (assemblyVersion != null) {
+            parameters.add("-p:AssemblyVersion=" + assemblyVersion);
+        }
+
+        if (vendor != null) {
+            parameters.add("-p:Company=" + vendor);
+        }
+
+        retry(1, parameters);
     }
 
     public void pack(String version, String vendor, String description, String repositoryUrl) throws MojoExecutionException {
 
         List<String> parameters = new ArrayList<>(List.of(
                 "pack",
                 "--no-build",
-                "-p:PackageVersion=" + version
+                "-p:Version=" + version
         ));
 
         if (vendor != null) {

diff --git a/src/main/java/de/eitco/cicd/dotnet/PackMojo.java b/src/main/java/de/eitco/cicd/dotnet/PackMojo.java
@@ -9,12 +9,6 @@
 @Mojo(name = "pack", defaultPhase = LifecyclePhase.PACKAGE)
 public class PackMojo extends AbstractDotnetMojo {
 
-    @Parameter(defaultValue = "${project.version}")
-    private String projectVersion;
-
-    @Parameter(defaultValue = "${project.organization.name}")
-    private String vendor;
-
     @Parameter(defaultValue = "${project.description}")
     private String description;