move to github.com/segmentio/encoding/json

miku · Jul 7, 2021 · 0b0c7e6 · 0b0c7e6
1 parent 6c9afd0
commit 0b0c7e6
Show file tree

Hide file tree

Showing 42 changed files with 47 additions and 41 deletions.
diff --git a/assetutil/helper.go b/assetutil/helper.go
@@ -24,7 +24,7 @@ package assetutil
 import (
 	"bufio"
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"io"
 	"regexp"
 	"strings"

diff --git a/cmd/span-amsl-discovery/main.go b/cmd/span-amsl-discovery/main.go
@@ -5,7 +5,7 @@ package main
 import (
 	"bufio"
 	"database/sql"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-check/main.go b/cmd/span-check/main.go
@@ -3,7 +3,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"os"

diff --git a/cmd/span-crossref-members/main.go b/cmd/span-crossref-members/main.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-crossref-snapshot/main.go b/cmd/span-crossref-snapshot/main.go
@@ -12,7 +12,7 @@ package main
 import (
 	"bufio"
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-folio/main.go b/cmd/span-folio/main.go
@@ -52,7 +52,7 @@ package main
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-freeze/main.go b/cmd/span-freeze/main.go
@@ -13,7 +13,7 @@ package main
 import (
 	"archive/zip"
 	"crypto/sha1"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-genios-modules/main.go b/cmd/span-genios-modules/main.go
@@ -34,7 +34,7 @@ package main
 import (
 	"archive/zip"
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"encoding/xml"
 	"fmt"
 	"io/ioutil"

diff --git a/cmd/span-hcov/main.go b/cmd/span-hcov/main.go
@@ -3,7 +3,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-import/main.go b/cmd/span-import/main.go
@@ -3,7 +3,7 @@ package main
 
 import (
 	"encoding"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-join-assets/main.go b/cmd/span-join-assets/main.go
@@ -34,7 +34,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"io"
 	"os"

diff --git a/cmd/span-local-data/main.go b/cmd/span-local-data/main.go
@@ -5,7 +5,7 @@ package main
 import (
 	"bufio"
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-oa-filter/main.go b/cmd/span-oa-filter/main.go
@@ -3,7 +3,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"os"

diff --git a/cmd/span-redact/main.go b/cmd/span-redact/main.go
@@ -5,7 +5,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-report/main.go b/cmd/span-report/main.go
@@ -40,7 +40,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-review/main.go b/cmd/span-review/main.go
@@ -12,7 +12,7 @@ package main
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-tag/main.go b/cmd/span-tag/main.go
@@ -9,7 +9,7 @@ package main
 import (
 	"bufio"
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-tagger/main.go b/cmd/span-tagger/main.go
@@ -28,7 +28,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-update-labels/main.go b/cmd/span-update-labels/main.go
@@ -4,7 +4,7 @@
 package main
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"io"

diff --git a/cmd/span-webhookd/main.go b/cmd/span-webhookd/main.go
@@ -32,7 +32,7 @@
 package main
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"flag"
 	"fmt"
 	"net"

diff --git a/container/string.go b/container/string.go
@@ -23,7 +23,7 @@ package container
 
 import (
 	"bufio"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 	"io"
 	"sort"

diff --git a/encoding/formeta/marshal_test.go b/encoding/formeta/marshal_test.go
@@ -1,7 +1,7 @@
 package formeta
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"testing"
 	"time"
 )

diff --git a/filter/collection.go b/filter/collection.go
@@ -1,7 +1,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 
 	"github.com/miku/span/container"
 	"github.com/miku/span/formats/finc"

diff --git a/filter/doi.go b/filter/doi.go
@@ -1,7 +1,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 
 	"github.com/miku/span/formats/finc"
 	"github.com/miku/span/xio"

diff --git a/filter/filter.go b/filter/filter.go
@@ -16,7 +16,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 
 	"github.com/miku/span/formats/finc"

diff --git a/filter/filter_test.go b/filter/filter_test.go
@@ -1,7 +1,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"testing"
 
 	"github.com/miku/span/formats/finc"

diff --git a/filter/holdings.go b/filter/holdings.go
@@ -2,7 +2,7 @@ package filter
 
 import (
 	"archive/zip"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"io"
 	"os"
 	"strings"

diff --git a/filter/issn.go b/filter/issn.go
@@ -1,7 +1,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"strings"
 
 	log "github.com/sirupsen/logrus"

diff --git a/filter/logic.go b/filter/logic.go
@@ -1,7 +1,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 
 	"github.com/miku/span/formats/finc"

diff --git a/filter/package.go b/filter/package.go
@@ -1,7 +1,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 
 	"github.com/miku/span/container"
 	"github.com/miku/span/formats/finc"

diff --git a/filter/source.go b/filter/source.go
@@ -1,7 +1,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 
 	"github.com/miku/span/formats/finc"
 )

diff --git a/filter/subject.go b/filter/subject.go
@@ -1,7 +1,7 @@
 package filter
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 
 	"github.com/miku/span/container"
 	"github.com/miku/span/formats/finc"

diff --git a/folio/folio.go b/folio/folio.go
@@ -2,7 +2,7 @@ package folio
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 	"net/http"
 

diff --git a/formats/finc/solr.go b/formats/finc/solr.go
@@ -2,7 +2,7 @@
 package finc
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/freeze.go b/freeze.go
@@ -3,7 +3,7 @@ package span
 import (
 	"archive/zip"
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"

diff --git a/freeze_test.go b/freeze_test.go
@@ -1,7 +1,7 @@
 package span
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"io/ioutil"
 	"os"
 	"reflect"

diff --git a/go.mod b/go.mod
@@ -19,6 +19,7 @@ require (
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/klauspost/compress v1.9.8 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.8 // indirect
 	github.com/klauspost/pgzip v1.2.1
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kr/pretty v0.2.1 // indirect
@@ -30,7 +31,7 @@ require (
 	github.com/miku/xmlstream v0.0.0-20190415141048-c7ce7c45f0e0
 	github.com/mvdan/xurls v1.1.0 // indirect
 	github.com/olebedev/config v0.0.0-20190528211619-364964f3a8e4
-	github.com/segmentio/encoding v0.1.8
+	github.com/segmentio/encoding v0.2.19
 	github.com/sethgrid/pester v0.0.0-20190127155807-68a33a018ad0
 	github.com/shantanubhadoria/go-roman v0.0.0-20180925203848-b6cf86aa5b76
 	github.com/sirupsen/logrus v1.4.2

diff --git a/go.sum b/go.sum
@@ -39,6 +39,9 @@ github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8Nz
 github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak=
 github.com/klauspost/compress v1.9.8 h1:VMAMUUOh+gaxKTMk+zqbjsSjsIcUcL/LF4o63i82QyA=
 github.com/klauspost/compress v1.9.8/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/cpuid/v2 v2.0.5/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.0.8 h1:bhR2mgIlno/Sfk4oUbH4sPlc83z1yGrN9bvqiq3C33I=
+github.com/klauspost/cpuid/v2 v2.0.8/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/pgzip v1.2.1 h1:oIPZROsWuPHpOdMVWLuJZXwgjhrW8r1yEX8UqMyeNHM=
 github.com/klauspost/pgzip v1.2.1/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -77,6 +80,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/segmentio/encoding v0.1.8 h1:kCTskIbhR+hubyRMflF8pTQU8Ky5Yf9MzIPgLL1AhSc=
 github.com/segmentio/encoding v0.1.8/go.mod h1:RWhr02uzMB9gQC1x+MfYxedtmBibb9cZ6Vv9VxRSSbw=
+github.com/segmentio/encoding v0.2.19 h1:Kshkmoz080qvUtdtakR8Bjk2sIlLS8wSvijFMEHRGow=
+github.com/segmentio/encoding v0.2.19/go.mod h1:7E68jTSWMnNoYhHi1JbLd7NBSB6XfE4vzqhR88hDBQc=
 github.com/sethgrid/pester v0.0.0-20190127155807-68a33a018ad0 h1:X9XMOYjxEfAYSy3xK1DzO5dMkkWhs9E9UCcS1IERx2k=
 github.com/sethgrid/pester v0.0.0-20190127155807-68a33a018ad0/go.mod h1:Ad7IjTpvzZO8Fl0vh9AzQ+j/jYZfyp2diGwI8m5q+ns=
 github.com/shantanubhadoria/go-roman v0.0.0-20180925203848-b6cf86aa5b76 h1:yMBHiWaX2XBKRKspoQUE25LYg6kQnIuwu8VcnDnc7Q4=

diff --git a/quality/checks.go b/quality/checks.go
@@ -3,7 +3,7 @@
 package quality
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"errors"
 	"fmt"
 	"net/url"

diff --git a/reviewutil/review.go b/reviewutil/review.go
@@ -2,7 +2,7 @@ package reviewutil
 
 import (
 	"bytes"
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"

diff --git a/solrutil/index.go b/solrutil/index.go
@@ -2,7 +2,7 @@
 package solrutil
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 	"math/rand"
 	"net/http"

diff --git a/solrutil/live.go b/solrutil/live.go
@@ -1,7 +1,7 @@
 package solrutil
 
 import (
-	"encoding/json"
+	"github.com/segmentio/encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ package main @@
     import (
     	"bufio"
-    	"encoding/json"
+    	"github.com/segmentio/encoding/json"
     	"flag"
     	"fmt"
     	"os"
@@ Expand Down @@