Return-Path: 
 <commits-return-6282-apmail-syncope-commits-archive=syncope.apache.org@syncope.apache.org>
X-Original-To: apmail-syncope-commits-archive@www.apache.org
Delivered-To: apmail-syncope-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DCD311879F
	for <apmail-syncope-commits-archive@www.apache.org>;
 Wed,  4 Nov 2015 17:42:31 +0000 (UTC)
Received: (qmail 50172 invoked by uid 500); 4 Nov 2015 17:42:31 -0000
Delivered-To: apmail-syncope-commits-archive@syncope.apache.org
Received: (qmail 50097 invoked by uid 500); 4 Nov 2015 17:42:31 -0000
Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@syncope.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@syncope.apache.org>
List-Post: <mailto:commits@syncope.apache.org>
List-Id: <commits.syncope.apache.org>
Reply-To: dev@syncope.apache.org
Delivered-To: mailing list commits@syncope.apache.org
Received: (qmail 50042 invoked by uid 99); 4 Nov 2015 17:42:31 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Nov 2015 17:42:31 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 62359E05DB; Wed,  4 Nov 2015 17:42:31 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: ilgrosso@apache.org
To: commits@syncope.apache.org
Date: Wed, 04 Nov 2015 17:42:33 -0000
Message-Id: <c5ceb2fb6241488cb640ec00d34b8674@git.apache.org>
In-Reply-To: <f0e6d9cbf51446fab6c463cba25fed75@git.apache.org>
References: <f0e6d9cbf51446fab6c463cba25fed75@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/3] syncope git commit: Merge from 1_2_x

Merge from 1_2_x


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/10f6a51b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/10f6a51b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/10f6a51b

Branch: refs/heads/master
Commit: 10f6a51b1394a93a23640e3a55086dc0a523152f
Parents: 3082eb0 28c20ac
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Wed Nov 4 18:42:15 2015 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Wed Nov 4 18:42:15 2015 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/10f6a51b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index dc328ed,7bfd6cf..a732b16
--- a/pom.xml
+++ b/pom.xml
@@@ -318,53 -319,76 +318,53 @@@ under the License
  
    <properties>
      <syncope.version>${project.version}</syncope.version>
 -    <targetJdk>1.6</targetJdk>
 -
 -    <servlet-api.version>3.0.1</servlet-api.version>
 -    <jsp-api.version>2.2</jsp-api.version>
 -    <jstl.version>1.2</jstl.version>
 -    <!-- Upgrade to 3.0.0 for Java 7+ -->
 -    <javax.el.version>3.0-b02</javax.el.version>
 -    <jax-rs.version>2.0</jax-rs.version>
 -
 -    <connid.version>1.4.1.0</connid.version>
 -    <connid.soap.version>1.3.0</connid.soap.version>
 -    <connid.db.table.version>2.2.2</connid.db.table.version>
 +
 +    <connid.version>1.4.2.0</connid.version>
 +    <connid.soap.version>1.4.0-SNAPSHOT</connid.soap.version>
 +    <connid.database.version>2.2.3-SNAPSHOT</connid.database.version>
      <connid.csvdir.version>0.8.2</connid.csvdir.version>
 -    <connid.ldap.version>1.4.0</connid.ldap.version>
 -    <connid.ad.version>1.2.4</connid.ad.version>
 +    <connid.ldap.version>1.5.0-SNAPSHOT</connid.ldap.version>
 +    <connid.ad.version>1.3.0-SNAPSHOT</connid.ad.version>
  
-     <cxf.version>3.1.4-SNAPSHOT</cxf.version>
 -    <commons-jexl.version>2.1.1</commons-jexl.version>
 -    <commons-lang.version>3.3.2</commons-lang.version>
 -    <commons-codec.version>1.10</commons-codec.version>
++    <cxf.version>3.1.4</cxf.version>
  
 -    <activiti.version>5.16.4</activiti.version>
 +    <camel.version>2.16.0</camel.version>	
  
 -    <aspectj.version>1.8.7</aspectj.version>
 +    <jackson.version>2.6.3</jackson.version>
  
 -    <cxf.version>3.0.7</cxf.version>	
 -    <spring.version>4.0.9.RELEASE</spring.version>
 -    <spring-security.version>3.2.9.RELEASE</spring-security.version>
 -    <jackson.version>2.4.6</jackson.version>
 -    <velocity.version>1.7</velocity.version>
 -    <velocitytools.version>2.0</velocitytools.version>
 -    <quartz.version>2.2.1</quartz.version>
 +    <spring.version>4.2.2.RELEASE</spring.version>
 +    <spring-security.version>4.0.3.RELEASE</spring-security.version>
  
 -    <openjpa.version>2.3.0</openjpa.version>
 -    <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
 -    <commons-dbcp.version>1.4</commons-dbcp.version>
 -    <commons.logging.version>1.1.3</commons.logging.version>
 +    <openjpa.version>2.4.0</openjpa.version>
 +    <commons-dbcp.version>2.1.1</commons-dbcp.version>
 +    <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
  
 -    <cocoon.version>3.0.0-alpha-3</cocoon.version>
 +    <jasypt.version>1.9.2</jasypt.version>
 +
 +    <quartz.version>2.2.2</quartz.version>
  
 -    <wicket.version>6.20.0</wicket.version>
 +    <cocoon.version>3.0.0-alpha-3</cocoon.version>
  
 -    <groovy.version>2.3.10</groovy.version>
 +    <groovy.version>2.4.5</groovy.version>
  
 -    <h2.version>1.4.190</h2.version>
 +    <activiti.version>5.18.0</activiti.version>
  
 -    <log4j.version>2.3</log4j.version>
      <slf4j.version>1.7.12</slf4j.version>
 +    <log4j.version>2.4.1</log4j.version>
      <disruptor.version>3.3.2</disruptor.version>
  
 -    <junit.version>4.11</junit.version>
 -    <selenium.version>2.46.0</selenium.version>
 -
 -    <apacheds.version>1.5.7</apacheds.version>
 -    
 -    <httpclient.version>4.3.6</httpclient.version>
 +    <commons-io.version>2.4</commons-io.version>
 +    <commons-codec.version>1.10</commons-codec.version>
 +    <commons-jexl.version>2.1.1</commons-jexl.version>
 +    <commons-lang.version>3.4</commons-lang.version>
 +    <commons-collection.version>4.0</commons-collection.version>
 +    <commons-logging.version>1.1.3</commons-logging.version>
  
 -    <tomcat.version>7.0.65</tomcat.version>
 +    <h2.version>1.4.190</h2.version>
  
 -    <jasypt.version>1.9.2</jasypt.version>
 - 
 -    <jquery.version>1.11.1</jquery.version>
 -    <jquery-ui.version>1.10.4</jquery-ui.version>
 -    <highlightjs.version>8.0</highlightjs.version>
 -    <codemirror.version>3.23</codemirror.version>
 +    <junit.version>4.12</junit.version>
 +    <selenium.version>2.48.2</selenium.version>
  
 -    <izpack.version>5.0.5</izpack.version>
 -    <maven-invoker.version>2.1.1</maven-invoker.version>
 -    
 -    <jdeb.version>1.4</jdeb.version>
 - 
      <conf.directory>${project.build.directory}/test-classes</conf.directory>
      <bundles.directory>${project.build.directory}/bundles</bundles.directory>
      <connid.location>file:${bundles.directory}/</connid.location>