Author: gwimmel
Date: Wed Mar 26 21:41:26 2014
New Revision: 1582078
URL: http://svn.apache.org/r1582078
Log:
[SYNCOPE-487] revert accidental modification of quartz.version in conflict
resolution of merge from 1_1_X
Modified:
syncope/trunk/pom.xml
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1582078&r1=1582077&r2=1582078&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Mar 26 21:41:26 2014
@@ -328,7 +328,7 @@ under the License.
<xstream.version>1.4.7</xstream.version>
<velocity.version>1.7</velocity.version>
<velocitytools.version>2.0</velocitytools.version>
- <quartz.version>2.1.7</quartz.version>
+ <quartz.version>2.2.1</quartz.version>
<openjpa.version>2.3.0</openjpa.version>
<bval.version>0.5</bval.version>
