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/10 07:46:54 UTC
[camel-quarkus] branch quarkus-master updated (16ddcf7 -> 0bfc557)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard 16ddcf7 Upgrade to Quarkus 1.10.0
new 0bfc557 Upgrade to Quarkus 1.10.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (16ddcf7)
\
N -- N -- N refs/heads/quarkus-master (0bfc557)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] 01/01: Upgrade to Quarkus 1.10.0
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0bfc557d8db432d9ff66ad35688cfd5e6df76f4a
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Oct 8 10:21:45 2020 +0100
Upgrade to Quarkus 1.10.0
---
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..8837eb1 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>999-SNAPSHOT</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>