This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch issue/SLING-12065 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit 636e20c6505c04ccb2b9d7ba4dcbf268ad1199d7 Author: Robert Munteanu <[email protected]> AuthorDate: Wed Jun 11 13:18:56 2025 +0200 SLING-12065 - Migrate sling.discovery.base to jakarta.json --- pom.xml | 6 +++--- .../base/connectors/announcement/Announcement.java | 14 +++++++------- .../connectors/announcement/AnnouncementRegistryImpl.java | 2 +- .../base/connectors/ping/TopologyConnectorClient.java | 2 +- .../base/connectors/ping/TopologyConnectorServlet.java | 2 +- .../base/connectors/ping/TopologyRequestValidator.java | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 5b3a3f0..6cc77b6 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-json_1.1_spec</artifactId> - <version>1.5</version> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>2.0.2</version> <scope>provided</scope> </dependency> <dependency> diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java index d6f15f4..c9daba2 100644 --- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java +++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java @@ -28,13 +28,13 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonReaderFactory; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonReaderFactory; +import jakarta.json.JsonValue; import org.apache.sling.api.resource.ModifiableValueMap; import org.apache.sling.api.resource.PersistenceException; diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java index 40a03ca..a734310 100644 --- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java +++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/AnnouncementRegistryImpl.java @@ -25,7 +25,7 @@ import java.util.LinkedList; import java.util.Map; import java.util.Map.Entry; -import javax.json.JsonException; +import jakarta.json.JsonException; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.PersistenceException; diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java index fc6d124..446fd9b 100644 --- a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java +++ b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorClient.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.UUID; import java.util.zip.GZIPOutputStream; -import javax.json.JsonException; +import jakarta.json.JsonException; import javax.servlet.http.HttpServletResponse; import org.apache.http.Header; diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorServlet.java b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorServlet.java index 748b868..724daa6 100644 --- a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorServlet.java +++ b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyConnectorServlet.java @@ -28,7 +28,7 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.zip.GZIPOutputStream; -import javax.json.JsonException; +import jakarta.json.JsonException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java index 3a8118d..a5f9545 100644 --- a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java +++ b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java @@ -48,12 +48,12 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.SecretKeySpec; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonException; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonException; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
