You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2023/07/19 07:42:12 UTC
[camel-quarkus] 15/15: Fixed ArangoDB and google-secret-manager version conflict + generated poms
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0d9216fd04a159c4e1982b16795b550063ac3c70
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Wed Jul 19 09:41:42 2023 +0200
Fixed ArangoDB and google-secret-manager version conflict + generated poms
---
extensions-jvm/google-secret-manager/runtime/pom.xml | 8 +++++++-
.../quarkus/component/arangodb/it/ArangodbResource.java | 4 +---
.../quarkus/component/arangodb/it/ArangodbTest.java | 5 ++---
poms/bom/src/main/generated/flattened-full-pom.xml | 17 +++++++++++------
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
.../main/generated/flattened-reduced-verbose-pom.xml | 2 +-
6 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/extensions-jvm/google-secret-manager/runtime/pom.xml b/extensions-jvm/google-secret-manager/runtime/pom.xml
index 54269907aa..6f2fa282ee 100644
--- a/extensions-jvm/google-secret-manager/runtime/pom.xml
+++ b/extensions-jvm/google-secret-manager/runtime/pom.xml
@@ -83,8 +83,14 @@
</exclusions>
</dependency>
<dependency>
- <artifactId>google-cloud-pubsub</artifactId>
<groupId>com.google.cloud</groupId>
+ <artifactId>google-cloud-pubsub</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>gax-httpjson</artifactId>
+ <groupId>com.google.api</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java
index eafdbbf913..e56adbcb65 100644
--- a/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java
+++ b/integration-tests/arangodb/src/main/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbResource.java
@@ -23,7 +23,6 @@ import java.util.Map;
import com.arangodb.entity.DocumentCreateEntity;
import com.arangodb.entity.DocumentDeleteEntity;
-import com.arangodb.util.MapBuilder;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.Consumes;
@@ -121,8 +120,7 @@ public class ArangodbResource {
LOG.infof("Retrieve document from arangodb with foo: %s", fooName);
String query = "FOR t IN camel FILTER t.foo == @foo RETURN t";
- Map<String, Object> bindVars = new MapBuilder().put("foo", fooName)
- .get();
+ Map<String, Object> bindVars = Map.of("foo", fooName);
Map<String, Object> headers = new HashMap<>();
headers.put(AQL_QUERY, query);
diff --git a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java
index 82cf2bb695..642dd304c0 100644
--- a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java
+++ b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.quarkus.component.arangodb.it;
import com.arangodb.ArangoCollection;
import com.arangodb.ArangoDB;
import com.arangodb.ArangoDatabase;
-import com.arangodb.DbName;
import com.arangodb.entity.BaseDocument;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -140,8 +139,8 @@ class ArangodbTest {
String host = ConfigProvider.getConfig().getValue("camel.arangodb.host", String.class);
Integer port = ConfigProvider.getConfig().getValue("camel.arangodb.port", Integer.class);
arangoDb = new ArangoDB.Builder().host(host, port).build();
- arangoDb.createDatabase(DbName.of(DATABASE_NAME));
- ArangoDatabase arangoDatabase = arangoDb.db(DbName.of(DATABASE_NAME));
+ arangoDb.createDatabase(DATABASE_NAME);
+ ArangoDatabase arangoDatabase = arangoDb.db(DATABASE_NAME);
arangoDatabase.createCollection(COLLECTION_NAME);
collection = arangoDatabase.collection(COLLECTION_NAME);
}
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 0849da1c1c..c8a7c7c619 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6059,7 +6059,7 @@
<dependency>
<groupId>com.google.oauth-client</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-oauth-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.34.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.34.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6180,6 +6180,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>dropwizard-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.2.19</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>metrics-jmx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.2.19</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>io.perfmark</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>perfmark-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -21039,11 +21049,6 @@
<artifactId>metrics-core</artifactId><!-- io.debezium:debezium-bom:2.3.0.Final -->
<version>4.0.1</version><!-- io.debezium:debezium-bom:2.3.0.Final -->
</dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId><!-- io.debezium:debezium-bom:2.3.0.Final -->
- <artifactId>metrics-jmx</artifactId><!-- io.debezium:debezium-bom:2.3.0.Final -->
- <version>4.0.1</version><!-- io.debezium:debezium-bom:2.3.0.Final -->
- </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId><!-- io.debezium:debezium-bom:2.3.0.Final -->
<artifactId>metrics-healthchecks</artifactId><!-- io.debezium:debezium-bom:2.3.0.Final -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 52cf685193..7a18d60f90 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6059,7 +6059,7 @@
<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
- <version>1.34.0</version>
+ <version>1.34.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
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 3e75c27e15..d69c679e8e 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6059,7 +6059,7 @@
<dependency>
<groupId>com.google.oauth-client</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>google-oauth-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.34.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.34.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->