This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new e1aee74 Fix karaf feature for johnzon b
e1aee74 is described below
commit e1aee74d08709b56849c0eba052800a1e5105937
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Mar 7 14:08:31 2022 +0100
Fix karaf feature for johnzon b
---
.../karaf/features/src/main/resources/features.xml | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 0146723..6f87f46 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -938,10 +938,10 @@
<bundle
dependency='true'>wrap:mvn:com.google.http-client/google-http-client-appengine/${google-cloud-http-client-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}</bundle>
<bundle
dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client/${google-cloud-oauth-client-version}</bundle>
- <bundle
dependency='true'>wrap:mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
+ <bundle
dependency='true'>mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
+ <bundle
dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
<bundle
dependency='true'>mvn:com.google.guava/guava/${google-cloud-guava-version}</bundle>
- <bundle
dependency='true'>wrap:mvn:com.google.guava/failureaccess/1.0.1</bundle>
- <bundle
dependency='true'>wrap:mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</bundle>
<bundle
dependency='true'>mvn:commons-logging/commons-logging/${commons-logging-version}</bundle>
<bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle
dependency='true'>wrap:mvn:io.opencensus/opencensus-api/${opencensus-api-version}</bundle>
@@ -1189,8 +1189,8 @@
<bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.aries/org.apache.aries.util/${aries-util-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-json_1.1_spec/${geronimo-json-spec-version}</bundle>
<bundle>mvn:org.apache.camel/camel-johnzon/${project.version}</bundle>
</feature>
@@ -1259,9 +1259,9 @@
<bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.aries/org.apache.aries.util/${aries-util-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.johnzon/johnzon-jsonb/${johnzon-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:org.apache.johnzon/johnzon-jsonb/${johnzon-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-json_1.1_spec/${geronimo-json-spec-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jsonb_1.0_spec/${geronimo-jsonb-spec-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jsonb/${project.version}</bundle>
@@ -1761,12 +1761,13 @@
</feature>
<feature name='camel-protobuf' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:com.google.protobuf/protobuf-java/3.17.3</bundle>
- <bundle
dependency='true'>mvn:com.google.protobuf/protobuf-java-util/3.17.3</bundle>
+ <bundle
dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
+ <bundle
dependency='true'>mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
<bundle
dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle
dependency='true'>mvn:com.google.guava/guava/${protobuf-guava-version}</bundle>
<bundle
dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</bundle>
+ <bundle
dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
<bundle>mvn:org.apache.camel/camel-protobuf/${project.version}</bundle>
</feature>
<feature name='camel-pubnub' version='${project.version}' start-level='50'>
