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 dc5b6c4 Upgrade Quarkus to 2.7.0.Final
dc5b6c4 is described below
commit dc5b6c49ef91e7ba53b7493a2369aa6dd20c83cd
Author: James Netherton <[email protected]>
AuthorDate: Wed Jan 26 15:20:59 2022 +0000
Upgrade Quarkus to 2.7.0.Final
---
docs/antora.yml | 2 +-
.../org/apache/camel/quarkus/component/amqp/it/AmqpResource.java | 2 +-
.../java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java | 4 ++--
.../apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java | 2 +-
.../org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java | 4 ++--
.../camel/quarkus/component/sjms/qpid/it/QpidSjmsResource.java | 2 +-
.../apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java | 4 ++--
.../camel/quarkus/component/sjms2/qpid/it/QpidSjms2Resource.java | 2 +-
.../apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java | 4 ++--
pom.xml | 6 +++---
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 009e4bb..5c382fb 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.14.0 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
- quarkus-version: 2.7.0.CR1 # replace ${quarkus.version}
+ quarkus-version: 2.7.0.Final # replace ${quarkus.version}
graalvm-version: 21.3.0 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
diff --git
a/integration-tests/amqp/src/main/java/org/apache/camel/quarkus/component/amqp/it/AmqpResource.java
b/integration-tests/amqp/src/main/java/org/apache/camel/quarkus/component/amqp/it/AmqpResource.java
index c9c0aae..8b250cc 100644
---
a/integration-tests/amqp/src/main/java/org/apache/camel/quarkus/component/amqp/it/AmqpResource.java
+++
b/integration-tests/amqp/src/main/java/org/apache/camel/quarkus/component/amqp/it/AmqpResource.java
@@ -33,6 +33,6 @@ public class AmqpResource {
@Path("/connection/factory")
@Produces(MediaType.TEXT_PLAIN)
public String connectionFactoryImplementation() {
- return connectionFactory.getClass().getName();
+ return connectionFactory.getClass().getName().toLowerCase();
}
}
diff --git
a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
index b79155d..cf703a8 100644
---
a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
+++
b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/AmqpTest.java
@@ -24,7 +24,7 @@ import
org.apache.camel.quarkus.messaging.jms.AbstractJmsMessagingTest;
import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
import org.junit.jupiter.api.Test;
-import static org.hamcrest.Matchers.startsWith;
+import static org.hamcrest.Matchers.containsString;
@QuarkusTest
@QuarkusTestResource(initArgs = {
@@ -37,6 +37,6 @@ class AmqpTest extends AbstractJmsMessagingTest {
RestAssured.get("/amqp/connection/factory")
.then()
.statusCode(200)
- .body(startsWith("javax.jms.QpidJms"));
+ .body(containsString("qpid"));
}
}
diff --git
a/integration-tests/jms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java
b/integration-tests/jms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java
index 586218f..3a8c656 100644
---
a/integration-tests/jms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java
+++
b/integration-tests/jms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/jms/qpid/it/QpidJmsResource.java
@@ -42,7 +42,7 @@ public class QpidJmsResource {
@Path("/connection/factory")
@Produces(MediaType.TEXT_PLAIN)
public String connectionFactoryImplementation() {
- return connectionFactory.getClass().getName();
+ return connectionFactory.getClass().getName().toLowerCase();
}
@POST
diff --git
a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
index 3217a3b..13d8f4b 100644
---
a/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
+++
b/integration-tests/jms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/jms/qpid/it/JmsQpidTest.java
@@ -24,8 +24,8 @@ import
org.apache.camel.quarkus.messaging.jms.AbstractJmsMessagingTest;
import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.startsWith;
@QuarkusTest
@QuarkusTestResource(initArgs = {
@@ -37,7 +37,7 @@ class JmsQpidTest extends AbstractJmsMessagingTest {
RestAssured.get("/messaging/jms/qpid/connection/factory")
.then()
.statusCode(200)
- .body(startsWith("javax.jms.QpidJms"));
+ .body(containsString("qpid"));
}
@Test
diff --git
a/integration-tests/sjms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/sjms/qpid/it/QpidSjmsResource.java
b/integration-tests/sjms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/sjms/qpid/it/QpidSjmsResource.java
index 075008d..32623bf 100644
---
a/integration-tests/sjms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/sjms/qpid/it/QpidSjmsResource.java
+++
b/integration-tests/sjms-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/sjms/qpid/it/QpidSjmsResource.java
@@ -35,7 +35,7 @@ public class QpidSjmsResource {
@Path("/connection/factory")
@Produces(MediaType.TEXT_PLAIN)
public String connectionFactoryImplementation() {
- return connectionFactory.getClass().getName();
+ return connectionFactory.getClass().getName().toLowerCase();
}
}
diff --git
a/integration-tests/sjms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java
b/integration-tests/sjms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java
index c63feb4..0dd73d8 100644
---
a/integration-tests/sjms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java
+++
b/integration-tests/sjms-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms/qpid/it/SjmsQpidTest.java
@@ -24,7 +24,7 @@ import
org.apache.camel.quarkus.messaging.sjms.AbstractSjmsMessagingTest;
import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
import org.junit.jupiter.api.Test;
-import static org.hamcrest.Matchers.startsWith;
+import static org.hamcrest.Matchers.containsString;
@QuarkusTest
@QuarkusTestResource(initArgs = {
@@ -36,6 +36,6 @@ class SjmsQpidTest extends AbstractSjmsMessagingTest {
RestAssured.get("/messaging/sjms/qpid/connection/factory")
.then()
.statusCode(200)
- .body(startsWith("javax.jms.QpidJms"));
+ .body(containsString("qpid"));
}
}
diff --git
a/integration-tests/sjms2-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/sjms2/qpid/it/QpidSjms2Resource.java
b/integration-tests/sjms2-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/sjms2/qpid/it/QpidSjms2Resource.java
index 1dd8dc1..c1d816f 100644
---
a/integration-tests/sjms2-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/sjms2/qpid/it/QpidSjms2Resource.java
+++
b/integration-tests/sjms2-qpid-amqp-client/src/main/java/org/apache/camel/quarkus/component/sjms2/qpid/it/QpidSjms2Resource.java
@@ -35,7 +35,7 @@ public class QpidSjms2Resource {
@Path("/connection/factory")
@Produces(MediaType.TEXT_PLAIN)
public String connectionFactoryImplementation() {
- return connectionFactory.getClass().getName();
+ return connectionFactory.getClass().getName().toLowerCase();
}
}
diff --git
a/integration-tests/sjms2-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java
b/integration-tests/sjms2-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java
index fa6f7ee..5702a46 100644
---
a/integration-tests/sjms2-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java
+++
b/integration-tests/sjms2-qpid-amqp-client/src/test/java/org/apache/camel/quarkus/component/sjms2/qpid/it/Sjms2QpidTest.java
@@ -24,7 +24,7 @@ import
org.apache.camel.quarkus.messaging.sjms.AbstractSjmsMessagingTest;
import org.apache.camel.quarkus.test.support.activemq.ActiveMQTestResource;
import org.junit.jupiter.api.Test;
-import static org.hamcrest.Matchers.startsWith;
+import static org.hamcrest.Matchers.containsString;
@QuarkusTest
@QuarkusTestResource(initArgs = {
@@ -36,6 +36,6 @@ class Sjms2QpidTest extends AbstractSjmsMessagingTest {
RestAssured.get("/messaging/sjms2/qpid/connection/factory")
.then()
.statusCode(200)
- .body(startsWith("javax.jms.QpidJms"));
+ .body(containsString("qpid"));
}
}
diff --git a/pom.xml b/pom.xml
index e35e08c..34ee3b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<quarkiverse-jsch.version>1.0.0</quarkiverse-jsch.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch-parent/ -->
<quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-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.0.CR1</quarkus.version><!--
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>2.7.0.Final</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.30.0</quarkus-qpid-jms.version><!--
https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -113,7 +113,7 @@
<jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive
deps -->
<json-smart.version>2.4.7</json-smart.version>
<jzlib.version>1.1.3</jzlib.version><!-- @sync
io.quarkiverse.jsch:quarkus-jsch-parent:${quarkiverse-jsch.version}
prop:jzlib.version -->
- <kafka.version>3.0.0</kafka.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
+ <kafka.version>3.1.0</kafka.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
<kotlin.version>1.6.10</kotlin.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:org.jetbrains.kotlin:kotlin-stdlib -->
<libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark
-->
@@ -121,7 +121,7 @@
<mvel2.version>${mvel-version}</mvel2.version>
<okhttp.version>${squareup-okhttp-version}</okhttp.version>
<okio.version>${squareup-okio-version}</okio.version>
- <protobuf.version>3.19.2</protobuf.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java
-->
+ <protobuf.version>3.19.3</protobuf.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java
-->
<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 -->
