Author: bvahdat
Date: Thu Jan 3 05:39:03 2013
New Revision: 1428172
URL: http://svn.apache.org/viewvc?rev=1428172&view=rev
Log:
Removed the second definition of 'commons-jxpath-version' inside the parent
pom. Also added back the removed version properties inside the parent pom
through the previous commit as they're used by the karaf features (my bad).
Modified:
camel/trunk/parent/pom.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1428172&r1=1428171&r2=1428172&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 3 05:39:03 2013
@@ -78,6 +78,7 @@
<commons-configuration-version>1.8</commons-configuration-version>
<commons-csv-bundle-version>1.0-r706899_5</commons-csv-bundle-version>
<commons-cli-version>1.2</commons-cli-version>
+ <commons-daemon-version>1.0.5</commons-daemon-version>
<commons-dbcp-bundle-version>1.4_3</commons-dbcp-bundle-version>
<commons-dbcp-version>1.4</commons-dbcp-version>
<commons-digester-version>2.1</commons-digester-version>
@@ -85,13 +86,14 @@
<commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>
<commons-io-bundle-version>1.4_3</commons-io-bundle-version>
<commons-io-version>1.4</commons-io-version>
+ <commons-jexl2-version>2.0.1</commons-jexl2-version>
<commons-jxpath-version>1.3</commons-jxpath-version>
<commons-lang-version>2.6</commons-lang-version>
<commons-lang-version-xmljson>2.5</commons-lang-version-xmljson>
<commons-logging-version>1.1.1</commons-logging-version>
+ <commons-math-version>2.2</commons-math-version>
<commons-net-version>3.2</commons-net-version>
<commons-pool-version>1.6</commons-pool-version>
- <commons-jxpath-version>1.3</commons-jxpath-version>
<commons-vfs2-version>2.0</commons-vfs2-version>
<concurrentlinkedhashmap.version>1.3.2</concurrentlinkedhashmap.version>
<cxf-version>2.7.1</cxf-version>