Rename asn1 ber dependency. (#243)

vagruchi · johnweldon · commit dd082ae32a88 · 2019-11-06T17:21:05.000-07:00
* Rename asn1.ber dependency.

* go mod tidy

* Update travic CI to new asn1 ber

* Update travis go_import_path
diff --git a/.travis.yml b/.travis.yml
@@ -13,15 +13,15 @@ go:
     - tip
 
 git:
-  depth: 1
+    depth: 1
 
 matrix:
     fast_finish: true
     allow_failures:
         - go: tip
-go_import_path: gopkg.in/ldap.v3
+go_import_path: github.com/go-ldap/ldap
 install:
-    - go get gopkg.in/asn1-ber.v1
+    - go get github.com/go-asn1-ber/asn1-ber
     - go get code.google.com/p/go.tools/cmd/cover || go get golang.org/x/tools/cmd/cover
     - go get github.com/golang/lint/golint || go get golang.org/x/lint/golint || true
     - go build -v ./...
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Import the latest version with:
 
 ## Required Libraries:
 
- - gopkg.in/asn1-ber.v1
+ - github.com/go-asn1-ber/asn1-ber
 
 ## Features:
 
diff --git a/add.go b/add.go
@@ -12,7 +12,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // Attribute represents an LDAP attribute
diff --git a/bind.go b/bind.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // SimpleBindRequest represents a username/password bind operation
diff --git a/compare.go b/compare.go
@@ -22,7 +22,7 @@ package ldap
 import (
 	"fmt"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // CompareRequest represents an LDAP CompareRequest operation.
diff --git a/conn.go b/conn.go
@@ -11,7 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 const (
diff --git a/conn_test.go b/conn_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 func TestUnresponsiveConnection(t *testing.T) {
diff --git a/control.go b/control.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 const (
diff --git a/control_test.go b/control_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 func TestControlPaging(t *testing.T) {
diff --git a/debug.go b/debug.go
@@ -3,7 +3,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // debugging type
diff --git a/del.go b/del.go
@@ -8,7 +8,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // DelRequest implements an LDAP deletion request
diff --git a/dn.go b/dn.go
@@ -48,7 +48,7 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 // AttributeTypeAndValue represents an attributeTypeAndValue from https://tools.ietf.org/html/rfc4514
diff --git a/error.go b/error.go
@@ -3,7 +3,7 @@ package ldap
 import (
 	"fmt"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // LDAP Result Codes
diff --git a/error_test.go b/error_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 // TestNilPacket tests that nil packets don't cause a panic.
diff --git a/filter.go b/filter.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 // Filter choices
diff --git a/filter_test.go b/filter_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 type compileTest struct {
diff --git a/go.mod b/go.mod
@@ -1,3 +1,5 @@
 module github.com/go-ldap/ldap
 
-require gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d
+require github.com/go-asn1-ber/asn1-ber v1.3.1
+
+go 1.13
diff --git a/go.sum b/go.sum
@@ -1,2 +1,2 @@
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
+github.com/go-asn1-ber/asn1-ber v1.3.1 h1:gvPdv/Hr++TRFCl0UbPFHC54P9N9jgsRPnmnr419Uck=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
diff --git a/ldap.go b/ldap.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // LDAP Application Codes
diff --git a/moddn.go b/moddn.go
@@ -13,7 +13,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // ModifyDNRequest holds the request to modify a DN
diff --git a/modify.go b/modify.go
@@ -28,7 +28,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // Change operation choices
diff --git a/passwdmodify.go b/passwdmodify.go
@@ -8,7 +8,7 @@ package ldap
 import (
 	"fmt"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 const (
diff --git a/request.go b/request.go
@@ -3,7 +3,7 @@ package ldap
 import (
 	"errors"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 var (
diff --git a/search.go b/search.go
@@ -61,7 +61,7 @@ import (
 	"sort"
 	"strings"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // scope choices

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ package ldap`
`12`	`12`	`import (`
`13`	`13`	`"log"`
`14`	`14`
`15`		`- ber "gopkg.in/asn1-ber.v1"`
	`15`	`+ ber "github.com/go-asn1-ber/asn1-ber"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// Attribute represents an LDAP attribute`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- ber "gopkg.in/asn1-ber.v1"`
	`7`	`+ ber "github.com/go-asn1-ber/asn1-ber"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// SimpleBindRequest represents a username/password bind operation`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ package ldap`
`22`	`22`	`import (`
`23`	`23`	`"fmt"`
`24`	`24`
`25`		`- ber "gopkg.in/asn1-ber.v1"`
	`25`	`+ ber "github.com/go-asn1-ber/asn1-ber"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// CompareRequest represents an LDAP CompareRequest operation.`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"sync/atomic"`
`12`	`12`	`"time"`
`13`	`13`
`14`		`- ber "gopkg.in/asn1-ber.v1"`
	`14`	`+ ber "github.com/go-asn1-ber/asn1-ber"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"testing"`
`13`	`13`	`"time"`
`14`	`14`
`15`		`- "gopkg.in/asn1-ber.v1"`
	`15`	`+ "github.com/go-asn1-ber/asn1-ber"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func TestUnresponsiveConnection(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"strconv"`
`6`	`6`
`7`		`- "gopkg.in/asn1-ber.v1"`
	`7`	`+ "github.com/go-asn1-ber/asn1-ber"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"runtime"`
`8`	`8`	`"testing"`
`9`	`9`
`10`		`- ber "gopkg.in/asn1-ber.v1"`
	`10`	`+ ber "github.com/go-asn1-ber/asn1-ber"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestControlPaging(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package ldap`
`3`	`3`	`import (`
`4`	`4`	`"log"`
`5`	`5`
`6`		`- ber "gopkg.in/asn1-ber.v1"`
	`6`	`+ ber "github.com/go-asn1-ber/asn1-ber"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// debugging type`