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/11/21 09:21:21 UTC
[3/3] syncope git commit: Merge branch '1_1_X' into 1_2_X
Merge branch '1_1_X' into 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/9a86fe0d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9a86fe0d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9a86fe0d
Branch: refs/heads/1_2_X
Commit: 9a86fe0d60c99c9bf5c0e902ac88acf9e538160f
Parents: 50b0d2a 48bdc59
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 21 09:19:42 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 21 09:19:42 2014 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9a86fe0d/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 78a2c8e,fccabf6..efc45d5
--- a/pom.xml
+++ b/pom.xml
@@@ -343,22 -338,19 +343,22 @@@ under the License
<wicket.version>6.18.0</wicket.version>
- <groovy.version>2.2.2</groovy.version>
+ <groovy.version>2.3.6</groovy.version>
- <h2.version>1.3.176</h2.version>
+ <h2.version>1.4.182</h2.version>
- <logback.version>1.1.2</logback.version>
+ <log4j.version>2.1</log4j.version>
<slf4j.version>1.7.7</slf4j.version>
+ <disruptor.version>3.3.0</disruptor.version>
<junit.version>4.11</junit.version>
- <selenium.version>2.43.1</selenium.version>
+ <selenium.version>2.44.0</selenium.version>
<apacheds.version>1.5.7</apacheds.version>
+
+ <httpclient.version>4.3.6</httpclient.version>
- <tomcat.version>7.0.56</tomcat.version>
+ <tomcat.version>7.0.57</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>