googleapis · Aug 30, 2021 · Sep 8, 2021 · Sep 9, 2021 · Sep 9, 2021 · Sep 14, 2021
diff --git a/.github/readme/synth.py b/.github/readme/synth.py
diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml
@@ -1,2 +1,3 @@
 trustedContributors:
-- renovate-bot
+- renovate-bot
+- gcf-owl-bot[bot]
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,6 +12,9 @@ jobs:
         java: [8, 11]
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: ${{matrix.java}}
@@ -23,6 +26,9 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8
@@ -37,6 +43,9 @@ jobs:
         java: [8, 11]
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: ${{matrix.java}}
@@ -46,6 +55,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8
@@ -57,6 +69,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.8.1
     - uses: actions/setup-java@v1
       with:
         java-version: 8

diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg
diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.

diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.

diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.

diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2019 Google Inc.
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021 Google Inc.
+# 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.

diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.

diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 Google Inc.
+# 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.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+### [2.5.1](https://www.github.com/googleapis/java-common-protos/compare/v2.5.0...v2.5.1) (2021-09-24)
+
+
+### Dependencies
+
+* update dependency com.google.protobuf:protobuf-bom to v3.18.0 ([#224](https://www.github.com/googleapis/java-common-protos/issues/224)) ([7b41003](https://www.github.com/googleapis/java-common-protos/commit/7b4100372c2f614c929f27f1659d9d1b6bd7d716))
+* update dependency com.google.protobuf:protobuf-java to v3.18.0 ([#225](https://www.github.com/googleapis/java-common-protos/issues/225)) ([9205c62](https://www.github.com/googleapis/java-common-protos/commit/9205c625308f82c4a2bf512b20b81bb5484a5ae9))
+* update dependency io.grpc:grpc-protobuf to v1.41.0 ([#228](https://www.github.com/googleapis/java-common-protos/issues/228)) ([484e5c1](https://www.github.com/googleapis/java-common-protos/commit/484e5c111a7030693fb6462ac3e4b8928ddca3f3))
+* update dependency io.grpc:grpc-stub to v1.41.0 ([#229](https://www.github.com/googleapis/java-common-protos/issues/229)) ([82de6a1](https://www.github.com/googleapis/java-common-protos/commit/82de6a18804e4c88b6f10422b2781a869aa61078))
+
 ## [2.5.0](https://www.github.com/googleapis/java-common-protos/compare/v2.4.1...v2.5.0) (2021-08-30)
 
 

diff --git a/grpc-google-common-protos/build.gradle b/grpc-google-common-protos/build.gradle
@@ -18,8 +18,8 @@ repositories {
 }
 
 dependencies {
-  compile 'io.grpc:grpc-stub:1.40.1'
-  compile 'io.grpc:grpc-protobuf:1.40.1'
+  compile 'io.grpc:grpc-stub:1.41.0'
+  compile 'io.grpc:grpc-protobuf:1.41.0'
   compile project(':proto-google-common-protos')
 }
 

diff --git a/grpc-google-common-protos/pom.xml b/grpc-google-common-protos/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-common-protos</artifactId>
-  <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+  <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   <name>grpc-google-common-protos</name>
   <description>GRPC library for grpc-google-common-protos</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-common-protos-parent</artifactId>
-    <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+    <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.api.grpc</groupId>
   <artifactId>google-common-protos-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+  <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   <name>Google Common Protos Parent</name>
   <url>https://github.com/googleapis/java-iam</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.3</version>
   </parent>
 
   <developers>
@@ -63,7 +63,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-iam-parent</site.installationModule>
-    <protobuf.version>3.17.3</protobuf.version>
+    <protobuf.version>3.18.0</protobuf.version>
     <junit.version>4.13.2</junit.version>
     <grpc.version>1.38.1</grpc.version>
     <guava.version>30.1-android</guava.version>
@@ -88,7 +88,7 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-common-protos</artifactId>
-        <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+        <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -147,7 +147,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.1</version>
         <reportSets>
           <reportSet>
             <id>html</id>

diff --git a/proto-google-common-protos/build.gradle b/proto-google-common-protos/build.gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.google.protobuf:protobuf-java:3.17.3'
+  compile 'com.google.protobuf:protobuf-java:3.18.0'
 }
 
 sourceSets {

diff --git a/proto-google-common-protos/pom.xml b/proto-google-common-protos/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-common-protos</artifactId>
-  <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+  <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   <name>proto-google-common-protos</name>
   <description>PROTO library for proto-google-common-protos</description>
   <parent>
     <groupId>com.google.api.grpc</groupId>
     <artifactId>google-common-protos-parent</artifactId>
-    <version>2.5.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
+    <version>2.5.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/renovate.json b/renovate.json
@@ -50,7 +50,8 @@
         "^junit:junit",
         "^com.google.truth:truth",
         "^org.mockito:mockito-core",
-        "^org.objenesis:objenesis"
+        "^org.objenesis:objenesis",
+        "^com.google.cloud:google-cloud-conformance-tests"
       ],
       "semanticCommitType": "test",
       "semanticCommitScope": "deps"
@@ -69,8 +70,5 @@
     }
   ],
   "semanticCommits": true,
-  "dependencyDashboard": true,
-  "dependencyDashboardLabels": [
-    "type: process"
-  ]
+  "dependencyDashboard": true
 }