Author: ilgrosso
Date: Wed Sep 17 13:53:26 2014
New Revision: 1625591
URL: http://svn.apache.org/r1625591
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1625477-1625590
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1625591&r1=1625590&r2=1625591&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Sep 17 13:53:26 2014
@@ -321,7 +321,7 @@ under the License.
<commons-lang.version>3.3.2</commons-lang.version>
<commons-codec.version>1.9</commons-codec.version>
- <activiti.version>5.16.2</activiti.version>
+ <activiti.version>5.16.3</activiti.version>
<aspectj.version>1.8.2</aspectj.version>
