Merge pull request #1839 from nniuzft/releng_20210407_193728

Update version for 2.5.0 release.

Author: nniuzft

WORKSPACE

@@ -15,8 +15,8 @@ workspace(name = "tf_serving")
 load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "150b5a4feb512d4c9f82d32fc342b70281fddf68944a61d1ff171a8024bd27a5",
-    git_commit = "e0b0822dd5fabe2d9b8374c7d7c7fb375ac9d98e",
+    sha256 = "073403cc88520dfe60ac79e1205995931c7c8f744b2e492cada61fe32e2e9f4e",
+    git_commit = "a8b6d5ff93a37ccba92137e1cab2ae2ee6640ad6",
 )
 
 # Import all of TensorFlow Serving's external dependencies.

tensorflow_serving/model_servers/BUILD

@@ -490,7 +490,7 @@ pkg_deb(
     homepage = "https://github.com/tensorflow/serving",
     maintainer = "TensorFlow Serving team",
     package = "tensorflow-model-server",
-    version = "undefined",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
+    version = "2.5.0",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )
 
 # Build with '-c opt'
@@ -501,5 +501,5 @@ pkg_deb(
     homepage = "https://github.com/tensorflow/serving",
     maintainer = "TensorFlow Serving team",
     package = "tensorflow-model-server-universal",
-    version = "undefined",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
+    version = "2.5.0",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )

tensorflow_serving/model_servers/version.h

@@ -22,8 +22,8 @@ limitations under the License.
 #define TF_MODELSERVER_STR_HELPER(x) #x
 #define TF_MODELSERVER_STR(x) TF_MODELSERVER_STR_HELPER(x)
 
-#define TF_MODELSERVER_MAJOR_VERSION 0
-#define TF_MODELSERVER_MINOR_VERSION 0
+#define TF_MODELSERVER_MAJOR_VERSION 2
+#define TF_MODELSERVER_MINOR_VERSION 5
 #define TF_MODELSERVER_PATCH_VERSION 0
 // TF_MODELSERVER_VERSION_SUFFIX is non-empty for pre-releases
 // (e.g. "-alpha", "-alpha.1", "-beta", "-rc", "-rc.1")

tensorflow_serving/tools/pip_package/setup.py

@@ -31,9 +31,9 @@
 DOCLINES = __doc__.split('\n')
 
 # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
-_VERSION = '0.0.0'
+_VERSION = '2.5.0'
 # Have this by default be open; releasing a new version will lock to TF version
-_TF_VERSION = '>=1.2.0,<3'
+_TF_VERSION = '>=2.5.0-rc0,<3'
 _TF_VERSION_SANITIZED = _TF_VERSION.replace('-', '')
 
 project_name = 'tensorflow-serving-api'