From 063eb6dfc3b0937de10661d3a9bf60f341a5b5d0 Mon Sep 17 00:00:00 2001
From: David Bidjan <david.bidjan@inventage.com>
Date: Thu, 19 Oct 2023 15:51:25 +0200
Subject: [PATCH] reverse dependency of server and extension modules during
 build

---
 extensions/pom.xml | 29 -----------------------------
 server/pom.xml     | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/extensions/pom.xml b/extensions/pom.xml
index 8bd8168..811e6c8 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -22,16 +22,6 @@
         <module>extension-no-op-protocol-mapper</module>
     </modules>
 
-    <dependencies>
-        <!-- the server module must be built for copying the jars into -->
-        <dependency>
-            <groupId>com.inventage.keycloak.custom</groupId>
-            <artifactId>server</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
-    </dependencies>
-
     <build>
         <pluginManagement>
             <plugins>
@@ -49,25 +39,6 @@
                         </annotationProcessorPaths>
                     </configuration>
                 </plugin>
-                <!-- deployment configuration for all extension modules -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>deploy-${project.artifactId}</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <target>
-                                    <copy file="${file.to.deploy}" todir="${keycloak.providers.dir}"/>
-                                </target>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/server/pom.xml b/server/pom.xml
index 24f238d..e97424f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -26,6 +26,16 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bootstrap-runner</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.inventage.keycloak.custom</groupId>
+            <artifactId>extension-no-op-authenticator</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.inventage.keycloak.custom</groupId>
+            <artifactId>extension-no-op-protocol-mapper</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -48,6 +58,19 @@
                             <outputDirectory>${project.build.directory}</outputDirectory>
                         </configuration>
                     </execution>
+                    <!-- extract jars of extensions -->
+                    <execution>
+                        <id>unpack-signature-extension</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeGroupIds>com.inventage.keycloak.custom</includeGroupIds>
+                            <includeArtifactIds>extension-no-op-authenticator, extension-no-op-protocol-mapper</includeArtifactIds>
+                            <outputDirectory>${project.build.directory}/keycloak/providers</outputDirectory>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <!-- for moving the content of the installation to $keycloak.dir -->