merge with branch issue-282

This commit is contained in:
Sebastian Sdorra
2012-12-10 16:39:08 +01:00

View File

@@ -407,21 +407,20 @@
<!-- logging libraries -->
<slf4j.version>1.7.2</slf4j.version>
<logback.version>1.0.9</logback.version>
<servlet.version>2.5</servlet.version>
<guice.version>3.0</guice.version>
<jersey.version>1.16</jersey.version>
<ehcache.version>2.6.2</ehcache.version>
<freemarker.version>2.3.19</freemarker.version>
<jetty.version>7.6.8.v20121106</jetty.version>
<!-- security libraries -->
<shiro.version>1.2.1</shiro.version>
<!-- repostitory libraries -->
<jgit.version>2.1.0.201209190230-r</jgit.version>
<svnkit.version>1.7.6-scm2</svnkit.version>
<svnkit.version>1.7.6-scm3</svnkit.version>
<!-- build properties -->
<project.build.javaLevel>1.6</project.build.javaLevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>