From d64bfc50c6b8717d1b28e2f2a6ee4d41f4c6f5cd Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Wed, 4 Oct 2023 09:22:01 +0200
Subject: [PATCH] Fix set-version.sh's handling of NPM versions (#23638)
 (#23680)

This introduces a maven property, `project.version.npm`, to allow maven to know what NPM version is, in scenarios that it's not identical to `project.version`. This occurs when the set-version's semver translation code is activated

Closes #23635

Co-authored-by: Alex Szczuczko <aszczucz@redhat.com>
---
 js/libs/keycloak-js/pom.xml | 4 ++--
 pom.xml                     | 2 ++
 set-version.sh              | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/js/libs/keycloak-js/pom.xml b/js/libs/keycloak-js/pom.xml
index 429140eb448..584f8377d44 100644
--- a/js/libs/keycloak-js/pom.xml
+++ b/js/libs/keycloak-js/pom.xml
@@ -83,8 +83,8 @@
                         </goals>
                         <configuration>
                             <artifacts>
-                                <artifact>${project.basedir}/assembly.xml
-                                    <file>target/keycloak-js-${project.version}.tgz</file>
+                                <artifact>
+                                    <file>target/keycloak-js-${project.version.npm}.tgz</file>
                                     <type>tar.gz</type>
                                 </artifact>
                             </artifacts>
diff --git a/pom.xml b/pom.xml
index 5b669de8e0c..46492607d81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,8 @@
     <packaging>pom</packaging>
 
     <properties>
+        <project.version.npm>999.0.0-SNAPSHOT</project.version.npm>
+
         <asciidoctor.plugin.version>1.5.8</asciidoctor.plugin.version>
 
         <jboss.repo.nexusUrl>https://s01.oss.sonatype.org/</jboss.repo.nexusUrl>
diff --git a/set-version.sh b/set-version.sh
index b8e442b3915..21886a20216 100755
--- a/set-version.sh
+++ b/set-version.sh
@@ -11,6 +11,7 @@ fi
 
 # Maven
 mvn versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -DgroupId=org.keycloak* -DartifactId=*
+mvn versions:set-property --non-recursive -Dproperty=project.version.npm -DnewVersion="$NEW_NPM_VERSION"
 
 # Docker
 sed -i "s/ENV KEYCLOAK_VERSION .*/ENV KEYCLOAK_VERSION $NEW_VERSION/" quarkus/container/Dockerfile
@@ -29,3 +30,6 @@ echo "$(jq '. += {"version": "'$NEW_NPM_VERSION'"}' js/libs/keycloak-js/package.
 
 # Keycloak Admin Client
 echo "$(jq '. += {"version": "'$NEW_NPM_VERSION'"}' js/libs/keycloak-admin-client/package.json)" > js/libs/keycloak-admin-client/package.json
+
+echo "New Mvn Version: $NEW_VERSION" >&2
+echo "New NPM Version: $NEW_NPM_VERSION" >&2