Upgrading Jersey to 3.x and Jena to 4.6.1

Author: namedgraph

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>com.atomgraph</groupId>
     <artifactId>processor</artifactId>
-    <version>3.14.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>${packaging.type}</packaging>
 
     <name>AtomGraph Processor</name>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -79,17 +79,17 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>twirl</artifactId>
-            <version>1.0.30</version>
+            <version>1.0.31-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>core</artifactId>
-            <version>3.1.16</version>
+            <version>4.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-shacl</artifactId>
-            <version>4.5.0</version>
+            <version>4.6.1</version>
             <exclusions>
                 <!-- exclude HTTP Client as its version clashes with Jersey's -->
                 <exclusion>

src/main/java/com/atomgraph/processor/model/Template.java

@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import javax.ws.rs.core.CacheControl;
+import jakarta.ws.rs.core.CacheControl;
 import org.apache.jena.ontology.OntClass;
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.Resource;

src/main/java/com/atomgraph/processor/model/TemplateCall.java

@@ -15,7 +15,7 @@
  */
 package com.atomgraph.processor.model;
 
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import org.apache.jena.query.QuerySolutionMap;
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.RDFNode;

src/main/java/com/atomgraph/processor/model/impl/TemplateCallImpl.java

@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriBuilder;
 import org.apache.jena.query.QuerySolutionMap;
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.RDFNode;

src/main/java/com/atomgraph/processor/model/impl/TemplateImpl.java

@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import javax.ws.rs.core.CacheControl;
+import jakarta.ws.rs.core.CacheControl;
 import org.apache.jena.enhanced.EnhGraph;
 import org.apache.jena.enhanced.EnhNode;
 import org.apache.jena.enhanced.Implementation;

src/main/java/com/atomgraph/processor/util/Skolemizer.java

@@ -33,7 +33,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 import com.atomgraph.processor.vocabulary.LDT;
 import com.atomgraph.processor.vocabulary.SIOC;
 import org.apache.jena.datatypes.xsd.XSDDatatype;

src/main/java/com/atomgraph/server/Application.java

@@ -22,7 +22,7 @@
 import org.apache.jena.util.FileManager;
 import javax.annotation.PostConstruct;
 import javax.servlet.ServletConfig;
-import javax.ws.rs.core.Context;
+import jakarta.ws.rs.core.Context;
 import org.apache.jena.enhanced.BuiltinPersonalities;
 import org.apache.jena.util.LocationMapper;
 import com.atomgraph.core.factory.DataManagerFactory;
@@ -72,7 +72,7 @@
 import com.atomgraph.spinrdf.vocabulary.SP;
 import java.util.HashMap;
 import java.util.Optional;
-import javax.ws.rs.client.Client;
+import jakarta.ws.rs.client.Client;
 import org.apache.jena.ontology.Ontology;
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.glassfish.hk2.api.TypeLiteral;

src/main/java/com/atomgraph/server/factory/OntologyFactory.java

@@ -16,7 +16,7 @@
 package com.atomgraph.server.factory;
 
 import java.util.Optional;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Provider;
 import org.apache.jena.ontology.Ontology;
 import org.glassfish.hk2.api.Factory;
 

src/main/java/com/atomgraph/server/factory/TemplateCallFactory.java

@@ -21,11 +21,11 @@
 import com.atomgraph.processor.util.TemplateMatcher;
 import java.net.URI;
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.Provider;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.Provider;
 import org.apache.jena.ontology.Ontology;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.glassfish.hk2.api.Factory;

src/main/java/com/atomgraph/server/filter/response/ResponseHeaderFilter.java

@@ -22,13 +22,13 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.UriInfo;
 import org.apache.jena.ontology.Ontology;
 
 /**
@@ -38,8 +38,8 @@
 public class ResponseHeaderFilter implements ContainerResponseFilter
 {
 
-    @Inject javax.inject.Provider<Optional<Ontology>> ontology;
-    @Inject javax.inject.Provider<Optional<TemplateCall>> templateCall;
+    @Inject jakarta.inject.Provider<Optional<Ontology>> ontology;
+    @Inject jakarta.inject.Provider<Optional<TemplateCall>> templateCall;
 
     @Context UriInfo uriInfo;