remove javax rudimentary

HighKo · HighKo · commit dcc642f015f9 · 2025-06-26T14:37:16.000+02:00
diff --git a/kotlin-atlassian-client-core-common/pom.xml b/kotlin-atlassian-client-core-common/pom.xml
@@ -14,9 +14,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/ConfluencePage.kt b/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/ConfluencePage.kt
@@ -19,7 +19,7 @@
  */
 package com.linkedplanet.kotlinatlassianclientcore.common.api
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 data class ConfluencePage(
     @field:NotNull val id: Int, // pageId
diff --git a/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/JiraGroup.kt b/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/JiraGroup.kt
@@ -19,7 +19,7 @@
  */
 package com.linkedplanet.kotlinatlassianclientcore.common.api
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 data class JiraGroup(
     @field:NotNull val name: String,
diff --git a/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/JiraProject.kt b/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/JiraProject.kt
@@ -19,7 +19,7 @@
  */
 package com.linkedplanet.kotlinatlassianclientcore.common.api
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 data class JiraProject(
     @field:NotNull val id: Long,
diff --git a/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/JiraUser.kt b/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/JiraUser.kt
@@ -19,7 +19,7 @@
  */
 package com.linkedplanet.kotlinatlassianclientcore.common.api
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 data class JiraUser(
     @field:NotNull val key: String,
diff --git a/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/Page.kt b/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/Page.kt
@@ -19,7 +19,7 @@
  */
 package com.linkedplanet.kotlinatlassianclientcore.common.api
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 open class Page<T>(
     @field:NotNull val items: List<T>,
diff --git a/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/ProjectVersion.kt b/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/ProjectVersion.kt
@@ -19,7 +19,7 @@
  */
 package com.linkedplanet.kotlinatlassianclientcore.common.api
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 data class ProjectVersion(
     @field:NotNull val id: Int,
diff --git a/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/StatusAttribute.kt b/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/api/StatusAttribute.kt
@@ -19,7 +19,7 @@
  */
 package com.linkedplanet.kotlinatlassianclientcore.common.api
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 data class StatusAttribute(
     @field:NotNull val id: Int,
diff --git a/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/error/AtlassianClientError.kt b/kotlin-atlassian-client-core-common/src/main/kotlin/com/linkedplanet/kotlinatlassianclientcore/common/error/AtlassianClientError.kt
@@ -22,7 +22,7 @@
 package com.linkedplanet.kotlinatlassianclientcore.common.error
 
 import arrow.core.Either
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 open class AtlassianClientError(
     @field:NotNull val error: String,
diff --git a/kotlin-insight-client/kotlin-insight-client-api/pom.xml b/kotlin-insight-client/kotlin-insight-client-api/pom.xml
@@ -23,9 +23,9 @@
             <version>2.2.31</version>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/kotlin-insight-client/kotlin-insight-client-api/src/main/kotlin/com/linkedplanet/kotlininsightclient/api/model/Model.kt b/kotlin-insight-client/kotlin-insight-client-api/src/main/kotlin/com/linkedplanet/kotlininsightclient/api/model/Model.kt
@@ -30,7 +30,7 @@ import java.time.LocalDate
 import java.time.LocalTime
 import java.time.ZonedDateTime
 import java.util.Collections.emptyList
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 // region ID wrapper
 
diff --git a/kotlin-insight-client/kotlin-insight-client-sdk/pom.xml b/kotlin-insight-client/kotlin-insight-client-sdk/pom.xml
@@ -57,10 +57,6 @@
                     <groupId>org.codehaus.groovy.modules.http-builder</groupId>
                     <artifactId>http-builder</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.ehcache</groupId>
                     <artifactId>ehcache</artifactId>
@@ -94,12 +90,5 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Others -->
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml
@@ -53,13 +53,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
diff --git a/kotlin-insight-client/kotlin-insight-client-test-sdk/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-sdk/pom.xml
@@ -82,10 +82,6 @@
                     <groupId>org.codehaus.groovy.modules.http-builder</groupId>
                     <artifactId>http-builder</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.ehcache</groupId>
                     <artifactId>ehcache</artifactId>
@@ -141,13 +137,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
diff --git a/kotlin-insight-client/pom.xml b/kotlin-insight-client/pom.xml
@@ -53,10 +53,6 @@
                         <groupId>org.codehaus.groovy.modules.http-builder</groupId>
                         <artifactId>http-builder</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>org.ehcache</groupId>
                         <artifactId>ehcache</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-api/pom.xml b/kotlin-jira-client/kotlin-jira-client-api/pom.xml
@@ -26,9 +26,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/kotlin-jira-client/kotlin-jira-client-api/src/main/kotlin/com/linkedplanet/kotlinjiraclient/api/model/Model.kt b/kotlin-jira-client/kotlin-jira-client-api/src/main/kotlin/com/linkedplanet/kotlinjiraclient/api/model/Model.kt
@@ -19,7 +19,7 @@
  */
 package com.linkedplanet.kotlinjiraclient.api.model
 
-import javax.validation.constraints.NotNull
+import jakarta.validation.constraints.NotNull
 
 data class JiraStatus(
     @field:NotNull val id: String,
diff --git a/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml b/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml
@@ -27,6 +27,19 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.atlassian.jira</groupId>
             <artifactId>jira-api</artifactId>
@@ -76,10 +89,6 @@
                     <groupId>org.codehaus.groovy.modules.http-builder</groupId>
                     <artifactId>http-builder</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.ehcache</groupId>
                     <artifactId>ehcache</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueTypeOperator.kt b/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraIssueTypeOperator.kt
@@ -46,7 +46,7 @@ import com.linkedplanet.kotlinjiraclient.sdk.util.toEither
 import java.net.MalformedURLException
 import java.net.URL
 import org.springframework.stereotype.Component
-import javax.ws.rs.core.UriBuilder
+import jakarta.ws.rs.core.UriBuilder
 
 @Component
 object SdkJiraIssueTypeOperator : JiraIssueTypeOperator {
@@ -151,7 +151,7 @@ object SdkJiraIssueTypeOperator : JiraIssueTypeOperator {
                 jiraBaseUrls.baseUrl() + issueType.iconUrl
             }
             val restApiUrl = UriBuilder.fromPath(jiraBaseUrls.restApi2BaseUrl())
-            val self = ResourceUriBuilder().build(restApiUrl, IssueTypeResource::class.java, issueType.id).toString()
+            val self = "ResourceUriBuilder().build(restApiUrl, IssueTypeResource::class.java, issueType.id).toString()"
             JiraIssueType(id, name, self, descTranslation, isSubTask, iconAbsoluteURL, avatar?.id ?: 0L)
         }
 
diff --git a/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/util/IssueJsonConverter.kt b/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/util/IssueJsonConverter.kt
@@ -33,8 +33,8 @@ import com.google.gson.*
 import com.linkedplanet.kotlinjiraclient.api.model.IssueQueryParams
 import com.linkedplanet.kotlinjiraclient.sdk.field.FieldAccessorImpl
 import org.slf4j.LoggerFactory
-import javax.ws.rs.core.UriBuilder
-import javax.xml.bind.annotation.XmlTransient
+import jakarta.ws.rs.core.UriBuilder
+import jakarta.xml.bind.annotation.XmlTransient
 
 /**
  * Converts a Jira Issue to Json.
@@ -75,7 +75,7 @@ class IssueJsonConverter {
     ): JsonObject {
         val expanded = queryParams.expanded.joinToString(",")
         val issueBean: IssueBean = beanBuilderFactory
-            .newIssueBeanBuilder2(IncludedFields.includeNavigableByDefault(null), expanded, uriBuilder)
+            .newIssueBeanBuilder2(IncludedFields.includeNavigableByDefault(null), expanded /*uriBuilder*/)
             .build(issue)
         this.addOrderableFieldsToBean(issueBean, issue)
         this.addAvailableNavigableFieldsToBean(issueBean, issue)
diff --git a/kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml
@@ -53,13 +53,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml
@@ -82,10 +82,6 @@
                     <groupId>org.codehaus.groovy.modules.http-builder</groupId>
                     <artifactId>http-builder</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.ehcache</groupId>
                     <artifactId>ehcache</artifactId>
@@ -141,13 +137,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
diff --git a/kotlin-jira-client/pom.xml b/kotlin-jira-client/pom.xml
@@ -51,10 +51,6 @@
                         <groupId>org.codehaus.groovy.modules.http-builder</groupId>
                         <artifactId>http-builder</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>org.ehcache</groupId>
                         <artifactId>ehcache</artifactId>
