This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/master by this push: new f8a1b9d Add circuit-breaker capability #257 new b27e184 Merge pull request #350 from lburgazzoli/github-257 f8a1b9d is described below commit f8a1b9d520397bddf342fe4b90cdb155145716b5 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Wed Jun 3 17:11:47 2020 +0200 Add circuit-breaker capability #257 --- .../camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy | 3 +++ .../src/it/generate-catalog-quarkus/verify.groovy | 2 ++ .../java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 6 ++++++ 3 files changed, 11 insertions(+) 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 b08a066..73b6d01 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 @@ -34,6 +34,9 @@ new File(basedir, "catalog.yaml").withReader { assert catalog.spec.runtime.capabilities['rest'].dependencies[1].artifactId == 'camel-k-runtime-http' assert catalog.spec.runtime.capabilities['platform-http'].dependencies[0].groupId == 'org.apache.camel.k' assert catalog.spec.runtime.capabilities['platform-http'].dependencies[0].artifactId == 'camel-k-runtime-http' + assert catalog.spec.runtime.capabilities['circuit-breaker'].dependencies[0].groupId == 'org.apache.camel' + assert catalog.spec.runtime.capabilities['circuit-breaker'].dependencies[0].artifactId == 'camel-microprofile-fault-tolerance' + assert catalog.metadata.labels['camel.apache.org/runtime.version'] == runtimeVersion 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 5ad4fe2..1b271f2 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 @@ -34,6 +34,8 @@ new File(basedir, "catalog.yaml").withReader { assert catalog.spec.runtime.capabilities['rest'].dependencies[1].artifactId == 'camel-quarkus-platform-http' assert catalog.spec.runtime.capabilities['platform-http'].dependencies[0].groupId == 'org.apache.camel.quarkus' assert catalog.spec.runtime.capabilities['platform-http'].dependencies[0].artifactId == 'camel-quarkus-platform-http' + assert catalog.spec.runtime.capabilities['circuit-breaker'].dependencies[0].groupId == 'org.apache.camel.quarkus' + assert catalog.spec.runtime.capabilities['circuit-breaker'].dependencies[0].artifactId == 'camel-quarkus-microprofile-fault-tolerance' assert catalog.metadata.labels['camel.apache.org/runtime.version'] == runtimeVersion 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 1ac750b..541fb41 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 @@ -138,6 +138,9 @@ public class GenerateCatalogMojo extends AbstractMojo { .addDependency("org.apache.camel", "camel-rest") .addDependency("org.apache.camel.k", "camel-k-runtime-http") .build()); + runtimeSpec.putCapability( + "circuit-breaker", + CamelCapability.forArtifact("org.apache.camel", "camel-microprofile-fault-tolerance")); break; case "quarkus": catalog.setRuntimeProvider(new QuarkusRuntimeProvider()); @@ -158,6 +161,9 @@ public class GenerateCatalogMojo extends AbstractMojo { .addDependency("org.apache.camel.quarkus", "camel-quarkus-rest") .addDependency("org.apache.camel.quarkus", "camel-quarkus-platform-http") .build()); + runtimeSpec.putCapability( + "circuit-breaker", + CamelCapability.forArtifact("org.apache.camel.quarkus", "camel-quarkus-microprofile-fault-tolerance")); break; default: throw new IllegalArgumentException("catalog.runtime parameter value [" + runtime + "] is not supported!");