From 2fefc991df713cbbc813eddd9b6cee4e8544a43f Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Fri, 20 Nov 2020 14:00:24 -0800
Subject: [PATCH] GUACAMOLE-1218: Update to version 1.3.0 of guacamole-ext.

---
 extensions/guacamole-auth-json/pom.xml                |  4 ++--
 .../guacamole/auth/json/user/UserDataConnection.java  | 11 ++---------
 .../src/main/resources/guac-manifest.json             |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/extensions/guacamole-auth-json/pom.xml b/extensions/guacamole-auth-json/pom.xml
index aefc37071..74fbae3a0 100644
--- a/extensions/guacamole-auth-json/pom.xml
+++ b/extensions/guacamole-auth-json/pom.xml
@@ -26,7 +26,7 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-json</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0-1</version>
+    <version>1.3.0</version>
     <name>guacamole-auth-json</name>
     <url>http://guacamole.apache.org/</url>
 
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.0.0</version>
+            <version>1.3.0</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataConnection.java b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataConnection.java
index 8c0b6b853..fd24f91f2 100644
--- a/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataConnection.java
+++ b/extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/UserDataConnection.java
@@ -22,7 +22,6 @@ package org.apache.guacamole.auth.json.user;
 import com.google.inject.Inject;
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.apache.guacamole.GuacamoleException;
@@ -30,7 +29,6 @@ import org.apache.guacamole.GuacamoleSecurityException;
 import org.apache.guacamole.auth.json.connection.ConnectionService;
 import org.apache.guacamole.net.GuacamoleTunnel;
 import org.apache.guacamole.net.auth.Connection;
-import org.apache.guacamole.net.auth.ConnectionRecord;
 import org.apache.guacamole.protocol.GuacamoleClientInformation;
 import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
@@ -158,11 +156,6 @@ public class UserDataConnection implements Connection {
         return null;
     }
 
-    @Override
-    public List<? extends ConnectionRecord> getHistory() throws GuacamoleException {
-        return Collections.<ConnectionRecord>emptyList();
-    }
-
     @Override
     public Set<String> getSharingProfileIdentifiers() throws GuacamoleException {
         return Collections.<String>emptySet();
@@ -174,8 +167,8 @@ public class UserDataConnection implements Connection {
     }
 
     @Override
-    public GuacamoleTunnel connect(GuacamoleClientInformation info)
-            throws GuacamoleException {
+    public GuacamoleTunnel connect(GuacamoleClientInformation info,
+            Map<String, String> tokens) throws GuacamoleException {
 
         // Prevent future use immediately upon connect
         if (connection.isSingleUse()) {
diff --git a/extensions/guacamole-auth-json/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-json/src/main/resources/guac-manifest.json
index 4f13b8c02..a9ff464c5 100644
--- a/extensions/guacamole-auth-json/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-json/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
 {
 
-    "guacamoleVersion" : "1.0.0",
+    "guacamoleVersion" : "1.3.0",
 
     "name"      : "Encrypted JSON Authentication",
     "namespace" : "guac-json",