This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d5871ff603eef73a60c60a7d66f3135f2f52856b Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Mon Feb 22 07:31:23 2021 +0000 Upgrade to Quarkus 1.13.0.Final --- .../org/apache/camel/quarkus/component/hbase/it/HbaseTest.java | 2 ++ extensions-jvm/mybatis/integration-test/pom.xml | 4 ---- extensions-support/debezium/deployment/pom.xml | 4 ++++ extensions-support/debezium/runtime/pom.xml | 4 ++++ extensions/pg-replication-slot/deployment/pom.xml | 4 ++++ extensions/pg-replication-slot/runtime/pom.xml | 4 ++++ integration-tests/sql/pom.xml | 5 ----- .../org/apache/camel/quarkus/component/sql/it/SqlResource.java | 2 -- integration-tests/sql/src/main/resources/application.properties | 7 ------- .../java/org/apache/camel/quarkus/component/sql/it/SqlTest.java | 3 --- pom.xml | 2 +- 11 files changed, 19 insertions(+), 22 deletions(-) diff --git a/extensions-jvm/hbase/integration-test/src/test/java/org/apache/camel/quarkus/component/hbase/it/HbaseTest.java b/extensions-jvm/hbase/integration-test/src/test/java/org/apache/camel/quarkus/component/hbase/it/HbaseTest.java index 1125aca..c686845 100644 --- a/extensions-jvm/hbase/integration-test/src/test/java/org/apache/camel/quarkus/component/hbase/it/HbaseTest.java +++ b/extensions-jvm/hbase/integration-test/src/test/java/org/apache/camel/quarkus/component/hbase/it/HbaseTest.java @@ -28,12 +28,14 @@ import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.TableDescriptorBuilder; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.core.Is.is; @QuarkusTest @QuarkusTestResource(HBaseTestResource.class) +@Disabled("https://github.com/apache/camel-quarkus/issues/2295") class HbaseTest { @Test diff --git a/extensions-jvm/mybatis/integration-test/pom.xml b/extensions-jvm/mybatis/integration-test/pom.xml index 2c3f859..5f290fe 100644 --- a/extensions-jvm/mybatis/integration-test/pom.xml +++ b/extensions-jvm/mybatis/integration-test/pom.xml @@ -51,10 +51,6 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy</artifactId> </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-jdbc-h2</artifactId> - </dependency> <!-- test dependencies --> <dependency> diff --git a/extensions-support/debezium/deployment/pom.xml b/extensions-support/debezium/deployment/pom.xml index 3e1622b..74015d5 100644 --- a/extensions-support/debezium/deployment/pom.xml +++ b/extensions-support/debezium/deployment/pom.xml @@ -35,6 +35,10 @@ <artifactId>quarkus-core-deployment</artifactId> </dependency> <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-datasource-deployment</artifactId> + </dependency> + <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-support-debezium</artifactId> <exclusions> diff --git a/extensions-support/debezium/runtime/pom.xml b/extensions-support/debezium/runtime/pom.xml index 46a4f6e..c8a4e13 100644 --- a/extensions-support/debezium/runtime/pom.xml +++ b/extensions-support/debezium/runtime/pom.xml @@ -52,6 +52,10 @@ <artifactId>quarkus-core</artifactId> </dependency> <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-datasource</artifactId> + </dependency> + <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> diff --git a/extensions/pg-replication-slot/deployment/pom.xml b/extensions/pg-replication-slot/deployment/pom.xml index b42c52f..58f7f5b 100644 --- a/extensions/pg-replication-slot/deployment/pom.xml +++ b/extensions/pg-replication-slot/deployment/pom.xml @@ -40,6 +40,10 @@ </dependency> <dependency> <groupId>io.quarkus</groupId> + <artifactId>quarkus-datasource-deployment</artifactId> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> <artifactId>quarkus-jdbc-postgresql-deployment</artifactId> </dependency> </dependencies> diff --git a/extensions/pg-replication-slot/runtime/pom.xml b/extensions/pg-replication-slot/runtime/pom.xml index e9b5c2b..5da5800 100644 --- a/extensions/pg-replication-slot/runtime/pom.xml +++ b/extensions/pg-replication-slot/runtime/pom.xml @@ -58,6 +58,10 @@ </dependency> <dependency> <groupId>io.quarkus</groupId> + <artifactId>quarkus-datasource</artifactId> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> <artifactId>quarkus-jdbc-postgresql</artifactId> </dependency> </dependencies> diff --git a/integration-tests/sql/pom.xml b/integration-tests/sql/pom.xml index 27801dd..fcf501e 100644 --- a/integration-tests/sql/pom.xml +++ b/integration-tests/sql/pom.xml @@ -50,11 +50,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-test-h2</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> diff --git a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java index 5e47575..a9c3398 100644 --- a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java +++ b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java @@ -38,7 +38,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import io.agroal.api.AgroalDataSource; -import io.quarkus.agroal.DataSource; import org.apache.camel.ProducerTemplate; import org.apache.camel.quarkus.component.sql.it.model.Camel; import org.springframework.util.LinkedCaseInsensitiveMap; @@ -48,7 +47,6 @@ import org.springframework.util.LinkedCaseInsensitiveMap; public class SqlResource { @Inject - @DataSource("camel-sql") AgroalDataSource dataSource; @Inject diff --git a/integration-tests/sql/src/main/resources/application.properties b/integration-tests/sql/src/main/resources/application.properties index 723b365..6ed39f3 100644 --- a/integration-tests/sql/src/main/resources/application.properties +++ b/integration-tests/sql/src/main/resources/application.properties @@ -16,13 +16,6 @@ ## --------------------------------------------------------------------------- # -# Quarkus Datasource -# -quarkus.datasource.camel-sql.jdbc.url=jdbc:h2:tcp://localhost/mem:test -quarkus.datasource.camel-sql.db-kind=h2 -quarkus.datasource.camel-sql.jdbc.max-size=8 - -# # Camel Quarkus SQL # quarkus.camel.sql.script-files=sql/get-camels.sql diff --git a/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java b/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java index d4b016d..c99995b 100644 --- a/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java +++ b/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.quarkus.component.sql.it; -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.h2.H2DatabaseTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; @@ -26,7 +24,6 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.is; @QuarkusTest -@QuarkusTestResource(H2DatabaseTestResource.class) class SqlTest { @Test diff --git a/pom.xml b/pom.xml index 654ee2d..b02b839 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ <optaplanner.version>7.46.0.Final</optaplanner.version> <quarkiverse.freemarker.version>0.2.2</quarkiverse.freemarker.version> <quarkiverse-minio.version>0.2.0</quarkiverse-minio.version> - <quarkus.version>1.12.1.Final</quarkus.version> + <quarkus.version>999-SNAPSHOT</quarkus.version> <quarkus-google-cloud.version>0.3.0</quarkus-google-cloud.version> <quarkus-hazelcast-client.version>1.1.1</quarkus-hazelcast-client.version> <quarkus-qpid-jms.version>0.23.0</quarkus-qpid-jms.version>