Repository: googleapis/google-http-java-client
Pull request #1458 (2021-09-23 17:40:58)

chore: migrate to owlbot


Patch:
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
new file mode 100644
index 00000000..ec24ba68
--- /dev/null
+++ b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,3 @@
+docker:
+  digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb
+  image: gcr.io/repo-automation-bots/owlbot-java:latest
diff --git a/synth.py b/.github/.OwlBot.yaml
similarity index 64%
rename from synth.py
rename to .github/.OwlBot.yaml
index cb1a283f..8c5f03b4 100644
--- a/synth.py
+++ b/.github/.OwlBot.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,14 +11,6 @@
 # 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.languages.java as java
-
-java.common_templates(excludes=[
-    "README.md",
-    "java.header",
-    "checkstyle.xml",
-    "license-checks.xml",
-    ".github/workflows/samples.yaml",
-])
+docker:
+  image: "gcr.io/repo-automation-bots/owlbot-java:latest"
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 2176b054..1a23ea42 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,5 +1,5 @@
 # Configuration for the Blunderbuss GitHub app. For more info see
-# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
+# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
 assign_prs_by:
 - labels:
   - samples
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2425d723..3becb5c0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-    - main
+    - master
   pull_request:
 name: ci
 jobs:
@@ -9,15 +9,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [8, 11]
     steps:
     - uses: actions/checkout@v2
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v1
       with:
-        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/build.sh
@@ -30,9 +29,8 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v1
       with:
-        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.bat
@@ -42,15 +40,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [8, 11]
     steps:
     - uses: actions/checkout@v2
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v1
       with:
-        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
@@ -61,9 +58,8 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v1
       with:
-        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
@@ -76,9 +72,8 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v1
       with:
-        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9a5105d7..9030ba8f 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -28,28 +28,7 @@ source ${scriptDir}/common.sh
 java -version
 echo $JOB_TYPE
 
-function determineMavenOpts() {
-  local javaVersion=$(
-    # filter down to the version line, then pull out the version between quotes,
-    # then trim the version number down to its minimal number (removing any
-    # update or suffix number).
-    java -version 2>&1 | grep "version" \
-      | sed -E 's/^.*"(.*?)".*$/\1/g' \
-      | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
-  )
-
-  case $javaVersion in
-    "17")
-      # MaxPermSize is no longer supported as of jdk 17
-      echo -n "-Xmx1024m"
-      ;;
-    *)
-      echo -n "-Xmx1024m -XX:MaxPermSize=128m"
-      ;;
-  esac
-}
-
-export MAVEN_OPTS=$(determineMavenOpts)
+export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
 retry_with_backoff 3 10 \
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9af4966..9c3c2da1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+### [1.40.1](https://www.github.com/googleapis/google-http-java-client/compare/v1.40.0...v1.40.1) (2021-10-07)
+
+
+### Bug Fixes
+
+* add used packages to OSGI manifest again ([#1439](https://www.github.com/googleapis/google-http-java-client/issues/1439)) ([#1440](https://www.github.com/googleapis/google-http-java-client/issues/1440)) ([59fc8b0](https://www.github.com/googleapis/google-http-java-client/commit/59fc8b03e5518864c60ce4dd47664e8935da343b))
+* update NetHttpRequest to prevent silent retry of DELETE requests ([#1472](https://www.github.com/googleapis/google-http-java-client/issues/1472)) ([57ef11a](https://www.github.com/googleapis/google-http-java-client/commit/57ef11a0e1904bb932e5493a30f0a2ca2a2798cf)), closes [#1471](https://www.github.com/googleapis/google-http-java-client/issues/1471)
+
+
+### Dependencies
+
+* update dependency com.fasterxml.jackson.core:jackson-core to v2.12.5 ([#1437](https://www.github.com/googleapis/google-http-java-client/issues/1437)) ([0ce8467](https://www.github.com/googleapis/google-http-java-client/commit/0ce84676bfbe4cc8e237d5e33dfaa532b13e798c))
+* update dependency com.fasterxml.jackson.core:jackson-core to v2.13.0 ([#1469](https://www.github.com/googleapis/google-http-java-client/issues/1469)) ([7d9a042](https://www.github.com/googleapis/google-http-java-client/commit/7d9a042110b8879b592d7e80bd73e77c7a84d8b7))
+* update dependency com.google.protobuf:protobuf-java to v3.18.0 ([#1454](https://www.github.com/googleapis/google-http-java-client/issues/1454)) ([cc63e41](https://www.github.com/googleapis/google-http-java-client/commit/cc63e41fac8295c7fea751191a6fe9537c1f70e3))
+* update dependency com.google.protobuf:protobuf-java to v3.18.1 ([#1470](https://www.github.com/googleapis/google-http-java-client/issues/1470)) ([c36637a](https://www.github.com/googleapis/google-http-java-client/commit/c36637acbca536992349970664026cf145ad8964))
+* update dependency com.puppycrawl.tools:checkstyle to v9 ([#1441](https://www.github.com/googleapis/google-http-java-client/issues/1441)) ([a95cd97](https://www.github.com/googleapis/google-http-java-client/commit/a95cd9717fc8accd80252b12357971cb71887d90))
+* update project.appengine.version to v1.9.91 ([#1287](https://www.github.com/googleapis/google-http-java-client/issues/1287)) ([09ebf8d](https://www.github.com/googleapis/google-http-java-client/commit/09ebf8d7e3860f2b94a6fea0ef134c93904d4ed1))
+
 ## [1.40.0](https://www.github.com/googleapis/google-http-java-client/compare/v1.39.2...v1.40.0) (2021-08-20)
 
 
diff --git a/docs/setup.md b/docs/setup.md
index dc5e809e..3e57c074 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>23.0.0</version>
+      <version>23.1.0</version>
       <type>pom</type>
       <scope>import</scope>
      </dependency>
diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml
index c8f9978d..dfa33aa7 100644
--- a/google-http-client-android/pom.xml
+++ b/google-http-client-android/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-android</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
   <name>Android Platform Extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml
index 97d30730..665c42aa 100644
--- a/google-http-client-apache-v2/pom.xml
+++ b/google-http-client-apache-v2/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-apache-v2</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
   <name>Apache HTTP transport v2 for the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml
index cc6feee4..e43b5528 100644
--- a/google-http-client-appengine/pom.xml
+++ b/google-http-client-appengine/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-appengine</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
   <name>Google App Engine extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml
index 29587862..fe09e59f 100644
--- a/google-http-client-assembly/pom.xml
+++ b/google-http-client-assembly/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.google.http-client</groupId>
   <artifactId>google-http-client-assembly</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-assembly:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-assembly:current} -->
   <packaging>pom</packaging>
   <name>Assembly for the Google HTTP Client Library for Java</name>
 
diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml
index 12ea1915..3c22fee5 100644
--- a/google-http-client-bom/pom.xml
+++ b/google-http-client-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.http-client</groupId>
   <artifactId>google-http-client-bom</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-bom:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-bom:current} -->
   <packaging>pom</packaging>
 
   <name>Google HTTP Client Library for Java BOM</name>
@@ -63,52 +63,52 @@
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-android</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-apache-v2</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-appengine</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-findbugs</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-findbugs:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-findbugs:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-gson</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-gson:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-gson:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-jackson2</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-jackson2:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-jackson2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-protobuf</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-protobuf:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-protobuf:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-test</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-xml</artifactId>
-        <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-xml:current} -->
+        <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-xml:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml
index 6c2fe5b7..d64698aa 100644
--- a/google-http-client-findbugs/pom.xml
+++ b/google-http-client-findbugs/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-findbugs</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-findbugs:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-findbugs:current} -->
   <name>Google APIs Client Library Findbugs custom plugin.</name>
 
   <build>
diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml
index d27e7254..ec2fcae6 100644
--- a/google-http-client-gson/pom.xml
+++ b/google-http-client-gson/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-gson</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-gson:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-gson:current} -->
   <name>GSON extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml
index 2eeeb036..adfee37c 100644
--- a/google-http-client-jackson2/pom.xml
+++ b/google-http-client-jackson2/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-jackson2</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-jackson2:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-jackson2:current} -->
   <name>Jackson 2 extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml
index fda09d2c..5428450c 100644
--- a/google-http-client-protobuf/pom.xml
+++ b/google-http-client-protobuf/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-protobuf</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-protobuf:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-protobuf:current} -->
   <name>Protocol Buffer extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml
index 551066df..a9ba1e31 100644
--- a/google-http-client-xml/pom.xml
+++ b/google-http-client-xml/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-xml</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-xml:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-xml:current} -->
   <name>XML extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
index 8ef066b1..1c15a597 100644
--- a/google-http-client/pom.xml
+++ b/google-http-client/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client:current} -->
   <name>Google HTTP Client Library for Java</name>
   <description>
     Google HTTP Client Library for Java. Functionality that works on all supported Java platforms,
diff --git a/owlbot.py b/owlbot.py
new file mode 100644
index 00000000..8a64e383
--- /dev/null
+++ b/owlbot.py
@@ -0,0 +1,32 @@
+# Copyright 2021 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
+#
+#     https://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.
+
+import synthtool as s
+from synthtool.languages import java
+
+
+for library in s.get_staging_dirs():
+    # put any special-case replacements here
+    s.move(library)
+
+s.remove_staging_dirs()
+java.common_templates(
+    excludes=[
+        "README.md",
+        "java.header",
+        "checkstyle.xml",
+        "license-checks.xml",
+        ".github/workflows/samples.yaml",
+    ]
+)
diff --git a/pom.xml b/pom.xml
index 7db368c1..6eaabafa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.http-client</groupId>
   <artifactId>google-http-client-parent</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
   <packaging>pom</packaging>
   <name>Parent for the Google HTTP Client Library for Java</name>
   <description>Google HTTP Client Library for Java</description>
@@ -568,7 +568,7 @@
       - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here)
       - Internally, update the default features.json file
     -->
-    <project.http-client.version>1.40.1-SNAPSHOT</project.http-client.version><!-- {x-version-update:google-http-client-parent:current} -->
+    <project.http-client.version>1.40.2-SNAPSHOT</project.http-client.version><!-- {x-version-update:google-http-client-parent:current} -->
     <project.appengine.version>1.9.91</project.appengine.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.jsr305.version>3.0.2</project.jsr305.version>
diff --git a/renovate.json b/renovate.json
index 93a8a717..eeedeff5 100644
--- a/renovate.json
+++ b/renovate.json
@@ -70,5 +70,8 @@
     }
   ],
   "semanticCommits": true,
-  "dependencyDashboard": true
+  "dependencyDashboard": true,
+  "dependencyDashboardLabels": [
+    "type: process"
+  ]
 }
diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml
index 02bc39a4..79c34b57 100644
--- a/samples/dailymotion-simple-cmdline-sample/pom.xml
+++ b/samples/dailymotion-simple-cmdline-sample/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>dailymotion-simple-cmdline-sample</artifactId>
diff --git a/samples/snippets/src/main/java/com/example/json/YouTubeSample.java b/samples/snippets/src/main/java/com/example/json/YouTubeSample.java
index aad2b8a9..56107f94 100644
--- a/samples/snippets/src/main/java/com/example/json/YouTubeSample.java
+++ b/samples/snippets/src/main/java/com/example/json/YouTubeSample.java
@@ -18,7 +18,6 @@ package com.example.json;
 
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.util.Key;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -28,8 +27,7 @@ public class YouTubeSample {
     @Key("items")
     private List<SearchResult> searchResults;
 
-    @Key
-    private PageInfo pageInfo;
+    @Key private PageInfo pageInfo;
 
     public List<SearchResult> getSearchResults() {
       return searchResults;
@@ -41,11 +39,9 @@ public class YouTubeSample {
   }
 
   public static class PageInfo {
-    @Key
-    private long totalResults;
+    @Key private long totalResults;
 
-    @Key
-    private long resultsPerPage;
+    @Key private long resultsPerPage;
 
     public long getTotalResults() {
       return totalResults;
@@ -57,14 +53,12 @@ public class YouTubeSample {
   }
 
   public static class SearchResult {
-    @Key
-    private String kind;
+    @Key private String kind;
 
     @Key("id")
     private VideoId videoId;
 
-    @Key
-    private Snippet snippet;
+    @Key private Snippet snippet;
 
     public String getKind() {
       return kind;
@@ -80,11 +74,9 @@ public class YouTubeSample {
   }
 
   public static class VideoId {
-    @Key
-    private String kind;
+    @Key private String kind;
 
-    @Key
-    private String videoId;
+    @Key private String videoId;
 
     public String getKind() {
       return kind;
@@ -96,20 +88,15 @@ public class YouTubeSample {
   }
 
   public static class Snippet {
-    @Key
-    private String publishedAt;
+    @Key private String publishedAt;
 
-    @Key
-    private String channelId;
+    @Key private String channelId;
 
-    @Key
-    private String title;
+    @Key private String title;
 
-    @Key
-    private String description;
+    @Key private String description;
 
-    @Key
-    private Map<String, Thumbnail> thumbnails;
+    @Key private Map<String, Thumbnail> thumbnails;
 
     public String getPublishedAt() {
       return publishedAt;
@@ -133,14 +120,11 @@ public class YouTubeSample {
   }
 
   public static class Thumbnail {
-    @Key
-    private String url;
+    @Key private String url;
 
-    @Key
-    private long width;
+    @Key private long width;
 
-    @Key
-    private long height;
+    @Key private long height;
 
     public String getUrl() {
       return url;
@@ -171,5 +155,4 @@ public class YouTubeSample {
     }
     return listResponse;
   }
-
-}
\ No newline at end of file
+}
diff --git a/versions.txt b/versions.txt
index ed3410fc..1f246075 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,17 +1,17 @@
 # Format:
 # module:released-version:current-version
 
-google-http-client:1.40.0:1.40.1-SNAPSHOT
-google-http-client-bom:1.40.0:1.40.1-SNAPSHOT
-google-http-client-parent:1.40.0:1.40.1-SNAPSHOT
-google-http-client-android:1.40.0:1.40.1-SNAPSHOT
-google-http-client-android-test:1.40.0:1.40.1-SNAPSHOT
-google-http-client-apache-v2:1.40.0:1.40.1-SNAPSHOT
-google-http-client-appengine:1.40.0:1.40.1-SNAPSHOT
-google-http-client-assembly:1.40.0:1.40.1-SNAPSHOT
-google-http-client-findbugs:1.40.0:1.40.1-SNAPSHOT
-google-http-client-gson:1.40.0:1.40.1-SNAPSHOT
-google-http-client-jackson2:1.40.0:1.40.1-SNAPSHOT
-google-http-client-protobuf:1.40.0:1.40.1-SNAPSHOT
-google-http-client-test:1.40.0:1.40.1-SNAPSHOT
-google-http-client-xml:1.40.0:1.40.1-SNAPSHOT
+google-http-client:1.40.1:1.40.2-SNAPSHOT
+google-http-client-bom:1.40.1:1.40.2-SNAPSHOT
+google-http-client-parent:1.40.1:1.40.2-SNAPSHOT
+google-http-client-android:1.40.1:1.40.2-SNAPSHOT
+google-http-client-android-test:1.40.1:1.40.2-SNAPSHOT
+google-http-client-apache-v2:1.40.1:1.40.2-SNAPSHOT
+google-http-client-appengine:1.40.1:1.40.2-SNAPSHOT
+google-http-client-assembly:1.40.1:1.40.2-SNAPSHOT
+google-http-client-findbugs:1.40.1:1.40.2-SNAPSHOT
+google-http-client-gson:1.40.1:1.40.2-SNAPSHOT
+google-http-client-jackson2:1.40.1:1.40.2-SNAPSHOT
+google-http-client-protobuf:1.40.1:1.40.2-SNAPSHOT
+google-http-client-test:1.40.1:1.40.2-SNAPSHOT
+google-http-client-xml:1.40.1:1.40.2-SNAPSHOT


Test patch:
diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml
index cbdc8673..f9b2e389 100644
--- a/google-http-client-android-test/pom.xml
+++ b/google-http-client-android-test/pom.xml
@@ -4,7 +4,7 @@
   <groupId>google-http-client</groupId>
   <artifactId>google-http-client-android-test</artifactId>
   <name>Test project for google-http-client-android.</name>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-android-test:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-android-test:current} -->
   <packaging>apk</packaging>
 
   <build>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-android</artifactId>
-      <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
+      <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
       <exclusions>
         <exclusion>
           <artifactId>android</artifactId>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-test</artifactId>
-      <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
+      <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
       <exclusions>
         <exclusion>
           <artifactId>junit</artifactId>
diff --git a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java
index 9357ffdd..0665acc2 100644
--- a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java
+++ b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java
@@ -15,7 +15,6 @@ package com.google.api.client.extensions.android.json;
 
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.test.json.AbstractJsonFactoryTest;
-
 import java.util.ArrayList;
 
 /**
@@ -24,16 +23,31 @@ import java.util.ArrayList;
  * @author Yaniv Inbar
  */
 public class AndroidJsonFactoryTest extends AbstractJsonFactoryTest {
-  
+
   private static final String GSON_LINE_SEPARATOR = "\n";
 
   private static final String JSON_ENTRY_PRETTY =
       "{" + GSON_LINE_SEPARATOR + "  \"title\": \"foo\"" + GSON_LINE_SEPARATOR + "}";
-  private static final String JSON_FEED_PRETTY = "{" + GSON_LINE_SEPARATOR + "  \"entries\": ["
-      + GSON_LINE_SEPARATOR + "    {" + GSON_LINE_SEPARATOR + "      \"title\": \"foo\""
-      + GSON_LINE_SEPARATOR + "    }," + GSON_LINE_SEPARATOR + "    {"
-      + GSON_LINE_SEPARATOR + "      \"title\": \"bar\"" + GSON_LINE_SEPARATOR + "    }"
-      + GSON_LINE_SEPARATOR + "  ]" + GSON_LINE_SEPARATOR + "}";
+  private static final String JSON_FEED_PRETTY =
+      "{"
+          + GSON_LINE_SEPARATOR
+          + "  \"entries\": ["
+          + GSON_LINE_SEPARATOR
+          + "    {"
+          + GSON_LINE_SEPARATOR
+          + "      \"title\": \"foo\""
+          + GSON_LINE_SEPARATOR
+          + "    },"
+          + GSON_LINE_SEPARATOR
+          + "    {"
+          + GSON_LINE_SEPARATOR
+          + "      \"title\": \"bar\""
+          + GSON_LINE_SEPARATOR
+          + "    }"
+          + GSON_LINE_SEPARATOR
+          + "  ]"
+          + GSON_LINE_SEPARATOR
+          + "}";
 
   public AndroidJsonFactoryTest(String name) {
     super(name);
@@ -61,5 +75,4 @@ public class AndroidJsonFactoryTest extends AbstractJsonFactoryTest {
     feed.entries.add(entryBar);
     assertEquals(JSON_FEED_PRETTY, newFactory().toPrettyString(feed));
   }
-
 }
diff --git a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java
index 75561385..e917e114 100644
--- a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java
+++ b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java
@@ -26,6 +26,5 @@ public class FakeTest extends TestCase {
     super(name);
   }
 
-  public final void test() throws Exception {
-  }
+  public final void test() throws Exception {}
 }
diff --git a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java
index 8fdf668d..7ecefd77 100644
--- a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java
+++ b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java
@@ -17,6 +17,4 @@
  *
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.extensions.android.json;
-
diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java
index bd2ddb50..13ed288c 100644
--- a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java
+++ b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java
@@ -20,8 +20,7 @@ import com.google.api.client.util.Beta;
 @Beta
 public class BetaClass {
 
-  public void method() {
-  }
+  public void method() {}
 
   @Beta
   public void betaMethod() {
@@ -36,8 +35,7 @@ public class BetaClass {
 
   int field;
 
-  @Beta
-  int betaField;
+  @Beta int betaField;
 
   @Override
   public String toString() {
diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java
index ea1c5315..4ceb1cb1 100644
--- a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java
+++ b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java
@@ -19,12 +19,10 @@ import com.google.api.client.util.Beta;
 /** A class which contains {@link Beta} fields. */
 public class ClassWithBetaField {
 
-  @Beta
-  public int betaField;
+  @Beta public int betaField;
   public int field;
 
-  @Beta
-  public static final int betaStaticField = 10;
+  @Beta public static final int betaStaticField = 10;
   public static final int staticField = 20;
 
   public ClassWithBetaField() {
diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java
index 85082217..3c80ee4b 100644
--- a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java
+++ b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java
@@ -19,8 +19,7 @@ import com.google.api.client.util.Beta;
 /** A class which contains {@link Beta} methods. */
 public class ClassWithBetaMethod {
 
-  @Beta
-  int betaField = 10;
+  @Beta int betaField = 10;
 
   @Beta
   public void betaMethod() {
diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml
index ab446021..f93185c2 100644
--- a/google-http-client-test/pom.xml
+++ b/google-http-client-test/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-test</artifactId>
-  <version>1.40.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
+  <version>1.40.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
   <name>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java b/samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java
index 8454437f..92ed5ab3 100644
--- a/samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java
+++ b/samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java
@@ -19,10 +19,6 @@ package com.example.json;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import org.junit.Test;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
@@ -36,12 +32,17 @@ import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import org.junit.Test;
 
 public class YouTubeSampleTest {
 
   @Test
   public void testParsing() throws IOException {
-    final InputStream contents = getClass().getClassLoader().getResourceAsStream("youtube-search.json");
+    final InputStream contents =
+        getClass().getClassLoader().getResourceAsStream("youtube-search.json");
     Preconditions.checkNotNull(contents);
     HttpTransport transport =
         new MockHttpTransport() {
@@ -91,4 +92,4 @@ public class YouTubeSampleTest {
       }
     }
   }
-}
\ No newline at end of file
+}