This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6fdf7df Updating Xbean
6fdf7df is described below
commit 6fdf7dff4013b262f0194d99a2ee927b330fcd67
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Sat Jun 22 12:55:13 2019 +0100
Updating Xbean
---
parent/pom.xml | 4 +---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e0b880a..25601a8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -703,9 +703,7 @@
<wsdl4j-version>1.6.3</wsdl4j-version>
<xalan-bundle-version>2.7.2_3</xalan-bundle-version>
<xalan-version>2.7.2</xalan-version>
- <xbean-spring-version>4.5</xbean-spring-version>
- <!-- xbean-asm4-bundle is used by openjpa -->
- <xbean-asm4-bundle-version>3.14</xbean-asm4-bundle-version>
+ <xbean-spring-version>4.14</xbean-spring-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
<xchange-version>4.3.19</xchange-version>
<xerces-bundle-version>2.12.0_1</xerces-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index a7b1ea2..c468e0e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1539,7 +1539,7 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.xbean/xbean-asm4-shaded/${xbean-asm4-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.xbean/xbean-asm5-shaded/${xbean-asm5-shaded-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jpa/${project.version}</bundle>
</feature>
<feature name='camel-jsch' version='${project.version}' start-level='50'>
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 7a48eec..f2c9775 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3626,7 +3626,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>4.5</version>
+ <version>4.14</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
