Upgrade to use jakarta for json classes in Jakarta RESTful Web services processing media Signed-off-by: Jonathan Coustick <jonathan.coustick@payara.fish>
diff --git a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java index c551072..f6797b7 100644 --- a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java +++ b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java
@@ -21,10 +21,10 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.json.Json; -import javax.json.JsonReader; -import javax.json.JsonReaderFactory; -import javax.json.JsonStructure; +import jakarta.json.Json; +import jakarta.json.JsonReader; +import jakarta.json.JsonReaderFactory; +import jakarta.json.JsonStructure; import javax.ws.rs.Consumes; import javax.ws.rs.WebApplicationException;
diff --git a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java index 026ae09..6e7208d 100644 --- a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java +++ b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java
@@ -23,10 +23,10 @@ import java.util.HashMap; import java.util.Map; -import javax.json.Json; -import javax.json.JsonStructure; -import javax.json.JsonWriter; -import javax.json.JsonWriterFactory; +import jakarta.json.Json; +import jakarta.json.JsonStructure; +import jakarta.json.JsonWriter; +import jakarta.json.JsonWriterFactory; import javax.annotation.PostConstruct; import javax.ws.rs.Produces;
diff --git a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java index 11562b0..1381ff6 100644 --- a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java +++ b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java
@@ -20,10 +20,10 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.json.Json; -import javax.json.JsonReader; -import javax.json.JsonReaderFactory; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonReader; +import jakarta.json.JsonReaderFactory; +import jakarta.json.JsonValue; import javax.ws.rs.Consumes; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType;
diff --git a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java index 0cd0fd4..15be89b 100644 --- a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java +++ b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java
@@ -23,11 +23,11 @@ import java.util.HashMap; import java.util.Map; import javax.annotation.PostConstruct; -import javax.json.Json; -import javax.json.JsonValue; -import javax.json.JsonWriter; -import javax.json.JsonWriterFactory; -import javax.json.stream.JsonGenerator; +import jakarta.json.Json; +import jakarta.json.JsonValue; +import jakarta.json.JsonWriter; +import jakarta.json.JsonWriterFactory; +import jakarta.json.stream.JsonGenerator; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Configuration;