include gson in deployment jar

privacyidea · Nov 26, 2020 · ceb6d78 · ceb6d78
1 parent 9c9837a
commit ceb6d78
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/lib/sdk-java b/lib/sdk-java
diff --git a/pom.xml b/pom.xml
@@ -78,6 +78,12 @@
             <version>9.0.3</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -103,6 +109,7 @@
                             <artifactSet>
                                 <includes>
                                     <include>org.privacyidea:sdk-java</include>
+                                    <include>com.google.code.gson</include>
                                 </includes>
                             </artifactSet>
                         </configuration>

diff --git a/src/main/java/org/privacyidea/authenticator/PrivacyIDEAAuthenticator.java b/src/main/java/org/privacyidea/authenticator/PrivacyIDEAAuthenticator.java
@@ -1,10 +1,5 @@
 package org.privacyidea.authenticator;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
 import org.jboss.logging.Logger;
 import org.keycloak.authentication.AuthenticationFlowContext;
 import org.keycloak.authentication.AuthenticationFlowError;
@@ -13,13 +8,12 @@
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserModel;
-import org.privacyidea.Challenge;
-import org.privacyidea.Constants;
-import org.privacyidea.PILoggerBridge;
-import org.privacyidea.PIResponse;
-import org.privacyidea.PrivacyIDEA;
-import org.privacyidea.RolloutInfo;
-import org.privacyidea.TokenInfo;
+import org.privacyidea.*;
+
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import java.util.List;
+import java.util.Optional;
 
 
 /**

diff --git a/src/main/java/org/privacyidea/authenticator/PrivacyIDEAAuthenticatorFactory.java b/src/main/java/org/privacyidea/authenticator/PrivacyIDEAAuthenticatorFactory.java
@@ -1,13 +1,14 @@
 package org.privacyidea.authenticator;
 
-import java.util.ArrayList;
-import java.util.List;
 import org.keycloak.Config;
 import org.keycloak.models.AuthenticationExecutionModel;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
 import org.keycloak.provider.ProviderConfigProperty;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 /**
  * Copyright 2019 NetKnights GmbH - micha.preusser@netknights.it