You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2019/06/26 16:45:49 UTC
[camel] 01/03: Updating Xbean
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 483e1afe6b04b44d26c09acb53119cb5648779ed
Author: Colm O hEigeartaigh <co...@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 7b1cf67..ba1f7f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -721,9 +721,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.13</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 ddc8373..ca04d18 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1345,7 +1345,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}' resolver='(obr)' 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 8183876..90ecb04 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
@@ -3461,7 +3461,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>