You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/11/11 08:24:21 UTC
[camel-quarkus] branch master updated: Upgrade to Quarkus 1.10.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 1c14574 Upgrade to Quarkus 1.10.0.CR1
1c14574 is described below
commit 1c14574afdafe884be5583e3dd8fae0ee0e0c8ff
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Nov 11 06:46:42 2020 +0000
Upgrade to Quarkus 1.10.0.CR1
---
catalog/pom.xml | 2 +-
extensions/as2/runtime/pom.xml | 2 +-
.../camel/quarkus/component/shiro/deployment/ShiroProcessor.java | 1 +
.../debezium/common/it/postgres/DebeziumPostgresTestResource.java | 5 ++++-
pom.xml | 6 +++---
poms/bom-test/pom.xml | 4 ++++
6 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 1668fd2..ce7b9de 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
+ <artifactId>slf4j-jboss-logmanager</artifactId>
<scope>test</scope>
</dependency>
diff --git a/extensions/as2/runtime/pom.xml b/extensions/as2/runtime/pom.xml
index cb8a369..ddbbfe5 100644
--- a/extensions/as2/runtime/pom.xml
+++ b/extensions/as2/runtime/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
+ <artifactId>slf4j-jboss-logmanager</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
index f7afa46..ae3dfc3 100644
--- a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
+++ b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
@@ -58,6 +58,7 @@ class ShiroProcessor {
.collect(Collectors.toList());
dtos.add(CamelAuthorizationException.class.getName());
+ dtos.add(Boolean[].class.getName());
dtos.add(Float[].class.getName());
dtos.add(java.util.Date[].class.getName());
dtos.add(Calendar[].class.getName());
diff --git a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTestResource.java b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTestResource.java
index 8cd83e5..28d23b4 100644
--- a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTestResource.java
+++ b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTestResource.java
@@ -21,6 +21,7 @@ import org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTes
import org.apache.camel.quarkus.component.debezium.common.it.DebeziumPostgresResource;
import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
public class DebeziumPostgresTestResource extends AbstractDebeziumTestResource<PostgreSQLContainer> {
@@ -35,7 +36,9 @@ public class DebeziumPostgresTestResource extends AbstractDebeziumTestResource<P
@Override
protected PostgreSQLContainer createContainer() {
- return new PostgreSQLContainer<>(POSTGRES_IMAGE)
+ DockerImageName imageName = DockerImageName.parse(POSTGRES_IMAGE)
+ .asCompatibleSubstituteFor("postgres");
+ return new PostgreSQLContainer<>(imageName)
.withUsername(DB_USERNAME)
.withPassword(DB_PASSWORD)
.withDatabaseName(DebeziumPostgresResource.DB_NAME)
diff --git a/pom.xml b/pom.xml
index 98b7973..c083f73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,12 +85,12 @@
<okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
<opencensus-api.version>0.26.0</opencensus-api.version><!-- Mess in pubsub transitive deps vs google cloud deps -->
- <quarkus.version>1.9.2.Final</quarkus.version>
+ <quarkus.version>1.10.0.CR1</quarkus.version>
<quarkus-qpid-jms.version>0.19.0</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
<scala-2.11.version>2.11.12</scala-2.11.version><!-- Spark -->
- <smallrye.reactive.messaging.camel.version>2.4.0</smallrye.reactive.messaging.camel.version>
+ <smallrye.reactive.messaging.camel.version>2.5.0</smallrye.reactive.messaging.camel.version>
<soap-api.version>1.4.0</soap-api.version><!-- keep in sync with Camel -->
<!-- Keep spring.version aligned with the version used by Camel -->
<spring.version>5.2.9.RELEASE</spring.version>
@@ -118,7 +118,7 @@
<slf4j-log4j12.version>1.7.30</slf4j-log4j12.version><!-- Mess in the transitive dependencies of hbase-testing-util -->
<sshd.version>2.3.0</sshd.version>
<stax2.version>4.2</stax2.version>
- <testcontainers.version>1.14.3</testcontainers.version>
+ <testcontainers.version>1.15.0</testcontainers.version>
<wiremock.version>2.27.2</wiremock.version>
<zt-exec.version>1.11</zt-exec.version>
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index 1ffb844..ddf066c 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -134,6 +134,10 @@
<artifactId>guice</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.glassfish.web</groupId>
<artifactId>*</artifactId>
</exclusion>