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 2020/12/14 12:02:42 UTC
[camel-karaf] branch master updated: CAMEL-15934:
camel-resilience4j - Upgrade to 1.6.x
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new fe26bda CAMEL-15934: camel-resilience4j - Upgrade to 1.6.x
fe26bda is described below
commit fe26bda6af36b10a94e5d306eeee18e9eac3fa6a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 13:02:19 2020 +0100
CAMEL-15934: camel-resilience4j - Upgrade to 1.6.x
---
platforms/karaf/features/src/main/resources/features.xml | 11 -----------
pom.xml | 1 -
2 files changed, 12 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index a5997e1..2961799 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2090,17 +2090,6 @@
<bundle dependency='true'>wrap:mvn:io.micrometer/micrometer-core/${micrometer-version}</bundle>
<bundle>mvn:org.apache.camel/camel-reactor/${project.version}</bundle>
</feature>
- <!-- does not work in OSGi: https://github.com/resilience4j/resilience4j/issues/750
- <feature name='camel-resilience4j' version='${project.version}' start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:io.github.resilience4j/resilience4j-core/${resilience4j-version}</bundle>
- <bundle dependency='true'>mvn:io.github.resilience4j/resilience4j-circuitbreaker/${resilience4j-version}</bundle>
- <bundle dependency='true'>mvn:io.github.resilience4j/resilience4j-bulkhead/${resilience4j-version}</bundle>
- <bundle dependency='true'>mvn:io.github.resilience4j/resilience4j-timelimiter/${resilience4j-version}</bundle>
- <bundle dependency='true'>mvn:io.vavr/vavr/${vavr-version}</bundle>
- <bundle dependency='true'>mvn:io.vavr/vavr-match/${vavr-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-resilience4j/${project.version}</bundle>
- </feature> -->
<feature name='camel-rest-openapi' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-http</feature>
diff --git a/pom.xml b/pom.xml
index 45b906f..308cd74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,7 +244,6 @@
<protobuf-javanano-version>3.1.0</protobuf-javanano-version>
<reflections-bundle-version>0.9.12_1</reflections-bundle-version>
<regexp-bundle-version>1.4_1</regexp-bundle-version>
- <resilience4j-version>1.3.0</resilience4j-version>
<roaster-version>2.21.1.Final</roaster-version>
<saxon-bundle-version>9.9.1-6_1</saxon-bundle-version>
<scribe-bundle-version>1.3.7_1</scribe-bundle-version>