From 0f2d8b821a26d991ca65dbe0623e61373f91a703 Mon Sep 17 00:00:00 2001
From: Benji Vesterby <benji@devnw.com>
Date: Wed, 29 Sep 2021 16:05:10 -0400
Subject: [PATCH] GH-400, GH-401 Upgrading JWT Library to V4

Adding 1.16.x and 1.17.x tests to matrix

updated to go 1.15 min
---
 .github/workflows/testing.yml | 4 ++--
 go.mod                        | 6 +++---
 go.sum                        | 9 +++++----
 jira.go                       | 2 +-
 request_context.go            | 1 +
 request_legacy.go             | 1 +
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 80e51e22..dd2526c4 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -11,7 +11,7 @@ jobs:
     name: Test and lint
     strategy:
       matrix:
-        go-version: [1.x, 1.15.x, 1.14.x]
+        go-version: [1.15.x, 1.16.x, 1.17.x]
         platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
 
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: ${{ matrix.go-version }}
 
       # Caching go modules to speed up the run
       - uses: actions/cache@v2
diff --git a/go.mod b/go.mod
index c70857d7..899a8dcc 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,12 @@
 module github.com/andygrunwald/go-jira
 
-go 1.12
+go 1.15
 
 require (
 	github.com/fatih/structs v1.1.0
-	github.com/golang-jwt/jwt v3.2.1+incompatible
+	github.com/golang-jwt/jwt/v4 v4.1.0
 	github.com/google/go-cmp v0.5.6
-	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135
+	github.com/google/go-querystring v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/trivago/tgo v1.0.7
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
diff --git a/go.sum b/go.sum
index c09a21dd..7db8a1a6 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,12 @@
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
-github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
-github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/trivago/tgo v1.0.7 h1:uaWH/XIy9aWYWpjm2CU3RpcqZXmX2ysQ9/Go+d9gyrM=
diff --git a/jira.go b/jira.go
index 7d7702bb..66046a45 100644
--- a/jira.go
+++ b/jira.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang-jwt/jwt"
+	jwt "github.com/golang-jwt/jwt/v4"
 	"github.com/google/go-querystring/query"
 	"github.com/pkg/errors"
 )
diff --git a/request_context.go b/request_context.go
index fc0052df..9f3e2647 100644
--- a/request_context.go
+++ b/request_context.go
@@ -1,3 +1,4 @@
+//go:build go1.13
 // +build go1.13
 
 // This file provides glue to use Context in `http.Request` with
diff --git a/request_legacy.go b/request_legacy.go
index 5ceee886..93eb65e8 100644
--- a/request_legacy.go
+++ b/request_legacy.go
@@ -1,3 +1,4 @@
+//go:build !go1.13
 // +build !go1.13
 
 // This file provides glue to use Context in `http.Request` with