Switch to javax jsonp

helidon-io · Aug 27, 2024 · 3af2923 · 3af2923
1 parent 16ef296
commit 3af2923
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 29 deletions.
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2016, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2016, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/maven-plugins/shade-extensions/pom.xml b/maven-plugins/shade-extensions/pom.xml
@@ -35,24 +35,14 @@
             <artifactId>maven-shade-plugin</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.parsson</groupId>
-            <artifactId>parsson</artifactId>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/...gins/shade-extensions/src/main/java/io/helidon/build/maven/shade/JsonArrayAggregator.java b/...gins/shade-extensions/src/main/java/io/helidon/build/maven/shade/JsonArrayAggregator.java
@@ -23,16 +23,15 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
-import jakarta.json.Json;
-import jakarta.json.JsonArray;
-import jakarta.json.JsonArrayBuilder;
-import jakarta.json.JsonValue;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonValue;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 class JsonArrayAggregator implements Aggregator {
 
-    private static final String REJECT_ALL_PATTERN = "!*";
     private final String path;
     private final JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
 

diff --git a/...-extensions/src/test/java/io/helidon/build/maven/shade/HelidonServiceTransformerTest.java b/...-extensions/src/test/java/io/helidon/build/maven/shade/HelidonServiceTransformerTest.java
@@ -28,11 +28,11 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.JarOutputStream;
 
-import jakarta.json.Json;
-import jakarta.json.JsonArray;
-import jakarta.json.JsonObject;
-import jakarta.json.JsonWriterFactory;
-import jakarta.json.stream.JsonGenerator;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.JsonWriterFactory;
+import javax.json.stream.JsonGenerator;
 import org.junit.jupiter.api.Test;
 
 import static io.helidon.build.maven.shade.HelidonServiceTransformer.CONFIG_METADATA_PATH;

diff --git a/pom.xml b/pom.xml
@@ -172,7 +172,6 @@
         <version.lib.wagon-http>3.5.3</version.lib.wagon-http>
         <version.lib.commons-text>1.10.0</version.lib.commons-text>
         <version.lib.maven-shade-plugin>3.5.1</version.lib.maven-shade-plugin>
-        <version.lib.parsson>1.1.7</version.lib.parsson>
 
         <!--
             !Version statement! - end
@@ -949,11 +948,6 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>${version.lib.maven-shade-plugin}</version>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.parsson</groupId>
-                <artifactId>parsson</artifactId>
-                <version>${version.lib.parsson}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>