Merge pull request #1594 from nrobeR/releng_20200407_175550

Update version for 2.2.0-rc0 release.

Author: nrobeR

WORKSPACE

@@ -11,8 +11,8 @@ load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "06c92078a88b21cd4af89e46e65fc62896c3d46574ac92f6a635d4141b19aa00",
-    git_commit = "fc94412b3921ba38e763438b2eedf30da596ed1c",
+    sha256 = "c0ab3a378a7bae2a0562b88432d70d8eeafca5186a3482da8e7b9b2569521941",
+    git_commit = "2641774badd99be2ea1d3c24ec89d661dd3343bd",
 )
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

tensorflow_serving/model_servers/BUILD

@@ -440,7 +440,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.2.0-rc0",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )
 
 # Build with '-c opt'
@@ -451,5 +451,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.2.0-rc0",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )

tensorflow_serving/model_servers/version.h

@@ -22,12 +22,12 @@ 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 2
 #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")
-#define TF_MODELSERVER_VERSION_SUFFIX ""
+#define TF_MODELSERVER_VERSION_SUFFIX "-rc0"
 
 #ifndef TF_MODELSERVER_VERSION_NO_META
 // TF_MODELSERVER_BUILD_TAG can be set to be nightly for nightly builds

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.2.0-rc0'
 # Have this by default be open; releasing a new version will lock to TF version
-_TF_VERSION = '>=1.2.0,<3'
+_TF_VERSION = '~=2.2.0-rc0'
 _TF_VERSION_SANITIZED = _TF_VERSION.replace('-', '')
 
 project_name = 'tensorflow-serving-api'