From 31c272d73f6cf868193330cb3fa8d1a6f8d29713 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Wed, 13 Apr 2022 15:18:56 +0200
Subject: [PATCH] Include Admin UI as a regular dependency (#11156)

---
 quarkus/runtime/pom.xml | 10 ++++++++++
 release.sh              |  2 +-
 set-version.sh          |  1 -
 themes/pom.xml          | 38 --------------------------------------
 4 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml
index 86aec2e57a..2d71e3ca56 100644
--- a/quarkus/runtime/pom.xml
+++ b/quarkus/runtime/pom.xml
@@ -171,6 +171,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-admin-ui</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-saml-core-public</artifactId>
diff --git a/release.sh b/release.sh
index 838e7d95d8..b09dc08350 100755
--- a/release.sh
+++ b/release.sh
@@ -9,7 +9,7 @@ echo "--------------------------------------------------------------------------
 echo "Building:"
 echo ""
 
-mvn -Pgpg,admin-preview,jboss-release,distribution-downloads,nexus-staging -DskipTests -DskipTestsuite -DretryFailedDeploymentCount=10 -DautoReleaseAfterClose=true clean deploy
+mvn -Pgpg,jboss-release,distribution-downloads,nexus-staging -DskipTests -DskipTestsuite -DretryFailedDeploymentCount=10 -DautoReleaseAfterClose=true clean deploy
 
 
 echo "------------------------------------------------------------------------------------------------------------"
diff --git a/set-version.sh b/set-version.sh
index 4495f95308..a97bb0c0d4 100755
--- a/set-version.sh
+++ b/set-version.sh
@@ -3,6 +3,5 @@
 NEW_VERSION=$1
 
 mvn versions:set -DnewVersion=$NEW_VERSION -DgenerateBackupPoms=false -DgroupId=org.keycloak* -DartifactId=*
-mvn versions:use-dep-version -Dincludes=org.keycloak:keycloak-admin-ui -DdepVersion=$NEW_VERSION -DforceVersion=true -pl org.keycloak:keycloak-parent
 
 sed -i "s/ENV KEYCLOAK_VERSION .*/ENV KEYCLOAK_VERSION $NEW_VERSION/" quarkus/container/Dockerfile
\ No newline at end of file
diff --git a/themes/pom.xml b/themes/pom.xml
index 53697f34f7..1ab5e9f80a 100755
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -191,44 +191,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>admin-preview</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.keycloak</groupId>
-                    <artifactId>keycloak-admin-ui</artifactId>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unpack</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.keycloak</groupId>
-                                            <artifactId>keycloak-admin-ui</artifactId>
-                                            <type>jar</type>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${project.build.directory}/classes/theme/keycloak.v2</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>community</id>
             <activation>