Merge branch 'ib/bump-takari-plugin' into brig/code-coverage

walmartlabs · Dec 3, 2024 · 877857d · 877857d
2 parents c6f75ec + 9d498b5
commit 877857d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -148,7 +148,7 @@
             <plugin>
                 <groupId>io.takari.maven.plugins</groupId>
                 <artifactId>takari-lifecycle-plugin</artifactId>
-                <version>1.13.7</version>
+                <version>2.2.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <source>${maven.compiler.source}</source>

diff --git a/tasks/jira/src/main/java/com/walmartlabs/concord/plugins/jira/JiraTaskCommon.java b/tasks/jira/src/main/java/com/walmartlabs/concord/plugins/jira/JiraTaskCommon.java
@@ -129,7 +129,6 @@ Map<String, Object> createIssue(CreateIssueParams in) {
         String description = in.description();
         String requestorUid = in.requestorUid();
         String issueType = in.issueType();
-        String issuePriority = in.issuePriority();
         Map<String, Object> assignee = in.assignee();
         List<String> labels = in.labels();
         List<String> components = in.components();
@@ -141,7 +140,6 @@ Map<String, Object> createIssue(CreateIssueParams in) {
         try {
             //Build JSON data
             Map<String, Object> objProj = Collections.singletonMap("key", projectKey);
-            Map<String, Object> objPriority = Collections.singletonMap("name", issuePriority);
             Map<String, Object> objIssueType = Collections.singletonMap("name", issueType);
 
             Map<String, Object> objMain = new HashMap<>();
@@ -153,7 +151,10 @@ Map<String, Object> createIssue(CreateIssueParams in) {
                 objMain.put("reporter", Collections.singletonMap("name", requestorUid));
             }
 
-            objMain.put("priority", objPriority);
+            if (in.issuePriority() != null) {
+                objMain.put("priority", Map.of("name", in.issuePriority()));
+            }
+
             objMain.put("issuetype", objIssueType);
 
             if (labels != null && !labels.isEmpty()) {