Merge pull request #38 from linked-planet/feature/update_to_platform_6_5

HighKo · web-flow · commit 0cbdb5b10592 · 2025-06-24T16:52:25.000+02:00
Feature/update to platform 6 5
diff --git a/kotlin-http-client/kotlin-http-client-api/pom.xml b/kotlin-http-client/kotlin-http-client-api/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/kotlin-http-client/kotlin-http-client-atlas/pom.xml b/kotlin-http-client/kotlin-http-client-atlas/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.atlassian.sal</groupId>
             <artifactId>sal-api</artifactId>
-            <version>4.2.1</version>
+            <!-- <version> provided by platform dependency management </version> -->
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/kotlin-insight-client/kotlin-insight-client-api/pom.xml b/kotlin-insight-client/kotlin-insight-client-api/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/kotlin-insight-client/kotlin-insight-client-http/pom.xml b/kotlin-insight-client/kotlin-insight-client-http/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git 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 @@
         <dependency>
             <groupId>com.atlassian.sal</groupId>
             <artifactId>sal-api</artifactId>
-            <version>4.2.1</version>
+            <!-- <version> provided by platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
         </dependency>
 
         <!-- WIRED TEST RUNNER DEPENDENCIES -->
@@ -115,7 +115,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>${maven.resources.plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -150,6 +150,9 @@
                 <artifactId>confluence-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <banningExcludes>
+                        <exclude>com.google.code.gson:gson</exclude>
+                    </banningExcludes>
                     <productVersion>${confluence.version}</productVersion>
                     <productDataVersion>${confluence.version}</productDataVersion>
                     <productDataPath>${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
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
 
diff --git 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 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
         </dependency>
         <dependency>
             <groupId>com.linked-planet.client</groupId>
diff --git 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 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
         </dependency>
 
         <dependency>
             <groupId>com.atlassian.sal</groupId>
             <artifactId>sal-api</artifactId>
-            <version>4.2.1</version>
+            <!-- <version> provided by platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
 
@@ -165,7 +165,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>${maven.resources.plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -199,6 +199,9 @@
                 <artifactId>jira-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <banningExcludes>
+                        <exclude>com.google.code.gson:gson</exclude>
+                    </banningExcludes>
                     <productVersion>${jira.version}</productVersion>
                     <productDataVersion>${jira.version}</productDataVersion>
                     <productDataPath>${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
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/kotlin-jira-client/kotlin-jira-client-http/pom.xml b/kotlin-jira-client/kotlin-jira-client-http/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml b/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
 
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
@@ -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<SdkJiraField> {
     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<SdkJiraField> {
 
     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
@@ -79,20 +79,14 @@
         <dependency>
             <groupId>com.atlassian.sal</groupId>
             <artifactId>sal-api</artifactId>
-            <version>4.2.1</version>
+            <!-- <version> provided by platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
+            <!-- <version>defined by the platform dependency management </version> -->
         </dependency>
 
         <!-- WIRED TEST RUNNER DEPENDENCIES -->
@@ -126,7 +120,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>${maven.resources.plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -161,6 +155,9 @@
                 <artifactId>confluence-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <banningExcludes>
+                        <exclude>com.google.code.gson:gson</exclude>
+                    </banningExcludes>
                     <productVersion>${confluence.version}</productVersion>
                     <productDataVersion>${confluence.version}</productDataVersion>
                     <productDataPath>${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
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
 
@@ -80,6 +80,9 @@
                         <artifactId>jira-maven-plugin</artifactId>
                         <extensions>true</extensions>
                         <configuration>
+                            <banningExcludes>
+                                <exclude>com.google.code.gson:gson</exclude>
+                            </banningExcludes>
                             <productVersion>${jira.version}</productVersion>
                             <productDataVersion>${jira.version}</productDataVersion>
                             <productDataPath>${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
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
         </dependency>
 
         <!-- kotlin-jira-client -->
diff --git 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 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <!-- <version>defined by the platform dependency management </version> -->
         </dependency>
 
         <dependency>
             <groupId>com.atlassian.sal</groupId>
             <artifactId>sal-api</artifactId>
-            <version>4.2.1</version>
+            <!-- <version> provided by platform dependency management </version> -->
             <scope>provided</scope>
         </dependency>
 
@@ -167,7 +167,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>${maven.resources.plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -202,6 +202,9 @@
                 <version>${amps.version}</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <banningExcludes>
+                        <exclude>com.google.code.gson:gson</exclude>
+                    </banningExcludes>
                     <productVersion>${jira.version}</productVersion>
                     <productDataVersion>${jira.version}</productDataVersion>
                     <productDataPath>${maven.multiModuleProjectDirectory}/test-resources/jira-generated-test-resources.zip
diff --git a/pom.xml b/pom.xml
@@ -19,9 +19,13 @@
     </modules>
 
     <properties>
+        <!-- https://mvnrepository.com/artifact/com.atlassian.platform.dependencies/platform-deps/ -->
+        <platform.version>6.5.46</platform.version>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
         <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin.version>2.1.20</kotlin.version>
@@ -32,8 +36,8 @@
         <jira.version>9.12.10</jira.version>
         <servicedesk.version>5.12.10</servicedesk.version>
         <jira.http.port>2990</jira.http.port>
-        <atlassian.spring.scanner.version>2.2.1</atlassian.spring.scanner.version>
-        <amps.version>8.9.2</amps.version>
+        <atlassian.spring.scanner.version>3.0.4</atlassian.spring.scanner.version>
+        <amps.version>9.3.3</amps.version><!-- OK to use a newer version of AMPS with an older version of the SDK. -->
         <insight.version>10.12.1-QR-0157</insight.version>
         <confluence.version>9.2.3</confluence.version>
         <atlassian-plugins-osgi-testrunner.version>2.0.9</atlassian-plugins-osgi-testrunner.version>
@@ -64,6 +68,27 @@
                 <artifactId>junit</artifactId>
                 <version>4.13.2</version>
             </dependency>
+            <dependency>
+                <groupId>com.atlassian.platform.dependencies</groupId>
+                <artifactId>platform-public-api</artifactId>
+                <version>${platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.atlassian.platform.dependencies</groupId>
+                <artifactId>platform-deprecated-public-api</artifactId>
+                <version>${platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.arrow-kt</groupId>
+                <artifactId>arrow-stack</artifactId>
+                <version>${arrow.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -378,6 +403,9 @@
                         <version>${amps.version}</version>
                         <extensions>true</extensions>
                         <configuration>
+                            <banningExcludes>
+                                <exclude>com.google.code.gson:gson</exclude>
+                            </banningExcludes>
                             <productVersion>${jira.version}</productVersion>
                             <productDataVersion>${jira.version}</productDataVersion>
                             <productDataPath>${project.basedir}/test-resources/jira-generated-test-resources.zip
