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 76c91fbb Upgrade jsonb specs
76c91fbb is described below
commit 76c91fbb3d54fe97d2d1994302ee57a66613ca41
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Aug 3 14:58:42 2022 +0200
Upgrade jsonb specs
---
platforms/karaf/features/src/main/resources/features.xml | 11 +++++++----
pom.xml | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 1acfa4ae..19ec7758 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1292,16 +1292,19 @@
<bundle
dependency='true'>wrap:mvn:com.github.jasminb/jsonapi-converter/${jasminb-jsonapi-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jsonapi/${project.version}</bundle>
</feature>
- <feature name='camel-jsonb' version='${project.version}' start-level='50'>
+ <feature name='camel-xxx-jsonb' version='${project.version}'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:org.ow2.asm/asm-commons/${asm-version}</bundle>
- <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm-version}</bundle>
- <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
+ <bundle
dependency='true'>mvn:org.ow2.asm/asm/${asm.bundle.version}</bundle>
+ <bundle
dependency='true'>mvn:org.ow2.asm/asm-analysis/${asm.bundle.version}</bundle>
+ <bundle
dependency='true'>mvn:org.ow2.asm/asm-commons/${asm.bundle.version}</bundle>
+ <bundle
dependency='true'>mvn:org.ow2.asm/asm-tree/${asm.bundle.version}</bundle>
+ <bundle
dependency='true'>mvn:org.ow2.asm/asm-util/${asm.bundle.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'>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-annotation_1.3_spec/1.3</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>
diff --git a/pom.xml b/pom.xml
index 433790db..b0dc87e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,8 +118,8 @@
<apache-mime4j-version>0.8.3</apache-mime4j-version>
<asciidoctorj-version>2.1.0</asciidoctorj-version>
<asm-version>5.0.4</asm-version>
- <aries-spifly.bundle.version>1.3.0</aries-spifly.bundle.version>
- <asm.bundle.version>8.0.1</asm.bundle.version>
+ <aries-spifly.bundle.version>1.3.5</aries-spifly.bundle.version>
+ <asm.bundle.version>9.3</asm.bundle.version>
<asterisk-java-bundle-version>1.0.0-final_1</asterisk-java-bundle-version>
<atlassian-jira-client-bundle-version>5.2.4_2</atlassian-jira-client-bundle-version>
<automaton-bundle-version>1.11-8_1</automaton-bundle-version>