diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a8366c0..12d0fff 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,4 +24,11 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: weekly + interval: "monthly" + groups: + workflow-actions: + patterns: + - "*" + allow: + - dependency-name: "actions/*" + - dependency-name: "redhat-actions/*" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8012a64..cae5469 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: java-version: 21 - name: Cache local Maven repository - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # 4.2.0 + uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # 4.2.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 287a220..43a4dcf 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,7 +34,7 @@ jobs: java-version: 21 - name: Set up Helm - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # 4.2.0 + uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # 4.3.0 with: version: 'v3.13.3' diff --git a/pom.xml b/pom.xml index 3a77ef0..601a72f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ UTF-8 quarkus-bom io.quarkus.platform - 3.18.4 + 3.19.1 1.13.0 3.27.0 true diff --git a/src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueDeleteEventHandler.java b/src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueDeleteEventHandler.java index 320d5e0..de71876 100644 --- a/src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueDeleteEventHandler.java +++ b/src/main/java/org/hibernate/infra/replicate/jira/service/jira/handler/JiraIssueDeleteEventHandler.java @@ -11,7 +11,6 @@ import org.hibernate.infra.replicate.jira.service.jira.client.JiraRestException; import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraFields; import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssue; -import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraIssueTransition; import org.hibernate.infra.replicate.jira.service.jira.model.rest.JiraTransition; import org.hibernate.infra.replicate.jira.service.reporting.ReportingConfig; @@ -83,15 +82,14 @@ private void handleDeletedMovedIssue(String type) { private Optional prepareTransition(JiraIssue issue) { Optional deletedStatus = context.projectGroup().statuses().deletedStatus(); if (deletedStatus.isPresent()) { - prepareTransition(deletedStatus.get(), issue); - JiraTransition transition = new JiraTransition(); - transition.transition = new JiraIssueTransition(deletedStatus.get()); - - Optional deletedResolution = context.projectGroup().statuses().deletedResolution(); - deletedResolution.ifPresent( - name -> transition.properties().put("fields", Map.of("resolution", Map.of("name", name)))); - - return Optional.of(transition); + Optional transition = prepareTransition(deletedStatus.get(), issue); + + return transition.map(tr -> { + Optional deletedResolution = context.projectGroup().statuses().deletedResolution(); + deletedResolution + .ifPresent(name -> tr.properties().put("fields", Map.of("resolution", Map.of("name", name)))); + return tr; + }); } return Optional.empty();