From 6fa26d7ff4af66a23c308ab82b4cc51c5a63e988 Mon Sep 17 00:00:00 2001
From: vramik <vramik@redhat.com>
Date: Fri, 3 Nov 2023 10:34:34 +0100
Subject: [PATCH] Delete map dependencies from dependency management

Closes #24101
---
 dependencies/server-all/pom.xml               | 20 ---------------
 model/map-file/pom.xml                        |  1 +
 model/map-hot-rod/pom.xml                     |  1 +
 model/map-jpa/pom.xml                         |  1 +
 model/map-ldap/pom.xml                        |  1 +
 pom.xml                                       | 25 -------------------
 quarkus/config-api/pom.xml                    |  1 +
 quarkus/runtime/pom.xml                       |  4 +++
 .../services/testsuite-providers/pom.xml      | 10 ++++++++
 .../integration-arquillian/tests/base/pom.xml |  1 +
 10 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
index 485aacbcfa..d175607fce 100755
--- a/dependencies/server-all/pom.xml
+++ b/dependencies/server-all/pom.xml
@@ -40,18 +40,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-map</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-map-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-map-ldap</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-legacy</artifactId>
@@ -68,14 +56,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-infinispan</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-map-hot-rod</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-map-file</artifactId>
-        </dependency>
         <!-- identity providers -->
         <dependency>
             <groupId>org.twitter4j</groupId>
diff --git a/model/map-file/pom.xml b/model/map-file/pom.xml
index ea6f5b9278..1fba6e343a 100644
--- a/model/map-file/pom.xml
+++ b/model/map-file/pom.xml
@@ -39,6 +39,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
diff --git a/model/map-hot-rod/pom.xml b/model/map-hot-rod/pom.xml
index 6ec871b298..cc425bb166 100644
--- a/model/map-hot-rod/pom.xml
+++ b/model/map-hot-rod/pom.xml
@@ -23,6 +23,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.infinispan</groupId>
diff --git a/model/map-jpa/pom.xml b/model/map-jpa/pom.xml
index e47356b281..81d1ecb7ce 100644
--- a/model/map-jpa/pom.xml
+++ b/model/map-jpa/pom.xml
@@ -32,6 +32,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
diff --git a/model/map-ldap/pom.xml b/model/map-ldap/pom.xml
index a62c95e83d..6a70680c03 100644
--- a/model/map-ldap/pom.xml
+++ b/model/map-ldap/pom.xml
@@ -32,6 +32,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
diff --git a/pom.xml b/pom.xml
index 89eb10ae85..93060d115f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1308,36 +1308,11 @@
                 <artifactId>keycloak-model-legacy-services</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-map</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-map-jpa</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-map-ldap</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-model-infinispan</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-map-hot-rod</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-model-map-file</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>launcher</artifactId>
diff --git a/quarkus/config-api/pom.xml b/quarkus/config-api/pom.xml
index f4eb8eba36..5b4e814cc5 100755
--- a/quarkus/config-api/pom.xml
+++ b/quarkus/config-api/pom.xml
@@ -44,6 +44,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map-hot-rod</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml
index 6c801e9446..5177c0ab87 100644
--- a/quarkus/runtime/pom.xml
+++ b/quarkus/runtime/pom.xml
@@ -320,6 +320,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -330,6 +331,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map-jpa</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -340,6 +342,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map-hot-rod</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -350,6 +353,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map-file</artifactId>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml
index 7f5cba4c10..fc0db114f9 100644
--- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml
+++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/pom.xml
@@ -94,6 +94,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-map</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-model-map-hot-rod</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index ae521e5022..dae7c005a6 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -128,6 +128,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-map</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>