Author: ilgrosso
Date: Thu Jan 30 15:35:03 2014
New Revision: 1562856
URL: http://svn.apache.org/r1562856
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/webapp/WEB-INF/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1562788-1562855
Propchange: syncope/trunk/core/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 30 15:35:03 2014
@@ -0,0 +1 @@
+.jboss-deployment-structure.xml.swp
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1562856&r1=1562855&r2=1562856&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Jan 30 15:35:03 2014
@@ -334,7 +334,7 @@ under the License.
<groovy.version>2.2.1</groovy.version>
- <h2.version>1.3.174</h2.version>
+ <h2.version>1.3.175</h2.version>
<log4j.version>2.0RC1-SNAPSHOT</log4j.version>
<slf4j.version>1.7.5</slf4j.version>
