Revert "Bump v1.51.x to 1.51.0-pre1 (#31620)" (#31621)

This reverts commit bae9dd79aa.
2 years ago · 42c2767c19
parent a437fa1ff9
commit 42c2767c19
39 changed files with 45 additions and 45 deletions
--- a/2
+++ b/2
@ -160,7 +160,7 @@ g_stands_for = "galaxy"  # @unused

 core_version = "29.0.0"  # @unused

-version = "1.51.0-pre1"  # @unused
+version = "1.51.0-dev"  # @unused

 GPR_PUBLIC_HDRS = [
    "include/grpc/support/alloc.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -25,12 +25,12 @@
 cmake_minimum_required(VERSION 3.5.1)

 set(PACKAGE_NAME          "grpc")
-set(PACKAGE_VERSION       "1.51.0-pre1")
+set(PACKAGE_VERSION       "1.51.0-dev")
 set(gRPC_CORE_VERSION     "29.0.0")
 set(gRPC_CORE_SOVERSION   "29")
-set(gRPC_CPP_VERSION      "1.51.0-pre1")
+set(gRPC_CPP_VERSION      "1.51.0-dev")
 set(gRPC_CPP_SOVERSION    "1.51")
-set(gRPC_CSHARP_VERSION   "2.51.0-pre1")
+set(gRPC_CSHARP_VERSION   "2.51.0-dev")
 set(gRPC_CSHARP_SOVERSION "2.51")
 set(PACKAGE_STRING        "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME       "${PACKAGE_NAME}-${PACKAGE_VERSION}")
@ -299,7 +299,7 @@ endif()
 if (gRPC_XDS_USER_AGENT_IS_CSHARP)
  # The value of the defines needs to contain quotes.
  # See https://github.com/grpc/grpc/blob/fbf32836a418cc84f58786700273b65cb9174e1d/src/core/ext/xds/xds_api.cc#L854
-  add_definitions("-DGRPC_XDS_USER_AGENT_NAME_SUFFIX=\"csharp\"" "-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX=\"2.51.0-pre1\"")
+  add_definitions("-DGRPC_XDS_USER_AGENT_NAME_SUFFIX=\"csharp\"" "-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX=\"2.51.0-dev\"")
 endif()

 if(UNIX AND NOT HAIKU)
--- a/4
+++ b/4
@ -411,8 +411,8 @@ Q = @
 endif

 CORE_VERSION = 29.0.0
-CPP_VERSION = 1.51.0-pre1
-CSHARP_VERSION = 2.51.0-pre1
+CPP_VERSION = 1.51.0-dev
+CSHARP_VERSION = 2.51.0-dev

 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
--- a/_metadata.py
+++ b/_metadata.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!

-__version__ = """1.51.0rc1"""
+__version__ = """1.51.0.dev0"""
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@ -16,7 +16,7 @@ settings:
  csharp_major_version: 2
  g_stands_for: galaxy
  protobuf_version: 3.21.6
-  version: 1.51.0-pre1
+  version: 1.51.0-dev
 configs:
  asan:
    CC: clang
--- a/config.m4
+++ b/config.m4
@ -1211,7 +1211,7 @@ if test "$PHP_GRPC" != "no"; then
    -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
    -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
    -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
-    -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.51.0RC1\""')
+    -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.51.0dev\""')

  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/channel_idle)
--- a/doc/g_stands_for.md
+++ b/doc/g_stands_for.md
@ -50,4 +50,4 @@
 - 1.48 'g' stands for ['garum'](https://github.com/grpc/grpc/tree/v1.48.x)
 - 1.49 'g' stands for ['gamma'](https://github.com/grpc/grpc/tree/v1.49.x)
 - 1.50 'g' stands for ['galley'](https://github.com/grpc/grpc/tree/v1.50.x)
- 1.51 'g' stands for ['galaxy'](https://github.com/grpc/grpc/tree/v1.51.x)
+- 1.51 'g' stands for ['galaxy'](https://github.com/grpc/grpc/tree/master)
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -22,7 +22,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-C++'
  # TODO (mxyan): use version that match gRPC version when pod is stabilized
-  version = '1.51.0-pre1'
+  version = '1.51.0-dev'
  s.version  = version
  s.summary  = 'gRPC C++ library'
  s.homepage = 'https://grpc.io'
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -21,7 +21,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-Core'
-  version = '1.51.0-pre1'
+  version = '1.51.0-dev'
  s.version  = version
  s.summary  = 'Core cross-platform gRPC library, written in C'
  s.homepage = 'https://grpc.io'
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@ -21,7 +21,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-ProtoRPC'
-  version = '1.51.0-pre1'
+  version = '1.51.0-dev'
  s.version  = version
  s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
  s.homepage = 'https://grpc.io'
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@ -21,7 +21,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-RxLibrary'
-  version = '1.51.0-pre1'
+  version = '1.51.0-dev'
  s.version  = version
  s.summary  = 'Reactive Extensions library for iOS/OSX.'
  s.homepage = 'https://grpc.io'
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -20,7 +20,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC'
-  version = '1.51.0-pre1'
+  version = '1.51.0-dev'
  s.version  = version
  s.summary  = 'gRPC client library for iOS/OSX'
  s.homepage = 'https://grpc.io'
--- a/include/grpcpp/version_info.h
+++ b/include/grpcpp/version_info.h
@ -21,7 +21,7 @@
 #define GRPC_CPP_VERSION_MAJOR 1
 #define GRPC_CPP_VERSION_MINOR 51
 #define GRPC_CPP_VERSION_PATCH 0
-#define GRPC_CPP_VERSION_TAG "pre1"
-#define GRPC_CPP_VERSION_STRING "1.51.0-pre1"
+#define GRPC_CPP_VERSION_TAG "dev"
+#define GRPC_CPP_VERSION_STRING "1.51.0-dev"

 #endif  // GRPCPP_VERSION_INFO_H
--- a/package.xml
+++ b/package.xml
@ -13,8 +13,8 @@
 <date>2019-09-24</date>
 <time>16:06:07</time>
 <version>
-  <release>1.51.0RC1</release>
-  <api>1.51.0RC1</api>
+  <release>1.51.0dev</release>
+  <api>1.51.0dev</api>
 </version>
 <stability>
  <release>beta</release>
--- a/src/csharp/build/dependencies.props
+++ b/src/csharp/build/dependencies.props
@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
  <PropertyGroup>
-    <GrpcCsharpVersion>2.51.0-pre1</GrpcCsharpVersion>
+    <GrpcCsharpVersion>2.51.0-dev</GrpcCsharpVersion>
    <GoogleProtobufVersion>3.21.6</GoogleProtobufVersion>
  </PropertyGroup>
 </Project>
--- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
@ -42,7 +42,7 @@ Pod::Spec.new do |s|
  # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
  # before them.
  s.name     = '!ProtoCompiler-gRPCCppPlugin'
-  v = '1.51.0-pre1'
+  v = '1.51.0-dev'
  s.version  = v
  s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
  s.description = <<-DESC
--- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@ -42,7 +42,7 @@ Pod::Spec.new do |s|
  # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
  # before them.
  s.name     = '!ProtoCompiler-gRPCPlugin'
-  v = '1.51.0-pre1'
+  v = '1.51.0-dev'
  s.version  = v
  s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
  s.description = <<-DESC
--- a/src/objective-c/GRPCClient/version.h
+++ b/src/objective-c/GRPCClient/version.h
@ -22,4 +22,4 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.

-#define GRPC_OBJC_VERSION_STRING @"1.51.0-pre1"
+#define GRPC_OBJC_VERSION_STRING @"1.51.0-dev"
--- a/src/objective-c/tests/version.h
+++ b/src/objective-c/tests/version.h
@ -22,5 +22,5 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.

-#define GRPC_OBJC_VERSION_STRING @"1.51.0-pre1"
+#define GRPC_OBJC_VERSION_STRING @"1.51.0-dev"
 #define GRPC_C_VERSION_STRING @"29.0.0"
--- a/src/php/ext/grpc/version.h
+++ b/src/php/ext/grpc/version.h
@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H

-#define PHP_GRPC_VERSION "1.51.0RC1"
+#define PHP_GRPC_VERSION "1.51.0dev"

 #endif /* VERSION_H */
--- a/src/python/grpcio/grpc/_grpcio_metadata.py
+++ b/src/python/grpcio/grpc/_grpcio_metadata.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!

-__version__ = """1.51.0rc1"""
+__version__ = """1.51.0.dev0"""
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/python/grpcio_admin/grpc_version.py
+++ b/src/python/grpcio_admin/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/python/grpcio_channelz/grpc_version.py
+++ b/src/python/grpcio_channelz/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/python/grpcio_csds/grpc_version.py
+++ b/src/python/grpcio_csds/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/python/grpcio_reflection/grpc_version.py
+++ b/src/python/grpcio_reflection/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/python/grpcio_status/grpc_version.py
+++ b/src/python/grpcio_status/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/python/grpcio_testing/grpc_version.py
+++ b/src/python/grpcio_testing/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@ -14,4 +14,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@ -14,5 +14,5 @@

 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.51.0.pre1'
+  VERSION = '1.51.0.dev'
 end
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@ -14,6 +14,6 @@

 module GRPC
  module Tools
-    VERSION = '1.51.0.pre1'
+    VERSION = '1.51.0.dev'
  end
 end
--- a/tools/distrib/python/grpc_version.py
+++ b/tools/distrib/python/grpc_version.py
@ -14,5 +14,5 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
 PROTOBUF_VERSION = '3.21.6'
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@ -14,5 +14,5 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

-VERSION = '1.51.0rc1'
+VERSION = '1.51.0.dev0'
 PROTOBUF_VERSION = '3.21.6'
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.51.0-pre1
+PROJECT_NUMBER         = 1.51.0-dev

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.51.0-pre1
+PROJECT_NUMBER         = 1.51.0-dev

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.objc
+++ b/tools/doxygen/Doxyfile.objc
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.51.0-pre1
+PROJECT_NUMBER         = 1.51.0-dev

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.objc.internal
+++ b/tools/doxygen/Doxyfile.objc.internal
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.51.0-pre1
+PROJECT_NUMBER         = 1.51.0-dev

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.php
+++ b/tools/doxygen/Doxyfile.php
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC PHP"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.51.0-pre1
+PROJECT_NUMBER         = 1.51.0-dev

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a