This is an automated email from the ASF dual-hosted git repository.
acosentino 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 2dafd89 Use BeanUtils 1.9.3 in Karaf feature to align to the JAR
version
2dafd89 is described below
commit 2dafd89b77a19bd7fbcbb2943a44275c19cf69f3
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Jun 6 10:32:25 2018 +0200
Use BeanUtils 1.9.3 in Karaf feature to align to the JAR version
---
components/camel-gora/pom.xml | 6 +++---
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 9 +++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index 3f45032..8f01a2d 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -151,9 +151,9 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
- <version>${commons-beanutils-bundle-version}</version>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils-version}</version>
</dependency>
</dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 698a15f..22eb719 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -135,7 +135,6 @@
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
<cometd-java-server>3.1.2</cometd-java-server>
<commons-beanutils-version>1.9.3</commons-beanutils-version>
-
<commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
<commons-codec-version>1.11</commons-codec-version>
<commons-collections-version>3.2.2</commons-collections-version>
<commons-compress-version>1.16.1</commons-compress-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 8cda8b0..08279c6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -906,7 +906,7 @@
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle
dependency='true'>mvn:com.sun.mail/javax.mail/${javax-mail-version}</bundle>
<bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}</bundle>
<bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle
dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
<bundle
dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
@@ -1319,7 +1319,8 @@
<feature version='${project.version}'>camel-core</feature>
<!-- All those bundles should be optional I think, but the commons-jxpath
osgi metadata is not really good -->
<feature>war</feature>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle
dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle>
@@ -1963,7 +1964,7 @@
</feature>
<feature name='camel-shiro' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.commons/commons-configuration2/${commons-configuration2-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.shiro/shiro-core/${shiro-version}</bundle>
@@ -2387,7 +2388,7 @@
<!-- NOTICE: XOM cannot be included by default due to an incompatible
license; please review its license model and install the dependency manually if
you agree. -->
<details>Before using this feature make sure to install this bundle first
manually: mvn:xom/xom/${xom-version}</details>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ezmorph/${ezmorph-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json-lib/${jsonlib-bundle-version}</bundle>
--
To stop receiving notification emails like this one, please contact
[email protected].
