fix missed ginkgo v2 updates during branching

Author: geofffranks

integration/retry_test.go

@@ -2,13 +2,14 @@ package integration
 
 import (
 	"bytes"
+	"fmt"
+	"net/http"
+
 	"code.cloudfoundry.org/gorouter/route"
 	"code.cloudfoundry.org/gorouter/test/common"
 	"code.cloudfoundry.org/gorouter/test_util"
-	"fmt"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"net/http"
 )
 
 var _ = Describe("Retries", func() {

proxy/fails/classifier_group_test.go

@@ -10,8 +10,6 @@ import (
 	"code.cloudfoundry.org/gorouter/proxy/fails"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"code.cloudfoundry.org/gorouter/proxy/fails"
 )
 
 var _ = Describe("ClassifierGroup", func() {

test/common/tcp_app.go

@@ -1,16 +1,17 @@
 package common
 
 import (
+	"encoding/json"
+	"fmt"
+	"net"
+	"sync"
+
 	"code.cloudfoundry.org/gorouter/common/uuid"
 	"code.cloudfoundry.org/gorouter/route"
 	"code.cloudfoundry.org/gorouter/test_util"
-	"encoding/json"
-	"fmt"
 	nats "github.com/nats-io/nats.go"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"net"
-	"sync"
 )
 
 type TcpApp struct {