Skip to content

Jira 6.x build support #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Jira 6.x build support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3561fd0
Fix compile error
ksulli Apr 19, 2015
244941f
Make plugin buildable with latest Atlassian SDK
ksulli Apr 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
target/
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/xiplink/jira/git/issuetabpanels/changes/GitRevisionsTabPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down