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 @@ UTF-8 - 5.0.1 - 5.0.1 + 6.4.2 + 1.6 + 5.0.9 Git Jira plugin @@ -127,20 +128,19 @@ com.atlassian.maven.plugins maven-jira-plugin - 3.9.1 + ${amps.version} true ${jira.version} - ${jira.data.version} + ${jira.version} org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.5 - 1.5 + ${jdkLevel} + ${jdkLevel} 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 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 actions = new ArrayList(logEntries.size());