8 files changed, 17 insertions, 17 deletions
diff --git a/tools/module-updater/main.go b/tools/module-updater/main.go
index 08c5db2d0..d8cfbda1e 100644
--- a/tools/module-updater/main.go
+++ b/tools/module-updater/main.go
@@ -259,8 +259,8 @@ func verifyModulePath(moduleRootPath string) error {
 
 // rewriteProto re-write proto files by changing the go_package option declaration:
 // 1. option go_package = "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb";
-// 2. option go_package = "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb";
-// 4. option go_package = "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb";
+// 2. option go_package = "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb";
+// 4. option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb";
 func rewriteProto(moduleAbsRootPath, prev, next string) error {
 	protoDirPath := filepath.Join(moduleAbsRootPath, "proto")
 	if err := filepath.Walk(protoDirPath, func(path string, info fs.FileInfo, err error) error {
diff --git a/tools/protoc-gen-gitaly-lint/lint.go b/tools/protoc-gen-gitaly-lint/lint.go
index 901c22946..8bb4c9e70 100644
--- a/tools/protoc-gen-gitaly-lint/lint.go
+++ b/tools/protoc-gen-gitaly-lint/lint.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"gitlab.com/gitlab-org/gitaly/v14/internal/protoutil"
-	"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/protoutil"
+	"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
 	"google.golang.org/protobuf/reflect/protoregistry"
 	"google.golang.org/protobuf/types/descriptorpb"
 	"google.golang.org/protobuf/types/pluginpb"
diff --git a/tools/protoc-gen-gitaly-lint/lint_test.go b/tools/protoc-gen-gitaly-lint/lint_test.go
index 68a8424a4..02b18241c 100644
--- a/tools/protoc-gen-gitaly-lint/lint_test.go
+++ b/tools/protoc-gen-gitaly-lint/lint_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	_ "gitlab.com/gitlab-org/gitaly/v14/tools/protoc-gen-gitaly-lint/testdata"
+	_ "gitlab.com/gitlab-org/gitaly/v15/tools/protoc-gen-gitaly-lint/testdata"
 	"google.golang.org/protobuf/reflect/protodesc"
 	protoreg "google.golang.org/protobuf/reflect/protoregistry"
 	"google.golang.org/protobuf/types/descriptorpb"
diff --git a/tools/protoc-gen-gitaly-lint/method.go b/tools/protoc-gen-gitaly-lint/method.go
index b1f5c7282..39329b521 100644
--- a/tools/protoc-gen-gitaly-lint/method.go
+++ b/tools/protoc-gen-gitaly-lint/method.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"gitlab.com/gitlab-org/gitaly/v14/internal/protoutil"
-	"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/protoutil"
+	"gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
 	"google.golang.org/protobuf/types/descriptorpb"
 	"google.golang.org/protobuf/types/pluginpb"
 )
diff --git a/tools/protoc-gen-gitaly-lint/testdata/invalid.pb.go b/tools/protoc-gen-gitaly-lint/testdata/invalid.pb.go
index 6ab6f2aaa..72740a005 100644
--- a/tools/protoc-gen-gitaly-lint/testdata/invalid.pb.go
+++ b/tools/protoc-gen-gitaly-lint/testdata/invalid.pb.go
@@ -7,7 +7,7 @@
 package testdata
 
 import (
-	gitalypb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
+	gitalypb "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -960,12 +960,12 @@ var file_protoc_gen_gitaly_lint_testdata_invalid_proto_rawDesc = []byte{
 	0x6f, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x70,
 	0x6f, 0x1a, 0x1b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64,
 	0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08,
-	0xfa, 0x97, 0x28, 0x04, 0x08, 0x03, 0x10, 0x02, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x6c,
+	0xfa, 0x97, 0x28, 0x04, 0x08, 0x03, 0x10, 0x02, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x6c,
 	0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72,
-	0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x34, 0x2f, 0x74, 0x6f, 0x6f,
-	0x6c, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x69,
-	0x74, 0x61, 0x6c, 0x79, 0x2d, 0x6c, 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61,
-	0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x74, 0x6f, 0x6f, 0x6c, 0x73, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79,
+	0x2d, 0x6c, 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/tools/protoc-gen-gitaly-lint/testdata/invalid.proto b/tools/protoc-gen-gitaly-lint/testdata/invalid.proto
index 80deaa416..562700d40 100644
--- a/tools/protoc-gen-gitaly-lint/testdata/invalid.proto
+++ b/tools/protoc-gen-gitaly-lint/testdata/invalid.proto
@@ -5,7 +5,7 @@ package test;
 import "lint.proto";
 import "shared.proto";
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/tools/protoc-gen-gitaly-lint/testdata";
+option go_package = "gitlab.com/gitlab-org/gitaly/tools/protoc-gen-gitaly-lint/testdata";
 
 message InvalidMethodRequest {
 }
diff --git a/tools/protoc-gen-gitaly-lint/testdata/valid.pb.go b/tools/protoc-gen-gitaly-lint/testdata/valid.pb.go
index c49093be0..39477c540 100644
--- a/tools/protoc-gen-gitaly-lint/testdata/valid.pb.go
+++ b/tools/protoc-gen-gitaly-lint/testdata/valid.pb.go
@@ -7,7 +7,7 @@
 package testdata
 
 import (
-	gitalypb "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
+	gitalypb "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -651,7 +651,7 @@ var file_protoc_gen_gitaly_lint_testdata_valid_proto_rawDesc = []byte{
 	0x74, 0x65, 0x73, 0x74, 0x2e, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
 	0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x03, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69,
 	0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d,
-	0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x34, 0x2f, 0x74,
+	0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x35, 0x2f, 0x74,
 	0x6f, 0x6f, 0x6c, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d,
 	0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2d, 0x6c, 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x73, 0x74,
 	0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
diff --git a/tools/protoc-gen-gitaly-lint/testdata/valid.proto b/tools/protoc-gen-gitaly-lint/testdata/valid.proto
index e9763b067..398c1b15f 100644
--- a/tools/protoc-gen-gitaly-lint/testdata/valid.proto
+++ b/tools/protoc-gen-gitaly-lint/testdata/valid.proto
@@ -5,7 +5,7 @@ package test;
 import "lint.proto";
 import "shared.proto";
 
-option go_package = "gitlab.com/gitlab-org/gitaly/v14/tools/protoc-gen-gitaly-lint/testdata";
+option go_package = "gitlab.com/gitlab-org/gitaly/v15/tools/protoc-gen-gitaly-lint/testdata";
 
 message ValidRequest {
   gitaly.Repository destination = 1 [(gitaly.target_repository)=true];