Skip to content

Commit e526ccc

Browse files
author
Philipp Karlsson
committed
Upgrading Jira to 9.12.10, SM to 5.12.10, Confluence to 9.2.3, Java to 17
1 parent 17edf00 commit e526ccc

File tree

10 files changed

+117
-26
lines changed

10 files changed

+117
-26
lines changed

‎kotlin-insight-client/kotlin-insight-client-sdk/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@
5353
<artifactId>insight</artifactId>
5454
<scope>provided</scope>
5555
<exclusions>
56+
<exclusion>
57+
<groupId>org.codehaus.groovy.modules.http-builder</groupId>
58+
<artifactId>http-builder</artifactId>
59+
</exclusion>
60+
<exclusion>
61+
<groupId>javax.xml.bind</groupId>
62+
<artifactId>jaxb-api</artifactId>
63+
</exclusion>
5664
<exclusion>
5765
<groupId>org.ehcache</groupId>
5866
<artifactId>ehcache</artifactId>

‎kotlin-insight-client/kotlin-insight-client-test-sdk/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@
7878
<artifactId>insight</artifactId>
7979
<scope>provided</scope>
8080
<exclusions>
81+
<exclusion>
82+
<groupId>org.codehaus.groovy.modules.http-builder</groupId>
83+
<artifactId>http-builder</artifactId>
84+
</exclusion>
85+
<exclusion>
86+
<groupId>javax.xml.bind</groupId>
87+
<artifactId>jaxb-api</artifactId>
88+
</exclusion>
8189
<exclusion>
8290
<groupId>org.ehcache</groupId>
8391
<artifactId>ehcache</artifactId>

‎kotlin-insight-client/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,28 @@
4848
<groupId>com.atlassian.jira.plugins</groupId>
4949
<artifactId>insight</artifactId>
5050
<version>${insight.version}</version>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>org.codehaus.groovy.modules.http-builder</groupId>
54+
<artifactId>http-builder</artifactId>
55+
</exclusion>
56+
<exclusion>
57+
<groupId>javax.xml.bind</groupId>
58+
<artifactId>jaxb-api</artifactId>
59+
</exclusion>
60+
<exclusion>
61+
<groupId>org.ehcache</groupId>
62+
<artifactId>ehcache</artifactId>
63+
</exclusion>
64+
<exclusion>
65+
<groupId>com.atlassian.translations</groupId>
66+
<artifactId>*</artifactId>
67+
</exclusion>
68+
<exclusion>
69+
<groupId>com.atlassian.jira.plugins</groupId>
70+
<artifactId>insight-core-widget-report</artifactId>
71+
</exclusion>
72+
</exclusions>
5173
</dependency>
5274

5375
<!-- Kotlin -->

‎kotlin-jira-client/kotlin-jira-client-sdk/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@
7979
<artifactId>insight</artifactId>
8080
<scope>provided</scope>
8181
<exclusions>
82+
<exclusion>
83+
<groupId>org.codehaus.groovy.modules.http-builder</groupId>
84+
<artifactId>http-builder</artifactId>
85+
</exclusion>
86+
<exclusion>
87+
<groupId>javax.xml.bind</groupId>
88+
<artifactId>jaxb-api</artifactId>
89+
</exclusion>
8290
<exclusion>
8391
<groupId>org.ehcache</groupId>
8492
<artifactId>ehcache</artifactId>

‎kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@
8989
<version>2.2.2-atlassian-1</version>
9090
</dependency>
9191

92+
<dependency>
93+
<groupId>org.jetbrains.kotlin</groupId>
94+
<artifactId>kotlin-stdlib</artifactId>
95+
<version>${kotlin.version}</version>
96+
</dependency>
97+
9298
<!-- WIRED TEST RUNNER DEPENDENCIES -->
9399
<dependency>
94100
<groupId>com.atlassian.plugins</groupId>

‎kotlin-jira-client/kotlin-jira-client-test-applink/src/test/kotlin/it/JiraApplinkClientTest.kt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,13 @@ import com.linkedplanet.kotlinjiraclient.api.interfaces.*
3131
import com.linkedplanet.kotlinjiraclient.http.*
3232
import com.linkedplanet.kotlinjiraclient.http.field.HttpJiraField
3333
import com.linkedplanet.kotlinjiraclient.http.field.HttpJiraFieldFactory
34+
import com.linkedplanet.kotlinjiraclient.util.Story
35+
import com.linkedplanet.kotlinjiraclient.util.issueParser
36+
import kotlinx.coroutines.runBlocking
37+
import org.hamcrest.CoreMatchers.equalTo
38+
import org.hamcrest.MatcherAssert.assertThat
3439
import org.junit.Before
40+
import org.junit.Test
3541
import org.junit.runner.RunWith
3642

3743
@RunWith(AtlassianPluginsTestRunner::class)
@@ -77,4 +83,17 @@ class JiraApplinkClientTest constructor(
7783
loginAsUser("admin")
7884
}
7985

86+
// @Test
87+
// fun arghTest() {
88+
// val issues: List<Story>? = runBlocking {
89+
// issueOperator.getIssuesByJQL("summary ~ \"Test-*\"", parser = ::issueParser).getOrNull()
90+
// }
91+
// assertThat(issues?.size, equalTo(10))
92+
// val keys = 1..10
93+
// keys.forEach { searchedKeyIndex ->
94+
// val issue = issues?.first { "Test-$searchedKeyIndex" == it.summary }
95+
// assertThat(issue?.insightObjectKey, equalTo("IT-1"))
96+
// assertThat(issue?.status?.name, equalTo("To Do"))
97+
// }
98+
// }
8099
}

‎kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,14 @@
8080
<artifactId>insight</artifactId>
8181
<scope>provided</scope>
8282
<exclusions>
83+
<exclusion>
84+
<groupId>org.codehaus.groovy.modules.http-builder</groupId>
85+
<artifactId>http-builder</artifactId>
86+
</exclusion>
87+
<exclusion>
88+
<groupId>javax.xml.bind</groupId>
89+
<artifactId>jaxb-api</artifactId>
90+
</exclusion>
8391
<exclusion>
8492
<groupId>org.ehcache</groupId>
8593
<artifactId>ehcache</artifactId>
@@ -191,32 +199,19 @@
191199
<plugin>
192200
<groupId>com.atlassian.maven.plugins</groupId>
193201
<artifactId>jira-maven-plugin</artifactId>
202+
<version>${amps.version}</version>
194203
<extensions>true</extensions>
195204
<configuration>
196205
<productVersion>${jira.version}</productVersion>
197206
<productDataVersion>${jira.version}</productDataVersion>
198207
<productDataPath>${maven.multiModuleProjectDirectory}/test-resources/jira-generated-test-resources.zip
199208
</productDataPath>
200209
<skipITs>true</skipITs>
201-
<enableQuickReload>true</enableQuickReload>
202-
<startupTimeout>1800000</startupTimeout>
203210
<jvmArgs>-Xms2g -Xmx4g -XX:+UseG1GC</jvmArgs>
204211
<contextPath>/</contextPath>
205212
<productLicense>${jira.service.management.license}</productLicense>
206213
<httpPort>${jira.http.port}</httpPort>
207214
<!-- https://developer.atlassian.com/docs/advanced-topics/configuration-of-instructions-in-atlassian-plugins -->
208-
<instructions>
209-
<Atlassian-Plugin-Key>${atlassian.plugin.key}</Atlassian-Plugin-Key>
210-
<Export-Package>
211-
com.linkedplanet.plugin.jira.jiraclient.test.api,
212-
</Export-Package>
213-
<Import-Package>
214-
org.springframework.osgi.*;resolution:="optional",
215-
org.eclipse.gemini.blueprint.*;resolution:="optional",
216-
*;version="0";resolution:=optional
217-
</Import-Package>
218-
<Spring-Context>*</Spring-Context>
219-
</instructions>
220215
<applications>
221216
<application>
222217
<applicationKey>jira-software</applicationKey>

‎kotlin-jira-client/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,28 @@
4747
<groupId>com.atlassian.jira.plugins</groupId>
4848
<artifactId>insight</artifactId>
4949
<version>${insight.version}</version>
50+
<exclusions>
51+
<exclusion>
52+
<groupId>org.codehaus.groovy.modules.http-builder</groupId>
53+
<artifactId>http-builder</artifactId>
54+
</exclusion>
55+
<exclusion>
56+
<groupId>javax.xml.bind</groupId>
57+
<artifactId>jaxb-api</artifactId>
58+
</exclusion>
59+
<exclusion>
60+
<groupId>org.ehcache</groupId>
61+
<artifactId>ehcache</artifactId>
62+
</exclusion>
63+
<exclusion>
64+
<groupId>com.atlassian.translations</groupId>
65+
<artifactId>*</artifactId>
66+
</exclusion>
67+
<exclusion>
68+
<groupId>com.atlassian.jira.plugins</groupId>
69+
<artifactId>insight-core-widget-report</artifactId>
70+
</exclusion>
71+
</exclusions>
5072
</dependency>
5173

5274
<!-- Kotlin -->

‎pom.xml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,24 @@
2020

2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23-
<maven.compiler.source>1.8</maven.compiler.source>
24-
<maven.compiler.target>1.8</maven.compiler.target>
23+
<maven.compiler.source>17</maven.compiler.source>
24+
<maven.compiler.target>17</maven.compiler.target>
25+
<kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
2526
<kotlin.code.style>official</kotlin.code.style>
26-
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
27-
<kotlin.version>1.8.20</kotlin.version>
27+
<kotlin.version>2.1.20</kotlin.version>
2828
<kotlinx.coroutines.core.version>1.6.4</kotlinx.coroutines.core.version>
2929
<arrow.version>1.2.1</arrow.version>
3030
<arrow.meta.version>1.6.2</arrow.meta.version>
31-
32-
<jira.version>9.4.2</jira.version>
33-
<servicedesk.version>5.4.2</servicedesk.version>
31+
<atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
32+
<jira.version>9.12.10</jira.version>
33+
<servicedesk.version>5.12.10</servicedesk.version>
34+
<!-- <jira.version>9.4.2</jira.version>-->
35+
<!-- <servicedesk.version>5.4.2</servicedesk.version>-->
3436
<jira.http.port>2990</jira.http.port>
3537
<atlassian.spring.scanner.version>2.2.1</atlassian.spring.scanner.version>
36-
<amps.version>8.9.1</amps.version>
37-
<insight.version>10.4.2</insight.version>
38-
<confluence.version>7.19.5</confluence.version>
38+
<amps.version>8.9.2</amps.version>
39+
<insight.version>10.12.1-QR-0157</insight.version>
40+
<confluence.version>9.2.3</confluence.version>
3941
<atlassian-plugins-osgi-testrunner.version>2.0.3</atlassian-plugins-osgi-testrunner.version>
4042
</properties>
4143

@@ -383,6 +385,7 @@
383385
<plugin>
384386
<groupId>com.atlassian.maven.plugins</groupId>
385387
<artifactId>jira-maven-plugin</artifactId>
388+
<version>${amps.version}</version>
386389
<extensions>true</extensions>
387390
<configuration>
388391
<productVersion>${jira.version}</productVersion>

‎test-resources/jira-generated-test-resources.zip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:28aa6d6e4415a63f577030a0dce1140199aa7598d8da1f31371410ef375146e8
3-
size 41299019
2+
oid sha256:23679d8bc4f6033f42b728c1d9799f90701f6734a202f7b0e9ac668de1339ae9
3+
size 11794512

0 commit comments

Comments
 (0)