From 3547f6e4d0cf3e212d00c5ebbbe086fc5ff74e89 Mon Sep 17 00:00:00 2001
From: U6024216 <U6024216@U6024216-TPL-B.ten.thomsonreuters.com>
Date: Sat, 24 Aug 2019 22:59:14 +0530
Subject: [PATCH 1/3] Including all third party jars inside a single hs fat jar
 - Dev

---
 hanko-plugin-keycloak-ejb/pom.xml | 217 ++++++++++++++++--------------
 1 file changed, 117 insertions(+), 100 deletions(-)

diff --git a/hanko-plugin-keycloak-ejb/pom.xml b/hanko-plugin-keycloak-ejb/pom.xml
index 8a797c1..e634b66 100755
--- a/hanko-plugin-keycloak-ejb/pom.xml
+++ b/hanko-plugin-keycloak-ejb/pom.xml
@@ -1,107 +1,124 @@
-<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>hanko-plugin-keycloak-parent</artifactId>
-        <groupId>io.hanko.plugins.keycloak</groupId>
-        <version>0.2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
+<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>hanko-plugin-keycloak-parent</artifactId>
+		<groupId>io.hanko.plugins.keycloak</groupId>
+		<version>0.2-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
 
-    <name>HANKO Plugin Keycloak EJB</name>
-    <description/>
-    <modelVersion>4.0.0</modelVersion>
+	<name>HANKO Plugin Keycloak EJB</name>
+	<description />
+	<modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hanko-plugin-keycloak-ejb</artifactId>
-    <packaging>jar</packaging>
+	<artifactId>hanko-plugin-keycloak-ejb</artifactId>
+	<packaging>jar</packaging>
 
-    <repositories>
-        <repository>
-            <id>bintray-hanko-jvm-sdks</id>
-            <name>bintray-plugins</name>
-            <url>https://dl.bintray.com/hanko/jvm-sdks</url>
-        </repository>
-        <repository>
-            <id>central</id>
-            <name>bintray</name>
-            <url>http://jcenter.bintray.com</url>
-        </repository>
-    </repositories>
+	<repositories>
+		<repository>
+			<id>bintray-hanko-jvm-sdks</id>
+			<name>bintray-plugins</name>
+			<url>https://dl.bintray.com/hanko/jvm-sdks</url>
+		</repository>
+		<repository>
+			<id>central</id>
+			<name>bintray</name>
+			<url>http://jcenter.bintray.com</url>
+		</repository>
+	</repositories>
 
-    <dependencies>
-        <dependency>
-                <groupId>net.glxn.qrgen</groupId>
-                <artifactId>javase</artifactId>
-                <version>2.0</version>
-        </dependency>    
-        <dependency>
-                <groupId>com.google.zxing</groupId>
-                <artifactId>core</artifactId>
-                <version>3.4.0</version>
-        </dependency>
-        <dependency>
-                <groupId>com.google.zxing</groupId>
-                <artifactId>javase</artifactId>
-                <version>3.4.0</version>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>net.glxn.qrgen</groupId>
+			<artifactId>javase</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>core</artifactId>
+			<version>3.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>javase</artifactId>
+			<version>3.4.0</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <version>4.8.3.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-            <version>4.8.3.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi-private</artifactId>
-            <version>4.8.3.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-services</artifactId>
-            <version>4.8.3.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-jpa</artifactId>
-            <version>4.8.3.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-wildfly-adduser</artifactId>
-            <version>4.8.3.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20180130</version>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-core</artifactId>
+			<version>4.8.3.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-server-spi</artifactId>
+			<version>4.8.3.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-server-spi-private</artifactId>
+			<version>4.8.3.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-services</artifactId>
+			<version>4.8.3.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.keycloak</groupId>
+			<artifactId>keycloak-model-jpa</artifactId>
+			<version>4.8.3.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20180130</version>
+		</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>
+	<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>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.4.1</version>
+				<configuration>
+					<!-- get all project dependencies -->
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<!-- bind to the packaging phase -->
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

From 6169858536144c15510308446a8095e8ffa293d4 Mon Sep 17 00:00:00 2001
From: U6024216 <U6024216@U6024216-TPL-B.ten.thomsonreuters.com>
Date: Sat, 24 Aug 2019 23:01:57 +0530
Subject: [PATCH 2/3] Copy fat jar to keycloak deployment folder - Dev

---
 clean-build-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clean-build-install.sh b/clean-build-install.sh
index 7956e53..34c8085 100755
--- a/clean-build-install.sh
+++ b/clean-build-install.sh
@@ -15,8 +15,8 @@ echo "Cleaning the hypersign plugin.."
 rm -rf ${KCBASE}/hanko-plugin-keycloak-ejb-0.2-SNAPSHOT.jar
 rm -rf ${KCBASE}/modules/hanko-plugin-keycloak-ejb/
 
-echo "Coping the plugin.."
-cp ./dist/hanko-plugin-keycloak-ejb-0.2-SNAPSHOT.jar ${KCBASE}
+echo "Coping the plugin which contains all the third party jars also..."
+cp ./dist/hanko-plugin-keycloak-ejb-0.2-SNAPSHOT-jar-with-dependencies ${KCBASE}
 
 echo "Dploying the hypersign theme.."
 cp hs-themes/hypersign-config.ftl ${KCBASE}/themes/base/login

From 01f6cd1d6ab48b9c18383feb36e82bd6520dcd49 Mon Sep 17 00:00:00 2001
From: vishwas1 <vishwasanand.cse@gmail.com>
Date: Sun, 25 Aug 2019 09:50:10 +0530
Subject: [PATCH 3/3] adduser dependency added

---
 clean-build-install.sh            | 2 +-
 hanko-plugin-keycloak-ejb/pom.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/clean-build-install.sh b/clean-build-install.sh
index 34c8085..ae6b7c1 100755
--- a/clean-build-install.sh
+++ b/clean-build-install.sh
@@ -16,7 +16,7 @@ rm -rf ${KCBASE}/hanko-plugin-keycloak-ejb-0.2-SNAPSHOT.jar
 rm -rf ${KCBASE}/modules/hanko-plugin-keycloak-ejb/
 
 echo "Coping the plugin which contains all the third party jars also..."
-cp ./dist/hanko-plugin-keycloak-ejb-0.2-SNAPSHOT-jar-with-dependencies ${KCBASE}
+cp ./dist/hanko-plugin-keycloak-ejb-0.2-SNAPSHOT-jar-with-dependencies.jar ${KCBASE}
 
 echo "Dploying the hypersign theme.."
 cp hs-themes/hypersign-config.ftl ${KCBASE}/themes/base/login
diff --git a/hanko-plugin-keycloak-ejb/pom.xml b/hanko-plugin-keycloak-ejb/pom.xml
index e634b66..0e91ac9 100755
--- a/hanko-plugin-keycloak-ejb/pom.xml
+++ b/hanko-plugin-keycloak-ejb/pom.xml
@@ -70,6 +70,11 @@
 			<artifactId>keycloak-model-jpa</artifactId>
 			<version>4.8.3.Final</version>
 		</dependency>
+		<dependency>								
+      <groupId>org.keycloak</groupId>				
+    	<artifactId>keycloak-wildfly-adduser</artifactId>		
+      <version>4.8.3.Final</version>				
+    </dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>