Skip to content

Commit

Permalink
Rename asn1 ber dependency. (#243)
Browse files Browse the repository at this point in the history
* Rename asn1.ber dependency.

* go mod tidy

* Update travic CI to new asn1 ber

* Update travis go_import_path
  • Loading branch information
vagruchi authored and johnweldon committed Nov 7, 2019
1 parent c135faa commit dd082ae
Show file tree
Hide file tree
Showing 24 changed files with 29 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Import the latest version with:

## Required Libraries:

- gopkg.in/asn1-ber.v1
- github.com/go-asn1-ber/asn1-ber

## Features:

Expand Down
2 changes: 1 addition & 1 deletion add.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bind.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync/atomic"
"time"

ber "gopkg.in/asn1-ber.v1"
ber "github.com/go-asn1-ber/asn1-ber"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion conn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"gopkg.in/asn1-ber.v1"
"github.com/go-asn1-ber/asn1-ber"
)

func TestUnresponsiveConnection(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion control.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strconv"

"gopkg.in/asn1-ber.v1"
"github.com/go-asn1-ber/asn1-ber"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion control_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion debug.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ldap
import (
"log"

ber "gopkg.in/asn1-ber.v1"
ber "github.com/go-asn1-ber/asn1-ber"
)

// debugging type
Expand Down
2 changes: 1 addition & 1 deletion del.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dn.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion error.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion error_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"unicode/utf8"

"gopkg.in/asn1-ber.v1"
"github.com/go-asn1-ber/asn1-ber"
)

// Filter choices
Expand Down
2 changes: 1 addition & 1 deletion filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"gopkg.in/asn1-ber.v1"
"github.com/go-asn1-ber/asn1-ber"
)

type compileTest struct {
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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=
2 changes: 1 addition & 1 deletion ldap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion moddn.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modify.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion passwdmodify.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package ldap
import (
"fmt"

ber "gopkg.in/asn1-ber.v1"
ber "github.com/go-asn1-ber/asn1-ber"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion request.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ldap
import (
"errors"

ber "gopkg.in/asn1-ber.v1"
ber "github.com/go-asn1-ber/asn1-ber"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion search.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ import (
"sort"
"strings"

ber "gopkg.in/asn1-ber.v1"
ber "github.com/go-asn1-ber/asn1-ber"
)

// scope choices
Expand Down

0 comments on commit dd082ae

Please sign in to comment.