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/04/15 13:44:22 UTC
[camel-quarkus] branch master updated (05a0f54 -> 20d5d58)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 05a0f54 Update readme for example
new 16b1db7 Upgrade Quarkus to 1.4.0.CR1
new 2f261e4 Try to capture some debugging info for AMQP CI failures
new 2574671 Reinstate MongoDB extensions
new 20d5d58 Add missing dependencies for OpenTracing extension to work around quarkusio/quarkus#8578
The 4 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:
.github/workflows/pr-build.yaml | 2 +-
extensions-jvm/pom.xml | 2 +-
extensions/opentracing/runtime/pom.xml | 10 ++++++++++
extensions/pom.xml | 2 +-
.../camel/quarkus/component/amqp/it/ActiveMQTestResource.java | 4 +++-
.../mongodb/{pom-disabled-issue-1064.xml => pom.xml} | 0
integration-tests/pom.xml | 2 +-
pom.xml | 2 +-
8 files changed, 18 insertions(+), 6 deletions(-)
rename integration-tests/mongodb/{pom-disabled-issue-1064.xml => pom.xml} (100%)
[camel-quarkus] 02/04: Try to capture some debugging info for AMQP
CI failures
Posted by ja...@apache.org.
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
commit 2f261e4c1470303f3e371f35dd39410c96923e23
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 15 09:52:48 2020 +0100
Try to capture some debugging info for AMQP CI failures
---
.../apache/camel/quarkus/component/amqp/it/ActiveMQTestResource.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/ActiveMQTestResource.java b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/ActiveMQTestResource.java
index 195eae5..52a1697 100644
--- a/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/ActiveMQTestResource.java
+++ b/integration-tests/amqp/src/test/java/org/apache/camel/quarkus/component/amqp/it/ActiveMQTestResource.java
@@ -23,6 +23,7 @@ import org.apache.camel.util.CollectionHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.utility.TestcontainersConfiguration;
@@ -43,6 +44,7 @@ public class ActiveMQTestResource implements QuarkusTestResourceLifecycleManager
try {
container = new GenericContainer(ACTIVEMQ_IMAGE)
.withExposedPorts(AMQP_PORT)
+ .withLogConsumer(new Slf4jLogConsumer(LOGGER))
.waitingFor(Wait.forListeningPort());
container.start();
@@ -66,7 +68,7 @@ public class ActiveMQTestResource implements QuarkusTestResourceLifecycleManager
container.stop();
}
} catch (Exception e) {
- // ignored
+ e.printStackTrace();
}
}
}
[camel-quarkus] 03/04: Reinstate MongoDB extensions
Posted by ja...@apache.org.
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
commit 2574671fc22c4e554a16cd5ec055ca3f40993e04
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 15 09:52:58 2020 +0100
Reinstate MongoDB extensions
Fixes #1064
---
.github/workflows/pr-build.yaml | 2 +-
extensions-jvm/pom.xml | 2 +-
extensions/pom.xml | 2 +-
integration-tests/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index f337c2a..f7eda72 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -206,10 +206,10 @@ jobs:
servicenow
slack
- category: SQL
- # TODO: re-add mongodb
test-modules: >
couchdb
jdbc
+ mongodb
sql
- category: Social
test-modules: >
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index d014b84..0dc9b5f 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -50,7 +50,7 @@
<module>aws2-translate</module>
<module>cassandraql</module>
<module>couchbase</module>
- <!--module>debezium-mongodb</module-->
+ <module>debezium-mongodb</module>
<module>debezium-mysql</module>
<module>debezium-postgres</module>
<module>debezium-sqlserver</module>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 2554d57..5e7598e 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -100,7 +100,7 @@
<module>mail</module>
<module>microprofile-health</module>
<module>microprofile-metrics</module>
- <!-- <module>mongodb</module>-->
+ <module>mongodb</module>
<module>mustache</module>
<module>netty</module>
<module>netty-http</module>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 5e32424..f520f90 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -92,7 +92,7 @@
<module>mail</module>
<module>messaging</module>
<module>microprofile</module>
- <!-- <module>mongodb</module>-->
+ <module>mongodb</module>
<module>mustache</module>
<module>netty</module>
<module>olingo4</module>
[camel-quarkus] 01/04: Upgrade Quarkus to 1.4.0.CR1
Posted by ja...@apache.org.
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
commit 16b1db7db8c607778a275cafd9d7eb58407dda0f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 15 09:45:31 2020 +0100
Upgrade Quarkus to 1.4.0.CR1
---
integration-tests/mongodb/{pom-disabled-issue-1064.xml => pom.xml} | 0
pom.xml | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/integration-tests/mongodb/pom-disabled-issue-1064.xml b/integration-tests/mongodb/pom.xml
similarity index 100%
rename from integration-tests/mongodb/pom-disabled-issue-1064.xml
rename to integration-tests/mongodb/pom.xml
diff --git a/pom.xml b/pom.xml
index 85c6b55..63e5b87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<javassist.version>3.22.0-CR2</javassist.version><!-- debezium -->
<jetty.version>9.4.18.v20190429</jetty.version>
<kotlin.version>1.3.61</kotlin.version>
- <quarkus.version>1.3.2.Final</quarkus.version>
+ <quarkus.version>1.4.0.CR1</quarkus.version>
<quarkus-qpid-jms.version>0.13.1</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
[camel-quarkus] 04/04: Add missing dependencies for OpenTracing
extension to work around quarkusio/quarkus#8578
Posted by ja...@apache.org.
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
commit 20d5d58a943d9eda5a2266cf54977119998e2ef3
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 15 12:08:24 2020 +0100
Add missing dependencies for OpenTracing extension to work around quarkusio/quarkus#8578
---
extensions/opentracing/runtime/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/extensions/opentracing/runtime/pom.xml b/extensions/opentracing/runtime/pom.xml
index 128bb7f..8ce5d2e 100644
--- a/extensions/opentracing/runtime/pom.xml
+++ b/extensions/opentracing/runtime/pom.xml
@@ -61,6 +61,16 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-opentracing</artifactId>
</dependency>
+
+ <!-- TODO: Remove this when Quarkus Jaeger extension issues are fixed https://github.com/quarkusio/quarkus/issues/8578 -->
+ <dependency>
+ <groupId>org.eclipse.microprofile.metrics</groupId>
+ <artifactId>microprofile-metrics-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.smallrye</groupId>
+ <artifactId>smallrye-metrics</artifactId>
+ </dependency>
</dependencies>
<build>