Author: ilgrosso
Date: Fri Aug 29 13:28:36 2014
New Revision: 1621304
URL: http://svn.apache.org/r1621304
Log:
Merge from 1_1_X + Activiti update
Modified:
syncope/branches/1_2_X/ (props changed)
syncope/branches/1_2_X/pom.xml
Propchange: syncope/branches/1_2_X/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1614550-1621302
Modified: syncope/branches/1_2_X/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_2_X/pom.xml?rev=1621304&r1=1621303&r2=1621304&view=diff
==============================================================================
--- syncope/branches/1_2_X/pom.xml (original)
+++ syncope/branches/1_2_X/pom.xml Fri Aug 29 13:28:36 2014
@@ -315,13 +315,13 @@ under the License.
<connid.db.table.version>2.1.7</connid.db.table.version>
<connid.csvdir.version>0.7</connid.csvdir.version>
<connid.ldap.version>1.3.7</connid.ldap.version>
- <connid.ad.version>1.1.2</connid.ad.version>
+ <connid.ad.version>1.1.3</connid.ad.version>
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>3.3.2</commons-lang.version>
<commons-codec.version>1.9</commons-codec.version>
- <activiti.version>5.16.1</activiti.version>
+ <activiti.version>5.16.2</activiti.version>
<aspectj.version>1.8.2</aspectj.version>
