From 74ac67a0cfbeb96ee7bc882da94520d32feeaa72 Mon Sep 17 00:00:00 2001
From: Alexandre Porcelli <alexandre.porcelli@gmail.com>
Date: Thu, 16 Jan 2014 13:03:21 -0200
Subject: [PATCH] BZ-1054267: downgrade UberFire version of JGit

---
 .../java/org/uberfire/java/nio/fs/jgit/util/JGitUtil.java   | 6 +++---
 uberfire-parent-with-dependencies/pom.xml                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-jgit/src/main/java/org/uberfire/java/nio/fs/jgit/util/JGitUtil.java b/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-jgit/src/main/java/org/uberfire/java/nio/fs/jgit/util/JGitUtil.java
index cef7b207d0..1a0716ed42 100644
--- a/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-jgit/src/main/java/org/uberfire/java/nio/fs/jgit/util/JGitUtil.java
+++ b/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-jgit/src/main/java/org/uberfire/java/nio/fs/jgit/util/JGitUtil.java
@@ -62,7 +62,7 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevObject;
 import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.eclipse.jgit.storage.file.FileRepository;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.treewalk.CanonicalTreeParser;
@@ -196,7 +196,7 @@ public static Git cloneRepository( final File repoFolder,
             final Repository repository;
             final Git git;
             if ( gitDir != null && gitDir.exists() ) {
-                repository = FileRepositoryBuilder.create( gitDir );
+                repository = new FileRepository( gitDir );
                 git = new Git( repository );
             } else {
                 git = Git.cloneRepository()
@@ -377,7 +377,7 @@ public static void commit( final Git git,
                                final CommitInfo commitInfo,
                                final boolean amend,
                                final CommitContent content ) {
-        if (content instanceof RevertCommitContent){
+        if ( content instanceof RevertCommitContent ) {
             commit( git, branchName, commitInfo, amend, resolveObjectId( git, ( (RevertCommitContent) content ).getRefTree() ), content );
         } else {
             commit( git, branchName, commitInfo, amend, null, content );
diff --git a/uberfire-parent-with-dependencies/pom.xml b/uberfire-parent-with-dependencies/pom.xml
index 496c890925..0f5ef829e1 100644
--- a/uberfire-parent-with-dependencies/pom.xml
+++ b/uberfire-parent-with-dependencies/pom.xml
@@ -78,7 +78,7 @@
 
     <version.org.apache.lucene>4.0.0</version.org.apache.lucene>
     <version.org.apache.helix>0.6.2-incubating</version.org.apache.helix>
-    <version.org.eclipse.jgit>3.1.0.201310021548-r</version.org.eclipse.jgit>
+    <version.org.eclipse.jgit>2.1.0.201209190230-r</version.org.eclipse.jgit>
 
     <version.org.apache.sshd>0.9.0</version.org.apache.sshd>
     <version.org.ocpsoft.prettytime>3.0.2.Final</version.org.ocpsoft.prettytime>