resolve conflict

Author: stillfox-lee

test/e2e/go.mod

@@ -5,6 +5,7 @@ go 1.18
 require (
 	github.com/apache/apisix-ingress-controller v0.0.0-20210105024109-72e53386de5a
 	github.com/apache/apisix-ingress-controller/test/e2e/testbackend v0.0.0
+	github.com/eclipse/paho.mqtt.golang v1.3.5
 	github.com/gavv/httpexpect/v2 v2.3.1
 	github.com/gorilla/websocket v1.4.2
 	github.com/gruntwork-io/terratest v0.32.8

test/e2e/suite-plugins/mqtt-proxy.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/onsi/ginkgo"
+	ginkgo "github.com/onsi/ginkgo/v2"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"