Yi EungJun 2015-01-28
svn: Fix a server error when edit revision property
NPE occured when edit revprop so we couldn't use svnsync.
@f155f742d4278e231ecac9bdd1b49956e9331a6c
build.sbt
--- build.sbt
+++ build.sbt
@@ -24,11 +24,11 @@
   // Symlink support for Java7
   "org.eclipse.jgit" % "org.eclipse.jgit.java7" % "3.5.3.201412180710-r",
   // svnkit
-  "sonia.svnkit" % "svnkit" % "1.7.10-scm3",
+  "sonia.svnkit" % "svnkit" % "1.8.5-scm2",
   // svnkit-dav
-  "sonia.svnkit" % "svnkit-dav" % "1.7.10-scm3",
+  "sonia.svnkit" % "svnkit-dav" % "1.8.5-scm2",
   // javahl
-  "sonia.svnkit" % "svnkit-javahl16" % "1.7.10-scm3",
+  "sonia.svnkit" % "svnkit-javahl16" % "1.8.5-scm2",
   "net.sourceforge.jexcelapi" % "jxl" % "2.6.10",
 // shiro
   "org.apache.shiro" % "shiro-core" % "1.2.1",
test/controllers/ProjectAppTest.java
--- test/controllers/ProjectAppTest.java
+++ test/controllers/ProjectAppTest.java
@@ -30,6 +30,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.tigris.subversion.javahl.ClientException;
+import org.tmatesoft.svn.core.SVNException;
 import play.libs.Json;
 import play.mvc.Http;
 import play.mvc.Result;
@@ -435,7 +436,7 @@
     }
 
     @Test
-    public void testAcceptTransfer() throws IOException, ServletException, ClientException {
+    public void testAcceptTransfer() throws IOException, ServletException, SVNException {
         //Given
         GitRepository.setRepoPrefix("resources/test/repo/git/");
 
@@ -461,7 +462,7 @@
     }
 
     @Test
-    public void testAcceptTransferWithWrongKey() throws IOException, ServletException, ClientException {
+    public void testAcceptTransferWithWrongKey() throws IOException, ServletException, SVNException {
         //Given
         GitRepository.setRepoPrefix("resources/test/repo/git/");
 
test/models/PullRequestTest.java
--- test/models/PullRequestTest.java
+++ test/models/PullRequestTest.java
@@ -24,22 +24,30 @@
 import org.apache.commons.lang3.time.DateUtils;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.diff.*;
+import org.eclipse.jgit.diff.DiffAlgorithm;
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.diff.RawTextComparator;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.transport.RefSpec;
-import org.junit.*;
-
-import org.tigris.subversion.javahl.ClientException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.tmatesoft.svn.core.SVNException;
 import play.test.Helpers;
-import playRepository.*;
+import playRepository.FileDiff;
+import playRepository.GitRepository;
+import playRepository.PlayRepository;
+import playRepository.RepositoryService;
 
 import javax.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -58,7 +66,7 @@
 
     @Before
     public void initRepositories() throws IOException, GitAPIException, ServletException,
-            ClientException, PullRequestException {
+            PullRequestException, SVNException {
         GitRepository.setRepoPrefix(REPO_PREFIX);
 
         app = support.Helpers.makeTestApplication();
Add a comment
List