From 5f03726b5c45f80f35a0ea16c4e31e7a269a688c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 15:39:08 +0000
Subject: [PATCH 1/2] Update jersey monorepo to v3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c26b51b..9e54b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
3.9.9
true
UTF-8
- 2.46
+ 3.1.10
From 7764624a41580ac850412af7027af5cfd7922340 Mon Sep 17 00:00:00 2001
From: Alexander Suter
Date: Fri, 31 Jan 2025 16:13:53 +0100
Subject: [PATCH 2/2] Move from javax to jakarta namespace
---
.../ivy/changelog/generator/jira/JiraService.java | 9 ++++-----
.../java/ch/ivyteam/ivy/jira/JiraClientFactory.java | 9 ++++-----
.../ivy/jira/release/JiraReleaseService.java | 13 ++++++-------
.../ivy/changelog/generator/TestJiraJson.java | 5 ++---
4 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/main/java/ch/ivyteam/ivy/changelog/generator/jira/JiraService.java b/src/main/java/ch/ivyteam/ivy/changelog/generator/jira/JiraService.java
index a172d49..7edbadc 100644
--- a/src/main/java/ch/ivyteam/ivy/changelog/generator/jira/JiraService.java
+++ b/src/main/java/ch/ivyteam/ivy/changelog/generator/jira/JiraService.java
@@ -4,16 +4,15 @@
import java.util.List;
import java.util.stream.Collectors;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status.Family;
-
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.settings.Server;
import ch.ivyteam.ivy.changelog.generator.jira.JiraResponse.Issue;
import ch.ivyteam.ivy.jira.JiraClientFactory;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status.Family;
public class JiraService {
private final String serverUri;
diff --git a/src/main/java/ch/ivyteam/ivy/jira/JiraClientFactory.java b/src/main/java/ch/ivyteam/ivy/jira/JiraClientFactory.java
index c0643e1..4e913f4 100644
--- a/src/main/java/ch/ivyteam/ivy/jira/JiraClientFactory.java
+++ b/src/main/java/ch/ivyteam/ivy/jira/JiraClientFactory.java
@@ -1,8 +1,5 @@
package ch.ivyteam.ivy.jira;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-
import org.apache.maven.settings.Server;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
@@ -11,13 +8,15 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+
public class JiraClientFactory {
public static Client createClient(Server server) {
final JacksonJsonProvider jacksonJsonProvider = new JacksonJaxbJsonProvider()
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
- Client client = ClientBuilder.newClient(new ClientConfig(jacksonJsonProvider));
+ var client = ClientBuilder.newClient(new ClientConfig(jacksonJsonProvider));
if (server != null) {
client.register(HttpAuthenticationFeature.basic(server.getUsername(), server.getPassword()));
}
diff --git a/src/main/java/ch/ivyteam/ivy/jira/release/JiraReleaseService.java b/src/main/java/ch/ivyteam/ivy/jira/release/JiraReleaseService.java
index b59f8a9..f1d2724 100644
--- a/src/main/java/ch/ivyteam/ivy/jira/release/JiraReleaseService.java
+++ b/src/main/java/ch/ivyteam/ivy/jira/release/JiraReleaseService.java
@@ -3,18 +3,17 @@
import java.net.URI;
import java.util.List;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.apache.maven.settings.Server;
import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ivyteam.ivy.jira.JiraClientFactory;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
public class JiraReleaseService {
diff --git a/src/test/java/ch/ivyteam/ivy/changelog/generator/TestJiraJson.java b/src/test/java/ch/ivyteam/ivy/changelog/generator/TestJiraJson.java
index 0577a5f..336567e 100644
--- a/src/test/java/ch/ivyteam/ivy/changelog/generator/TestJiraJson.java
+++ b/src/test/java/ch/ivyteam/ivy/changelog/generator/TestJiraJson.java
@@ -10,9 +10,6 @@
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider;
import org.junit.jupiter.api.Test;
@@ -21,6 +18,8 @@
import ch.ivyteam.ivy.changelog.generator.jira.JiraResponse;
import ch.ivyteam.ivy.changelog.generator.jira.Paging;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedHashMap;
class TestJiraJson {