You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2021/07/14 06:20:31 UTC
[camel-quarkus] branch quarkus-main updated (de86bd5 -> 9fe86ec)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard de86bd5 Upgrade Quarkus to 2.1.0.CR1
add fab4b76 Updated CHANGELOG.md
add 5e07d0c Test OpenTracing @Traced beans in conjunction with Camel routes
add 9344d52 Test OpenTelemetry invocation of Camel routes from JAX-RS services
new 9fe86ec Upgrade Quarkus to 2.1.0.CR1
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 (de86bd5)
\
N -- N -- N refs/heads/quarkus-main (9fe86ec)
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:
CHANGELOG.md | 4 ++
integration-tests/opentelemetry/pom.xml | 34 ++++++++++++
.../opentelemetry/it/OpenTelemetryResource.java | 36 +++----------
.../it/OpenTelemetryRouteBuilder.java | 6 +++
...etryResource.java => SpanExporterResource.java} | 30 +++++++----
.../src/main/resources/application.properties | 6 ++-
.../opentelemetry/it/OpenTelemetryTest.java | 52 +++++++++++++-----
integration-tests/opentracing/pom.xml | 17 ++++++
.../opentracing/it/OpenTracingResource.java | 23 ++++++++
.../opentracing/it/OpenTracingRouteBuilder.java | 29 ++++++++++
.../component/opentracing/it/TracedBean.java} | 13 +++--
.../opentracing/it/TracedBeanProducer.java} | 11 ++--
.../component/opentracing/it/OpenTracingTest.java | 61 ++++++++++++++++++----
13 files changed, 249 insertions(+), 73 deletions(-)
copy integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/{OpenTelemetryResource.java => SpanExporterResource.java} (70%)
copy integration-tests/opentracing/src/{test/java/org/apache/camel/quarkus/component/opentracing/it/OpenTracingIT.java => main/java/org/apache/camel/quarkus/component/opentracing/it/TracedBean.java} (76%)
copy integration-tests/{opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterProducer.java => opentracing/src/main/java/org/apache/camel/quarkus/component/opentracing/it/TracedBeanProducer.java} (78%)
[camel-quarkus] 01/01: Upgrade Quarkus to 2.1.0.CR1
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9fe86ec9354316b3b18e7b9ff0220e71dfe4d5af
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jun 29 11:59:41 2021 +0100
Upgrade Quarkus to 2.1.0.CR1
---
docs/antora.yml | 6 +++++-
pom.xml | 18 +++++++++---------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index e297c85..d8a0c18 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -24,4 +24,8 @@ asciidoc:
attributes:
cq-camel-components: 3.11.x@components # replace ${camel.docs.components.xref}
min-maven-version: 3.6.2 # replace ${min-maven-version}
- quarkus-version: 2.0.1.Final # replace ${quarkus.version}
\ No newline at end of file
+<<<<<<< HEAD
+ quarkus-version: 2.0.1.Final # replace ${quarkus.version}
+=======
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
+>>>>>>> fe4701c4eb... Upgrade Quarkus to 2.1.0.CR1
diff --git a/pom.xml b/pom.xml
index 2455114..02ad112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<optaplanner.version>8.0.0.Final</optaplanner.version><!-- May go back to Camel's ${optaplanner-version} when they are in sync https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
<quarkiverse.freemarker.version>0.3.0</quarkiverse.freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
<quarkiverse-minio.version>2.0.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
- <quarkus.version>2.0.1.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-google-cloud.version>0.8.0</quarkus-google-cloud.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/googlecloudservices/quarkus-google-cloud-services-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.25.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -61,7 +61,7 @@
<avro.version>1.10.2</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>1.0.3</azure-sdk-bom.version><!-- Revert back to ${azure-sdk-bom-version} with Camel 3.11 see https://github.com/apache/camel/pull/5642 -->
- <bouncycastle.version>1.68</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->
+ <bouncycastle.version>1.69</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on -->
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
<commons-cli.version>1.4</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core -->
<commons-collections.version>3.2.2</commons-collections.version><!-- used by hbase, should be pretty stable as commons-collections are not developed actively anymore -->
@@ -97,7 +97,7 @@
<json-smart.version>2.4.7</json-smart.version>
<kafka.version>2.8.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.4.32</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>1.5.20</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<netty3.version>${netty3-version}</netty3.version><!-- Spark -->
<minio.version>${minio-version}</minio.version><!-- Keep in sync with quarkiverse-minio and Camel, preferring Camel assuming that it is more likely to be up to date -->
<mvel2.version>${mvel-version}</mvel2.version>
@@ -108,7 +108,7 @@
<retrofit.version>2.5.0</retrofit.version>
<saaj.impl.version>1.5.3</saaj.impl.version>
<scala-2.11.version>2.11.12</scala-2.11.version><!-- Spark -->
- <smallrye.reactive.messaging.camel.version>3.5.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
+ <smallrye.reactive.messaging.camel.version>3.6.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring5-version}</spring.version>
<snakeyaml.version>${snakeyaml-version}</snakeyaml.version>
<snappy.version>1.1.7.7</snappy.version><!-- Spark -->
@@ -580,7 +580,7 @@
<executions>
<execution>
<id>default-test</id>
- <phase /><!-- unbound here to speedup -Dquickly build; bound to a phase in camel-quarkus-build-parent-it -->
+ <phase/><!-- unbound here to speedup -Dquickly build; bound to a phase in camel-quarkus-build-parent-it -->
</execution>
</executions>
</plugin>
@@ -591,7 +591,7 @@
<executions>
<execution>
<id>attach-descriptor</id>
- <phase /><!-- skip to save time -->
+ <phase/><!-- skip to save time -->
</execution>
</executions>
</plugin>
@@ -625,7 +625,7 @@
<requireJavaVersion>
<version>11</version>
</requireJavaVersion>
- <dependencyConvergence />
+ <dependencyConvergence/>
<requireMavenVersion>
<version>${supported-maven-versions}</version>
</requireMavenVersion>
@@ -844,7 +844,7 @@
<executions>
<execution>
<id>camel-quarkus-enforcer-rules</id>
- <phase /><!-- Speedup the check-format profile by skipping the enforcer -->
+ <phase/><!-- Speedup the check-format profile by skipping the enforcer -->
</execution>
</executions>
</plugin>
@@ -867,7 +867,7 @@
<executions>
<execution>
<id>source-release-assembly</id>
- <phase /><!-- fix https://github.com/apache/camel-quarkus/issues/844 -->
+ <phase/><!-- fix https://github.com/apache/camel-quarkus/issues/844 -->
</execution>
<execution>
<id>camel-quarkus-source-release-assembly</id>