This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 784754e48017ceded7cb5eda9cff5e3f6a628067 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Jul 28 11:27:44 2022 +0200 Step to align to 3.18.0 --- .../main/java/org/apache/camel/k/support/SourcesSupport.java | 10 ++-------- .../src/main/java/org/apache/camel/k/quarkus/Application.java | 6 ++++++ .../camel-k-maven-plugin/src/it/generate-catalog/verify.groovy | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java index 2fc4326b..80e9ad5b 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java @@ -150,10 +150,8 @@ public final class SourcesSupport { "There should not be any template definition when configuring error handler, got " + templates.size()); } - if (hasErrorHandlerBuilder(builder)) { - LOGGER.debug("Setting default error handler builder factory as {}", builder.getErrorHandlerBuilder()); - runtime.getCamelContext().adapt(ExtendedCamelContext.class).setErrorHandlerFactory(builder.getErrorHandlerBuilder()); - } + LOGGER.debug("Setting default error handler builder factory as {}", builder.getErrorHandlerFactory()); + runtime.getCamelContext().adapt(ExtendedCamelContext.class).setErrorHandlerFactory(builder.getErrorHandlerFactory()); } }); break; @@ -175,10 +173,6 @@ public final class SourcesSupport { } } - static boolean hasErrorHandlerBuilder(RouteBuilder builder) { - return builder.hasErrorHandlerBuilder(); - } - public static void loadErrorHandlerSource(Runtime runtime, SourceDefinition errorHandlerSourceDefinition) { LOGGER.info("Loading error handler from: {}", errorHandlerSourceDefinition); load(runtime, Sources.fromDefinition(errorHandlerSourceDefinition)); diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java index 4950bc45..1002fb59 100644 --- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java +++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java @@ -33,6 +33,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.main.BaseMainSupport; import org.apache.camel.main.MainListener; import org.apache.camel.main.RoutesCollector; +import org.apache.camel.spi.Resource; public final class Application { private Application() { @@ -146,6 +147,11 @@ public final class Application { return Collections.emptyList(); } + @Override + public Collection<Resource> findRouteResourcesFromDirectory(CamelContext camelContext, String excludePattern, String includePattern) { + return Collections.emptyList(); + } + @Override public List<RoutesBuilder> collectRoutesFromRegistry(CamelContext camelContext, String excludePattern, String includePattern) { return Collections.emptyList(); diff --git a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy index 032c2465..2381dfe7 100644 --- a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy +++ b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy @@ -21,7 +21,8 @@ new File(basedir, "catalog.yaml").withReader { assert catalog.spec.runtime.version == runtimeVersion assert catalog.spec.runtime.applicationClass == 'io.quarkus.bootstrap.runner.QuarkusEntryPoint' assert catalog.spec.runtime.metadata['camel.version'] == camelVersion - assert catalog.spec.runtime.metadata['quarkus.version'] == quarkusVersion + //For 1.14.0 we need to use a different quarkus.platform version released for a last time CVE. Let's re-enable the assert for the next release. + //assert catalog.spec.runtime.metadata['quarkus.version'] == quarkusVersion assert catalog.spec.runtime.metadata['camel-quarkus.version'] == camelQuarkusVersion assert catalog.spec.runtime.dependencies.any {
