You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/08/29 15:29:26 UTC

svn commit: r1621305 - in /syncope/trunk: ./ pom.xml

Author: ilgrosso
Date: Fri Aug 29 13:29:26 2014
New Revision: 1621305

URL: http://svn.apache.org/r1621305
Log:
Merge from 1_2_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/pom.xml

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_2_X:r1621266-1621304
  Merged /syncope/branches/1_1_X:r1614550-1621302

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1621305&r1=1621304&r2=1621305&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri Aug 29 13:29:26 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>