Skip to content

Feature/update to platform 6 5 #38

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

Merged
merged 12 commits into from
Jun 24, 2025
Merged

Feature/update to platform 6 5 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aed4e21
remove usage of WebResourceUrlProvider
HighKo Jun 24, 2025
2431b98
update amps; add platform 6.5 BOM
HighKo Jun 24, 2025
662e32c
bump maven.resources.plugin from 3.1.0 to 3.3.1
HighKo Jun 24, 2025
8882c5a
use com.atlassian.sal version from platform depdencency management
HighKo Jun 24, 2025
dfe63b3
bump spring scanner to 3.0.4
HighKo Jun 24, 2025
5e99a47
do not ban gson
HighKo Jun 24, 2025
58e6fbd
make gson provided for all dependencies
HighKo Jun 24, 2025
a6929b9
use the platform version for GSON
HighKo Jun 24, 2025
76198c2
add gson to banningExcludes
HighKo Jun 24, 2025
90baa21
Revert "make gson provided for all dependencies"
HighKo Jun 24, 2025
e477d92
remove redundant dependency (exists in parent)
HighKo Jun 24, 2025
7cb261b
add gson to banningExcludes
HighKo Jun 24, 2025
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
2 changes: 1 addition & 1 deletion kotlin-http-client/kotlin-http-client-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions kotlin-http-client/kotlin-http-client-atlas/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion kotlin-insight-client/kotlin-insight-client-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion kotlin-insight-client/kotlin-insight-client-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 6 additions & 3 deletions kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kotlin-insight-client/kotlin-insight-client-test-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kotlin-insight-client/kotlin-insight-client-test-ktor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 6 additions & 3 deletions kotlin-insight-client/kotlin-insight-client-test-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kotlin-jira-client/kotlin-jira-client-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion kotlin-jira-client/kotlin-jira-client-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion kotlin-jira-client/kotlin-jira-client-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 1 addition & 5 deletions ...-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueOperator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
}

Expand Down
15 changes: 6 additions & 9 deletions kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion kotlin-jira-client/kotlin-jira-client-test-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kotlin-jira-client/kotlin-jira-client-test-ktor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
9 changes: 6 additions & 3 deletions kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
32 changes: 30 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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
Expand Down