Author: janstey
Date: Thu Sep 29 00:38:23 2011
New Revision: 1177129
URL: http://svn.apache.org/viewvc?rev=1177129&view=rev
Log:
Merged revisions 1177126 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1177126 | janstey | 2011-09-28 22:01:44 -0230 (Wed, 28 Sep 2011) | 1 line
CAMEL-4499 - use same version of jasypt as Karaf
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
svn:mergeinfo = /camel/trunk:1177126
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1177129&r1=1177128&r2=1177129&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Thu Sep 29
00:38:23 2011
@@ -84,7 +84,7 @@
<jackrabbit-version>1.5.3</jackrabbit-version>
<java-apns-bundle-version>0.1.6_1</java-apns-bundle-version>
<jaxb-bundle-version>2.2.1.1_1</jaxb-bundle-version>
- <jasypt-bundle-version>1.7_2</jasypt-bundle-version>
+ <jasypt-bundle-version>1.7_3</jasypt-bundle-version>
<jetty-bundle-version>6.1.26_3</jetty-bundle-version>
<jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version>
<javax.el-bundle-version>2.1.0</javax.el-bundle-version>
