Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

update ehcache and jgit

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-12-27 15:44:34 +01:00
parent 2352bf55f1
commit 37d7989a6f
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/scm-git-plugin/pom.xml
View File

@@ -57,7 +57,7 @@
</dependencies> </dependencies>
<properties> <properties>
<jgit.version>0.9.3</jgit.version> <jgit.version>0.10.1</jgit.version>
</properties> </properties>
<repositories> <repositories>

2
pom.xml
View File

@@ -278,7 +278,7 @@
<servlet.version>2.5</servlet.version> <servlet.version>2.5</servlet.version>
<guice.version>2.0</guice.version> <guice.version>2.0</guice.version>
<jersey.version>1.5-ea08</jersey.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.javaLevel>1.6</project.build.javaLevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>SCM-BSD</netbeans.hint.license> <netbeans.hint.license>SCM-BSD</netbeans.hint.license>

9
scm-webapp/src/main/java/sonia/scm/api/rest/JsonJaxbContextResolver.java
View File

@@ -36,6 +36,7 @@ package sonia.scm.api.rest;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import sonia.scm.ScmState; import sonia.scm.ScmState;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.group.Group; import sonia.scm.group.Group;
import sonia.scm.plugin.PluginInformation; import sonia.scm.plugin.PluginInformation;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
@@ -102,7 +103,9 @@ public class JsonJaxbContextResolver implements ContextResolver<JAXBContext>
private JAXBContext context; private JAXBContext context;
/** Field description */ /** Field description */
private List<Class> types = Arrays.asList(new Class[] { Group.class, private List<Class> types = Arrays.asList(new Class[]
Repository.class, PluginInformation.class, ScmState.class, {
User.class }); Group.class, Repository.class, PluginInformation.class, ScmState.class,
User.class, ScmConfiguration.class
});
} }