Merge branch 'master' into autosynth-googleapis

Neenu1995 · web-flow · commit c90be3d6d41b · 2021-04-12T17:14:54.000-04:00
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
@@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 retry_with_backoff 3 10 \
   mvn install -B -V -ntp \
     -DskipTests=true \
+    -Dmaven.javadoc.skip=true \
     -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/pom.xml b/pom.xml
@@ -96,7 +96,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>0.20.1</version>
+        <version>0.21.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
   </parent>
 
   <properties>
diff --git a/samples/pom.xml b/samples/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
   </parent>
 
   <properties>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
   </parent>
 
   <properties>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud.samples</groupId>
     <artifactId>shared-configuration</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
   </parent>
 
   <properties>
diff --git a/synth.metadata b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-dialogflow-cx.git",
-        "sha": "43cdc986d04472760a42f61e8318090bd5565052"
+        "sha": "45f31e7068457c00a90bebd7be9620319d2634a7"
       }
     },
     {
@@ -27,7 +27,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098"
+        "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015"
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/java-dialogflow-cx.git",`
`7`		`- "sha": "43cdc986d04472760a42f61e8318090bd5565052"`
	`7`	`+ "sha": "45f31e7068457c00a90bebd7be9620319d2634a7"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`@@ -27,7 +27,7 @@`
`27`	`27`	`"git": {`
`28`	`28`	`"name": "synthtool",`
`29`	`29`	`"remote": "https://github.com/googleapis/synthtool.git",`
`30`		`- "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098"`
	`30`	`+ "sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015"`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`],`