From 947033e11df6596d0da795a818e8dd0ac21be492 Mon Sep 17 00:00:00 2001
From: Cody Oss <codyoss@google.com>
Date: Thu, 31 Oct 2019 14:18:33 -0600
Subject: [PATCH] chore: stop release for dialogflow

---
 .../grpc-google-cloud-dialogflow-v2/pom.xml   | 23 ++++++++-
 .../pom.xml                                   | 23 ++++++++-
 google-api-grpc/pom.xml                       |  8 ++--
 .../proto-google-cloud-dialogflow-v2/pom.xml  | 23 ++++++++-
 .../pom.xml                                   | 23 ++++++++-
 google-cloud-bom/pom.xml                      | 10 ++--
 .../.repo-metadata.json                       | 13 -----
 .../google-cloud-dialogflow/README.md         |  2 -
 .../google-cloud-dialogflow/pom.xml           | 24 +++++++++-
 .../google-cloud-dialogflow/synth.metadata    | 42 ----------------
 .../google-cloud-dialogflow/synth.py          | 48 -------------------
 versions.txt                                  |  5 --
 12 files changed, 119 insertions(+), 125 deletions(-)
 delete mode 100644 google-cloud-clients/google-cloud-dialogflow/.repo-metadata.json
 delete mode 100644 google-cloud-clients/google-cloud-dialogflow/synth.metadata
 delete mode 100644 google-cloud-clients/google-cloud-dialogflow/synth.py

diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
index 8cca329d102d..853465d716c6 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2/pom.xml
@@ -3,7 +3,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-dialogflow-v2</artifactId>
-  <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-dialogflow-v2:current} -->
+  <version>0.82.0</version>
   <name>grpc-google-cloud-dialogflow-v2</name>
   <description>GRPC library for grpc-google-cloud-dialogflow-v2</description>
   <parent>
@@ -28,6 +28,27 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <!-- skip deployment until we fully migrate to https://github.com/googleapis/java-dialogflow -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.8</version>
+        <configuration>
+          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <reporting>
     <plugins>
       <plugin>
diff --git a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
index 97e75cbf8934..720af9227540 100644
--- a/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,7 +3,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>grpc-google-cloud-dialogflow-v2beta1</artifactId>
-  <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-dialogflow-v2beta1:current} -->
+  <version>0.82.0</version>
   <name>grpc-google-cloud-dialogflow-v2beta1</name>
   <description>GRPC library for grpc-google-cloud-dialogflow-v2beta1</description>
   <parent>
@@ -28,6 +28,27 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <!-- skip deployment until we fully migrate to https://github.com/googleapis/java-dialogflow -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.8</version>
+        <configuration>
+          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <reporting>
     <plugins>
       <plugin>
diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 71324625876a..08e0b9661f6a 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -306,22 +306,22 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dialogflow-v2beta1</artifactId>
-        <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-dialogflow-v2beta1:current} -->
+        <version>0.82.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-dialogflow-v2beta1</artifactId>
-        <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-dialogflow-v2beta1:current} -->
+        <version>0.82.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dialogflow-v2</artifactId>
-        <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-dialogflow-v2:current} -->
+        <version>0.82.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-dialogflow-v2</artifactId>
-        <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-dialogflow-v2:current} -->
+        <version>0.82.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
index e3466d9d34c1..e9459225f662 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/pom.xml
@@ -3,7 +3,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>proto-google-cloud-dialogflow-v2</artifactId>
-  <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-dialogflow-v2:current} -->
+  <version>0.82.0</version>
   <name>proto-google-cloud-dialogflow-v2</name>
   <description>PROTO library for proto-google-cloud-dialogflow-v2</description>
   <parent>
@@ -28,4 +28,25 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <!-- skip deployment until we fully migrate to https://github.com/googleapis/java-dialogflow -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.8</version>
+        <configuration>
+          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
index ac64fa5a95ae..cb80e8ab4679 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2beta1/pom.xml
@@ -3,7 +3,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>proto-google-cloud-dialogflow-v2beta1</artifactId>
-  <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-dialogflow-v2beta1:current} -->
+  <version>0.82.0</version>
   <name>proto-google-cloud-dialogflow-v2beta1</name>
   <description>PROTO library for proto-google-cloud-dialogflow-v2beta1</description>
   <parent>
@@ -28,4 +28,25 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <!-- skip deployment until we fully migrate to https://github.com/googleapis/java-dialogflow -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.8</version>
+        <configuration>
+          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 7d0c2d92d04d..28e77d2ecdfa 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -389,27 +389,27 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-dialogflow</artifactId>
-        <version>0.117.0-alpha</version><!-- {x-version-update:google-cloud-dialogflow:current} -->
+        <version>0.117.0-alpha</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dialogflow-v2beta1</artifactId>
-        <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-dialogflow-v2beta1:current} -->
+        <version>0.82.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-dialogflow-v2beta1</artifactId>
-        <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-dialogflow-v2beta1:current} -->
+        <version>0.82.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dialogflow-v2</artifactId>
-        <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-dialogflow-v2:current} -->
+        <version>0.82.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-dialogflow-v2</artifactId>
-        <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-dialogflow-v2:current} -->
+        <version>0.82.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
diff --git a/google-cloud-clients/google-cloud-dialogflow/.repo-metadata.json b/google-cloud-clients/google-cloud-dialogflow/.repo-metadata.json
deleted file mode 100644
index 30177eacce8e..000000000000
--- a/google-cloud-clients/google-cloud-dialogflow/.repo-metadata.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "dialogflow",
-  "name_pretty": "Dialogflow API",
-  "product_documentation": "https://cloud.google.com/dialogflow-enterprise/",
-  "client_documentation": "https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/dialogflow/v2/package-summary.html",
-  "issue_tracker": "https://issuetracker.google.com/savedsearches/5300385",
-  "release_level": "alpha",
-  "language": "java",
-  "repo": "googleapis/google-cloud-java",
-  "repo_short": "google-cloud-java",
-  "distribution_name": "com.google.cloud:google-cloud-dialogflow",
-  "api_id": "dialogflow.googleapis.com"
-}
\ No newline at end of file
diff --git a/google-cloud-clients/google-cloud-dialogflow/README.md b/google-cloud-clients/google-cloud-dialogflow/README.md
index 117c32feb536..2dad14c7c4c0 100644
--- a/google-cloud-clients/google-cloud-dialogflow/README.md
+++ b/google-cloud-clients/google-cloud-dialogflow/README.md
@@ -17,7 +17,6 @@ Java idiomatic client for [Dialogflow][dialogflow].
 Quickstart
 ----------
 
-[//]: # ({x-version-update-start:google-cloud-dialogflow:released})
 If you are using Maven, add this to your pom.xml file
 ```xml
 <dependency>
@@ -34,7 +33,6 @@ If you are using SBT, add this to your dependencies
 ```Scala
 libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "0.117.0-alpha"
 ```
-[//]: # ({x-version-update-end})
 
 Authentication
 --------------
diff --git a/google-cloud-clients/google-cloud-dialogflow/pom.xml b/google-cloud-clients/google-cloud-dialogflow/pom.xml
index 4fc076ee1831..7d10f36b795d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/pom.xml
+++ b/google-cloud-clients/google-cloud-dialogflow/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-dialogflow</artifactId>
-  <version>0.117.0-alpha</version><!-- {x-version-update:google-cloud-dialogflow:current} -->
+  <version>0.117.0-alpha</version>
   <packaging>jar</packaging>
   <name>Google Cloud Dialog Flow API</name>
   <url>https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-dialogflow</url>
@@ -55,7 +55,27 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
+  <build>
+    <plugins>
+      <plugin>
+        <!-- skip deployment until we fully migrate to https://github.com/googleapis/java-dialogflow -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.8</version>
+        <configuration>
+          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <reporting>
     <plugins>
       <plugin>
diff --git a/google-cloud-clients/google-cloud-dialogflow/synth.metadata b/google-cloud-clients/google-cloud-dialogflow/synth.metadata
deleted file mode 100644
index 326d6c8d4927..000000000000
--- a/google-cloud-clients/google-cloud-dialogflow/synth.metadata
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "updateTime": "2019-09-13T22:38:14.071739Z",
-  "sources": [
-    {
-      "generator": {
-        "name": "artman",
-        "version": "0.36.2",
-        "dockerImage": "googleapis/artman@sha256:0e6f3a668cd68afc768ecbe08817cf6e56a0e64fcbdb1c58c3b97492d12418a1"
-      }
-    },
-    {
-      "git": {
-        "name": "googleapis",
-        "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "6b2ba2ae3124c22ecb56af7102c78110b8576671",
-        "internalRef": "268974829"
-      }
-    }
-  ],
-  "destinations": [
-    {
-      "client": {
-        "source": "googleapis",
-        "apiName": "dialogflow",
-        "apiVersion": "v2",
-        "language": "java",
-        "generator": "gapic",
-        "config": "google/cloud/dialogflow/artman_dialogflow_v2.yaml"
-      }
-    },
-    {
-      "client": {
-        "source": "googleapis",
-        "apiName": "dialogflow",
-        "apiVersion": "v2beta1",
-        "language": "java",
-        "generator": "gapic",
-        "config": "google/cloud/dialogflow/artman_dialogflow_v2beta1_java.yaml"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/google-cloud-clients/google-cloud-dialogflow/synth.py b/google-cloud-clients/google-cloud-dialogflow/synth.py
deleted file mode 100644
index d1004983db4b..000000000000
--- a/google-cloud-clients/google-cloud-dialogflow/synth.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""This script is used to synthesize generated parts of this library."""
-
-import synthtool as s
-import synthtool.gcp as gcp
-import synthtool.languages.java as java
-
-gapic = gcp.GAPICGenerator()
-
-library = gapic.java_library(
-    service='dialogflow',
-    version='v2',
-    config_path=f'/google/cloud/dialogflow/artman_dialogflow_v2.yaml',
-    artman_output_name='')
-
-s.copy(library / f'gapic-google-cloud-dialogflow-v2/src', 'src')
-s.copy(library / f'grpc-google-cloud-dialogflow-v2/src', f'../../google-api-grpc/grpc-google-cloud-dialogflow-v2/src')
-s.copy(library / f'proto-google-cloud-dialogflow-v2/src', f'../../google-api-grpc/proto-google-cloud-dialogflow-v2/src')
-
-# v2beta1 has a weird config name
-library = gapic.java_library(
-    service='dialogflow',
-    version='v2beta1',
-    config_path=f'/google/cloud/dialogflow/artman_dialogflow_v2beta1_java.yaml',
-    artman_output_name='')
-
-s.copy(library / f'gapic-google-cloud-dialogflow-v2beta1/src', 'src')
-s.copy(library / f'grpc-google-cloud-dialogflow-v2beta1/src', f'../../google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/src')
-s.copy(library / f'proto-google-cloud-dialogflow-v2beta1/src', f'../../google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src')
-
-java.format_code('./src')
-java.format_code(f'../../google-api-grpc/grpc-google-cloud-dialogflow-v2/src')
-java.format_code(f'../../google-api-grpc/proto-google-cloud-dialogflow-v2/src')
-java.format_code(f'../../google-api-grpc/grpc-google-cloud-dialogflow-v2beta1/src')
-java.format_code(f'../../google-api-grpc/proto-google-cloud-dialogflow-v2beta1/src')
diff --git a/versions.txt b/versions.txt
index dbbc8cb5d9ae..46581d9afccc 100644
--- a/versions.txt
+++ b/versions.txt
@@ -19,7 +19,6 @@ google-cloud-containeranalysis:0.117.0-beta:0.117.0-beta
 google-cloud-contrib:0.117.0-alpha:0.117.0-alpha
 google-cloud-dataproc:0.117.0:0.117.0
 google-cloud-datastore:1.99.0:1.99.0
-google-cloud-dialogflow:0.117.0-alpha:0.117.0-alpha
 google-cloud-dns:0.117.0-alpha:0.117.0-alpha
 google-cloud-errorreporting:0.117.0-beta:0.117.0-beta
 google-cloud-examples:0.117.0-alpha:0.117.0-alpha
@@ -45,8 +44,6 @@ grpc-google-cloud-containeranalysis-v1:0.82.0:0.82.0
 grpc-google-cloud-containeranalysis-v1beta1:0.82.0:0.82.0
 grpc-google-cloud-dataproc-v1:0.82.0:0.82.0
 grpc-google-cloud-dataproc-v1beta2:0.82.0:0.82.0
-grpc-google-cloud-dialogflow-v2:0.82.0:0.82.0
-grpc-google-cloud-dialogflow-v2beta1:0.82.0:0.82.0
 grpc-google-cloud-error-reporting-v1beta1:0.82.0:0.82.0
 grpc-google-cloud-firestore-admin-v1:1.29.0:1.29.0
 grpc-google-cloud-firestore-v1:1.29.0:1.29.0
@@ -67,8 +64,6 @@ proto-google-cloud-containeranalysis-v1beta1:0.82.0:0.82.0
 proto-google-cloud-dataproc-v1:0.82.0:0.82.0
 proto-google-cloud-dataproc-v1beta2:0.82.0:0.82.0
 proto-google-cloud-datastore-v1:0.82.0:0.82.0
-proto-google-cloud-dialogflow-v2:0.82.0:0.82.0
-proto-google-cloud-dialogflow-v2beta1:0.82.0:0.82.0
 proto-google-cloud-error-reporting-v1beta1:0.82.0:0.82.0
 proto-google-cloud-firestore-admin-v1:1.29.0:1.29.0
 proto-google-cloud-firestore-v1:1.29.0:1.29.0