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/65fbb52a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/65fbb52a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/65fbb52a Branch: refs/heads/master Commit: 65fbb52aa6dac0c181f6defdfab9612765646cac Parents: ace188b d5f3410 Author: fmartelli <[email protected]> Authored: Thu Apr 30 15:12:39 2015 +0200 Committer: fmartelli <[email protected]> Committed: Thu Apr 30 15:12:39 2015 +0200 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/65fbb52a/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index fee6498,8e7c921..7fdb405 --- a/pom.xml +++ b/pom.xml @@@ -324,47 -333,62 +324,47 @@@ under the License <connid.db.table.version>2.2.2</connid.db.table.version> <connid.csvdir.version>0.8.2</connid.csvdir.version> <connid.ldap.version>1.4.0</connid.ldap.version> - <connid.ad.version>1.2.2</connid.ad.version> + <connid.ad.version>1.2.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.10</commons-codec.version> + <cxf.version>3.0.5-SNAPSHOT</cxf.version> - <activiti.version>5.16.4</activiti.version> + <camel.version>2.15.1</camel.version> - <aspectj.version>1.8.5</aspectj.version> + <jackson.version>2.5.3</jackson.version> - <cxf.version>3.0.4</cxf.version> - <spring.version>4.0.9.RELEASE</spring.version> - <spring-security.version>3.2.7.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.1.6.RELEASE</spring.version> + <spring-security.version>4.0.1.RELEASE</spring-security.version> - <openjpa.version>2.3.0</openjpa.version> + <openjpa.version>2.4.0</openjpa.version> + <commons-dbcp.version>2.1</commons-dbcp.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> - <cocoon.version>3.0.0-alpha-3</cocoon.version> + <jasypt.version>1.9.2</jasypt.version> - <wicket.version>6.19.0</wicket.version> + <quartz.version>2.2.1</quartz.version> - <groovy.version>2.3.10</groovy.version> + <cocoon.version>3.0.0-alpha-3</cocoon.version> - <h2.version>1.4.187</h2.version> + <groovy.version>2.4.3</groovy.version> + + <activiti.version>5.16.4</activiti.version> - <log4j.version>2.2</log4j.version> <slf4j.version>1.7.12</slf4j.version> + <log4j.version>2.2</log4j.version> <disruptor.version>3.3.2</disruptor.version> - <junit.version>4.11</junit.version> - <selenium.version>2.45.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.61</tomcat.version> + <h2.version>1.4.187</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.45.0</selenium.version> - <izpack.version>5.0.0-rc4</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>
