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/25 06:42:43 UTC
[camel-quarkus] branch quarkus-main updated (ae9a3a2 -> 8208215)
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 ae9a3a2 Upgrade Quarkus to 2.6.0.CR1
add c646d34 Updated CHANGELOG.md
add 506b229 Fix xref links, remove them (its hard to understand how to link between sub projects)
add c82a51c JFR Native support
add f2f8fe1 core: Add RouteConfigurationsBuilder before regular RoutesBuilder when camel main is disabled #2978
add 4a9a561 Verify that kafka.bootstrap.servers property is available before attempting to use it for dev services
add 73211f2 Sql test using derby doesn't start dev service and shows class loading issue if stored procedure is called #3260
add 29e55dc Add manifest to camel-quarkus-support-spring source JARs
new 8208215 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 (ae9a3a2)
\
N -- N -- N refs/heads/quarkus-main (8208215)
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 +
docs/modules/ROOT/pages/migration-guide/2.6.0.adoc | 4 +-
.../ROOT/pages/reference/extensions/jfr.adoc | 61 +++++++++--
.../ROOT/partials/reference/others/jfr.adoc | 6 +-
.../core/deployment/CamelContextProcessor.java | 20 ++--
.../quarkus/core/deployment/CamelProcessor.java | 8 --
.../core/deployment/main/CamelMainProcessor.java | 2 +-
.../spi/CamelStartupStepRecorderBuildItem.java | 41 --------
.../camel/quarkus/core/CamelContextRecorder.java | 51 ++++-----
.../quarkus/component/jfr/CamelJfrRecorder.java | 52 ---------
extensions-jvm/pom.xml | 1 -
.../support/spring/test/SpringSupportTest.java | 44 ++++++++
.../jfr/deployment/pom.xml | 0
.../component/jfr/deployment/JfrProcessor.java | 17 +--
.../jfr/deployment/JfrConfigInterceptorTest.java | 0
{extensions-jvm => extensions}/jfr/pom.xml | 2 +-
{extensions-jvm => extensions}/jfr/runtime/pom.xml | 1 +
extensions/jfr/runtime/src/main/doc/usage.adoc | 33 ++++++
.../CamelJfrConfigSourceInterceptorFactory.java | 2 +-
.../quarkus/component/jfr/CamelJfrRecorder.java | 62 +++++++++++
.../component/jfr/RuntimeCamelJfrConfig.java | 4 +-
.../main/resources/META-INF/quarkus-extension.yaml | 0
....smallrye.config.ConfigSourceInterceptorFactory | 0
.../component/kafka/deployment/KafkaProcessor.java | 6 +-
extensions/pom.xml | 1 +
integration-tests-jvm/jfr/pom.xml | 116 ---------------------
integration-tests-jvm/pom.xml | 1 -
.../jfr}/pom.xml | 70 ++++++-------
.../quarkus/component/jfr/it/JfrResource.java | 0
.../camel/quarkus/component/jfr/it/JfrRoutes.java | 0
.../jfr}/src/main/resources/application.properties | 4 +-
.../camel/quarkus/component/jfr/it/JfrIT.java} | 4 +-
.../camel/quarkus/component/jfr/it/JfrTest.java | 0
.../quarkus/component/jfr/it/JfrTestResource.java | 6 ++
.../pom.xml | 12 ++-
.../camel/quarkus/main/MainDisabledResource.java} | 26 ++++-
.../MainDisabledRouteConfigurationException.java} | 19 ++--
.../main/MainDisabledRouteConfigurations.java | 14 +--
.../main/MainDisabledRouteConfigurationsCDI.java | 17 +--
.../camel/quarkus/main/MainDisabledRoutes.java | 23 ++--
.../camel/quarkus/main/MainDisabledRoutesCDI.java | 26 +++--
.../src/main/resources/application.properties | 2 +-
.../apache/camel/quarkus/main/MainDisabledIT.java} | 2 +-
.../camel/quarkus/main/MainDisabledTest.java | 85 +++++++++++++++
integration-tests/pom.xml | 2 +
integration-tests/sql/pom.xml | 17 +++
.../quarkus/component/sql/it/SqlResource.java | 28 ++++-
...ure.java => DerbyNumberAddStoredProcedure.java} | 14 ++-
.../sql/src/main/resources/sql/derby/initDb.sql | 2 +
.../camel/quarkus/component/sql/it/SqlTest.java | 8 +-
pom.xml | 5 +
tooling/scripts/test-categories.yaml | 2 +
52 files changed, 531 insertions(+), 396 deletions(-)
delete mode 100644 extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/spi/CamelStartupStepRecorderBuildItem.java
delete mode 100644 extensions-jvm/jfr/runtime/src/main/java/org/apache/camel/quarkus/component/jfr/CamelJfrRecorder.java
rename {extensions-jvm => extensions}/jfr/deployment/pom.xml (100%)
rename {extensions-jvm => extensions}/jfr/deployment/src/main/java/org/apache/camel/quarkus/component/jfr/deployment/JfrProcessor.java (73%)
rename {extensions-jvm => extensions}/jfr/deployment/src/test/java/org/apache/camel/quarkus/component/jfr/deployment/JfrConfigInterceptorTest.java (100%)
rename {extensions-jvm => extensions}/jfr/pom.xml (96%)
rename {extensions-jvm => extensions}/jfr/runtime/pom.xml (98%)
create mode 100644 extensions/jfr/runtime/src/main/doc/usage.adoc
rename {extensions-jvm => extensions}/jfr/runtime/src/main/java/org/apache/camel/quarkus/component/jfr/CamelJfrConfigSourceInterceptorFactory.java (96%)
create mode 100644 extensions/jfr/runtime/src/main/java/org/apache/camel/quarkus/component/jfr/CamelJfrRecorder.java
rename extensions-jvm/jfr/runtime/src/main/java/org/apache/camel/quarkus/component/jfr/CamelJfrConfig.java => extensions/jfr/runtime/src/main/java/org/apache/camel/quarkus/component/jfr/RuntimeCamelJfrConfig.java (95%)
rename {extensions-jvm => extensions}/jfr/runtime/src/main/resources/META-INF/quarkus-extension.yaml (100%)
rename {extensions-jvm => extensions}/jfr/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptorFactory (100%)
delete mode 100644 integration-tests-jvm/jfr/pom.xml
copy {integration-test-groups/foundation/component-name-resolver => integration-tests/jfr}/pom.xml (90%)
rename {integration-tests-jvm => integration-tests}/jfr/src/main/java/org/apache/camel/quarkus/component/jfr/it/JfrResource.java (100%)
rename {integration-tests-jvm => integration-tests}/jfr/src/main/java/org/apache/camel/quarkus/component/jfr/it/JfrRoutes.java (100%)
copy {integration-test-groups/foundation/bean => integration-tests/jfr}/src/main/resources/application.properties (91%)
copy integration-tests/{as2/src/test/java/org/apache/camel/quarkus/component/as2/it/As2IT.java => jfr/src/test/java/org/apache/camel/quarkus/component/jfr/it/JfrIT.java} (91%)
rename {integration-tests-jvm => integration-tests}/jfr/src/test/java/org/apache/camel/quarkus/component/jfr/it/JfrTest.java (100%)
rename {integration-tests-jvm => integration-tests}/jfr/src/test/java/org/apache/camel/quarkus/component/jfr/it/JfrTestResource.java (89%)
copy integration-tests/{platform-http-engine => main-disabled}/pom.xml (91%)
copy integration-tests/{main-discovery-disabled/src/main/java/org/apache/camel/quarkus/main/MainDiscoveryDisabledResource.java => main-disabled/src/main/java/org/apache/camel/quarkus/main/MainDisabledResource.java} (71%)
copy integration-tests/{cbor/src/main/java/org/apache/camel/quarkus/component/cbor/it/model/DummyObject.java => main-disabled/src/main/java/org/apache/camel/quarkus/main/MainDisabledRouteConfigurationException.java} (73%)
copy integration-test-groups/foundation/route-configurations/src/main/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsEndpointConfigurationBuilder.java => integration-tests/main-disabled/src/main/java/org/apache/camel/quarkus/main/MainDisabledRouteConfigurations.java (69%)
copy integration-test-groups/foundation/route-configurations/src/main/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsEndpointConfigurationBuilder.java => integration-tests/main-disabled/src/main/java/org/apache/camel/quarkus/main/MainDisabledRouteConfigurationsCDI.java (68%)
copy integration-test-groups/foundation/route-configurations/src/main/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsEndpointRouteBuilder.java => integration-tests/main-disabled/src/main/java/org/apache/camel/quarkus/main/MainDisabledRoutes.java (64%)
copy integration-test-groups/foundation/route-configurations/src/main/java/org/apache/camel/quarkus/core/it/routeconfigurations/RouteConfigurationsEndpointRouteBuilder.java => integration-tests/main-disabled/src/main/java/org/apache/camel/quarkus/main/MainDisabledRoutesCDI.java (63%)
copy integration-tests/{core-discovery-disabled => main-disabled}/src/main/resources/application.properties (95%)
copy integration-tests/{main-yaml/src/test/java/org/apache/camel/quarkus/main/CoreMainYamlIT.java => main-disabled/src/test/java/org/apache/camel/quarkus/main/MainDisabledIT.java} (94%)
create mode 100644 integration-tests/main-disabled/src/test/java/org/apache/camel/quarkus/main/MainDisabledTest.java
copy integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/storedproc/{NumberAddStoredProcedure.java => DerbyNumberAddStoredProcedure.java} (67%)
[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 8208215fc8fdf44b6951933bb58637870acab32f
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 0abfa4a..b9bfb91 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>