From f11575bfbe3ace84a7845aba42885426e89b3768 Mon Sep 17 00:00:00 2001
From: Hubbitus <pahan@hubbitus.info>
Date: Wed, 2 Apr 2014 11:47:58 +0400
Subject: [PATCH] According to
 https://developer.atlassian.com/display/CONFDEV/Enabling+XSS+Protection+in+Plugins
 Html method suffix should solve problem HTML escaping in velocity templates,
 but it does not work for v6.1 for some reasons. Fix it by add dependency to
 velocity-htmlsafe and use @HtmlSafe annotation.

Also refresh jgit version and minor changes for compatibility.
---
 pom.xml                                                   | 8 +++++++-
 src/main/java/RepoTest.java                               | 2 +-
 src/main/java/com/xiplink/jira/git/GitManagerImpl.java    | 2 +-
 .../git/issuetabpanels/changes/GitRevisionAction.java     | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e4633c8..1564fee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>0.10.1</version>
+            <version>3.3.1.201403241930-r</version>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
@@ -65,6 +65,12 @@
             <version>3.2.0</version>
             <scope>provided</scope>
         </dependency>
+		<dependency>
+			<groupId>com.atlassian.velocity.htmlsafe</groupId>
+			<artifactId>velocity-htmlsafe</artifactId>
+			<version>1.2.1-m2</version>
+			<scope>provided</scope>
+		</dependency>
 <!--
         <dependency>
             <groupId>opensymphony</groupId>
diff --git a/src/main/java/RepoTest.java b/src/main/java/RepoTest.java
index fe2e173..0b9df39 100644
--- a/src/main/java/RepoTest.java
+++ b/src/main/java/RepoTest.java
@@ -18,7 +18,7 @@ public static void main(String[] args) throws Exception {
         }
 
         Repository repository = builder.build();
-        System.out.println(repository.getObjectsDirectory().exists());
+        System.out.println(repository.getObjectDatabase().exists());
 
         repository.scanForRepoChanges();
         for(Map.Entry<String, Ref> pair : repository.getAllRefs().entrySet()) {
diff --git a/src/main/java/com/xiplink/jira/git/GitManagerImpl.java b/src/main/java/com/xiplink/jira/git/GitManagerImpl.java
index ede78e1..3d67411 100644
--- a/src/main/java/com/xiplink/jira/git/GitManagerImpl.java
+++ b/src/main/java/com/xiplink/jira/git/GitManagerImpl.java
@@ -344,7 +344,7 @@ public void activate() {
             return;
         }
 
-        if (!repository.getObjectsDirectory().exists()) {
+        if (!repository.getObjectDatabase().exists()) {
             log.error("Connection to git repository " + getRoot() + " failed: Invalid repository");
             // We don't want to throw an exception here because then the system
             // won't start if the repo is down or there is something wrong
diff --git a/src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionAction.java b/src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionAction.java
index 04bd5bb..23ccd0f 100644
--- a/src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionAction.java
+++ b/src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionAction.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.atlassian.velocity.htmlsafe.HtmlSafe;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -93,6 +94,7 @@ public FileDiff[] getChangedPaths() {
         return multipleGitRepositoryManager.getRepository(repoId).getFileDiffs(revision.getId().name());
     }
 
+	@HtmlSafe
     public String getLinkedLogMessageHtml() {
         // Name ends in Html to avoid HTML escaping
         // https://developer.atlassian.com/display/JIRADEV/Velocity+Templates