Skip to content

Commit

Permalink
Set proper jersey version for jersey-server artifact and updated all …
Browse files Browse the repository at this point in the history
…code accordingly
  • Loading branch information
Willem Elbers committed Sep 26, 2024
1 parent fddea24 commit 96be9e0
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>2.31</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
Expand Down Expand Up @@ -394,6 +394,12 @@
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
<type>jar</type>
</dependency>

<!--
Test dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.validation.constraints.Null;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import jakarta.ws.rs.core.PathSegment;
import jakarta.ws.rs.core.UriInfo;

import javax.annotation.Priority;
import jakarta.annotation.Priority;

import org.glassfish.jersey.message.internal.LanguageTag;
import org.glassfish.jersey.server.ResourceConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
package eu.clarin.cmdi.virtualcollectionregistry.rest.auth;

import eu.clarin.cmdi.virtualcollectionregistry.ApiKeyException;
import eu.clarin.cmdi.virtualcollectionregistry.ApiKeyNotFoundException;
import eu.clarin.cmdi.virtualcollectionregistry.ApiKeyRevokedException;
import eu.clarin.cmdi.virtualcollectionregistry.ApiKeyService;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

import javax.annotation.Priority;
import jakarta.annotation.Priority;
import jakarta.ws.rs.Priorities;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerRequestFilter;
Expand Down

0 comments on commit 96be9e0

Please sign in to comment.