From 003f9967aceb42d9cc9cc2e36c99af1e898d25b1 Mon Sep 17 00:00:00 2001
From: "Wilkins, Emily (Counterpointe Solutions)"
 <80470879+ewilkins-csi@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:18:52 -0600
Subject: [PATCH] [#373] fix chart deployment

Using the `.Chart.AppVersion` for image tags exposed a bug that was
introduced when we moved to opensource.  Previously we were overwriting
path dependencies in helm charts during the release process via the
`release` profile. After open-sourcing our release profile name changed
from `release` to `ossrh-release`, but we didn't update it in the
`extensions-helm` POM.  However, it was incorrect to only rewrite
dependencies during release anyway, as the chart dependencies should be
rewritten _any_ time we're deploying (including snapshots). So instead
we moved the functionality to the `ci` profile (which is also active
during release.)

Also found an issue with release-prepare introduced by #451 preventing
the version update process due to unresolved property.
---
 extensions/extensions-helm/pom.xml                              | 2 +-
 .../test-data-delivery-spark-model-basic/pom.xml                | 2 +-
 test/test-mda-models/test-data-delivery-spark-model/pom.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/extensions-helm/pom.xml b/extensions/extensions-helm/pom.xml
index 286d51b8e..028448534 100644
--- a/extensions/extensions-helm/pom.xml
+++ b/extensions/extensions-helm/pom.xml
@@ -62,7 +62,7 @@
             </properties>
         </profile>
         <profile>
-            <id>release</id>
+            <id>ci</id>
             <properties>
                 <overwrite.dependencies>true</overwrite.dependencies>
             </properties>
diff --git a/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml b/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml
index 2df6308d3..37e59a00f 100644
--- a/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml
+++ b/test/test-mda-models/test-data-delivery-spark-model-basic/pom.xml
@@ -136,7 +136,7 @@
             <classifier>tests</classifier>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${version.aissemble}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <!-- Spark hasn't migrated to Jakarta packages yet. Will need to shade it if we want to fully migrate. -->
diff --git a/test/test-mda-models/test-data-delivery-spark-model/pom.xml b/test/test-mda-models/test-data-delivery-spark-model/pom.xml
index 496350e98..6d39e235f 100644
--- a/test/test-mda-models/test-data-delivery-spark-model/pom.xml
+++ b/test/test-mda-models/test-data-delivery-spark-model/pom.xml
@@ -144,7 +144,7 @@
             <classifier>tests</classifier>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${version.aissemble}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <!-- Spark hasn't migrated to Jakarta packages yet. Will need to shade it if we want to fully migrate. -->