Author: davsclaus
Date: Wed Jan 2 15:15:40 2013
New Revision: 1427823
URL: http://svn.apache.org/viewvc?rev=1427823&view=rev
Log:
CAMEL-5903: More osgi dependency upgrades.
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1427823&r1=1427822&r2=1427823&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan 2 15:15:40 2013
@@ -74,6 +74,7 @@
<commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
<commons-codec-version>1.6</commons-codec-version>
<commons-collections-version>3.2.1</commons-collections-version>
+
<commons-configuration-bundle-version>1.8_1</commons-configuration-bundle-version>
<commons-configuration-version>1.8</commons-configuration-version>
<commons-csv-bundle-version>1.0-r706900_3</commons-csv-bundle-version>
<commons-cli-version>1.2</commons-cli-version>
@@ -283,6 +284,7 @@
<saxon-bundle-version>9.4.0.4_1</saxon-bundle-version>
<saxon-version>9.4.0.4</saxon-version>
<scala-bundle-version>2.9.2_2</scala-bundle-version>
+ <scala-library-bundle-version>2.9.2_1</scala-library-bundle-version>
<scala-version>2.9.2</scala-version>
<scala-maven-plugin-version>3.1.0</scala-maven-plugin-version>
<scriptengines-version>1.1</scriptengines-version>
@@ -348,7 +350,7 @@
<xmlbeans-version>2.5.0</xmlbeans-version>
<xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
<xmlrpc-version>3.1.3</xmlrpc-version>
-
<xmlrpc-client-bundle-version>3.1.3_1-SNAPSHOT</xmlrpc-client-bundle-version>
+ <xmlrpc-client-bundle-version>3.1.3_1</xmlrpc-client-bundle-version>
<xmlschema-version>2.0</xmlschema-version>
<xmlsec-version>1.5.1</xmlsec-version>
<xmlunit-version>1.3</xmlunit-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1427823&r1=1427822&r2=1427823&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed
Jan 2 15:15:40 2013
@@ -380,6 +380,7 @@
<bundle
dependency='true'>mvn:javax.mail/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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration-bundle-version}</bundle>
<bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle
dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
<bundle
dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
@@ -683,7 +684,7 @@
<bundle>mvn:org.apache.camel/camel-saxon/${project.version}</bundle>
</feature>
<feature name='camel-scala' version='${project.version}' resolver='(obr)'
start-level='50'>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-library-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${project.version}</bundle>
</feature>