use correct go mod semver (#395)

Signed-off-by: Scott Nichols <snichols@vmware.com>

.circleci/config.yml

@@ -35,16 +35,16 @@ jobs:
 
       - restore_cache:
           keys:
-            - gomod-cache-{{ checksum "go.sum" }}
+            - gomod-cache-{{ checksum "v2/go.sum" }}
       - run:
           name: "Check modules via go tidy"
-          command: go mod tidy && git diff --exit-code go.{mod,sum}
+          command: pushd v2; go mod tidy && git diff --exit-code go.{mod,sum}; popd
       - run:
           name: "Enforce Go Formatted Code"
-          command: "! GO111MODULE=off go fmt ./... 2>&1 | read" # Avoid any dependency resolution
+          command: "! GO111MODULE=off go fmt ./v2/... 2>&1 | read" # Avoid any dependency resolution
       - run:
           name: "Run go vet"
-          command: go vet ./...
+          command: pushd v2; go vet ./...; popd
       - run:
           name: Run unit tests
           command: |
@@ -55,7 +55,7 @@ jobs:
             TEST_AMQP_URL=amqp://localhost/test ./hack/integration-test.sh | tee ${TEST_RESULTS}/go-integration-test.out
 
       - save_cache:
-          key: gomod-cache-{{ checksum "go.sum" }}
+          key: gomod-cache-{{ checksum "v2/go.sum" }}
           paths:
             - "/go/pkg/mod"
 

hack/integration-test.sh

@@ -4,8 +4,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+# v2 only
+pushd ./v2
+
 # Run integration tests not in parallel
 go test -v -parallel 1 ./test/... -coverprofile ${TEST_RESULTS:-.}/integration_test_cover.out -timeout 60s
 
 # Remove test only deps.
 go mod tidy
+
+popd

hack/unit-test.sh

@@ -4,8 +4,16 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# Test everything in pkg and cmd, except amqp
-go test -v ./pkg/... ./cmd/... -coverprofile ${TEST_RESULTS:-.}/unit_test_cover.out -timeout 15s
-
+# v1
+pushd ./v1
+go test -v ./... -coverprofile ${TEST_RESULTS:-.}/unit_test_cover.out -timeout 15s
 # Remove test only deps.
 go mod tidy
+popd
+
+# v2
+pushd ./v2
+go test -v ./... -coverprofile ${TEST_RESULTS:-.}/unit_test_cover.out -timeout 15s
+# Remove test only deps.
+go mod tidy
+popd

v1/README.md

@@ -1,4 +1,4 @@
-# NOTE: The Legacy directory will be removed for v2.0.0.
+# NOTE: The v1 directory will be removed for v2.0.0.
 
 We will make a final migration release that will match the v2.0.0 release with
 the addition of this legacy directory for migration support.

v1/alias.go

@@ -1,15 +1,15 @@
-package cloudevents
+package v1
 
 // Package cloudevents alias' common functions and types to improve discoverability and reduce
 // the number of imports for simple HTTP clients.
 
 import (
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/client"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/context"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/observability"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport/http"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/client"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/context"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/observability"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/transport/http"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Client

v1/binding/buffering/acks_before_finish_message.go

@@ -3,7 +3,7 @@ package buffering
 import (
 	"sync/atomic"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 type acksMessage struct {

v1/binding/buffering/acks_before_finish_message_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func TestWithAcksBeforeFinish(t *testing.T) {

v1/binding/buffering/binary_buffer_message.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/valyala/bytebufferpool"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 var binaryMessagePool bytebufferpool.Pool

v1/binding/buffering/copy_message.go

@@ -3,7 +3,7 @@ package buffering
 import (
 	"context"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 // BufferMessage does the same than CopyMessage and it also bounds the original Message

v1/binding/buffering/copy_message_benchmark_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
 )
 
 var err error

v1/binding/buffering/copy_message_test.go

@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 type copyMessageTestCase struct {

v1/binding/buffering/struct_buffer_message.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/valyala/bytebufferpool"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
 )
 
 var structMessagePool bytebufferpool.Pool

v1/binding/event_message.go

@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"context"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 // EventMessage type-converts a cloudevents.Event object to implement Message.

v1/binding/example_implementing_test.go

@@ -7,9 +7,9 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/transport"
 )
 
 // ExMessage is a json.RawMessage, a byte slice containing a JSON encoded event.

v1/binding/example_using_test.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/client"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/client"
 )
 
 const count = 3 // Example ends after this many events.

v1/binding/finish_message_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func TestWithFinish(t *testing.T) {

v1/binding/format/format.go

@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"strings"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 // Format marshals and unmarshals structured events to bytes.

v1/binding/format/format_test.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func TestJSON(t *testing.T) {

v1/binding/interfaces.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 // Encoding enum specifies the type of encodings supported by binding interfaces

v1/binding/spec/attributes.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Kind is a version-independent identifier for a CloudEvent context attribute.

v1/binding/spec/attributes_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 )

v1/binding/spec/spec.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Version provides meta-data for a single spec-version.

v1/binding/spec/spec_test.go

@@ -3,8 +3,8 @@ package spec_test
 import (
 	"testing"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 	"github.com/stretchr/testify/assert"
 )
 

v1/binding/test/benchmark.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 // Simple send/receive benchmark.

v1/binding/test/events.go

@@ -7,9 +7,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func strptr(s string) *string { return &s }

v1/binding/test/mock_binary_message.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"io/ioutil"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 // MockBinaryMessage implements a binary-mode message as a simple struct.

v1/binding/test/mock_structured_message.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"io/ioutil"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
 )
 
 // MockStructuredMessage implements a structured-mode message as a simple struct.

v1/binding/test/test.go

@@ -12,12 +12,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // NameOf generates a string test name from x, esp. for ce.Event and ce.Message.

v1/binding/test/test_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
 )
 
 func TestEvent(t *testing.T) {

v1/binding/test/transcoder.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 type TranscoderTestArgs struct {

v1/binding/to_event.go

@@ -6,11 +6,11 @@ import (
 	"errors"
 	"io"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 var ErrCannotConvertToEvent = errors.New("cannot convert message to event")

v1/binding/to_event_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 type toEventTestCase struct {

v1/binding/transcoder.go

@@ -1,6 +1,6 @@
 package binding
 
-import ce "github.com/cloudevents/sdk-go/legacy"
+import ce "github.com/cloudevents/sdk-go/v1"
 
 // Implements a transformation process while transferring the event from the Message implementation
 // to the provided encoder

v1/binding/transcoder/add_metadata.go

@@ -1,9 +1,9 @@
 package transcoder
 
 import (
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 // Add cloudevents attribute (if missing) during the encoding process

v1/binding/transcoder/add_metadata_test.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func TestAddAttribute(t *testing.T) {

v1/binding/transcoder/delete_metadata.go

@@ -1,9 +1,9 @@
 package transcoder
 
 import (
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 // Delete cloudevents attribute during the encoding process

v1/binding/transcoder/delete_metadata_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
 )
 
 func TestDeleteAttribute(t *testing.T) {

v1/binding/transcoder/update_metadata.go

@@ -1,9 +1,9 @@
 package transcoder
 
 import (
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 // Update cloudevents attribute (if present) using the provided function during the encoding process

v1/binding/transcoder/update_metadata_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
 )
 
 func TestUpdateAttribute(t *testing.T) {

v1/binding/transcoder/version.go

@@ -1,9 +1,9 @@
 package transcoder
 
 import (
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 // Returns a TransformerFactory that converts the event context version to the specified one.

v1/binding/transcoder/version_test.go

@@ -7,11 +7,11 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 func TestVersionTranscoder(t *testing.T) {

v1/binding/translate.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	ce "github.com/cloudevents/sdk-go/legacy"
+	ce "github.com/cloudevents/sdk-go/v1"
 )
 
 const (

v1/binding/transport.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"io"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/transport"
 )
 
 // BindingTransport implements transport.Transport using a Sender and Receiver.

v1/binding/transport_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
 )
 
 func TestTransportSend(t *testing.T) {

v1/bindings/amqp/amqp_test.go

@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"pack.ag/amqp"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 func TestSendSkipBinary(t *testing.T) {

v1/bindings/amqp/encoder.go

@@ -7,10 +7,10 @@ import (
 
 	"pack.ag/amqp"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Fill the provided amqpMessage with the message m.

v1/bindings/amqp/message.go

@@ -9,9 +9,9 @@ import (
 
 	"pack.ag/amqp"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 const prefix = "cloudEvents:" // Name prefix for AMQP properties that hold CE attributes.

v1/bindings/amqp/option.go

@@ -1,6 +1,6 @@
 package amqp
 
-import "github.com/cloudevents/sdk-go/legacy/pkg/binding"
+import "github.com/cloudevents/sdk-go/v1/binding"
 
 type SenderOptionFunc func(sender *Sender)
 

v1/bindings/amqp/receiver.go

@@ -3,7 +3,7 @@ package amqp
 import (
 	"context"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 	"pack.ag/amqp"
 )
 

v1/bindings/amqp/sender.go

@@ -5,7 +5,7 @@ import (
 
 	"pack.ag/amqp"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 // Sender wraps an amqp.Sender as a binding.Sender

v1/bindings/amqp/types.go

@@ -1,6 +1,6 @@
 package amqp
 
-import "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+import "github.com/cloudevents/sdk-go/v1/cloudevents/types"
 
 func safeAMQPPropertiesUnwrap(val interface{}) (interface{}, error) {
 	v, err := types.Validate(val)

v1/bindings/http/http_test.go

@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	"github.com/cloudevents/sdk-go/legacy/pkg/bindings/http"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	"github.com/cloudevents/sdk-go/v1/bindings/http"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 func TestSendSkipBinary(t *testing.T) {

v1/bindings/http/message.go

@@ -6,9 +6,9 @@ import (
 	nethttp "net/http"
 	"strings"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 )
 
 const prefix = "Ce-"

v1/bindings/http/option.go

@@ -1,6 +1,6 @@
 package http
 
-import "github.com/cloudevents/sdk-go/legacy/pkg/binding"
+import "github.com/cloudevents/sdk-go/v1/binding"
 
 type SenderOptionFunc func(sender *Sender)
 

v1/bindings/http/receiver.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	nethttp "net/http"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 type msgErr struct {

v1/bindings/http/request_encoder.go

@@ -6,10 +6,10 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Fill the provided req with the message m.

v1/bindings/http/response_encoder.go

@@ -6,10 +6,10 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 // Fill the provided res with the message m.

v1/bindings/http/response_encoder_test.go

@@ -8,10 +8,10 @@ import (
 
 	"net/http"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 func TestEncodeHttpResponse(t *testing.T) {

v1/bindings/http/sender.go

@@ -7,7 +7,7 @@ import (
 	nethttp "net/http"
 	"net/url"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 type Sender struct {

v1/bindings/kafka_sarama/kafka_test.go

@@ -14,9 +14,9 @@ import (
 
 	"github.com/Shopify/sarama"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
 )
 
 const (

v1/bindings/kafka_sarama/message.go

@@ -5,10 +5,10 @@ import (
 	"context"
 	"strings"
 
-	ce "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
+	ce "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
 
 	"github.com/Shopify/sarama"
 )

v1/bindings/kafka_sarama/message_benchmark_test.go

@@ -6,9 +6,9 @@ import (
 	"context"
 	"testing"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/bindings/kafka_sarama"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/bindings/kafka_sarama"
 )
 
 // Avoid DCE

v1/bindings/kafka_sarama/option.go

@@ -1,6 +1,6 @@
 package kafka_sarama
 
-import "github.com/cloudevents/sdk-go/legacy/pkg/binding"
+import "github.com/cloudevents/sdk-go/v1/binding"
 
 type SenderOptionFunc func(sender *Sender)
 

v1/bindings/kafka_sarama/producer_message_encoder.go

@@ -7,11 +7,11 @@ import (
 
 	"github.com/Shopify/sarama"
 
-	ce "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/format"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/spec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	ce "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/format"
+	"github.com/cloudevents/sdk-go/v1/binding/spec"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 )
 
 const (

v1/bindings/kafka_sarama/producer_message_encoder_benchmark_test.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/Shopify/sarama"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	"github.com/cloudevents/sdk-go/legacy/pkg/bindings/kafka_sarama"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	"github.com/cloudevents/sdk-go/v1/bindings/kafka_sarama"
 )
 
 // Avoid DCE

v1/bindings/kafka_sarama/producer_message_encoder_test.go

@@ -10,10 +10,10 @@ import (
 	"github.com/Shopify/sarama"
 	"github.com/stretchr/testify/require"
 
-	cloudevents "github.com/cloudevents/sdk-go/legacy"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding/test"
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	cloudevents "github.com/cloudevents/sdk-go/v1"
+	"github.com/cloudevents/sdk-go/v1/binding"
+	"github.com/cloudevents/sdk-go/v1/binding/test"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 )
 
 func TestEncodeKafkaProducerMessage(t *testing.T) {

v1/bindings/kafka_sarama/receiver.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/Shopify/sarama"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 type msgErr struct {

v1/bindings/kafka_sarama/sender.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/Shopify/sarama"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/binding"
+	"github.com/cloudevents/sdk-go/v1/binding"
 )
 
 type Sender struct {

v1/cloudevents/client/client.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/extensions"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/observability"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport/http"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/extensions"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/observability"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/transport"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/transport/http"
 	"go.opencensus.io/trace"
 )
 

v1/cloudevents/client/client_test.go

@@ -12,10 +12,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/client"
-	cehttp "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport/http"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/client"
+	cehttp "github.com/cloudevents/sdk-go/v1/cloudevents/transport/http"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 	"github.com/lightstep/tracecontext.go/traceparent"
 	"go.opencensus.io/trace"
 

v1/cloudevents/client/defaulters.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
 	"github.com/google/uuid"
 )
 

v1/cloudevents/client/defaulters_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
 	"github.com/google/go-cmp/cmp"
 )
 

v1/cloudevents/client/observability.go

@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/observability"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/observability"
 	"go.opencensus.io/stats"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"

v1/cloudevents/client/options_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
 	"github.com/google/go-cmp/cmp"
 )
 

v1/cloudevents/client/receiver.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/transport"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/transport"
 )
 
 // Receive is the signature of a fn to be invoked for incoming cloudevents.

v1/cloudevents/client/receiver_test.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	"github.com/cloudevents/sdk-go/v1/cloudevents"
 	"github.com/google/go-cmp/cmp"
 )
 

v1/cloudevents/content_type_test.go

@@ -3,7 +3,7 @@ package cloudevents_test
 import (
 	"testing"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 	"github.com/google/go-cmp/cmp"
 )
 

v1/cloudevents/context/context_test.go

@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"testing"
 
-	cecontext "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/context"
+	cecontext "github.com/cloudevents/sdk-go/v1/cloudevents/context"
 	"github.com/google/go-cmp/cmp"
 )
 

v1/cloudevents/data_content_encoding_test.go

@@ -3,7 +3,7 @@ package cloudevents_test
 import (
 	"testing"
 
-	ce "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents"
+	ce "github.com/cloudevents/sdk-go/v1/cloudevents"
 	"github.com/google/go-cmp/cmp"
 )
 

v1/cloudevents/datacodec/codec.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/datacodec/json"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/datacodec/text"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/datacodec/xml"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/observability"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/datacodec/json"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/datacodec/text"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/datacodec/xml"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/observability"
 )
 
 // Decoder is the expected function signature for decoding `in` to `out`. What

v1/cloudevents/datacodec/codec_test.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/datacodec"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/datacodec"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 	"github.com/google/go-cmp/cmp"
 )
 

v1/cloudevents/datacodec/json/data.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/observability"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/observability"
 )
 
 // Decode takes `in` as []byte, or base64 string, normalizes in to unquoted and

v1/cloudevents/datacodec/json/data_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	cej "github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/datacodec/json"
-	"github.com/cloudevents/sdk-go/legacy/pkg/cloudevents/types"
+	cej "github.com/cloudevents/sdk-go/v1/cloudevents/datacodec/json"
+	"github.com/cloudevents/sdk-go/v1/cloudevents/types"
 	"github.com/google/go-cmp/cmp"
 )