From 37d7989a6f98c3ded319ebfea9a3076160ad72c9 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 27 Dec 2010 15:44:34 +0100
Subject: [PATCH] update ehcache and jgit

---
 plugins/scm-git-plugin/pom.xml                           | 2 +-
 pom.xml                                                  | 2 +-
 .../java/sonia/scm/api/rest/JsonJaxbContextResolver.java | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/scm-git-plugin/pom.xml b/plugins/scm-git-plugin/pom.xml
index 18074caa7d..bc4e5e15ef 100644
--- a/plugins/scm-git-plugin/pom.xml
+++ b/plugins/scm-git-plugin/pom.xml
@@ -57,7 +57,7 @@
   </dependencies>
 
   <properties>
-    <jgit.version>0.9.3</jgit.version>
+    <jgit.version>0.10.1</jgit.version>
   </properties>
 
   <repositories>
diff --git a/pom.xml b/pom.xml
index bd2e024c73..46f20eee34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -278,7 +278,7 @@
     <servlet.version>2.5</servlet.version>
     <guice.version>2.0</guice.version>
     <jersey.version>1.5-ea08</jersey.version>
-    <ehcache.version>2.3.0</ehcache.version>
+    <ehcache.version>2.3.1</ehcache.version>
     <project.build.javaLevel>1.6</project.build.javaLevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <netbeans.hint.license>SCM-BSD</netbeans.hint.license>
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/JsonJaxbContextResolver.java b/scm-webapp/src/main/java/sonia/scm/api/rest/JsonJaxbContextResolver.java
index 4788485e7d..94166a553f 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/JsonJaxbContextResolver.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/JsonJaxbContextResolver.java
@@ -36,6 +36,7 @@ package sonia.scm.api.rest;
 //~--- non-JDK imports --------------------------------------------------------
 
 import sonia.scm.ScmState;
+import sonia.scm.config.ScmConfiguration;
 import sonia.scm.group.Group;
 import sonia.scm.plugin.PluginInformation;
 import sonia.scm.repository.Repository;
@@ -102,7 +103,9 @@ public class JsonJaxbContextResolver implements ContextResolver<JAXBContext>
   private JAXBContext context;
 
   /** Field description */
-  private List<Class> types = Arrays.asList(new Class[] { Group.class,
-          Repository.class, PluginInformation.class, ScmState.class,
-          User.class });
+  private List<Class> types = Arrays.asList(new Class[]
+  {
+    Group.class, Repository.class, PluginInformation.class, ScmState.class,
+    User.class, ScmConfiguration.class
+  });
 }