From 2f278497844cd8db36bb14c48b582704548b92dd Mon Sep 17 00:00:00 2001 From: Alexander Ryabokon Date: Fri, 19 Apr 2024 17:51:32 +0300 Subject: [PATCH] Support 'releasesInDefaultbranch' --- components-registry/pom.xml | 2 +- .../octopus/jira/config/ComponentRegistryServiceImpl.kt | 2 +- .../main/kotlin/org/octopusden/octopus/jira/model/Component.kt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components-registry/pom.xml b/components-registry/pom.xml index 5c8ada4..b2e5731 100644 --- a/components-registry/pom.xml +++ b/components-registry/pom.xml @@ -23,7 +23,7 @@ org.octopusden.octopus.infrastructure components-registry-service-client - 2.0.11 + 2.0.20 io.github.openfeign diff --git a/components-registry/src/main/kotlin/org/octopusden/octopus/jira/config/ComponentRegistryServiceImpl.kt b/components-registry/src/main/kotlin/org/octopusden/octopus/jira/config/ComponentRegistryServiceImpl.kt index 16e69c6..3bedbb8 100644 --- a/components-registry/src/main/kotlin/org/octopusden/octopus/jira/config/ComponentRegistryServiceImpl.kt +++ b/components-registry/src/main/kotlin/org/octopusden/octopus/jira/config/ComponentRegistryServiceImpl.kt @@ -309,7 +309,7 @@ class ComponentRegistryServiceImpl @Inject constructor( } private fun org.octopusden.octopus.components.registry.core.dto.Component.toModel(): Component { - return Component(id, name, componentOwner, releaseManager, distribution?.toModel()) + return Component(id, name, componentOwner, releaseManager, distribution?.toModel(), releasesInDefaultBranch) } private fun JiraComponentVersionDTO.toModel(): JiraComponentVersion = diff --git a/components-registry/src/main/kotlin/org/octopusden/octopus/jira/model/Component.kt b/components-registry/src/main/kotlin/org/octopusden/octopus/jira/model/Component.kt index df77a83..8c6c7ea 100644 --- a/components-registry/src/main/kotlin/org/octopusden/octopus/jira/model/Component.kt +++ b/components-registry/src/main/kotlin/org/octopusden/octopus/jira/model/Component.kt @@ -6,4 +6,5 @@ data class Component( val componentOwner: String? = null, val releaseManager: String? = null, val distribution: Distribution? = null, + val releasesInDefaultBranch: Boolean?, )