diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 5e3b8ffeb..31262d8da 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -61,6 +61,7 @@ jobs: matrix: native-image-project: - :camel-k-quarkus-core-it + - :camel-k-quarkus-cron-it - :camel-k-quarkus-loader-xml-it - :camel-k-quarkus-loader-yaml-it - :camel-k-runtime-example-quarkus-xml diff --git a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java index c097c6648..167daca26 100644 --- a/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java +++ b/camel-k-quarkus/camel-k-quarkus-core/deployment/src/main/java/org/apache/camel/k/core/quarkus/deployment/DeploymentProcessor.java @@ -40,12 +40,19 @@ public class DeploymentProcessor { @BuildStep - CamelServicePatternBuildItem servicePatterns() { - return new CamelServicePatternBuildItem( - CamelServicePatternBuildItem.CamelServiceDestination.REGISTRY, - true, - Constants.SOURCE_LOADER_RESOURCE_PATH + "/*", - Constants.CONTEXT_CUSTOMIZER_RESOURCE_PATH + "/*"); + List servicePatterns() { + return List.of( + new CamelServicePatternBuildItem( + CamelServicePatternBuildItem.CamelServiceDestination.REGISTRY, + true, + Constants.SOURCE_LOADER_RESOURCE_PATH + "/*", + Constants.CONTEXT_CUSTOMIZER_RESOURCE_PATH + "/*"), + new CamelServicePatternBuildItem( + CamelServicePatternBuildItem.CamelServiceDestination.DISCOVERY, + true, + Constants.SOURCE_LOADER_INTERCEPTOR_RESOURCE_PATH + "/*") + ); + } @BuildStep diff --git a/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties index 876ce6b3e..d43bc0bbc 100644 --- a/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties +++ b/camel-k-quarkus/camel-k-quarkus-core/it/src/main/resources/application.properties @@ -19,6 +19,7 @@ # quarkus.log.file.enable = false quarkus.log.console.enable = false +quarkus.banner.enabled = false # # Camel diff --git a/camel-k-quarkus/camel-k-quarkus-cron/deployment/pom.xml b/camel-k-quarkus/camel-k-quarkus-cron/deployment/pom.xml new file mode 100644 index 000000000..f8d594f5c --- /dev/null +++ b/camel-k-quarkus/camel-k-quarkus-cron/deployment/pom.xml @@ -0,0 +1,71 @@ + + + + + org.apache.camel.k + camel-k-quarkus-cron-parent + 1.3.0-SNAPSHOT + + 4.0.0 + + camel-k-quarkus-cron-deployment + + + + + org.apache.camel.quarkus + camel-quarkus-bom-deployment + ${camel-quarkus.version} + pom + import + + + + + + + org.apache.camel.k + camel-k-quarkus-core-deployment + + + org.apache.camel.k + camel-k-quarkus-cron + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${quarkus.version} + + + + + + + + diff --git a/camel-k-quarkus/camel-k-quarkus-cron/deployment/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Feature.java b/camel-k-quarkus/camel-k-quarkus-cron/deployment/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Feature.java new file mode 100644 index 000000000..b8c60d300 --- /dev/null +++ b/camel-k-quarkus/camel-k-quarkus-cron/deployment/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Feature.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.k.quarkus.cron.deployment; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; + +public class Feature { + private static final String FEATURE = "camel-k-runtime-cron"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } +} diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/pom.xml b/camel-k-quarkus/camel-k-quarkus-cron/it/pom.xml new file mode 100644 index 000000000..7724032e4 --- /dev/null +++ b/camel-k-quarkus/camel-k-quarkus-cron/it/pom.xml @@ -0,0 +1,159 @@ + + + + + org.apache.camel.k + camel-k-quarkus-cron-parent + 1.3.0-SNAPSHOT + + 4.0.0 + + camel-k-quarkus-cron-it + + + + org.apache.camel.k + camel-k-quarkus-cron + + + + + io.quarkus + quarkus-jsonb + + + io.quarkus + quarkus-resteasy + + + io.quarkus + quarkus-resteasy-jsonb + + + + + io.quarkus + quarkus-junit5 + test + + + io.rest-assured + rest-assured + test + + + org.assertj + assertj-core + test + + + org.hamcrest + hamcrest-core + test + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + reserve-network-port + + reserve-network-port + + process-resources + + + test.http.port.jvm + test.http.port.native + + + + + + + io.quarkus + quarkus-maven-plugin + ${quarkus.version} + + + + build + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${test.http.port.jvm} + org.jboss.logmanager.LogManager + + + + + + + + + native + + + native + + + + native + --language:js + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + ${test.http.port.native} + ${project.build.directory}/${project.build.finalName}-runner + + + + + + + + + + + + diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java b/camel-k-quarkus/camel-k-quarkus-cron/it/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java new file mode 100644 index 000000000..3d8cb21ef --- /dev/null +++ b/camel-k-quarkus/camel-k-quarkus-cron/it/src/main/java/org/apache/camel/k/quarkus/cron/deployment/Application.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.k.quarkus.cron.deployment; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.apache.camel.CamelContext; +import org.apache.camel.ExtendedCamelContext; +import org.apache.camel.k.Constants; + +@Path("/test") +@ApplicationScoped +public class Application { + @Inject + CamelContext context; + + @GET + @Path("/find-cron-interceptor") + @Produces(MediaType.TEXT_PLAIN) + public String findCronInterceptor() { + return context.adapt(ExtendedCamelContext.class) + .getFactoryFinder(Constants.SOURCE_LOADER_INTERCEPTOR_RESOURCE_PATH) + .findClass("cron") + .map(Class::getName) + .orElse(""); + } +} diff --git a/camel-k-quarkus/camel-k-quarkus-core/it/src/test/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-cron/it/src/main/resources/application.properties similarity index 82% rename from camel-k-quarkus/camel-k-quarkus-core/it/src/test/resources/application.properties rename to camel-k-quarkus/camel-k-quarkus-cron/it/src/main/resources/application.properties index a35368cec..295891567 100644 --- a/camel-k-quarkus/camel-k-quarkus-core/it/src/test/resources/application.properties +++ b/camel-k-quarkus/camel-k-quarkus-cron/it/src/main/resources/application.properties @@ -18,4 +18,19 @@ # Quarkus # quarkus.log.file.enable = false -quarkus.log.console.enable = false \ No newline at end of file +quarkus.log.console.enable = true +quarkus.banner.enabled = false + +# +# Quarkus :: Camel +# +quarkus.camel.main.routes-discovery.enabled = false + +# +# Camel +# +camel.context.name = camel-k-quarkus-ctx + +# +# Integration +# diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionIT.java b/camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionIT.java new file mode 100644 index 000000000..9039b1278 --- /dev/null +++ b/camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionIT.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.k.quarkus.cron.deployment; + +import io.quarkus.test.junit.NativeImageTest; + +@NativeImageTest +public class ExtensionIT extends ExtensionTest { +} \ No newline at end of file diff --git a/camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionTest.java b/camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionTest.java new file mode 100644 index 000000000..8d0def1ae --- /dev/null +++ b/camel-k-quarkus/camel-k-quarkus-cron/it/src/test/java/org/apache/camel/k/quarkus/cron/deployment/ExtensionTest.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.k.quarkus.cron.deployment; + +import java.io.IOException; + +import io.quarkus.test.junit.QuarkusTest; +import org.apache.camel.k.cron.CronSourceLoaderInterceptor; +import org.junit.jupiter.api.Test; + +import static io.restassured.RestAssured.when; +import static org.hamcrest.Matchers.is; + +@QuarkusTest +public class ExtensionTest { + @Test + public void cronInterceptorIsRegistered() throws IOException { + when() + .get("/test/find-cron-interceptor") + .then() + .statusCode(200) + .body(is(CronSourceLoaderInterceptor.class.getName())); + } +} diff --git a/camel-k-quarkus/camel-k-quarkus-cron/pom.xml b/camel-k-quarkus/camel-k-quarkus-cron/pom.xml new file mode 100644 index 000000000..9ae1a12bc --- /dev/null +++ b/camel-k-quarkus/camel-k-quarkus-cron/pom.xml @@ -0,0 +1,37 @@ + + + + + org.apache.camel.k + camel-k-quarkus + 1.3.0-SNAPSHOT + + 4.0.0 + pom + + camel-k-quarkus-cron-parent + + + runtime + deployment + it + + + diff --git a/camel-k-quarkus/camel-k-quarkus-cron/runtime/pom.xml b/camel-k-quarkus/camel-k-quarkus-cron/runtime/pom.xml new file mode 100644 index 000000000..73a889be4 --- /dev/null +++ b/camel-k-quarkus/camel-k-quarkus-cron/runtime/pom.xml @@ -0,0 +1,86 @@ + + + + + org.apache.camel.k + camel-k-quarkus-cron-parent + 1.3.0-SNAPSHOT + + 4.0.0 + + camel-k-quarkus-cron + + + + org.apache.camel.k + camel-k-quarkus-core + + + org.apache.camel.k + camel-k-runtime-cron + + + + + + + io.quarkus + quarkus-bootstrap-maven-plugin + ${quarkus.version} + + + + extension-descriptor + + + ${project.groupId}:${project.artifactId}-deployment:${project.version} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${quarkus.version} + + + + + + org.jboss.jandex + jandex-maven-plugin + + + make-index + + jandex + + + + + + + + diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/main/resources/application.properties index 3dff7771d..b4cc6d46e 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/main/resources/application.properties +++ b/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/main/resources/application.properties @@ -19,6 +19,7 @@ # quarkus.log.file.enable = false quarkus.log.console.enable = false +quarkus.banner.enabled = false # # Quarkus :: Camel diff --git a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/resources/application.properties deleted file mode 100644 index a35368cec..000000000 --- a/camel-k-quarkus/camel-k-quarkus-loader-js/it/src/test/resources/application.properties +++ /dev/null @@ -1,21 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- -# -# Quarkus -# -quarkus.log.file.enable = false -quarkus.log.console.enable = false \ No newline at end of file diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/main/resources/application.properties index d277fd677..73b0e701a 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/main/resources/application.properties +++ b/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/main/resources/application.properties @@ -19,6 +19,7 @@ # quarkus.log.file.enable = false quarkus.log.console.enable = false +quarkus.banner.enabled = false # # Quarkus :: Camel diff --git a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/resources/application.properties deleted file mode 100644 index a35368cec..000000000 --- a/camel-k-quarkus/camel-k-quarkus-loader-xml/it/src/test/resources/application.properties +++ /dev/null @@ -1,21 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- -# -# Quarkus -# -quarkus.log.file.enable = false -quarkus.log.console.enable = false \ No newline at end of file diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/main/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/main/resources/application.properties index 3dff7771d..b4cc6d46e 100644 --- a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/main/resources/application.properties +++ b/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/main/resources/application.properties @@ -19,6 +19,7 @@ # quarkus.log.file.enable = false quarkus.log.console.enable = false +quarkus.banner.enabled = false # # Quarkus :: Camel diff --git a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/resources/application.properties b/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/resources/application.properties deleted file mode 100644 index a35368cec..000000000 --- a/camel-k-quarkus/camel-k-quarkus-loader-yaml/it/src/test/resources/application.properties +++ /dev/null @@ -1,21 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- -# -# Quarkus -# -quarkus.log.file.enable = false -quarkus.log.console.enable = false \ No newline at end of file diff --git a/camel-k-quarkus/pom.xml b/camel-k-quarkus/pom.xml index 564315936..539bbbfcb 100644 --- a/camel-k-quarkus/pom.xml +++ b/camel-k-quarkus/pom.xml @@ -50,6 +50,7 @@ camel-k-quarkus-core camel-k-quarkus-knative + camel-k-quarkus-cron camel-k-runtime-quarkus diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml index fdf21cb37..8051ed412 100644 --- a/camel-k-runtime-bom/pom.xml +++ b/camel-k-runtime-bom/pom.xml @@ -255,6 +255,16 @@ camel-k-quarkus-knative-deployment ${project.version} + + org.apache.camel.k + camel-k-quarkus-cron + ${project.version} + + + org.apache.camel.k + camel-k-quarkus-cron-deployment + ${project.version} + diff --git a/camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java b/camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java index 04585e992..e97eaeebf 100644 --- a/camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java +++ b/camel-k-runtime-cron/src/main/java/org/apache/camel/k/cron/CronSourceLoaderInterceptor.java @@ -85,8 +85,8 @@ public Optional builder() { return; } - CamelContext context = runtime.getCamelContext(); - String[] components = overridableComponents.split(",", -1); + final CamelContext context = runtime.getCamelContext(); + final String[] components = overridableComponents.split(",", -1); for (RouteDefinition def : builder.getRouteCollection().getRoutes()) { String uri = def.getInput() != null ? def.getInput().getUri() : null; diff --git a/pom.xml b/pom.xml index 7edbcd9ce..10ff8511f 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,7 @@ 2.1.3.Final 1.11.1 4.3.0 + 2.2 1.9.0 3.8.1 @@ -362,6 +363,16 @@ camel-k-runtime-knative ${project.version} + + org.apache.camel.k + camel-k-runtime-cron + ${project.version} + + + org.apache.camel.k + camel-k-runtime-master + ${project.version} + @@ -454,6 +465,16 @@ camel-k-quarkus-knative-deployment ${project.version} + + org.apache.camel.k + camel-k-quarkus-cron + ${project.version} + + + org.apache.camel.k + camel-k-quarkus-knative-cron + ${project.version} + @@ -564,6 +585,11 @@ assertj-core ${assertj.version} + + org.hamcrest + hamcrest-core + ${hamcrest.version} + diff --git a/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy index 21d246bf6..b08a066e9 100644 --- a/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy +++ b/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy @@ -24,6 +24,8 @@ new File(basedir, "catalog.yaml").withReader { assert catalog.spec.runtime.metadata['quarkus.version'] == quarkusVersion assert catalog.spec.runtime.metadata['camel-quarkus.version'] == camelQuarkusVersion + assert catalog.spec.runtime.capabilities['cron'].dependencies[0].groupId == 'org.apache.camel.k' + assert catalog.spec.runtime.capabilities['cron'].dependencies[0].artifactId == 'camel-k-runtime-cron' assert catalog.spec.runtime.capabilities['health'].dependencies[0].groupId == 'org.apache.camel.k' assert catalog.spec.runtime.capabilities['health'].dependencies[0].artifactId == 'camel-k-runtime-health' assert catalog.spec.runtime.capabilities['rest'].dependencies[0].groupId == 'org.apache.camel' diff --git a/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy index 9a450a072..5ad4fe243 100644 --- a/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy +++ b/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy @@ -24,6 +24,8 @@ new File(basedir, "catalog.yaml").withReader { assert catalog.spec.runtime.metadata['quarkus.version'] == quarkusVersion assert catalog.spec.runtime.metadata['camel-quarkus.version'] == camelQuarkusVersion + assert catalog.spec.runtime.capabilities['cron'].dependencies[0].groupId == 'org.apache.camel.k' + assert catalog.spec.runtime.capabilities['cron'].dependencies[0].artifactId == 'camel-k-quarkus-cron' assert catalog.spec.runtime.capabilities['health'].dependencies[0].groupId == 'org.apache.camel.quarkus' assert catalog.spec.runtime.capabilities['health'].dependencies[0].artifactId == 'camel-quarkus-microprofile-health' assert catalog.spec.runtime.capabilities['rest'].dependencies[0].groupId == 'org.apache.camel.quarkus' diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java index 99de09617..c63fae037 100644 --- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java +++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java @@ -145,7 +145,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { runtimeSpec.addDependency("org.apache.camel.k", "camel-k-runtime-quarkus"); runtimeSpec.putCapability( "cron", - CamelCapability.forArtifact("org.apache.camel.k", "camel-k-runtime-cron")); + CamelCapability.forArtifact("org.apache.camel.k", "camel-k-quarkus-cron")); runtimeSpec.putCapability( "health", CamelCapability.forArtifact("org.apache.camel.quarkus", "camel-quarkus-microprofile-health"));