Merge branch 'adorsys:main' into feat/add-support-for-default-first-b…

…roker-login-flow
adorsys · Oct 24, 2024 · 2c8e637 · 2c8e637
2 parents 79e3444 + fd07f9b
commit 2c8e637
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -160,7 +160,7 @@ jobs:
           cp target/keycloak-config-cli.jar keycloak-config-cli-${{ matrix.env.KEYCLOAK_VERSION }}.jar
           sha256sum keycloak-config-cli-${{ matrix.env.KEYCLOAK_VERSION }}.jar > keycloak-config-cli-${{ matrix.env.KEYCLOAK_VERSION }}.jar.sha256
 
-      - uses: actions/upload-artifact@v4.4.0
+      - uses: actions/upload-artifact@v4.4.3
         with:
           name: keycloak-config-cli-${{ matrix.env.KEYCLOAK_VERSION }}
           if-no-files-found: error

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fix  versioning in artifact to contain the correct keycloak version [#1097](https://github.com/adorsys/keycloak-config-cli/issues/1097)
 
 ### Added
 

diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <keycloak.version>25.0.1</keycloak.version>
+        <keycloak.version>${keycloak.version}</keycloak.version>
 
         <checkstyle-plugin.version>3.3.1</checkstyle-plugin.version>
         <checkstyle.version>10.17.0</checkstyle.version>
@@ -1074,6 +1074,17 @@ import org.keycloak.representations.userprofile.config.UPConfig;</token>
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>default-keycloak-version</id>
+            <activation>
+                <property>
+                    <name>!keycloak.version</name>
+                </property>
+            </activation>
+            <properties>
+                <keycloak.version>25.0.1</keycloak.version>
+            </properties>
+        </profile>
         <!-- Configure the JBoss GA Maven repository -->
         <profile>
             <id>rh-sso</id>