Use jakarta package in gf Signed-off-by: Jonathan Coustick <jonathan.coustick@payara.fish>
diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java index a0295fa..cbccf00 100644 --- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java +++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
@@ -16,9 +16,9 @@ package org.glassfish.json.customprovider; -import javax.json.JsonException; -import javax.json.JsonValue; -import javax.json.stream.JsonGenerator; +import jakarta.json.JsonException; +import jakarta.json.JsonValue; +import jakarta.json.stream.JsonGenerator; import java.io.IOException; import java.io.Writer; import java.math.BigDecimal;
diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java index 0d810f5..3015d1b 100644 --- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java +++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java
@@ -16,12 +16,12 @@ package org.glassfish.json.customprovider; -import javax.json.*; -import javax.json.spi.JsonProvider; -import javax.json.stream.JsonGenerator; -import javax.json.stream.JsonGeneratorFactory; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParserFactory; +import jakarta.json.*; +import jakarta.json.spi.JsonProvider; +import jakarta.json.stream.JsonGenerator; +import jakarta.json.stream.JsonGeneratorFactory; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParserFactory; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader;
diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java index ef7523b..92aa0f3 100644 --- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java +++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java
@@ -20,8 +20,8 @@ import javax.servlet.http.*; import javax.servlet.*; import java.io.IOException; -import javax.json.*; -import javax.json.stream.*; +import jakarta.json.*; +import jakarta.json.stream.*; import java.io.*; /**
diff --git a/gf/customprovider/src/main/resources/META-INF/services/javax.json.spi.JsonProvider b/gf/customprovider/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider similarity index 100% rename from gf/customprovider/src/main/resources/META-INF/services/javax.json.spi.JsonProvider rename to gf/customprovider/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
diff --git a/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java b/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java index 01001cf..782521c 100644 --- a/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java +++ b/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java
@@ -20,8 +20,8 @@ import javax.servlet.http.*; import javax.servlet.*; import java.io.IOException; -import javax.json.*; -import javax.json.stream.*; +import jakarta.json.*; +import jakarta.json.stream.*; import java.io.*; /**