From 46b0b6195c6a68688379763b6693c92b5927e6e3 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Mon, 23 Sep 2024 17:46:56 +0200
Subject: [PATCH] Remove `keycloak-js-adapter-jar` artifact (#33196)

Closes #32824

Signed-off-by: Jon Koops <jonkoops@gmail.com>
---
 adapters/oidc/js/pom.xml                      | 60 -------------------
 adapters/oidc/pom.xml                         | 36 -----------
 adapters/pom.xml                              |  1 -
 dependencies/server-min/pom.xml               |  4 --
 pom.xml                                       |  5 --
 quarkus/runtime/pom.xml                       | 10 ----
 .../services/testsuite-providers/pom.xml      | 29 +++++----
 7 files changed, 14 insertions(+), 131 deletions(-)
 delete mode 100644 adapters/oidc/js/pom.xml
 delete mode 100755 adapters/oidc/pom.xml

diff --git a/adapters/oidc/js/pom.xml b/adapters/oidc/js/pom.xml
deleted file mode 100644
index 22fa4462f9..0000000000
--- a/adapters/oidc/js/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>keycloak-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>999.0.0-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>keycloak-js-adapter-jar</artifactId>
-
-    <name>Keycloak JavaScript Adapter (JAR)</name>
-    <description>A build of the Keycloak JavaScript adapter that puts the compiled result in a JAR (for inclusion in the Keycloak server).</description>
-
-    <properties>
-        <js.projectDir>../../../js</js.projectDir>
-        <js.adapter.projectDir>${js.projectDir}/libs/keycloak-js</js.adapter.projectDir>
-        <js.adapter.distDir>${js.adapter.projectDir}/dist</js.adapter.distDir>
-        <!-- as the frontend-maven-plugin depends on workingDirectory, list all parts which should be ignored from the checksum -->
-        <maven.build.cache.exclude.value.1>${maven.multiModuleProjectDirectory}/js/libs/keycloak-js/node_modules</maven.build.cache.exclude.value.1>
-        <!-- TODO: this is almost correct, as the DIST folder includes also two source files -->
-        <maven.build.cache.exclude.value.2>${maven.multiModuleProjectDirectory}/js/libs/keycloak-js/dist</maven.build.cache.exclude.value.2>
-    </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${js.adapter.distDir}</directory>
-                <includes>
-                    <include>*.js</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${js.adapter.distDir}</directory>
-                            <excludes>
-                                <exclude>*.d.ts</exclude>
-                            </excludes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
-                <configuration>
-                    <workingDirectory>${js.projectDir}/libs/keycloak-js</workingDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/adapters/oidc/pom.xml b/adapters/oidc/pom.xml
deleted file mode 100755
index c546dd376e..0000000000
--- a/adapters/oidc/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
-  ~ and other contributors as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>keycloak-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>999.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <name>Keycloak OIDC Client Adapter Modules</name>
-    <description/>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-oidc-client-adapter-pom</artifactId>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>js</module>
-    </modules>
-</project>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index fac0534171..a82799bcd3 100755
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -33,6 +33,5 @@
     <modules>
         <module>spi</module>
         <module>saml</module>
-        <module>oidc</module>
     </modules>
 </project>
diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
index 8749833cd6..5388210a00 100755
--- a/dependencies/server-min/pom.xml
+++ b/dependencies/server-min/pom.xml
@@ -63,10 +63,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-server-spi-private</artifactId>
         </dependency>
-         <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-js-adapter-jar</artifactId>
-        </dependency>
 
         <!-- forms -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 6cacf49f47..19666b124a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -954,11 +954,6 @@
                 <artifactId>keycloak-jboss-adapter-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-js-adapter-jar</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-saml-wildfly-elytron-adapter</artifactId>
diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml
index 328f5dfab0..ab56c8dfb1 100644
--- a/quarkus/runtime/pom.xml
+++ b/quarkus/runtime/pom.xml
@@ -150,16 +150,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-js-adapter-jar</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-common</artifactId>
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 b908215875..ec2ac49590 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
@@ -31,8 +31,8 @@
     <name>Auth Server Services - Testsuite Providers</name>
 
     <properties>
-        <js-adapter.version>${project.version}</js-adapter.version>
-        <js-adapter.file.path>${project.basedir}/target/classes/javascript</js-adapter.file.path>
+        <js-adapter.dist.path>${project.basedir}/../../../../../../js/libs/keycloak-js/dist</js-adapter.dist.path>
+        <js-adapter.target.path>${project.basedir}/target/classes/javascript</js-adapter.target.path>
     </properties>
 
     <dependencies>
@@ -111,25 +111,24 @@
 
         <plugins>
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
+                <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-javascript-adapter</id>
+                        <id>copy-keycloak-js</id>
                         <phase>generate-resources</phase>
                         <goals>
-                            <goal>unpack</goal>
+                            <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.keycloak</groupId>
-                                    <artifactId>keycloak-js-adapter-jar</artifactId>
-                                    <version>${js-adapter.version}</version>
-                                    <type>jar</type>
-                                    <outputDirectory>${js-adapter.file.path}</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <includes>keycloak.js</includes>
+                            <outputDirectory>${js-adapter.target.path}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${js-adapter.dist.path}</directory>
+                                    <includes>
+                                        <include>keycloak.js</include>
+                                    </includes>
+                                </resource>
+                            </resources>
                         </configuration>
                     </execution>
                 </executions>