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/06/05 14:51:58 UTC
[5/5] 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/6d120f75
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6d120f75
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6d120f75
Branch: refs/heads/master
Commit: 6d120f753360546ada38d6e4efff507840c45403
Parents: 2f02892 632acda
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jun 5 14:51:29 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jun 5 14:51:29 2015 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6d120f75/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c32fbb8,441f906..c097c4b
--- a/pom.xml
+++ b/pom.xml
@@@ -326,45 -335,60 +326,45 @@@ under the License
<connid.ldap.version>1.4.0</connid.ldap.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.1.0</cxf.version>
- <activiti.version>5.16.4</activiti.version>
+ <camel.version>2.15.2</camel.version>
- <aspectj.version>1.8.5</aspectj.version>
+ <jackson.version>2.5.3</jackson.version>
- <cxf.version>3.0.5</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>
+
+ <quartz.version>2.2.1</quartz.version>
- <wicket.version>6.19.0</wicket.version>
+ <cocoon.version>3.0.0-alpha-3</cocoon.version>
- <groovy.version>2.3.10</groovy.version>
+ <groovy.version>2.4.3</groovy.version>
- <h2.version>1.4.187</h2.version>
+ <activiti.version>5.17.0</activiti.version>
- <log4j.version>2.3</log4j.version>
<slf4j.version>1.7.12</slf4j.version>
+ <log4j.version>2.3</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.62</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>
++ <selenium.version>2.46.0</selenium.version>
- <izpack.version>5.0.0-rc5</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>
@@@ -1229,9 -1245,94 +1229,9 @@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.4</version>
+ <version>2.5.5</version>
</plugin>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.7.0,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.0.0,)</versionRange>
- <goals>
- <goal>copy</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <versionRange>[1.5.0,)</versionRange>
- <goals>
- <goal>execute</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <versionRange>[2.0.0,)</versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>transform</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
+
<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>