diff --git a/gb-jira/pom.xml b/gb-jira/pom.xml index 1a57e3d..0341484 100644 --- a/gb-jira/pom.xml +++ b/gb-jira/pom.xml @@ -22,6 +22,10 @@ atlassian-packages https://packages.atlassian.com/maven-public/ + + atlassian + https://maven.artifacts.atlassian.com/ + @@ -46,7 +50,7 @@ com.atlassian.jira jira-rest-java-client-core - 5.2.7 + 7.0.1 org.slf4j @@ -57,7 +61,7 @@ io.atlassian.fugue fugue - 5.0.0 + 6.1.2 diff --git a/gb-jira/src/main/java/com/g2forge/gearbox/jira/ExtendedAsynchronousJiraRestClient.java b/gb-jira/src/main/java/com/g2forge/gearbox/jira/ExtendedAsynchronousJiraRestClient.java index cbe55e7..863be1c 100644 --- a/gb-jira/src/main/java/com/g2forge/gearbox/jira/ExtendedAsynchronousJiraRestClient.java +++ b/gb-jira/src/main/java/com/g2forge/gearbox/jira/ExtendedAsynchronousJiraRestClient.java @@ -2,8 +2,6 @@ import java.net.URI; -import javax.ws.rs.core.UriBuilder; - import com.atlassian.jira.rest.client.internal.async.AsynchronousJiraRestClient; import com.atlassian.jira.rest.client.internal.async.DisposableHttpClient; import com.g2forge.gearbox.jira.components.AsynchronousProjectComponentClient; @@ -13,6 +11,7 @@ import com.g2forge.gearbox.jira.user.AsynchronousExtendedUserRestClient; import com.g2forge.gearbox.jira.user.ExtendedUserRestClient; +import jakarta.ws.rs.core.UriBuilder; import lombok.Getter; @Getter diff --git a/gb-jira/src/main/java/com/g2forge/gearbox/jira/components/AsynchronousProjectComponentClient.java b/gb-jira/src/main/java/com/g2forge/gearbox/jira/components/AsynchronousProjectComponentClient.java index 4fcfd0e..198c3ff 100644 --- a/gb-jira/src/main/java/com/g2forge/gearbox/jira/components/AsynchronousProjectComponentClient.java +++ b/gb-jira/src/main/java/com/g2forge/gearbox/jira/components/AsynchronousProjectComponentClient.java @@ -2,13 +2,12 @@ import java.net.URI; -import javax.ws.rs.core.UriBuilder; - import com.atlassian.httpclient.api.HttpClient; import com.atlassian.jira.rest.client.api.domain.BasicComponent; import com.atlassian.jira.rest.client.internal.async.AbstractAsynchronousRestClient; import io.atlassian.util.concurrent.Promise; +import jakarta.ws.rs.core.UriBuilder; public class AsynchronousProjectComponentClient extends AbstractAsynchronousRestClient implements ProjectComponentsRestClient { private static final String PROJECT_URI_PREFIX = "project"; diff --git a/gb-jira/src/main/java/com/g2forge/gearbox/jira/sprint/AsynchronousSprintRestClient.java b/gb-jira/src/main/java/com/g2forge/gearbox/jira/sprint/AsynchronousSprintRestClient.java index 03a7930..f86c0ab 100644 --- a/gb-jira/src/main/java/com/g2forge/gearbox/jira/sprint/AsynchronousSprintRestClient.java +++ b/gb-jira/src/main/java/com/g2forge/gearbox/jira/sprint/AsynchronousSprintRestClient.java @@ -2,8 +2,6 @@ import java.net.URI; -import javax.ws.rs.core.UriBuilder; - import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -15,6 +13,7 @@ import com.g2forge.gearbox.jira.sprint.Sprint.SprintBuilder; import io.atlassian.util.concurrent.Promise; +import jakarta.ws.rs.core.UriBuilder; public class AsynchronousSprintRestClient extends AbstractAsynchronousRestClient implements SprintRestClient { protected static class SprintJsonParser implements JsonObjectParser { diff --git a/gb-jira/src/main/java/com/g2forge/gearbox/jira/user/AsynchronousExtendedUserRestClient.java b/gb-jira/src/main/java/com/g2forge/gearbox/jira/user/AsynchronousExtendedUserRestClient.java index 27e2928..6ce180e 100644 --- a/gb-jira/src/main/java/com/g2forge/gearbox/jira/user/AsynchronousExtendedUserRestClient.java +++ b/gb-jira/src/main/java/com/g2forge/gearbox/jira/user/AsynchronousExtendedUserRestClient.java @@ -2,13 +2,12 @@ import java.net.URI; -import javax.ws.rs.core.UriBuilder; - import com.atlassian.httpclient.api.HttpClient; import com.atlassian.jira.rest.client.api.domain.User; import com.atlassian.jira.rest.client.internal.async.AsynchronousUserRestClient; import io.atlassian.util.concurrent.Promise; +import jakarta.ws.rs.core.UriBuilder; public class AsynchronousExtendedUserRestClient extends AsynchronousUserRestClient implements ExtendedUserRestClient { protected static final String USER_URI_PREFIX = "user";