From 3561fd07a28009a06b88cb59e12270872172be49 Mon Sep 17 00:00:00 2001
From: Kim Sullivan <k@sulli.cz>
Date: Sun, 19 Apr 2015 22:04:27 +0200
Subject: [PATCH 1/2] Fix compile error

---
 .../jira/git/issuetabpanels/changes/GitRevisionsTabPanel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionsTabPanel.java b/src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionsTabPanel.java
index ebd514b..0c4e5c5 100644
--- a/src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionsTabPanel.java
+++ b/src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionsTabPanel.java
@@ -45,10 +45,10 @@ public List<IssueAction> getActions(Issue issue, User remoteUser) {
 
 			// This is a bit of a hack to get the error message across
             if (logEntries == null) {
-                GenericMessageAction action = new GenericMessageAction(getText("no.index.error.message"));
+                IssueAction action = new GenericMessageAction(getText("no.index.error.message"));
                 return EasyList.build(action);
             } else if (logEntries.size() == 0) {
-                GenericMessageAction action = new GenericMessageAction(getText("no.log.entries.message"));
+                IssueAction action = new GenericMessageAction(getText("no.log.entries.message"));
                 return EasyList.build(action);
 			} else {
 				List<IssueAction> actions = new ArrayList<IssueAction>(logEntries.size());

From 244941fd8b9d80163dade8fbe7eb2de8969def47 Mon Sep 17 00:00:00 2001
From: Kim Sullivan <k@sulli.cz>
Date: Sun, 26 Apr 2015 17:38:35 +0200
Subject: [PATCH 2/2] Make plugin buildable with latest Atlassian SDK

---
 .gitignore |  1 +
 pom.xml    | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2f7896d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/pom.xml b/pom.xml
index e4633c8..889ac59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jira.version>5.0.1</jira.version>
-        <jira.data.version>5.0.1</jira.data.version>
+        <jira.version>6.4.2</jira.version>
+        <jdkLevel>1.6</jdkLevel>
+        <amps.version>5.0.9</amps.version>
     </properties>
 
     <description>Git Jira plugin</description>
@@ -127,20 +128,19 @@
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
                 <artifactId>maven-jira-plugin</artifactId>
-                <version>3.9.1</version>
+                <version>${amps.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <productVersion>${jira.version}</productVersion>
-                    <productDataVersion>${jira.data.version}</productDataVersion>
+                    <productDataVersion>${jira.version}</productDataVersion>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>${jdkLevel}</source>
+                    <target>${jdkLevel}</target>
                 </configuration>
             </plugin>
         </plugins>