You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/31 16:19:48 UTC
svn commit: r1441014 - in /camel/trunk: parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Thu Jan 31 15:19:48 2013
New Revision: 1441014
URL: http://svn.apache.org/viewvc?rev=1441014&view=rev
Log:
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=1441014&r1=1441013&r2=1441014&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 31 15:19:48 2013
@@ -105,6 +105,7 @@
<deltaspike-version>0.3-incubating</deltaspike-version>
<derby-version>10.9.1.0</derby-version>
<dnsjava-version>2.1.1</dnsjava-version>
+ <dnsjava-bundle-version>2.1.1_1</dnsjava-bundle-version>
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<dozer-version>5.4.0</dozer-version>
<easymock-version>3.1</easymock-version>
@@ -306,7 +307,7 @@
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
- <saxon-bundle-version>9.4.0.4_1</saxon-bundle-version>
+ <saxon-bundle-version>9.4.0.4_2</saxon-bundle-version>
<saxon-version>9.4.0.4</saxon-version>
<scala-version>2.10.0</scala-version>
<scala29-version>2.9.2</scala29-version>
@@ -354,7 +355,7 @@
<tagsoup-bundle-version>1.2_5</tagsoup-bundle-version>
<tagsoup-version>1.2.1</tagsoup-version>
<testng-version>6.8</testng-version>
- <twitter4j-bundle-version>3.0.1_1</twitter4j-bundle-version>
+ <twitter4j-bundle-version>3.0.3_1</twitter4j-bundle-version>
<twitter4j-version>3.0.3</twitter4j-version>
<urlrewritefilter-version>4.0.4</urlrewritefilter-version>
<urlrewritefilter-bundle-version>4.0.4_1</urlrewritefilter-bundle-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=1441014&r1=1441013&r2=1441014&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Jan 31 15:19:48 2013
@@ -267,9 +267,8 @@
<bundle>mvn:org.apache.camel/camel-csv/${project.version}</bundle>
</feature>
<feature name='camel-dns' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>The camel-dns feature can only run on a SUN JVM. You need to ddd the package sun.net.spi.nameservice to the java platform packages in the etc/jre.properties file.</details>
- <bundle dependency='true'>mvn:dnsjava/dnsjava/${dnsjava-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
+ <details>The camel-dns feature can only run on a SUN JVM. You need to ddd the package sun.net.spi.nameservice to the java platform packages in the etc/jre.properties file.</details>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjava-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-dns/${project.version}</bundle>
</feature>