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 2015/03/27 15:15:20 UTC
[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/4da24605
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4da24605
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4da24605
Branch: refs/heads/master
Commit: 4da2460538bdd49618c87fdea4eca711661c1f12
Parents: 16de3b8 281478c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 27 15:15:11 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 27 15:15:11 2015 +0100
----------------------------------------------------------------------
installer/src/main/resources/izpack/install.xml | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4da24605/installer/src/main/resources/izpack/install.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4da24605/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 50194be,c1a4717..bf47092
--- a/pom.xml
+++ b/pom.xml
@@@ -326,50 -335,50 +326,50 @@@ under the License
<connid.ldap.version>1.4.0</connid.ldap.version>
<connid.ad.version>1.2.2</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.4</cxf.version>
- <activiti.version>5.16.4</activiti.version>
+ <camel.version>2.15.0</camel.version>
- <aspectj.version>1.8.5</aspectj.version>
+ <jackson.version>2.4.5</jackson.version>
- <cxf.version>3.0.4</cxf.version>
- <spring.version>4.0.9.RELEASE</spring.version>
+ <spring.version>4.1.6.RELEASE</spring.version>
<spring-security.version>3.2.7.RELEASE</spring-security.version>
- <jackson.version>2.4.5</jackson.version>
- <velocity.version>1.7</velocity.version>
- <velocitytools.version>2.0</velocitytools.version>
- <quartz.version>2.2.1</quartz.version>
<openjpa.version>2.3.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.186</h2.version>
+ <groovy.version>2.4.3</groovy.version>
+
+ <activiti.version>5.16.4</activiti.version>
- <slf4j.version>1.7.10</slf4j.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>
+ <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.3.2</commons-lang.version>
+ <commons.logging.version>1.1.3</commons.logging.version>
- <apacheds.version>1.5.7</apacheds.version>
-
- <httpclient.version>4.3.6</httpclient.version>
+ <h2.version>1.4.186</h2.version>
- <tomcat.version>7.0.59</tomcat.version>
+ <junit.version>4.12</junit.version>
+ <selenium.version>2.45.0</selenium.version>
- <jasypt.version>1.9.2</jasypt.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>
+ <log.directory>${project.build.directory}/log</log.directory>
+ <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
+
<jquery.version>1.11.1</jquery.version>
<jquery-ui.version>1.10.4</jquery-ui.version>
<highlightjs.version>8.0</highlightjs.version>
@@@ -532,33 -580,48 +532,33 @@@
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>${velocity.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>${velocitytools.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>struts-core</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- <exclusion>
- <artifactId>struts-taglib</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- <exclusion>
- <artifactId>struts-tiles</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- <exclusion>
- <artifactId>sslext</artifactId>
- <groupId>sslext</groupId>
- </exclusion>
- </exclusions>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
++ <version>${jackson.version}.1</version>
</dependency>
-
- <!-- Spring -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-afterburner</artifactId>
+ <version>${jackson.version}</version>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>