This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b1a2a1b6f9b CAMEL-18520 Google-secrets-manager:resolved conflicts
b1a2a1b6f9b is described below
commit b1a2a1b6f9b78ad235148947b93a26e02ecdc30c
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Fri Sep 16 11:35:57 2022 +0200
CAMEL-18520 Google-secrets-manager:resolved conflicts
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index bb3d33c0afd..1d2f3895d82 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -193,7 +193,7 @@
<geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
-
<google-auth-library-oauth2-http-version>1.4.0</google-auth-library-oauth2-http-version>
+
<google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
<google-guava-version>20.0</google-guava-version>
<google-api-client-version>1.32.1</google-api-client-version>
<google-api-services-drive-version>v2-rev20220110-1.32.1</google-api-services-drive-version>
@@ -206,7 +206,7 @@
<google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
<google-cloud-guava-version-prefix>30.1</google-cloud-guava-version-prefix>
<google-cloud-guava-version>${google-cloud-guava-version-prefix}-jre</google-cloud-guava-version>
-
<google-cloud-secretmanager-bom-version>2.1.1</google-cloud-secretmanager-bom-version>
+
<google-cloud-secretmanager-bom-version>2.2.0</google-cloud-secretmanager-bom-version>
<graaljs-version>22.1.0</graaljs-version>
<graphql-java-version>18.3</graphql-java-version>
<grizzly-websockets-version>2.4.4</grizzly-websockets-version>
