Skip to content

Commit 4e6bc2c

Browse files
author
Joe Hansche
committed
Bump versions for JIRA 6.4
1 parent c4b09a9 commit 4e6bc2c

File tree

2 files changed

+14
-36
lines changed

2 files changed

+14
-36
lines changed

pom.xml

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>junit</groupId>
8282
<artifactId>junit</artifactId>
83-
<version>4.11</version>
83+
<version>4.12</version>
8484
<scope>test</scope>
8585
</dependency>
8686
<dependency>
@@ -137,13 +137,13 @@
137137
<dependency>
138138
<groupId>javax.ws.rs</groupId>
139139
<artifactId>jsr311-api</artifactId>
140-
<version>1.0</version>
140+
<version>1.1.1</version>
141141
<scope>provided</scope>
142142
</dependency>
143143
<dependency>
144144
<groupId>javax.xml.bind</groupId>
145145
<artifactId>jaxb-api</artifactId>
146-
<version>2.1</version>
146+
<version>2.2.12</version>
147147
<scope>provided</scope>
148148
</dependency>
149149

@@ -192,48 +192,26 @@
192192
</build>
193193

194194
<properties>
195-
<jira.version>5.0</jira.version>
196-
<jira.test.version>5.0</jira.test.version>
197-
<jira.data.version>5.0</jira.data.version>
198-
<jira.rest.version>1.0.2</jira.rest.version>
199-
<atlas.template.version>1.1.1</atlas.template.version>
200-
<atlas.concurrent.version>2.3.0</atlas.concurrent.version>
201-
<atlas.sal.version>2.0.16</atlas.sal.version>
202-
<amps.version>3.10.3</amps.version>
195+
<jira.version>6.4.12</jira.version>
196+
<jira.test.version>6.4.12</jira.test.version>
197+
<jira.data.version>6.4.12</jira.data.version>
198+
<jira.rest.version>2.9.7</jira.rest.version>
199+
<atlas.template.version>2.0.0</atlas.template.version>
200+
<atlas.concurrent.version>2.6.3</atlas.concurrent.version>
201+
<atlas.sal.version>2.13.4</atlas.sal.version>
202+
<amps.version>6.2.1</amps.version>
203203
</properties>
204204

205205
<profiles>
206-
<profile>
207-
<id>jira5</id>
208-
<properties>
209-
<jira.version>5.0</jira.version>
210-
<skip.tests>true</skip.tests>
211-
<skip.func.tests>true</skip.func.tests>
212-
</properties>
213-
</profile>
214206
<profile>
215207
<id>release</id>
216208
<properties>
217-
<jira.version>5.0</jira.version>
218209
<skip.tests>true</skip.tests>
219210
<skip.func.tests>true</skip.func.tests>
220211
</properties>
221212
</profile>
222213
<profile>
223214
<id>jira6</id>
224-
<properties>
225-
<jira.version>6.4.5</jira.version>
226-
<jira.test.version>6.2-20131016.081905</jira.test.version>
227-
<jira.data.version>6.2-20131016.081905</jira.data.version>
228-
<jira.rest.version>2.9.0-REST-252-m01</jira.rest.version>
229-
<atlas.template.version>2.0.0-m4</atlas.template.version>
230-
<atlas.concurrent.version>2.4.1</atlas.concurrent.version>
231-
<atlas.sal.version>2.11.0-SAL-236-m03</atlas.sal.version>
232-
<amps.version>5.0.13</amps.version>
233-
<plugin.testrunner.version>1.1.2</plugin.testrunner.version>
234-
<skip.tests>true</skip.tests>
235-
<skip.func.tests>true</skip.func.tests>
236-
</properties>
237215
</profile>
238216
</profiles>
239217

src/main/resources/atlassian-plugin.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<url-pattern>/gerrit/admin</url-pattern>
6060
</servlet>
6161
<!-- Issue tab for Gerrit Reviews -->
62-
<issue-tabpanel key="gerrit-reviews-tabpanel" name="Gerrit Reviews Tab Panel" class="com.meetme.plugins.jira.gerrit.tabpanel.GerritReviewsTabPanel">
62+
<issue-tabpanel key="gerrit-reviews-tabpanel" name="Gerrit Reviews Tab Panel" class="com.meetme.plugins.jira.gerrit.tabpanel.GerritReviewsTabPanel" state="disabled">
6363
<description>Show Gerrit reviews related to an issue in an issue tab panel.</description>
6464
<label key="gerrit.tabpanel.label">Gerrit Reviews</label>
6565
<resource type="velocity" name="view" location="templates/gerrit-reviews-tabpanel-item.vm"/>
@@ -75,7 +75,7 @@
7575
<resource type="download" name="images/" location="images/"/>
7676
</web-resource>
7777
<!-- Tab panel to list Gerrit Reviews for each subtask -->
78-
<issue-tabpanel key="subtask-reviews-tabpanel" name="Subtask Gerrit Reviews Tab Panel" class="com.meetme.plugins.jira.gerrit.tabpanel.SubtaskReviewsTabPanel">
78+
<issue-tabpanel key="subtask-reviews-tabpanel" name="Subtask Gerrit Reviews Tab Panel" class="com.meetme.plugins.jira.gerrit.tabpanel.SubtaskReviewsTabPanel" state="disabled">
7979
<description>Show Gerrit reviews related issue subtasks in the parent issue's tab panel.</description>
8080
<label key="gerrit.tabpanel.subtasks.label">Gerrit Subtask Reviews</label>
8181
<resource type="velocity" name="view" location="templates/subtask-reviews-tabpanel-item.vm"/>
@@ -92,7 +92,7 @@
9292
<resource name="view" type="velocity" location="templates/gerrit-reviews-side-panel.vm"/>
9393
</web-panel>
9494
<!-- View Issue left-side panel -->
95-
<web-panel key="gerritreviewsmodule" name="Gerrit Reviews Main Panel" i18n-name-key="gerrit-reviews-left-panel.name" location="atl.jira.view.issue.left.context" state="disabled" weight="750">
95+
<web-panel key="gerritreviewsmodule" name="Gerrit Reviews Main Panel" i18n-name-key="gerrit-reviews-left-panel.name" location="atl.jira.view.issue.left.context" weight="750">
9696
<description key="gerrit-reviews-left-panel.description">Show Gerrit reviews in a View Issue panel</description>
9797
<label key="gerrit-reviews-left-panel.label">Gerrit Reviews</label>
9898
<context-provider class="com.meetme.plugins.jira.gerrit.webpanel.GerritReviewsIssueLeftPanel"/>

0 commit comments

Comments
 (0)