Skip to content
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

Update jersey monorepo to v3 (master) (major) #129

Merged
merged 2 commits into from
Jan 31, 2025
Merged

Update jersey monorepo to v3 (master) (major) #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f03726
Update jersey monorepo to v3
renovate[bot] Jan 30, 2025
7764624
Move from javax to jakarta namespace
alexsuter Jan 31, 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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<maven.version>3.9.9</maven.version>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey.version>2.46</jersey.version>
<jersey.version>3.1.10</jersey.version>
</properties>

<distributionManagement>
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/ch/ivyteam/ivy/changelog/generator/jira/JiraService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/ch/ivyteam/ivy/jira/JiraClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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()));
}
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/ch/ivyteam/ivy/jira/release/JiraReleaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
5 changes: 2 additions & 3 deletions src/test/java/ch/ivyteam/ivy/changelog/generator/TestJiraJson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down