You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2022/03/02 06:48:25 UTC
[camel-quarkus] 01/02: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a91e7f8d5a2224955fb473c03dd11a566e10339e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Jan 20 07:52:37 2022 +0000
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml | 4 +--
integration-tests/http/pom.xml | 2 +-
.../kafka/oauth/it/container/KafkaContainer.java | 30 +++++++++++++---------
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml | 9 ++++---
poms/build-parent/pom.xml | 9 +++++++
6 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index e7cb3f5..1db4eff 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,8 +31,8 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.15.0 # replace ${camel.version}
camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
- quarkus-version: 2.7.2.Final # replace ${quarkus.version}
- graalvm-version: 21.3.1 # replace ${graalvm.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
+ graalvm-version: 22.0.0.2 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
cq-camel-components: 3.15.x@components # replace ${camel.docs.components.xref}
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 0bb8a2a..793de20 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-undertow-websockets</artifactId>
+ <artifactId>quarkus-websockets</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
index 31885bf..e95e062 100644
--- a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
+++ b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
@@ -16,17 +16,20 @@
*/
package org.apache.camel.quarkus.kafka.oauth.it.container;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import javax.json.Json;
+import javax.json.stream.JsonParser;
+
import com.github.dockerjava.api.command.InspectContainerResponse;
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.commons.io.IOUtils;
import org.jboss.logging.Logger;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.Network;
@@ -45,19 +48,22 @@ public class KafkaContainer extends FixedHostPortGenericContainer<KafkaContainer
private static final int KAFKA_PORT = 9092;
private static final String LATEST_KAFKA_VERSION;
- private static final List<String> supportedKafkaVersions = new ArrayList<>(3);
+ private static final List<String> supportedKafkaVersions = new ArrayList<>();
static {
- InputStream inputStream = StrimziKafkaContainer.class.getResourceAsStream("/kafka-versions.txt");
- InputStreamReader streamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-
- try (BufferedReader bufferedReader = new BufferedReader(streamReader)) {
- String kafkaVersion;
- while ((kafkaVersion = bufferedReader.readLine()) != null) {
- supportedKafkaVersions.add(kafkaVersion);
+ InputStream inputStream = StrimziKafkaContainer.class.getResourceAsStream("/kafka_versions.json");
+ try {
+ String json = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+ try (JsonParser parser = Json.createParser(new StringReader(json))) {
+ parser.next();
+ parser.getObject()
+ .get("kafkaVersions")
+ .asJsonObject()
+ .keySet()
+ .forEach(supportedKafkaVersions::add);
}
} catch (IOException e) {
- LOGGER.error("Unable to load the supported Kafka versions", e);
+ throw new RuntimeException(e);
}
// sort kafka version from low to high
diff --git a/integration-tests/vertx-websocket/pom.xml b/integration-tests/vertx-websocket/pom.xml
index 7947fe5..abd5e2a 100644
--- a/integration-tests/vertx-websocket/pom.xml
+++ b/integration-tests/vertx-websocket/pom.xml
@@ -39,7 +39,7 @@
<!-- test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-undertow-websockets</artifactId>
+ <artifactId>quarkus-websockets</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index c3b52e1..5a7a63c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>2.7.2.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>2.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.32.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -66,6 +66,7 @@
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
<avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+ <assertj.version>3.22.0</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<awssdk.version>2.17.103</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>1.0.5</azure-sdk-bom.version><!-- Keep in sync with camel-azure component versions -->
@@ -86,8 +87,8 @@
<github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
<google-native-image-support.version>0.8.0</google-native-image-support.version>
<google-auth-library-credentials.version>0.22.2</google-auth-library-credentials.version><!-- @sync io.grpc:grpc-auth:${grpc.version} dep:com.google.auth:google-auth-library-credentials -->
- <graalvm.version>21.3.1</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
- <grpc.version>1.43.2</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <graalvm.version>22.0.0.2</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm -->
+ <grpc.version>1.44.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<guice-servlet.version>4.0</guice-servlet.version><!-- Spark -->
<hadoop3.version>${hadoop3-version}</hadoop3.version><!-- Spark -->
<hapi.version>${hapi-version}</hapi.version>
@@ -122,7 +123,7 @@
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
<scala-2.12.version>2.12.15</scala-2.12.version><!-- Spark -->
- <smallrye.reactive.messaging.camel.version>3.13.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+ <smallrye.reactive.messaging.camel.version>3.14.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
<snappy.version>1.1.7.7</snappy.version><!-- Spark -->
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index dee891f..6651378 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -37,6 +37,15 @@
<!-- maven-surefire-plugin -->
<failIfNoTests>false</failIfNoTests>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<pluginManagement>
<plugins>