Merge branch 'refs/heads/dev' into feature/configurable-expand

HighKo · HighKo · commit d4e1a1bd13cc · 2025-02-13T23:14:59.000+01:00
diff --git a/.mvn/local-settings.xml b/.mvn/local-settings.xml
@@ -8,14 +8,54 @@
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <mirrors>
-    <mirror>
-      <id>atlassian-central</id>
-      <mirrorOf>central</mirrorOf>
-      <name>atlassian-central</name>
-      <url>https://maven.atlassian.com/repository/public</url>
-    </mirror>
-  </mirrors>
+  <profiles>
+    <profile>
+      <id>defaultProfile</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>maven-central</id>
+          <name>Maven Central</name>
+          <url>https://repo1.maven.org/maven2/</url>
+        </repository>
+        <repository>
+          <id>atlassian-proxy</id>
+          <name>Atlassian Maven 2 Proxy</name>
+          <url>https://packages.atlassian.com/artifactory/maven-atlassian-all/ </url>
+        </repository>
+        <repository>
+          <id>terracotta</id>
+          <name>Terracotta</name>
+          <url>https://repo.terracotta.org/maven2/</url>
+        </repository>
+        <repository>
+          <id>jenkins-releases</id>
+          <name>Jenkins</name>
+          <url>https://repo.jenkins-ci.org/releases/</url>
+        </repository>
+      </repositories>
+
+      <pluginRepositories>
+        <pluginRepository>
+          <id>maven-central</id>
+          <name>Maven Central</name>
+          <url>https://repo1.maven.org/maven2/</url>
+        </pluginRepository>
+        <pluginRepository>
+          <id>atlassian-proxy</id>
+          <name>Atlassian Maven 2 Proxy</name>
+          <url>https://packages.atlassian.com/maven/repository/public</url>
+        </pluginRepository>
+      </pluginRepositories>
+
+      <properties>
+        <downloadSources>true</downloadSources>
+        <downloadJavadocs>true</downloadJavadocs>
+      </properties>
+    </profile>
+  </profiles>
 
   <servers>
     <server>
diff --git a/kotlin-atlassian-client-core-common/pom.xml b/kotlin-atlassian-client-core-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-atlassian-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-atlassian-client-core-common</artifactId>
diff --git a/kotlin-http-client/kotlin-http-client-api/pom.xml b/kotlin-http-client/kotlin-http-client-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-http-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-http-client-api</artifactId>
diff --git a/kotlin-http-client/kotlin-http-client-atlas/pom.xml b/kotlin-http-client/kotlin-http-client-atlas/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-http-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-http-client-atlas</artifactId>
diff --git a/kotlin-http-client/kotlin-http-client-ktor/pom.xml b/kotlin-http-client/kotlin-http-client-ktor/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-http-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-http-client-ktor</artifactId>
diff --git a/kotlin-http-client/pom.xml b/kotlin-http-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-atlassian-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-http-client</artifactId>
diff --git a/kotlin-insight-client/kotlin-insight-client-api/pom.xml b/kotlin-insight-client/kotlin-insight-client-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-insight-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-insight-client-api</artifactId>
diff --git a/kotlin-insight-client/kotlin-insight-client-http/pom.xml b/kotlin-insight-client/kotlin-insight-client-http/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-insight-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-insight-client-http</artifactId>
diff --git a/kotlin-insight-client/kotlin-insight-client-sdk/pom.xml b/kotlin-insight-client/kotlin-insight-client-sdk/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-insight-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-insight-client-sdk</artifactId>
diff --git a/kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-applink/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-insight-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-insight-client-test-applink</artifactId>
diff --git a/kotlin-insight-client/kotlin-insight-client-test-base/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-base/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-insight-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-insight-client-test-base</artifactId>
diff --git a/kotlin-insight-client/kotlin-insight-client-test-ktor/pom.xml b/kotlin-insight-client/kotlin-insight-client-test-ktor/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-insight-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-insight-client-test-ktor</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
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-insight-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-insight-client-test-sdk</artifactId>
diff --git a/kotlin-insight-client/pom.xml b/kotlin-insight-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-atlassian-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-insight-client</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-api/pom.xml b/kotlin-jira-client/kotlin-jira-client-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-jira-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-jira-client-api</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-http/pom.xml b/kotlin-jira-client/kotlin-jira-client-http/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-jira-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-jira-client-http</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml b/kotlin-jira-client/kotlin-jira-client-sdk/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-jira-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-jira-client-sdk</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraProjectOperator.kt b/kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraProjectOperator.kt
@@ -47,7 +47,7 @@ object SdkJiraProjectOperator : JiraProjectOperator {
         eitherAndCatch {
             projectService.getProjectById(user(), projectId.toLong()).toEither().bind().get().let {
                 val avatarUrl = avatarService.getProjectAvatarAbsoluteURL(it, Avatar.Size.defaultSize())
-                val url = it.url.ifEmpty { "${baseUrl()}/rest/api/2/project/${it.id}" }
+                val url = if (!it.url.isNullOrEmpty()) it.url else "${baseUrl()}/rest/api/2/project/${it.id}"
                 JiraProject(it.id, it.key, it.name, url, avatarUrl.toASCIIString())
             }
         }
@@ -56,7 +56,7 @@ object SdkJiraProjectOperator : JiraProjectOperator {
         eitherAndCatch {
             return Either.Right(projectService.getAllProjects(user()).toEither().bind().get().map {
                 val avatarUrl = avatarService.getProjectAvatarAbsoluteURL(it, Avatar.Size.defaultSize())
-                val url = it.url.ifEmpty { "${baseUrl()}/rest/api/2/project/${it.id}" }
+                val url = if (!it.url.isNullOrEmpty()) it.url else "${baseUrl()}/rest/api/2/project/${it.id}"
                 JiraProject(it.id, it.key, it.name, url, avatarUrl.toASCIIString())
             })
         }
diff --git a/kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-applink/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-jira-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-jira-client-test-applink</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-test-base/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-base/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-jira-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-jira-client-test-base</artifactId>
diff --git a/kotlin-jira-client/kotlin-jira-client-test-ktor/pom.xml b/kotlin-jira-client/kotlin-jira-client-test-ktor/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-jira-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-jira-client-test-ktor</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
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-jira-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-jira-client-test-sdk</artifactId>
diff --git a/kotlin-jira-client/pom.xml b/kotlin-jira-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.linked-planet.client</groupId>
         <artifactId>kotlin-atlassian-client</artifactId>
-        <version>0.14.7-SNAPSHOT</version>
+        <version>0.14.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>kotlin-jira-client</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>kotlin-atlassian-client</artifactId>
     <name>kotlin-atlassian-client</name>
     <groupId>com.linked-planet.client</groupId>
-    <version>0.14.7-SNAPSHOT</version>
+    <version>0.14.8-SNAPSHOT</version>
     <description>Provides clients for jira and insight functionality.</description>
     <packaging>pom</packaging>
 
@@ -67,13 +67,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <repositories>
-        <repository>
-            <id>mavenCentral</id>
-            <url>https://repo1.maven.org/maven2/</url>
-        </repository>
-    </repositories>
-
     <build>
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>
         <resources>
