diff --git a/kotlin-http-client/kotlin-http-client-api/pom.xml b/kotlin-http-client/kotlin-http-client-api/pom.xml
index f3424c57..a11bc225 100644
--- a/kotlin-http-client/kotlin-http-client-api/pom.xml
+++ b/kotlin-http-client/kotlin-http-client-api/pom.xml
@@ -16,7 +16,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
diff --git a/kotlin-http-client/kotlin-http-client-atlas/pom.xml b/kotlin-http-client/kotlin-http-client-atlas/pom.xml
index 9679e29f..1577cc76 100644
--- a/kotlin-http-client/kotlin-http-client-atlas/pom.xml
+++ b/kotlin-http-client/kotlin-http-client-atlas/pom.xml
@@ -22,7 +22,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
@@ -35,7 +35,7 @@
com.atlassian.sal
sal-api
- 4.2.1
+
org.apache.httpcomponents
diff --git a/kotlin-insight-client/kotlin-insight-client-api/pom.xml b/kotlin-insight-client/kotlin-insight-client-api/pom.xml
index 14a09847..41bfd1a3 100644
--- a/kotlin-insight-client/kotlin-insight-client-api/pom.xml
+++ b/kotlin-insight-client/kotlin-insight-client-api/pom.xml
@@ -31,7 +31,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
diff --git a/kotlin-insight-client/kotlin-insight-client-http/pom.xml b/kotlin-insight-client/kotlin-insight-client-http/pom.xml
index f58bdd4a..104ff7d0 100644
--- a/kotlin-insight-client/kotlin-insight-client-http/pom.xml
+++ b/kotlin-insight-client/kotlin-insight-client-http/pom.xml
@@ -16,7 +16,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
diff --git a/kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml
index d77cd9cb..c059ed8b 100644
--- a/kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml
+++ b/kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml
@@ -77,14 +77,14 @@
com.atlassian.sal
sal-api
- 4.2.1
+
provided
com.google.code.gson
gson
- 2.10.1
+
@@ -115,7 +115,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 3.1.0
+ ${maven.resources.plugin.version}
org.apache.maven.plugins
@@ -150,6 +150,9 @@
confluence-maven-plugin
true
+
+ com.google.code.gson:gson
+
${confluence.version}
${confluence.version}
${maven.multiModuleProjectDirectory}/test-resources/confluence-generated-test-resources.zip
diff --git a/kotlin-insight-client/kotlin-insight-client-test-base/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-base/pom.xml
index 684b9597..35992369 100644
--- a/kotlin-insight-client/kotlin-insight-client-test-base/pom.xml
+++ b/kotlin-insight-client/kotlin-insight-client-test-base/pom.xml
@@ -35,7 +35,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
diff --git a/kotlin-insight-client/kotlin-insight-client-test-ktor/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-ktor/pom.xml
index 0521d8ff..db123023 100644
--- a/kotlin-insight-client/kotlin-insight-client-test-ktor/pom.xml
+++ b/kotlin-insight-client/kotlin-insight-client-test-ktor/pom.xml
@@ -16,7 +16,7 @@
com.google.code.gson
gson
- 2.10.1
+
com.linked-planet.client
diff --git a/kotlin-insight-client/kotlin-insight-client-test-sdk/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-sdk/pom.xml
index 2bc66436..ba877021 100644
--- a/kotlin-insight-client/kotlin-insight-client-test-sdk/pom.xml
+++ b/kotlin-insight-client/kotlin-insight-client-test-sdk/pom.xml
@@ -104,13 +104,13 @@
com.google.code.gson
gson
- 2.10.1
+
com.atlassian.sal
sal-api
- 4.2.1
+
provided
@@ -165,7 +165,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 3.1.0
+ ${maven.resources.plugin.version}
org.apache.maven.plugins
@@ -199,6 +199,9 @@
jira-maven-plugin
true
+
+ com.google.code.gson:gson
+
${jira.version}
${jira.version}
${maven.multiModuleProjectDirectory}/test-resources/jira-generated-test-resources.zip
diff --git a/kotlin-jira-client/kotlin-jira-client-api/pom.xml b/kotlin-jira-client/kotlin-jira-client-api/pom.xml
index 485a67ce..8330a82f 100644
--- a/kotlin-jira-client/kotlin-jira-client-api/pom.xml
+++ b/kotlin-jira-client/kotlin-jira-client-api/pom.xml
@@ -17,7 +17,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
diff --git a/kotlin-jira-client/kotlin-jira-client-http/pom.xml b/kotlin-jira-client/kotlin-jira-client-http/pom.xml
index 15ca1697..5b0d089a 100644
--- a/kotlin-jira-client/kotlin-jira-client-http/pom.xml
+++ b/kotlin-jira-client/kotlin-jira-client-http/pom.xml
@@ -17,7 +17,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
diff --git a/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml b/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml
index ca9d6773..58247703 100644
--- a/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml
+++ b/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml
@@ -23,7 +23,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
diff --git a/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueOperator.kt b/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueOperator.kt
index b905b0e5..106fdaf6 100644
--- a/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueOperator.kt
+++ b/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueOperator.kt
@@ -38,7 +38,6 @@ import com.atlassian.jira.util.ErrorCollection.Reason
import com.atlassian.jira.util.ErrorCollections
import com.atlassian.jira.web.bean.I18nBean
import com.atlassian.jira.web.bean.PagerFilter
-import com.atlassian.plugin.webresource.WebResourceUrlProvider
import com.google.gson.JsonObject
import com.linkedplanet.kotlinatlassianclientcore.common.api.Page
import com.linkedplanet.kotlinatlassianclientcore.common.error.asEither
@@ -65,7 +64,6 @@ object SdkJiraIssueOperator : JiraIssueOperator {
private val jiraAuthenticationContext: JiraAuthenticationContext by getComponent()
private val jqlParser: JqlQueryParser by getComponent()
private val applicationProperties: ApplicationProperties by getComponent()
- private val webResourceUrlProvider: WebResourceUrlProvider by getComponent()
private val issueJsonConverter = IssueJsonConverter()
private fun user() = jiraAuthenticationContext.loggedInUser
@@ -85,9 +83,7 @@ object SdkJiraIssueOperator : JiraIssueOperator {
private fun toBasicReturnTypeIssue(createdIssue: MutableIssue): JiraIssue {
val basePath = applicationProperties.jiraBaseUrl
- val contextPath = webResourceUrlProvider.baseUrl
- val fullPath = if (contextPath.isNotEmpty()) "$basePath/$contextPath" else basePath
- val selfLink = fullPath + "/rest/api/2/issue/" + createdIssue.id
+ val selfLink = basePath + "/rest/api/2/issue/" + createdIssue.id
return JiraIssue(createdIssue.id.toString(), createdIssue.key, selfLink)
}
diff --git a/kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml
index 63df10cf..d70f263c 100644
--- a/kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml
+++ b/kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml
@@ -79,20 +79,14 @@
com.atlassian.sal
sal-api
- 4.2.1
+
provided
com.google.code.gson
gson
- 2.10.1
-
-
-
- org.jetbrains.kotlin
- kotlin-stdlib
- ${kotlin.version}
+
@@ -126,7 +120,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 3.1.0
+ ${maven.resources.plugin.version}
org.apache.maven.plugins
@@ -161,6 +155,9 @@
confluence-maven-plugin
true
+
+ com.google.code.gson:gson
+
${confluence.version}
${confluence.version}
${maven.multiModuleProjectDirectory}/test-resources/confluence-generated-test-resources.zip
diff --git a/kotlin-jira-client/kotlin-jira-client-test-base/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-base/pom.xml
index 0359940e..15da217b 100644
--- a/kotlin-jira-client/kotlin-jira-client-test-base/pom.xml
+++ b/kotlin-jira-client/kotlin-jira-client-test-base/pom.xml
@@ -31,7 +31,7 @@
com.google.code.gson
gson
- 2.10.1
+
provided
@@ -80,6 +80,9 @@
jira-maven-plugin
true
+
+ com.google.code.gson:gson
+
${jira.version}
${jira.version}
${project.parent.basedir}/jira/generated-test-resources.zip
diff --git a/kotlin-jira-client/kotlin-jira-client-test-ktor/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-ktor/pom.xml
index 9e8d5ce9..5117f885 100644
--- a/kotlin-jira-client/kotlin-jira-client-test-ktor/pom.xml
+++ b/kotlin-jira-client/kotlin-jira-client-test-ktor/pom.xml
@@ -16,7 +16,7 @@
com.google.code.gson
gson
- 2.10.1
+
diff --git a/kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml
index 3c808f5e..9acccb80 100644
--- a/kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml
+++ b/kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml
@@ -106,13 +106,13 @@
com.google.code.gson
gson
- 2.10.1
+
com.atlassian.sal
sal-api
- 4.2.1
+
provided
@@ -167,7 +167,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 3.1.0
+ ${maven.resources.plugin.version}
org.apache.maven.plugins
@@ -202,6 +202,9 @@
${amps.version}
true
+
+ com.google.code.gson:gson
+
${jira.version}
${jira.version}
${maven.multiModuleProjectDirectory}/test-resources/jira-generated-test-resources.zip
diff --git a/pom.xml b/pom.xml
index ed4d8372..4aaa65e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,13 @@
+
+ 6.5.46
+
UTF-8
17
17
+ 3.3.1
17
official
2.1.20
@@ -32,8 +36,8 @@
9.12.10
5.12.10
2990
- 2.2.1
- 8.9.2
+ 3.0.4
+ 9.3.3
10.12.1-QR-0157
9.2.3
2.0.9
@@ -64,6 +68,27 @@
junit
4.13.2
+
+ com.atlassian.platform.dependencies
+ platform-public-api
+ ${platform.version}
+ pom
+ import
+
+
+ com.atlassian.platform.dependencies
+ platform-deprecated-public-api
+ ${platform.version}
+ pom
+ import
+
+
+ io.arrow-kt
+ arrow-stack
+ ${arrow.version}
+ pom
+ import
+
@@ -378,6 +403,9 @@
${amps.version}
true
+
+ com.google.code.gson:gson
+
${jira.version}
${jira.version}
${project.basedir}/test-resources/jira-generated-test-resources.zip