From f24ed1801141da1fbb58d0a58fafdb5aeb0bfa6e Mon Sep 17 00:00:00 2001
From: Hiroyuki Wada <wadahiro@gmail.com>
Date: Mon, 14 Feb 2022 22:48:43 +0900
Subject: [PATCH] feat: update to keycloak 17.0.0 (based on Quarkus)

Deprecated the EAR format to support Keycloak 17.0.0 (based on Quarkus).
---
 README.md                                     |  6 +-
 ear/pom.xml                                   | 45 ----------
 .../META-INF/jboss-deployment-structure.xml   | 15 ----
 ejb/pom.xml                                   | 52 -----------
 pom.xml                                       | 90 +++++++++----------
 .../discord/DiscordIdentityProvider.java      |  0
 .../DiscordIdentityProviderConfig.java        |  0
 .../DiscordIdentityProviderFactory.java       |  0
 .../discord/DiscordUserAttributeMapper.java   |  0
 ...oak.broker.provider.IdentityProviderMapper |  0
 ...roker.social.SocialIdentityProviderFactory |  0
 .../messages/admin-messages_en.properties     |  0
 .../realm-identity-provider-discord-ext.html  |  0
 .../realm-identity-provider-discord.html      |  0
 14 files changed, 43 insertions(+), 165 deletions(-)
 delete mode 100755 ear/pom.xml
 delete mode 100755 ear/src/main/application/META-INF/jboss-deployment-structure.xml
 delete mode 100755 ejb/pom.xml
 rename {ejb/src => src}/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java (100%)
 rename {ejb/src => src}/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java (100%)
 rename {ejb/src => src}/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java (100%)
 rename {ejb/src => src}/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java (100%)
 rename {ejb/src => src}/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper (100%)
 rename {ejb/src => src}/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory (100%)
 rename {ejb/src => src}/main/resources/theme-resources/messages/admin-messages_en.properties (100%)
 rename {ejb/src => src}/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html (100%)
 rename {ejb/src => src}/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html (100%)

diff --git a/README.md b/README.md
index 3133f93..e5df20b 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ Keycloak Social Login extension for Discord.
 
 ## Install
 
-Download `keycloak-discord-ear-<version>.ear` from [Releases page](https://github.com/wadahiro/keycloak-discord/releases).
-Then deploy it into `$KEYCLOAK_HOME/standalone/deployments/` directory.
+Download `keycloak-discord-<version>.jar` from [Releases page](https://github.com/wadahiro/keycloak-discord/releases).
+Then deploy it into `$KEYCLOAK_HOME/providers` directory.
 
 ## Setup
 
@@ -27,7 +27,7 @@ Note: You don't need to setup the theme in `master` realm from v0.3.0.
 ## Source Build
 
 Clone this repository and run `mvn package`.
-You can see `keycloak-discord-ear-<version>.ear` under `ear/target` directory.
+You can see `keycloak-discord-<version>.jar` under `target` directory.
 
 
 ## Licence
diff --git a/ear/pom.xml b/ear/pom.xml
deleted file mode 100755
index 7d88f43..0000000
--- a/ear/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<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>
-        <groupId>org.keycloak.extensions</groupId>
-        <artifactId>keycloak-discord-parent</artifactId>
-        <version>0.3.2-SNAPSHOT</version>
-    </parent>
-
-    <name>Keycloak Discord EAR</name>
-    <description/>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-discord-ear</artifactId>
-    <packaging>ear</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak.extensions</groupId>
-            <artifactId>keycloak-discord-ejb</artifactId>
-            <type>ejb</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-ear-plugin</artifactId>
-                <version>2.10</version>
-                <configuration>
-                    <version>7</version>
-                    <defaultLibBundleDir>lib</defaultLibBundleDir>
-                    <fileNameMapping>no-version</fileNameMapping>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/ear/src/main/application/META-INF/jboss-deployment-structure.xml
deleted file mode 100755
index 6d7e67c..0000000
--- a/ear/src/main/application/META-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-deployment-structure>
-    <deployment>
-        <dependencies>
-            <module name="org.keycloak.keycloak-core" export="true" />
-            <module name="org.keycloak.keycloak-server-spi" export="true" />
-            <module name="org.keycloak.keycloak-server-spi-private" export="true" />
-            <module name="org.keycloak.keycloak-services" export="true" />
-            <module name="org.keycloak.keycloak-saml-core-public" export="true" />
-            <module name="org.bouncycastle" export="true" />
-            <module name="com.google.guava" export="true" />
-            <module name="org.jboss.logging" export="true" />
-        </dependencies>
-    </deployment>
-</jboss-deployment-structure>
diff --git a/ejb/pom.xml b/ejb/pom.xml
deleted file mode 100755
index b163125..0000000
--- a/ejb/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<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>
-        <groupId>org.keycloak.extensions</groupId>
-        <artifactId>keycloak-discord-parent</artifactId>
-        <version>0.3.2-SNAPSHOT</version>
-    </parent>
-
-    <name>Keycloak Discord EJB</name>
-    <description/>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-discord-ejb</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi-private</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-services</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/pom.xml b/pom.xml
index fd356c0..775fbed 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,62 +6,52 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.keycloak.extensions</groupId>
-    <artifactId>keycloak-discord-parent</artifactId>
+    <artifactId>keycloak-discord</artifactId>
     <version>0.3.2-SNAPSHOT</version>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
 
     <properties>
-        <version.keycloak>9.0.2</version.keycloak>
-        <version.wildfly.maven.plugin>1.1.0.Final</version.wildfly.maven.plugin>
+        <version.keycloak>17.0.0</version.keycloak>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.keycloak.bom</groupId>
-                <artifactId>keycloak-spi-bom</artifactId>
-                <version>${version.keycloak}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak.extensions</groupId>
-                <artifactId>keycloak-discord-ejb</artifactId>
-                <version>${project.version}</version>
-                <type>ejb</type>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-server-spi-private</artifactId>
-                <scope>provided</scope>
-                <version>${version.keycloak}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-services</artifactId>
-                <scope>provided</scope>
-                <version>${version.keycloak}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <modules>
-        <module>ejb</module>
-        <module>ear</module>
-    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <scope>provided</scope>
+            <version>${version.keycloak}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-spi</artifactId>
+            <scope>provided</scope>
+            <version>${version.keycloak}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-spi-private</artifactId>
+            <scope>provided</scope>
+            <version>${version.keycloak}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-services</artifactId>
+            <scope>provided</scope>
+            <version>${version.keycloak}</version>
+        </dependency>
+    </dependencies>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.wildfly.plugins</groupId>
-                    <artifactId>wildfly-maven-plugin</artifactId>
-                    <version>${version.wildfly.maven.plugin}</version>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
similarity index 100%
rename from ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
rename to src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java
similarity index 100%
rename from ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java
rename to src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java
diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java
similarity index 100%
rename from ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java
rename to src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java
diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java b/src/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java
similarity index 100%
rename from ejb/src/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java
rename to src/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java
diff --git a/ejb/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper b/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
similarity index 100%
rename from ejb/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
rename to src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper
diff --git a/ejb/src/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory b/src/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory
similarity index 100%
rename from ejb/src/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory
rename to src/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory
diff --git a/ejb/src/main/resources/theme-resources/messages/admin-messages_en.properties b/src/main/resources/theme-resources/messages/admin-messages_en.properties
similarity index 100%
rename from ejb/src/main/resources/theme-resources/messages/admin-messages_en.properties
rename to src/main/resources/theme-resources/messages/admin-messages_en.properties
diff --git a/ejb/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html
similarity index 100%
rename from ejb/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html
rename to src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html
diff --git a/ejb/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html
similarity index 100%
rename from ejb/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html
rename to src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html