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/11/24 07:23:32 UTC
[camel-quarkus] branch quarkus-main updated (8654a17 -> ae9a3a2)
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 8654a17 Upgrade Quarkus to 2.6.0.CR1
add 2e47c10 Updated CHANGELOG.md
add 886b58a Document that vertx-websocket consumers run on the Quarkus Vert.x web server
add 7dc8268 Repalce reference to quarkus-vertx-web with quarkus-vertx-http
add 1b6a587 Fix MicroProfileHealthTest.testFailureThreshold test failure
new ae9a3a2 Upgrade Quarkus to 2.6.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 (8654a17)
\
N -- N -- N refs/heads/quarkus-main (ae9a3a2)
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 | 8 +++
.../pages/reference/extensions/platform-http.adoc | 2 +-
.../reference/extensions/vertx-websocket.adoc | 38 +++++++++++++-
.../platform-http/runtime/src/main/doc/intro.adoc | 2 +-
.../runtime/src/main/doc/configuration.adoc | 12 +++++
.../runtime/src/main/doc/intro.adoc | 3 ++
.../runtime/src/main/doc/usage.adoc | 13 +++++
.../vertx/websocket/VertxWebsocketRecorder.java | 2 +-
...Check.java => FailureThresholdHealthCheck.java} | 24 +++++++--
.../it/health/MicroProfileHealthResource.java | 42 ++++++++++-----
.../it/health/MicroProfileHealthRouteBuilder.java | 3 --
.../it/health/MicroProfileHealthTest.java | 60 ++++++++++++++++------
12 files changed, 168 insertions(+), 41 deletions(-)
create mode 100644 extensions/vertx-websocket/runtime/src/main/doc/configuration.adoc
create mode 100644 extensions/vertx-websocket/runtime/src/main/doc/intro.adoc
create mode 100644 extensions/vertx-websocket/runtime/src/main/doc/usage.adoc
copy integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/{FailingHealthCheck.java => FailureThresholdHealthCheck.java} (65%)
[camel-quarkus] 01/01: Upgrade Quarkus to 2.6.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 ae9a3a2516cf348d19fafeffe9d8e07c83b27578
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Nov 11 14:04:24 2021 +0000
Upgrade Quarkus to 2.6.0.CR1
---
docs/antora.yml | 2 +-
.../camel/quarkus/component/csimple/deployment/CSimpleProcessor.java | 5 +++--
pom.xml | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index bc1bbc6..b5c2ecc 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -27,7 +27,7 @@ asciidoc:
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
camel-version: 3.13.0 # replace ${camel.version}
- quarkus-version: 2.5.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
# attributes used in xrefs to other Antora components
cq-camel-components: 3.13.x@components # replace ${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
index 72229a3..c5266fd 100644
--- a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
+++ b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
@@ -310,8 +310,9 @@ class CSimpleProcessor {
csimpleClassesDir.toFile(),
StandardCharsets.UTF_8.name(),
Collections.emptyList(),
- "1.8",
- "1.8",
+ null,
+ "11",
+ "11",
Collections.emptyList(),
Collections.emptyList());
}
diff --git a/pom.xml b/pom.xml
index 113ab49..937808d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<optaplanner.version>8.9.1.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.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
- <quarkus.version>2.5.0.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-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.30.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -105,7 +105,7 @@
<json-smart.version>2.4.7</json-smart.version>
<kafka.version>2.8.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
- <kotlin.version>1.5.31</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
+ <kotlin.version>1.6.0</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark -->
<metrics.version>${metrics-version}</metrics.version><!-- Spark -->
<mvel2.version>${mvel-version}</mvel2.version>