This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 14f04095bf Fix dependency convergence error for
google-auth-library-oauth2-http
14f04095bf is described below
commit 14f04095bf92633411bfc07f33aa226ed6a0392a
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Thu Aug 17 14:36:41 2023 +0100
Fix dependency convergence error for google-auth-library-oauth2-http
Fixes #5194
---
pom.xml | 2 +-
poms/bom/pom.xml | 13 ++++++++++++-
poms/bom/src/main/generated/flattened-full-pom.xml | 11 +++++++++++
poms/bom/src/main/generated/flattened-reduced-pom.xml | 11 +++++++++++
.../src/main/generated/flattened-reduced-verbose-pom.xml | 11 +++++++++++
5 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 146fa3282c..c6787bfd39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
<freemarker.version>2.3.32</freemarker.version><!-- @sync
io.quarkiverse.freemarker:quarkus-freemarker-parent:${quarkiverse-freemarker.version}
prop:freemarker.version -->
<geny.version>0.6.2</geny.version>
<github-api.version>1.313</github-api.version><!-- Used in a Groovy
script bellow -->
-
<google-auth-library-credentials.version>${google-auth-library-oauth2-http-version}</google-auth-library-credentials.version>
+ <google-auth-library.version>1.19.0</google-auth-library.version><!--
@sync com.google.cloud:google-cloud-pubsub:${google-cloud-pubsub.version}
dep:com.google.auth:google-auth-library-oauth2-http -->
<google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version>
<google-cloud-bom.version>0.202.0</google-cloud-bom.version><!-- @sync
com.google.cloud:libraries-bom:${google-cloud-bom-version}
dep:com.google.cloud:google-cloud-bom -->
<google-cloud-pubsub-bom.version>1.124.0</google-cloud-pubsub-bom.version><!--
@sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version}
dep:com.google.cloud:google-cloud-pubsub-bom -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 2f1afec036..6706b78144 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6068,7 +6068,18 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
- <version>${google-auth-library-credentials.version}</version>
+ <version>${google-auth-library.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.auth</groupId>
+ <artifactId>google-auth-library-oauth2-http</artifactId>
+ <version>${google-auth-library.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index d3058da8e6..5f28f37283 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -5993,6 +5993,17 @@
<artifactId>google-auth-library-credentials</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.19.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>com.google.auth</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>google-auth-library-oauth2-http</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.19.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jsr305</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.google.cloud</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-cloud-pubsub</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index ac5a5367da..92574dbbeb 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -5993,6 +5993,17 @@
<artifactId>google-auth-library-credentials</artifactId>
<version>1.19.0</version>
</dependency>
+ <dependency>
+ <groupId>com.google.auth</groupId>
+ <artifactId>google-auth-library-oauth2-http</artifactId>
+ <version>1.19.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 2ac1f04933..c9088fbb5b 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -5993,6 +5993,17 @@
<artifactId>google-auth-library-credentials</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.19.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>com.google.auth</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>google-auth-library-oauth2-http</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.19.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jsr305</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.google.cloud</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-cloud-pubsub</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
