You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2020/05/21 08:39:36 UTC
[camel-quarkus] 03/03: Upgrade to Quarkus 1.5.0.CR1
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2b698d91f2126d8a23c3187302b2249c51676a7d
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu May 21 09:57:07 2020 +0200
Upgrade to Quarkus 1.5.0.CR1
---
extensions-jvm/grpc/integration-test/pom.xml | 36 ++++++++++++++++++++++
.../deployment/SupportMongoDBProcessor.java | 4 +--
pom.xml | 3 +-
poms/bom-test/pom.xml | 8 +++++
4 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/extensions-jvm/grpc/integration-test/pom.xml b/extensions-jvm/grpc/integration-test/pom.xml
index 878552b..bab5bed 100644
--- a/extensions-jvm/grpc/integration-test/pom.xml
+++ b/extensions-jvm/grpc/integration-test/pom.xml
@@ -75,6 +75,42 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- gRPC is managed in Quarkus BOM but we still need ${grpc.version} for the protobuf-maven-plugin bellow -->
+ <!-- To solve that we parse the Quarkus BOM POM and set the grpc.version property dynamically -->
+ <!-- instead of hardcoding it -->
+ <id>set-grpc-version-property</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <properties>
+ <localRepository>${settings.localRepository}</localRepository>
+ <quarkusVersion>${quarkus.version}</quarkusVersion>
+ </properties>
+ <source>
+ import java.nio.file.Path
+ import java.nio.file.Paths
+ import java.nio.file.Files
+ final Path localMavenRepoPath = Paths.get(properties['localRepository'])
+ final Path quarkusBomPath = localMavenRepoPath.resolve('io/quarkus/quarkus-bom/' + properties['quarkusVersion'] + '/quarkus-bom-' + properties['quarkusVersion'] + '.pom')
+ if (!Files.exists(quarkusBomPath)) {
+ throw new IllegalStateException(quarkusBomPath + ' should exist')
+ }
+ def pomProject = new XmlParser().parseText(quarkusBomPath.getText('UTF-8'))
+ final String grpcVersion = pomProject.properties.'grpc.version'.text()
+ println 'setting grpc.version = ' + grpcVersion + ' as found in Quarkus BOM'
+ project.properties['grpc.version'] = grpcVersion
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<executions>
diff --git a/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java b/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java
index 3935138..ada330c 100644
--- a/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java
+++ b/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java
@@ -22,7 +22,7 @@ import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.mongodb.deployment.MongoClientBuildItem;
-import io.quarkus.mongodb.runtime.MongoClientRecorder;
+import io.quarkus.mongodb.runtime.MongoClientBeanUtil;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
class SupportMongoDBProcessor {
@@ -42,7 +42,7 @@ class SupportMongoDBProcessor {
for (MongoClientBuildItem mongoClient : mongoClients) {
// If there is a default mongo client instance, then bind it to the camel registry
// with the default mongo client name used by the camel-mongodb component
- if (MongoClientRecorder.DEFAULT_MONGOCLIENT_NAME.equals(mongoClient.getName())) {
+ if (MongoClientBeanUtil.isDefault(mongoClient.getName())) {
runtimeBeans.produce(
new CamelRuntimeBeanBuildItem(
"camelMongoClient",
diff --git a/pom.xml b/pom.xml
index a1c762a..44ebd61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,6 @@
<github-api.version>1.111</github-api.version>
<google-http-client.version>1.22.0</google-http-client.version>
<guava.version>26.0-jre</guava.version>
- <grpc.version>1.27.0</grpc.version>
<gson.version>2.8.5</gson.version>
<hapi.version>4.1.0</hapi.version>
<httpclient.cache.version>4.5.5</httpclient.cache.version>
@@ -68,7 +67,7 @@
<mongodb.version>4.0.1</mongodb.version>
<okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
- <quarkus.version>1.4.2.Final</quarkus.version>
+ <quarkus.version>1.5.0.CR1</quarkus.version>
<quarkus-qpid-jms.version>0.14.1</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index 69d8674..58a15df 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -46,6 +46,14 @@
<scope>import</scope>
</dependency>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-bom-test</artifactId>
+ <version>${quarkus.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-support-custom-dataformat</artifactId>
<version>${camel-quarkus.version}</version>