Merge branch 'grpc:master' into okhttp-additional-ciphers

RELEASING.md

@@ -10,19 +10,6 @@ We deploy GRPC to Maven Central under the following systems:
 
 Other systems may also work, but we haven't verified them.
 
-Prerequisites
--------------
-
-### Set Up OSSRH Account
-
-If you haven't deployed artifacts to Maven Central before, you need to setup
-your OSSRH (OSS Repository Hosting) account.
-- Follow the instructions on [this
-  page](https://central.sonatype.org/pages/ossrh-guide.html) to set up an
-  account with OSSRH.
-  - You only need to create the account, not set up a new project
-  - Contact a gRPC maintainer to add your account after you have created it.
-
 Common Variables
 ----------------
 Many of the following commands expect release-specific variables to be set. Set

interop-testing/build.gradle

@@ -147,13 +147,6 @@ task xds_test_server(type: CreateStartScripts) {
     classpath = startScripts.classpath
 }
 
-task xds_e2e_client(type: CreateStartScripts) {
-    mainClassName = "io.grpc.testing.integration.XdsInteropTest"
-    applicationName = "xds-e2e-test-client"
-    outputDir = new File(project.buildDir, 'tmp/scripts/' + name)
-    classpath = startScripts.classpath
-}
-
 applicationDistribution.into("bin") {
     from(test_client)
     from(test_server)
@@ -164,7 +157,6 @@ applicationDistribution.into("bin") {
     from(grpclb_fallback_test_client)
     from(xds_test_client)
     from(xds_test_server)
-    from(xds_e2e_client)
     fileMode = 0755
 }