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 2022/08/19 06:40:25 UTC
[camel-quarkus] branch quarkus-main updated (f781f0f1c8 -> bc10719f74)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard f781f0f1c8 Disable FOP native tests due to #3965
discard 17fe557e65 Disable js-dsl native tests due to #3961
discard c36ef9285c Upgrade Quarkus to 2.12.0.CR1
add fe3e4a2c9a Improve/clean-up camel-quarkus-validator extension tests.
add 013c483232 Updated CHANGELOG.md
add b1f6209d17 Remove documentation references to REST DSL inline routes
add cfbe7817d8 Updated CHANGELOG.md
add 7d0e3808ff Fix route inclusion / exclusion filtering
add a25812a829 Clean up redundant plugin executions for the docs module
add 5f7f579e18 Remove docs module verification step from CI build as it is now a manual step
add 7b2118ba25 Rename docs README_local_build.adoc to README.adoc
add 6d88cf18b6 perf-regression: add integration tests #3982
add d70da15319 perf-regression: add unit test #4001
add e30289a587 Updated CHANGELOG.md
add b73c280fb9 perf-regression: avoid using fixed port #4004
add 592f260804 Upgrade Quarkus to 2.12.0.CR1
add f89f05df83 Disable js-dsl native tests due to #3961
add 907f3afdc7 Disable FOP native tests due to #3965
add e7d2479f88 Temporarily work around map style configuration property resolution due to #4011
add d1b8d04734 perf-regression: collect reports during releases #3967
add dd78330970 Updated CHANGELOG.md
add aca0965672 Restore ability to run js-dsl native tests
new bc10719f74 Upgrade Quarkus to 2.13.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 (f781f0f1c8)
\
N -- N -- N refs/heads/quarkus-main (bc10719f74)
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:
.github/workflows/camel-master-cron.yaml | 2 +-
.github/workflows/ci-build.yaml | 13 ++--
.github/workflows/quarkus-master-cron.yaml | 2 +-
CHANGELOG.md | 18 +++++
docs/{README_local_build.adoc => README.adoc} | 2 +-
.../pages/contributor-guide/release-guide.adoc | 43 +++++++++++
.../ROOT/pages/reference/extensions/rest.adoc | 11 ++-
docs/pom.xml | 74 ------------------
.../quarkus/core/deployment/CamelProcessor.java | 31 +++++++-
.../core/deployment/main/CamelMainProcessor.java | 8 +-
...inRoutesExcludeFilterCombinedPropertyTest.java} | 35 +++++----
....java => CamelMainRoutesExcludeFilterTest.java} | 47 +++++++++---
...inRoutesIncludeFilterCombinedPropertyTest.java} | 36 +++++----
....java => CamelMainRoutesIncludeFilterTest.java} | 49 +++++++++---
.../camel/quarkus/core/RegistryRoutesLoaders.java | 9 +++
.../camel/quarkus/main/CamelMainRecorder.java | 9 ++-
.../quarkus/main/CamelMainRoutesCollector.java | 27 ++++++-
...AbstractClientApplicationBaseSubstitutions.java | 5 +-
.../rest/runtime/src/main/doc/configuration.adoc | 11 ++-
.../camel/quarkus/core/CoreThreadPoolsTest.java | 2 +
.../camel/quarkus/component/jq/it/JqRoutes.java | 8 ++
.../jq/src/main/resources/application.properties | 6 +-
integration-tests/js-dsl/README.adoc | 10 +++
integration-tests/js-dsl/pom.xml | 10 ++-
integration-tests/validator/pom.xml | 8 +-
.../component/validator/it/ValidatorResource.java | 29 +++----
.../validator/it/ValidatorRouteBuilder.java | 38 ++++++++-
.../src/main/resources/application.properties | 3 +-
.../src/main/resources/resources-config.json | 7 --
.../component/validator/it/ValidatorTest.java | 85 +++++++--------------
.../validator/it/ValidatorTestResource.java | 68 +++++++++++++++++
integration-tests/xstream/pom.xml | 4 -
pom.xml | 6 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 6 +-
.../src/main/generated/flattened-reduced-pom.xml | 6 +-
.../generated/flattened-reduced-verbose-pom.xml | 6 +-
.../cq-perf-regression-scenario.hf.yaml | 3 +-
.../cq-perf-regression-sample-base/pom.xml | 64 ++++++++++++----
tooling/perf-regression/pom.xml | 64 +++++++++++++++-
.../PerformanceRegressionReportTest.java | 36 ++++++---
.../regression/it/PerfRegressionIT.java | 89 ++++++++++++++++++++++
.../test/resources/expecteds/jvm-and-native.txt | 8 ++
.../src/test/resources/expecteds/jvm-only.txt | 6 ++
.../perf-regression-expecteds/nominal.txt | 6 --
44 files changed, 704 insertions(+), 306 deletions(-)
rename docs/{README_local_build.adoc => README.adoc} (97%)
copy extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/{CamelMainRoutesFilterTest.java => CamelMainRoutesExcludeFilterCombinedPropertyTest.java} (72%)
copy extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/{CamelMainRoutesFilterTest.java => CamelMainRoutesExcludeFilterTest.java} (67%)
copy extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/{CamelMainRoutesFilterTest.java => CamelMainRoutesIncludeFilterCombinedPropertyTest.java} (69%)
rename extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/main/{CamelMainRoutesFilterTest.java => CamelMainRoutesIncludeFilterTest.java} (64%)
create mode 100644 integration-tests/js-dsl/README.adoc
delete mode 100644 integration-tests/validator/src/main/resources/resources-config.json
create mode 100644 integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTestResource.java
create mode 100644 tooling/perf-regression/src/test/java/org/apache/camel/quarkus/performance/regression/it/PerfRegressionIT.java
create mode 100644 tooling/perf-regression/src/test/resources/expecteds/jvm-and-native.txt
create mode 100644 tooling/perf-regression/src/test/resources/expecteds/jvm-only.txt
delete mode 100644 tooling/perf-regression/src/test/resources/perf-regression-expecteds/nominal.txt
[camel-quarkus] 01/01: Upgrade Quarkus to 2.13.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 quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit bc10719f744b75a18830f22aef11e38f452b3e1e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Aug 19 07:40:15 2022 +0100
Upgrade Quarkus to 2.13.0.CR1
---
docs/antora.yml | 2 +-
pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 18b3b4e758..33197c8d7b 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.6 # replace ${target-maven-version}
camel-version: 3.18.1 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.12.0.CR1 # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.2.0 # replace ${graalvm.version}
graalvm-docs-version: 22.2
# attributes used in xrefs to other Antora components
diff --git a/pom.xml b/pom.xml
index b73d01f719..25e297dd11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<quarkiverse-minio.version>2.9.1</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>1.0.4</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>2.12.0.CR1</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>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>0.36.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -67,7 +67,7 @@
<ahc.version>${ahc-version}</ahc.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
- <avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
+ <avro.version>1.11.1</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<awssdk.version>2.17.220</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version -->
<assertj.version>3.23.1</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index deda3ac389..999fd4c181 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -10037,12 +10037,12 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index ed866b5355..c10b72661f 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -10037,12 +10037,12 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-jetty</artifactId>
- <version>1.11.0</version>
+ <version>1.11.1</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-netty</artifactId>
- <version>1.11.0</version>
+ <version>1.11.1</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 89e1d65240..cb79c89763 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -10037,12 +10037,12 @@
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->