You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/05/19 18:19:59 UTC

[camel-karaf] branch camel-karaf-3.11.x updated: Fix *** website build

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-karaf-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/camel-karaf-3.11.x by this push:
     new e99887e1 Fix *** website build
e99887e1 is described below

commit e99887e1d962e4d6d1965deaa67dc3992d187395
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu May 19 20:19:47 2022 +0200

    Fix *** website build
---
 .../org/apache/camel/catalog/karaf/others.properties      |  1 -
 .../org/apache/camel/catalog/karaf/others/hystrix.json    | 15 ---------------
 .../camel/catalog/karaf/KarafRuntimeProviderTest.java     |  1 -
 3 files changed, 17 deletions(-)

diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/others.properties b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/others.properties
index 26726606..67c59311 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/others.properties
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/others.properties
@@ -2,7 +2,6 @@ aws-xray
 blueprint
 caffeine-lrucache
 headersmap
-hystrix
 jasypt
 kura
 leveldb
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/others/hystrix.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/others/hystrix.json
deleted file mode 100644
index 97a03565..00000000
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/others/hystrix.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "hystrix",
-    "title": "Hystrix",
-    "description": "Circuit Breaker EIP using Netflix Hystrix",
-    "deprecated": true,
-    "firstVersion": "2.18.0",
-    "label": "eip,microservice",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-hystrix",
-    "version": "3.11.1-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java b/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
index 4aefc75a..50219376 100644
--- a/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
+++ b/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
@@ -115,7 +115,6 @@ public class KarafRuntimeProviderTest {
         assertFalse(names.isEmpty());
 
         // regular others
-        assertTrue(names.contains("hystrix"));
         assertTrue(names.contains("swagger-java"));
         assertTrue(names.contains("zipkin"));