This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push: new cf3c45c0 [MDEP-965] javax.json --> jakarta.json (#461) cf3c45c0 is described below commit cf3c45c0e1bef58fda1a34ae090f3f737a9b573e Author: Elliotte Rusty Harold <elh...@users.noreply.github.com> AuthorDate: Tue Nov 12 16:24:00 2024 +0000 [MDEP-965] javax.json --> jakarta.json (#461) * javax.json --> jakarta.json --- pom.xml | 10 +++++----- .../org/apache/maven/plugins/dependency/tree/TestTreeMojo.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 5845b678..d02c0181 100644 --- a/pom.xml +++ b/pom.xml @@ -311,15 +311,15 @@ under the License. <scope>test</scope> </dependency> <dependency> - <groupId>javax.json</groupId> - <artifactId>javax.json-api</artifactId> - <version>1.1.4</version> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>2.0.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> - <version>1.1.4</version> + <artifactId>jakarta.json</artifactId> + <version>2.0.1</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java index 344bbccc..edbceb87 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo.java @@ -18,11 +18,6 @@ */ package org.apache.maven.plugins.dependency.tree; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -38,6 +33,10 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.LegacySupport; @@ -190,6 +189,7 @@ public class TestTreeMojo extends AbstractDependencyMojoTestCase { public void testTreeJsonParsing() throws Exception { List<String> contents = runTreeMojo("tree2.json", "json"); + System.setProperty("jakarta.json.provider", "org.glassfish.json.JsonProviderImpl"); try (JsonReader reader = Json.createReader(new StringReader(String.join("\n", contents)))) { JsonObject root = reader.readObject();