Merge pull request #35 from hamnis/jpms-tests

Jpms improvements and dependency upgrades
hamnis · Sep 11, 2024 · 0440a33 · 0440a33
2 parents 869ba45 + 32b5f42
commit 0440a33
Show file tree

Hide file tree

Showing 21 changed files with 104 additions and 622 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: CI
+
+on:
+  push:
+    branches: [ "*" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B test --file pom.xml
diff --git a/.travis-settings.xml b/.travis-settings.xml
diff --git a/.travis.yml b/.travis.yml
diff --git a/ast/pom.xml b/ast/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>net.hamnaberg.json</groupId>
     <artifactId>immutable-json</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <name>Immutable JSON :: AST</name>
   <artifactId>immutable-json-ast</artifactId>

diff --git a/ast/src/test/java/net/hamnaberg/json/JsonTest.java b/ast/src/test/java/net/hamnaberg/json/JsonTest.java
@@ -23,7 +23,7 @@ public void jString() {
     public void jNumber() {
         Json.JNumber n1 = Json.jNumber(1);
         assertEquals(n1, Json.jNumber(1L));
-        assertEquals(n1, Json.jNumber(new Long(1L)));
+        assertEquals(n1, Json.jNumber(Long.valueOf(1L)));
         assertEquals(n1, Json.jNumber(new BigDecimal(1)));
         assertEquals(1, n1.asInt());
         assertEquals(1L, n1.asLong());

diff --git a/codec/pom.xml b/codec/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>net.hamnaberg.json</groupId>
     <artifactId>immutable-json</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <name>Immutable JSON :: Codec</name>
   <artifactId>immutable-json-codec</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -15,12 +15,13 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>net.hamnaberg.json</groupId>
     <artifactId>immutable-json</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <name>Immutable JSON :: Core</name>
   <artifactId>immutable-json-core</artifactId>
@@ -46,21 +47,4 @@
       <artifactId>junit</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test-jar</id>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/javax-json/pom.xml → glassfish/pom.xml b/javax-json/pom.xml → glassfish/pom.xml
@@ -20,10 +20,10 @@
   <parent>
     <groupId>net.hamnaberg.json</groupId>
     <artifactId>immutable-json</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
-  <name>Immutable JSON :: javax.json</name>
-  <artifactId>immutable-json-javax</artifactId>
+  <name>Immutable JSON :: glassfish</name>
+  <artifactId>immutable-json-glassfish</artifactId>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -50,26 +50,11 @@
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>jakarta.json</artifactId>
-      <version>1.1.6</version>
+      <version>2.0.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs>
-            <arg>--patch-module</arg>
-            <arg>immutable.json.core=${settings.localRepository}/net/hamnaberg/json/immutable-json-core/${project.version}/immutable-json-core-${project.version}-tests.jar</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/javax-json/src/main/java/module-info.java → glassfish/src/main/java/module-info.java b/javax-json/src/main/java/module-info.java → glassfish/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 module immutable.json.glassfish {
     requires immutable.json.core;
     requires immutable.json.codec;
-    requires java.json;
+    requires jakarta.json;
 }
diff --git a/...hamnaberg/json/javax/JavaxJsonParser.java → ...g/json/glassfish/GlassfishJsonParser.java b/...hamnaberg/json/javax/JavaxJsonParser.java → ...g/json/glassfish/GlassfishJsonParser.java
@@ -1,13 +1,14 @@
-package net.hamnaberg.json.javax;
+package net.hamnaberg.json.glassfish;
 
 import net.hamnaberg.json.Json;
 import net.hamnaberg.json.io.JsonParseException;
 
 import java.io.Reader;
 import java.util.*;
-import javax.json.stream.JsonParser;
 
-public final class JavaxJsonParser extends net.hamnaberg.json.io.JsonParser {
+import jakarta.json.stream.JsonParser;
+
+public final class GlassfishJsonParser extends net.hamnaberg.json.io.JsonParser {
     private final EnumSet<JsonParser.Event> scalarSet =
             EnumSet.of(
                     JsonParser.Event.VALUE_STRING,
@@ -19,7 +20,7 @@ public final class JavaxJsonParser extends net.hamnaberg.json.io.JsonParser {
 
     @Override
     protected Json.JValue parseImpl(Reader reader) {
-        JsonParser parser = javax.json.Json.createParser(reader);
+        JsonParser parser = jakarta.json.Json.createParser(reader);
         try {
             JsonParser.Event event;
 
@@ -63,14 +64,12 @@ private boolean isScalar(JsonParser.Event event) {
     private Json.JArray handleArray(JsonParser parser) {
         JsonParser.Event event;
         List<Json.JValue> list = new ArrayList<>();
-        while((event = parser.next())!= JsonParser.Event.END_ARRAY) {
+        while ((event = parser.next()) != JsonParser.Event.END_ARRAY) {
             if (isScalar(event)) {
                 list.add(handleScalarValue(event, parser));
-            }
-            else if (event == JsonParser.Event.START_OBJECT) {
+            } else if (event == JsonParser.Event.START_OBJECT) {
                 list.add(handleObject(parser));
-            }
-            else if (event == JsonParser.Event.START_ARRAY) {
+            } else if (event == JsonParser.Event.START_ARRAY) {
                 list.add(handleArray(parser));
             }
         }
@@ -81,7 +80,7 @@ private Json.JObject handleObject(JsonParser parser) {
         Map<String, Json.JValue> map = new LinkedHashMap<>();
         JsonParser.Event event;
         String name = null;
-        while((event = parser.next()) != JsonParser.Event.END_OBJECT) {
+        while ((event = parser.next()) != JsonParser.Event.END_OBJECT) {
             if (event == JsonParser.Event.KEY_NAME) {
                 name = parser.getString();
             }

diff --git a/javax-json/src/revapi/revapi-conf.json → glassfish/src/revapi/revapi-conf.json b/javax-json/src/revapi/revapi-conf.json → glassfish/src/revapi/revapi-conf.json
diff --git a/glassfish/src/test/java/net/hamnaberg/json/glassfish/GlassfishStreamingJsonParserTest.java b/glassfish/src/test/java/net/hamnaberg/json/glassfish/GlassfishStreamingJsonParserTest.java
@@ -0,0 +1,11 @@
+package net.hamnaberg.json.glassfish;
+
+import net.hamnaberg.json.io.JsonParser;
+import net.hamnaberg.json.io.JsonParserAbstractTest;
+
+public class GlassfishStreamingJsonParserTest extends JsonParserAbstractTest {
+    @Override
+    protected JsonParser getParser() {
+        return new GlassfishJsonParser();
+    }
+}
diff --git a/gson/pom.xml b/gson/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>net.hamnaberg.json</groupId>
     <artifactId>immutable-json</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <name>Immutable JSON :: GSON parser</name>
   <artifactId>immutable-json-gson</artifactId>
@@ -50,25 +50,11 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.9</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs>
-            <arg>--patch-module</arg>
-            <arg>immutable.json.core=${settings.localRepository}/net/hamnaberg/json/immutable-json-core/${project.version}/immutable-json-core-${project.version}-tests.jar</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/jackson/pom.xml b/jackson/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>net.hamnaberg.json</groupId>
     <artifactId>immutable-json</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
   </parent>
   <name>Immutable JSON :: Jackson parser</name>
   <artifactId>immutable-json-jackson</artifactId>
@@ -64,25 +64,14 @@
       <artifactId>jackson-core</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
   </dependencies>
-<!--
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <compilerArgs>
-            <arg>&#45;&#45;patch-module</arg>
-            <arg>immutable.json.core=${settings.localRepository}/net/hamnaberg/json/immutable-json-core/${project.version}/immutable-json-core-${project.version}-tests.jar</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
--->
 </project>
diff --git a/jackson/src/main/java/module-info.java b/jackson/src/main/java/module-info.java
@@ -2,4 +2,5 @@
     requires immutable.json.core;
     requires immutable.json.codec;
     requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.annotation;
 }