fix dependency resolution errors

.travis.yml

@@ -28,12 +28,3 @@ script:
   - go get github.com/haya14busa/goverage
   - goverage -coverprofile=coverage.txt ./...
   - bash <(curl -s https://codecov.io/bash) -t c5bd3dd8-e037-45d6-a426-968b3462a930
-
-jobs:
-  include:
-    - stage: integration
-      name: "Integration Tests"
-      script:
-        - git clone https://github.com/Comcast/comcast-bascule.git
-        - cd comcast-bascule
-        # build comcast-bascule

CHANGELOG.md

@@ -40,12 +40,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added constructor, enforcer, and listener alice decorators
 - Basic code and structure established
 
-[Unreleased]: https://github.com/Comcast/comcast-bascule/compare/v0.2.5...HEAD
-[v0.2.5]: https://github.com/Comcast/comcast-bascule/compare/0.2.4...v0.2.5
-[v0.2.4]: https://github.com/Comcast/comcast-bascule/compare/0.2.3...v0.2.4
-[v0.2.3]: https://github.com/Comcast/comcast-bascule/compare/0.2.2...v0.2.3
-[v0.2.2]: https://github.com/Comcast/comcast-bascule/compare/0.2.1...v0.2.2
-[v0.2.1]: https://github.com/Comcast/comcast-bascule/compare/0.2.0...v0.2.1
-[v0.2.0]: https://github.com/Comcast/comcast-bascule/compare/0.1.1...v0.2.0
-[v0.1.1]: https://github.com/Comcast/comcast-bascule/compare/0.1.0...v0.1.1
-[v0.1.0]: https://github.com/Comcast/comcast-bascule/compare/0.0.0...v0.1.0
+[Unreleased]: https://github.com/xmidt-org/bascule/compare/v0.2.5...HEAD
+[v0.2.5]: https://github.com/xmidt-org/bascule/compare/0.2.4...v0.2.5
+[v0.2.4]: https://github.com/xmidt-org/bascule/compare/0.2.3...v0.2.4
+[v0.2.3]: https://github.com/xmidt-org/bascule/compare/0.2.2...v0.2.3
+[v0.2.2]: https://github.com/xmidt-org/bascule/compare/0.2.1...v0.2.2
+[v0.2.1]: https://github.com/xmidt-org/bascule/compare/0.2.0...v0.2.1
+[v0.2.0]: https://github.com/xmidt-org/bascule/compare/0.1.1...v0.2.0
+[v0.1.1]: https://github.com/xmidt-org/bascule/compare/0.1.0...v0.1.1
+[v0.1.0]: https://github.com/xmidt-org/bascule/compare/0.0.0...v0.1.0

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Documentation
 -------------
 
 If you contribute anything that changes the behavior of the
-application, document it in the [README](https://github.com/Comcast/comcast-bascule/blob/master/README.md) or [wiki](https://github.com/Comcast/comcast-bascule/wiki)! This includes new features, additional variants of behavior and breaking changes.
+application, document it in the [README](https://github.com/xmidt-org/bascule/blob/master/README.md) or [wiki](https://github.com/xmidt-org/bascule/wiki)! This includes new features, additional variants of behavior and breaking changes.
 
 Testing
 -------

README.md

@@ -6,8 +6,8 @@ comcast-bascule provides ...
 [![codecov.io](http://codecov.io/github/Comcast/comcast-bascule/coverage.svg?branch=master)](http://codecov.io/github/Comcast/comcast-bascule?branch=master)
 [![Code Climate](https://codeclimate.com/github/Comcast/comcast-bascule/badges/gpa.svg)](https://codeclimate.com/github/Comcast/comcast-bascule)
 [![Issue Count](https://codeclimate.com/github/Comcast/comcast-bascule/badges/issue_count.svg)](https://codeclimate.com/github/Comcast/comcast-bascule)
-[![Go Report Card](https://goreportcard.com/badge/github.com/Comcast/comcast-bascule)](https://goreportcard.com/report/github.com/Comcast/comcast-bascule)
-[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/Comcast/comcast-bascule/blob/master/LICENSE)
+[![Go Report Card](https://goreportcard.com/badge/github.com/xmidt-org/bascule)](https://goreportcard.com/report/github.com/xmidt-org/bascule)
+[![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/xmidt-org/bascule/blob/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/release/Comcast/comcast-bascule.svg)](CHANGELOG.md)
 
 

bascule/basculehttp/constructor_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Comcast/comcast-bascule/bascule"
+	"github.com/xmidt-org/bascule/bascule"
 	"github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
 )

bascule/basculehttp/enforcer_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Comcast/comcast-bascule/bascule"
+	"github.com/xmidt-org/bascule/bascule"
 	"github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
 )

bascule/basculehttp/listener_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/Comcast/comcast-bascule/bascule"
+	"github.com/xmidt-org/bascule/bascule"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

bascule/basculehttp/mocks_test.go

@@ -1,7 +1,7 @@
 package basculehttp
 
 import (
-	"github.com/Comcast/comcast-bascule/bascule"
+	"github.com/xmidt-org/bascule/bascule"
 	"github.com/SermoDigital/jose"
 	"github.com/SermoDigital/jose/crypto"
 	"github.com/SermoDigital/jose/jws"

bascule/basculehttp/tokenFactory_test.go

@@ -7,8 +7,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/Comcast/comcast-bascule/bascule"
-	"github.com/Comcast/comcast-bascule/bascule/key"
+	"github.com/xmidt-org/bascule/bascule"
+	"github.com/xmidt-org/bascule/bascule/key"
 	"github.com/SermoDigital/jose"
 	"github.com/SermoDigital/jose/jws"
 	"github.com/SermoDigital/jose/jwt"

bascule/key/resolver.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/Comcast/webpa-common/resource"
+	"github.com/xmidt-org/webpa-common/resource"
 )
 
 // Resolver loads and parses keys associated with key identifiers.

bascule/key/resolverFactory.go

@@ -3,8 +3,8 @@ package key
 import (
 	"fmt"
 
-	"github.com/Comcast/webpa-common/resource"
-	"github.com/Comcast/webpa-common/types"
+	"github.com/xmidt-org/webpa-common/resource"
+	"github.com/xmidt-org/webpa-common/types"
 )
 
 const (

bascule/key/resolverFactory_test.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Comcast/webpa-common/resource"
+	"github.com/xmidt-org/webpa-common/resource"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

bascule/key/resolver_test.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Comcast/webpa-common/resource"
+	"github.com/xmidt-org/webpa-common/resource"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

go.mod

@@ -3,12 +3,12 @@ module github.com/xmidt-org/bascule
 go 1.12
 
 require (
-	github.com/Comcast/webpa-common v0.0.0-20190312224005-400bb4f8fc50
 	github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2
 	github.com/go-kit/kit v0.8.0
 	github.com/go-logfmt/logfmt v0.4.0 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/goph/emperror v0.17.1
 	github.com/jtacoma/uritemplates v1.0.0 // indirect
 	github.com/stretchr/testify v1.3.0
+	github.com/xmidt-org/webpa-common v1.3.1
 )

go.sum

@@ -1,5 +1,3 @@
-github.com/Comcast/webpa-common v0.0.0-20190312224005-400bb4f8fc50 h1:GzM00ldkAr5Zp56z3E/ceRFL4O+S8cjE/ZFIhykHDI8=
-github.com/Comcast/webpa-common v0.0.0-20190312224005-400bb4f8fc50/go.mod h1:XSu1nN06grod4RD/3WRYdeMMKDXBpeosZgIoNcmYsus=
 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 h1:koK7z0nSsRiRiBWwa+E714Puh+DO+ZRdIyAXiXzL+lg=
 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
 github.com/airbrake/gobrake v3.6.1+incompatible/go.mod h1:wM4gu3Cn0W0K7GUuVWnlXZU11AGBXMILnrdOU8Kn00o=
@@ -48,6 +46,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/xmidt-org/webpa-common v1.3.1 h1:IenWLbUZwM9vtIZz5n8+/us9bv2XxAQSx8FCimYMN4U=
+github.com/xmidt-org/webpa-common v1.3.1/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=