From fda87c3933ab0dc6402b2453a691457df1e66554 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 19 May 2022 14:05:27 +0200
Subject: [PATCH 01/24] #376: JsonProviderTest fails if run after other Junits
 in a test suite

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .../jsonp/api/provider/JsonProviderTest.java  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tck/tck-tests/src/main/java/ee/jakarta/tck/jsonp/api/provider/JsonProviderTest.java b/tck/tck-tests/src/main/java/ee/jakarta/tck/jsonp/api/provider/JsonProviderTest.java
index 6cb37497..17731d23 100644
--- a/tck/tck-tests/src/main/java/ee/jakarta/tck/jsonp/api/provider/JsonProviderTest.java
+++ b/tck/tck-tests/src/main/java/ee/jakarta/tck/jsonp/api/provider/JsonProviderTest.java
@@ -34,6 +34,8 @@
 import jakarta.json.stream.JsonGeneratorFactory;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParserFactory;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -46,7 +48,23 @@ public class JsonProviderTest {
 
     private static final String JSONP_PROVIDER_FACTORY = "jakarta.json.provider";
 
-    
+    private String factoryValue;
+
+    @BeforeEach
+    public void setUp() {
+        factoryValue = System.getProperty(JSONP_PROVIDER_FACTORY);
+        System.clearProperty(JSONP_PROVIDER_FACTORY);
+    }
+
+    @AfterEach
+    public void reset() {
+        if (factoryValue != null) {
+            System.setProperty(JSONP_PROVIDER_FACTORY, factoryValue);
+        } else {
+            System.clearProperty(JSONP_PROVIDER_FACTORY);
+        }
+    }
+
     /**
      * Verifies it is possible to obtain the JsonProvider implementation from a System property.
      */

From df40e20a4ffb815dd50557402bb62c0844a9085a Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 19 May 2022 17:46:50 +0200
Subject: [PATCH 02/24] simplify the provider lookup, add logging

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .../java/jakarta/json/spi/JsonProvider.java   | 96 +++++++++----------
 api/src/main/java/module-info.java            |  1 +
 2 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/api/src/main/java/jakarta/json/spi/JsonProvider.java b/api/src/main/java/jakarta/json/spi/JsonProvider.java
index 13f89dbc..02ca9045 100644
--- a/api/src/main/java/jakarta/json/spi/JsonProvider.java
+++ b/api/src/main/java/jakarta/json/spi/JsonProvider.java
@@ -23,11 +23,15 @@
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ServiceLoader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import jakarta.json.JsonArray;
 import jakarta.json.JsonArrayBuilder;
@@ -74,6 +78,9 @@ public abstract class JsonProvider {
     private static final String DEFAULT_PROVIDER
             = "org.eclipse.parsson.JsonProviderImpl";
 
+    /** A logger */
+    private static final Logger LOG = Logger.getLogger(JsonProvider.class.getName());
+
     /**
      * Default constructor.
      */
@@ -100,48 +107,62 @@ protected JsonProvider() {
      * @return a JSON provider
      */
     public static JsonProvider provider() {
-        if (LazyFactoryLoader.JSON_PROVIDER != null) {
-            return newInstance(LazyFactoryLoader.JSON_PROVIDER);
+        LOG.log(Level.FINE, "Checking system property {0}", JSONP_PROVIDER_FACTORY);
+        final String factoryClassName = System.getSecurityManager() != null
+                ? AccessController.doPrivileged((PrivilegedAction<String>) () -> System.getProperty(JSONP_PROVIDER_FACTORY))
+                : System.getProperty(JSONP_PROVIDER_FACTORY);
+        if (factoryClassName != null) {
+            JsonProvider provider = newInstance(factoryClassName);
+            LOG.log(Level.FINE, "System property used; returning object [{0}]",
+                    provider.getClass().getName());
+            return provider;
         }
+
+        LOG.log(Level.FINE, "Checking ServiceLoader");
         ServiceLoader<JsonProvider> loader = ServiceLoader.load(JsonProvider.class);
         Iterator<JsonProvider> it = loader.iterator();
         if (it.hasNext()) {
-            return it.next();
+            JsonProvider provider = it.next();
+            LOG.log(Level.FINE, "ServiceLoader loading Facility used; returning object [{0}]",
+                    provider.getClass().getName());
+            return provider;
         }
 
         // handling OSGi (specific default)
         if (isOsgi()) {
-            JsonProvider result = lookupUsingOSGiServiceLoader(JsonProvider.class);
-            if (result != null) {
-                return result;
+            LOG.log(Level.FINE, "Checking OSGi");
+            JsonProvider provider = lookupUsingOSGiServiceLoader(JsonProvider.class);
+            if (provider != null) {
+                LOG.log(Level.FINE, "OSGi loading facility used; returning object [{0}].",
+                        provider.getClass().getName());
+                return provider;
             }
         }
 
-        try {
-            Class<?> clazz = Class.forName(DEFAULT_PROVIDER);
-            return (JsonProvider) clazz.getConstructor().newInstance();
-        } catch (ClassNotFoundException x) {
-            throw new JsonException(
-                    "Provider " + DEFAULT_PROVIDER + " not found", x);
-        } catch (Exception x) {
-            throw new JsonException(
-                    "Provider " + DEFAULT_PROVIDER + " could not be instantiated: " + x,
-                    x);
-        }
+        // else no provider found
+        LOG.fine("Trying to create the platform default provider");
+        return newInstance(DEFAULT_PROVIDER);
     }
 
     /**
      * Creates a new instance from the specified class
-     * @param clazz class to instance
+     * @param className class to instantiate
      * @return the JsonProvider instance
      * @throws IllegalArgumentException for reflection issues
      */
-    private static JsonProvider newInstance(Class<? extends JsonProvider> clazz) {
-        checkPackageAccess(clazz.getName());
+    private static JsonProvider newInstance(String className) {
         try {
+            checkPackageAccess(className);
+            @SuppressWarnings({"unchecked"})
+            Class<JsonProvider> clazz = (Class<JsonProvider>) Class.forName(className);
             return clazz.getConstructor().newInstance();
-        } catch (ReflectiveOperationException e) {
-            throw new IllegalArgumentException("Unable to create " + clazz.getName(), e);
+        } catch (ClassNotFoundException x) {
+            throw new JsonException(
+                    "Provider " + DEFAULT_PROVIDER + " not found", x);
+        } catch (Exception x) {
+            throw new JsonException(
+                    "Provider " + DEFAULT_PROVIDER + " could not be instantiated: " + x,
+                    x);
         }
     }
 
@@ -617,37 +638,10 @@ private static <T> T lookupUsingOSGiServiceLoader(Class<? extends T> serviceClas
             @SuppressWarnings({"unchecked"})
             Iterator<? extends T> iter = ((Iterable<? extends T>) m.invoke(null, (Object[]) args)).iterator();
             return iter.hasNext() ? iter.next() : null;
-        } catch (Exception ignored) {
-            // log and continue
+        } catch (Exception ex) {
+            LOG.log(Level.FINE, "Unable to find from OSGi: [" + serviceClass.getName() + "]", ex);
             return null;
         }
     }
 
-    /**
-     * Lazy loads the class specified in System property with the key JSONP_PROVIDER_FACTORY.
-     * If no property is set, the value of {@link #JSON_PROVIDER} will be null.
-     * In case of errors an IllegalStateException is thrown.
-     *
-     */
-    @SuppressWarnings("unchecked")
-    private static class LazyFactoryLoader {
-
-        /**
-         * JSON provider class
-         */
-        private static final Class<? extends JsonProvider> JSON_PROVIDER;
-
-        static {
-            String className = System.getProperty(JSONP_PROVIDER_FACTORY);
-            if (className != null) {
-                try {
-                    JSON_PROVIDER = (Class<? extends JsonProvider>) Class.forName(className);
-                } catch (ReflectiveOperationException e) {
-                    throw new IllegalStateException("Unable to create " + className, e);
-                }
-            } else {
-                JSON_PROVIDER = null;
-            }
-        }
-    }
 }
diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
index 12cd6ba9..4ff532f5 100644
--- a/api/src/main/java/module-info.java
+++ b/api/src/main/java/module-info.java
@@ -18,6 +18,7 @@
  * Jakarta JSON Processing API.
  */
 module jakarta.json {
+    requires java.logging;
     exports jakarta.json;
     exports jakarta.json.spi;
     exports jakarta.json.stream;

From 0cbe3723caf3e8135f1f8d3ffd7349d5ba36a9c0 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 19 May 2022 18:09:34 +0200
Subject: [PATCH 03/24] cpright

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 api/src/main/java/module-info.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
index 4ff532f5..aad8a0e0 100644
--- a/api/src/main/java/module-info.java
+++ b/api/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at

From f278212fc376798aa933746592904c789bf576cb Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 19 May 2022 18:19:31 +0200
Subject: [PATCH 04/24] fix exception message

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 api/src/main/java/jakarta/json/spi/JsonProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/jakarta/json/spi/JsonProvider.java b/api/src/main/java/jakarta/json/spi/JsonProvider.java
index 02ca9045..4587f77d 100644
--- a/api/src/main/java/jakarta/json/spi/JsonProvider.java
+++ b/api/src/main/java/jakarta/json/spi/JsonProvider.java
@@ -158,10 +158,10 @@ private static JsonProvider newInstance(String className) {
             return clazz.getConstructor().newInstance();
         } catch (ClassNotFoundException x) {
             throw new JsonException(
-                    "Provider " + DEFAULT_PROVIDER + " not found", x);
+                    "Provider " + className + " not found", x);
         } catch (Exception x) {
             throw new JsonException(
-                    "Provider " + DEFAULT_PROVIDER + " could not be instantiated: " + x,
+                    "Provider " + className + " could not be instantiated: " + x,
                     x);
         }
     }

From fc14a6e8f821997038ad57d25dc15559baa4fd65 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 19 May 2022 18:21:49 +0200
Subject: [PATCH 05/24] fix javadoc

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 api/src/main/java/jakarta/json/spi/JsonProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/jakarta/json/spi/JsonProvider.java b/api/src/main/java/jakarta/json/spi/JsonProvider.java
index 4587f77d..28fe280a 100644
--- a/api/src/main/java/jakarta/json/spi/JsonProvider.java
+++ b/api/src/main/java/jakarta/json/spi/JsonProvider.java
@@ -146,9 +146,9 @@ public static JsonProvider provider() {
 
     /**
      * Creates a new instance from the specified class
-     * @param className class to instantiate
+     * @param className name of the class to instantiate
      * @return the JsonProvider instance
-     * @throws IllegalArgumentException for reflection issues
+     * @throws JsonException for issues during creation of an instance of the JsonProvider
      */
     private static JsonProvider newInstance(String className) {
         try {

From 83493a354619f00e5c8cfecbc3b7e333aa4cafd9 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 19 May 2022 18:28:07 +0200
Subject: [PATCH 06/24] update build plugins

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 api/pom.xml | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 61599d92..d1130256 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -83,7 +83,7 @@
         <spotbugs.exclude>${project.basedir}/../etc/spotbugs-exclude.xml</spotbugs.exclude>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Low</spotbugs.threshold>
-        <spotbugs.version>4.3.0</spotbugs.version>
+        <spotbugs.version>4.7.1.0</spotbugs.version>
 
         <non.final>false</non.final>
         <extension.name>jakarta.json</extension.name>
@@ -95,20 +95,15 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.commonjava.maven.plugins</groupId>
-                    <artifactId>directory-maven-plugin</artifactId>
-                    <version>0.3.1</version>
-                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>1.4</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.copyright</groupId>
@@ -118,7 +113,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.10.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.build</groupId>
@@ -128,7 +123,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.1</version>
+                    <version>5.1.7</version>
                     <configuration>
                         <instructions>
                             <_noextraheaders>true</_noextraheaders>
@@ -138,7 +133,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -148,12 +143,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
@@ -402,7 +397,6 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <configuration>
-                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
                     <fork>true</fork>
                     <excludeFilterFile>${spotbugs.exclude}</excludeFilterFile>
                     <failThreshold>High</failThreshold>

From 1b1f53188e24e34e6514ec8011fd5217e69b80cf Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 19 May 2022 14:59:00 +0200
Subject: [PATCH 07/24] remove obsolete tck runner belonging to the
 implementation project(s)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 impl-tck/pom.xml                        |  65 -------------
 impl-tck/tck-tests-pluggability/pom.xml |  63 ------------
 impl-tck/tck-tests/pom.xml              | 122 ------------------------
 3 files changed, 250 deletions(-)
 delete mode 100644 impl-tck/pom.xml
 delete mode 100644 impl-tck/tck-tests-pluggability/pom.xml
 delete mode 100644 impl-tck/tck-tests/pom.xml

diff --git a/impl-tck/pom.xml b/impl-tck/pom.xml
deleted file mode 100644
index ebe4884a..00000000
--- a/impl-tck/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-<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/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.eclipse.jsonp</groupId>
-    <artifactId>tck-project</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>tck-tests</module>
-        <module>tck-tests-pluggability</module>
-    </modules>
-
-    <properties>
-        <jsonp-api.version>2.1.0</jsonp-api.version>
-        <jsonp-impl.version>1.1.0</jsonp-impl.version>
-        <jsonp-tck.version>2.1.0-SNAPSHOT</jsonp-tck.version>
-    </properties>
-
-    <dependencies>
-        <!-- this API hides the one used by the implementation -->
-<!--        <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-api</artifactId>
-            <version>${jsonp-api.version}</version>
-            <scope>test</scope>
-        </dependency>-->
-        <!-- this is implementation only -->
-        <dependency>
-            <groupId>org.eclipse.parsson</groupId>
-            <artifactId>parsson</artifactId>
-            <version>${jsonp-impl.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- this is API+Impl bundle -->
-<!--        <dependency>-->
-<!--            <groupId>org.eclipse.parsson</groupId>-->
-<!--            <artifactId>jakarta.json</artifactId>-->
-<!--            <version>${jsonp-impl.version}</version>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-    </dependencies>
-
-</project>
diff --git a/impl-tck/tck-tests-pluggability/pom.xml b/impl-tck/tck-tests-pluggability/pom.xml
deleted file mode 100644
index f5fa1650..00000000
--- a/impl-tck/tck-tests-pluggability/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-<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/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.eclipse.jsonp</groupId>
-        <artifactId>tck-project</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>jakarta.json-tck-tests-pluggability</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-tck-tests-pluggability</artifactId>
-            <version>${jsonp-tck.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-tck-common</artifactId>
-            <version>${jsonp-tck.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M4</version>
-                <configuration>
-                    <dependenciesToScan>
-                        <dependency>jakarta.json:jakarta.json-tck-tests-pluggability</dependency>
-                    </dependenciesToScan>
-                    <trimStackTrace>false</trimStackTrace>
-                    <failIfNoTests>true</failIfNoTests>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/impl-tck/tck-tests/pom.xml b/impl-tck/tck-tests/pom.xml
deleted file mode 100644
index 3e376a4c..00000000
--- a/impl-tck/tck-tests/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-<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/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.eclipse.jsonp</groupId>
-        <artifactId>tck-project</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>jakarta.json-tck-tests</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-tck-tests</artifactId>
-            <version>${jsonp-tck.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-tck-common</artifactId>
-            <version>${jsonp-tck.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.netbeans.tools</groupId>
-            <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.4</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                  <execution>
-                    <id>copy</id>
-                    <phase>generate-test-sources</phase>
-                    <goals>
-                        <goal>copy</goal>
-                    </goals>
-                    <configuration>
-                      <artifactItems>
-                           <artifactItem>
-                              <groupId>jakarta.json</groupId>
-                              <artifactId>jakarta.json-api</artifactId>
-                              <version>${jsonp-api.version}</version>
-                              <type>jar</type>
-                              <overWrite>true</overWrite>
-                              <outputDirectory>${project.build.directory}/signaturedirectory</outputDirectory>
-                              <destFileName>jakarta.json-api.jar</destFileName>
-                          </artifactItem>
-                      </artifactItems>
-                    </configuration>
-                  </execution>
-                </executions>
-            </plugin> 
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M4</version>
-                <configuration>
-                    <dependenciesToScan>
-                        <dependency>jakarta.json:jakarta.json-tck-tests</dependency>
-                    </dependenciesToScan>
-                    <trimStackTrace>false</trimStackTrace>
-                    <failIfNoTests>true</failIfNoTests>
-                    <forkCount>1</forkCount>
-                    <reuseForks>false</reuseForks>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>sigtests</id>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>**/JSONPSigTest.java</include>
-                            </includes>
-                            <systemPropertyVariables>
-                                <jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
-                                <signature.sigTestClasspath>${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</signature.sigTestClasspath>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>default-test</id>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/JSONPSigTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

From 04b4354e7fe1776ec69968720240f8a2ed174784 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 21 Jul 2022 09:42:01 +0200
Subject: [PATCH 08/24] make the build jdk18 friendly (no comp warnings)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 api/src/main/java/jakarta/json/EmptyArray.java               | 5 ++++-
 api/src/main/java/jakarta/json/EmptyObject.java              | 5 ++++-
 .../main/java/jakarta/json/stream/JsonParsingException.java  | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/jakarta/json/EmptyArray.java b/api/src/main/java/jakarta/json/EmptyArray.java
index fcc3f5a7..1d627c3f 100644
--- a/api/src/main/java/jakarta/json/EmptyArray.java
+++ b/api/src/main/java/jakarta/json/EmptyArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -32,6 +32,9 @@ final class EmptyArray extends AbstractList<JsonValue> implements JsonArray, Ser
     /** for serialization */
     private static final long serialVersionUID = 7295439472061642859L;
 
+    /** Default constructor. */
+    EmptyArray() {}
+
     @Override
     public JsonValue get(int index) {
         throw new IndexOutOfBoundsException("Index: " + index);
diff --git a/api/src/main/java/jakarta/json/EmptyObject.java b/api/src/main/java/jakarta/json/EmptyObject.java
index f8c4aa8d..5210318b 100644
--- a/api/src/main/java/jakarta/json/EmptyObject.java
+++ b/api/src/main/java/jakarta/json/EmptyObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -31,6 +31,9 @@ final class EmptyObject extends AbstractMap<String, JsonValue> implements JsonOb
     /** for serialization */
     private static final long serialVersionUID = -1461653546889072583L;
 
+    /** Default constructor. */
+    EmptyObject() {}
+
     @Override
     public Set<Entry<String, JsonValue>> entrySet() {
         return Collections.<Entry<String, JsonValue>>emptySet();
diff --git a/api/src/main/java/jakarta/json/stream/JsonParsingException.java b/api/src/main/java/jakarta/json/stream/JsonParsingException.java
index 06c52c6d..c657083e 100644
--- a/api/src/main/java/jakarta/json/stream/JsonParsingException.java
+++ b/api/src/main/java/jakarta/json/stream/JsonParsingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,7 +30,7 @@ public class JsonParsingException extends JsonException {
     /**
      * The location of the incorrect JSON.
      */
-    private final JsonLocation location;
+    private transient final JsonLocation location;
 
     /**
      * Constructs a new runtime exception with the specified detail message.

From d63dc1136a6dd3975d39c51ce946d06ebd2d4acb Mon Sep 17 00:00:00 2001
From: Eclipse JSON-P Bot <jsonp-bot@eclipse.org>
Date: Thu, 21 Jul 2022 07:49:11 +0000
Subject: [PATCH 09/24] Update API version of jakarta.json:jsonp to 2.1.1

---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index d1130256..c05b4fb7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,7 +30,7 @@
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-api</artifactId>
 
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.1</version>
     <name>Jakarta JSON Processing API</name>
     <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

From dd36904bcd631c2ff122c766dd5bcc3454088aa9 Mon Sep 17 00:00:00 2001
From: Eclipse JSON-P Bot <jsonp-bot@eclipse.org>
Date: Thu, 21 Jul 2022 07:50:17 +0000
Subject: [PATCH 10/24] Update API version of jakarta.json:jsonp to
 2.1.2-SNAPSHOT

---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index c05b4fb7..0d75186d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,7 +30,7 @@
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-api</artifactId>
 
-    <version>2.1.1</version>
+    <version>2.1.2-SNAPSHOT</version>
     <name>Jakarta JSON Processing API</name>
     <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

From 713fc692f24823f2280aceeb471ad6e45851a21b Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Thu, 24 Nov 2022 08:25:52 +0100
Subject: [PATCH 11/24] Wrong version 53 package-info

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 api/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/pom.xml b/api/pom.xml
index 0d75186d..c01010c6 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -265,6 +265,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <release>9</release>
+                    <createMissingPackageInfoClass>false</createMissingPackageInfoClass>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
                         <arg>-Xdoclint:all</arg>
@@ -281,6 +282,7 @@
                         </goals>
                         <configuration>
                             <release>8</release>
+                            <createMissingPackageInfoClass>true</createMissingPackageInfoClass>
                             <excludes>
                                 <exclude>module-info.java</exclude>
                             </excludes>

From a75c9ab8455c4d04b787a6eb18fde5b855ba632c Mon Sep 17 00:00:00 2001
From: Marc Wrobel <marc.wrobel@gmail.com>
Date: Wed, 21 Dec 2022 12:51:37 +0100
Subject: [PATCH 12/24] fix JsonParser javadoc

Signed-off-by: Marc Wrobel <marc.wrobel@gmail.com>
---
 api/src/main/java/jakarta/json/stream/JsonParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/jakarta/json/stream/JsonParser.java b/api/src/main/java/jakarta/json/stream/JsonParser.java
index 0f718492..bd41d204 100644
--- a/api/src/main/java/jakarta/json/stream/JsonParser.java
+++ b/api/src/main/java/jakarta/json/stream/JsonParser.java
@@ -128,7 +128,7 @@
  * while (parser.hasNext() {
  *     Event event = parser.next();
  *     if (event == JsonParser.Event.KEY_NAME ) {
- *         String key = getString();
+ *         String key = parser.getString();
  *         event = parser.next();
  *         if (key.equals("phoneNumber") {
  *             JsonArray phones = parser.getArray();

From 81184d480776346da4d9cc9217cd555aa854e2fa Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 11 May 2023 12:56:35 +0200
Subject: [PATCH 13/24] update build plugins

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 api/pom.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index c01010c6..adf50472 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2011, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -83,7 +83,7 @@
         <spotbugs.exclude>${project.basedir}/../etc/spotbugs-exclude.xml</spotbugs.exclude>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Low</spotbugs.threshold>
-        <spotbugs.version>4.7.1.0</spotbugs.version>
+        <spotbugs.version>4.7.3.4</spotbugs.version>
 
         <non.final>false</non.final>
         <extension.name>jakarta.json</extension.name>
@@ -113,7 +113,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.build</groupId>
@@ -123,7 +123,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.7</version>
+                    <version>5.1.8</version>
                     <configuration>
                         <instructions>
                             <_noextraheaders>true</_noextraheaders>
@@ -133,7 +133,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -143,12 +143,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
@@ -269,10 +269,8 @@
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
                         <arg>-Xdoclint:all</arg>
-                        <arg>-Werror</arg>
                     </compilerArgs>
                     <showDeprecation>true</showDeprecation>
-                    <showWarnings>true</showWarnings>
                 </configuration>
                 <executions>
                     <execution>
@@ -282,7 +280,6 @@
                         </goals>
                         <configuration>
                             <release>8</release>
-                            <createMissingPackageInfoClass>true</createMissingPackageInfoClass>
                             <excludes>
                                 <exclude>module-info.java</exclude>
                             </excludes>

From 080d0e0363e077ece2388b546a70640d80fb44b3 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 11 May 2023 12:57:22 +0200
Subject: [PATCH 14/24] add 21-ea to gh action build

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .github/workflows/maven.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 25376ac8..29b87491 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021 Contributors to the Eclipse Foundation
+# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,6 +16,10 @@ on:
   pull_request:
   push:
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Test on JDK ${{ matrix.java_version }}
@@ -23,13 +27,13 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [ 11, 17-ea ]
+        java_version: [ 11, 17, 21-ea ]
 
     steps:
     - name: Checkout for build
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v3
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.java_version }}

From 190d5ff7c923b49b45bbde42cffe97829e3d1382 Mon Sep 17 00:00:00 2001
From: Eclipse JSON-P Bot <jsonp-bot@eclipse.org>
Date: Thu, 11 May 2023 11:35:01 +0000
Subject: [PATCH 15/24] Update API version of jakarta.json:jsonp to 2.1.2

---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index adf50472..29c876ba 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,7 +30,7 @@
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-api</artifactId>
 
-    <version>2.1.2-SNAPSHOT</version>
+    <version>2.1.2</version>
     <name>Jakarta JSON Processing API</name>
     <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

From dc41223b666377fc2777c568bbf64f4498feebad Mon Sep 17 00:00:00 2001
From: Eclipse JSON-P Bot <jsonp-bot@eclipse.org>
Date: Thu, 11 May 2023 11:37:16 +0000
Subject: [PATCH 16/24] Update API version of jakarta.json:jsonp to
 2.1.3-SNAPSHOT

---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index 29c876ba..2bee6a61 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,7 +30,7 @@
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-api</artifactId>
 
-    <version>2.1.2</version>
+    <version>2.1.3-SNAPSHOT</version>
     <name>Jakarta JSON Processing API</name>
     <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

From 7ff10875de66b3f893fce22f45b93d95afd71f1f Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 13 Jul 2023 10:33:15 +0200
Subject: [PATCH 17/24] add support for OSGi Service Loader Mediator

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 api/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/api/pom.xml b/api/pom.xml
index 2bee6a61..9b708aa8 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -331,6 +331,16 @@
                             !org.eclipse.parsson,
                             *
                         </Import-Package>
+                        <!-- optional to allow usage with hk2 resource locator as a fallback -->
+                        <Require-Capability><![CDATA[
+                          osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)
+                            (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                          osgi.serviceloader;
+                            filter:="(osgi.serviceloader=jakarta.json.spi.JsonProvider";
+                              osgi.serviceloader="jakarta.json.spi.JsonProvider";
+                              cardinality:=multiple;resolution:=optional
+                          ]]>
+                        </Require-Capability>
                     </instructions>
                 </configuration>
                 <executions>

From ed5c55c679cdb5eeadd3c90545255f44f920ed10 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 13 Jul 2023 10:36:43 +0200
Subject: [PATCH 18/24] update parent, build plugins

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 api/pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 9b708aa8..0781dd53 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.7</version>
+        <version>1.0.8</version>
         <relativePath/>
     </parent>
 
@@ -83,7 +83,7 @@
         <spotbugs.exclude>${project.basedir}/../etc/spotbugs-exclude.xml</spotbugs.exclude>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Low</spotbugs.threshold>
-        <spotbugs.version>4.7.3.4</spotbugs.version>
+        <spotbugs.version>4.7.3.5</spotbugs.version>
 
         <non.final>false</non.final>
         <extension.name>jakarta.json</extension.name>
@@ -98,12 +98,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.copyright</groupId>
@@ -123,7 +123,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.8</version>
+                    <version>5.1.9</version>
                     <configuration>
                         <instructions>
                             <_noextraheaders>true</_noextraheaders>
@@ -138,7 +138,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -148,7 +148,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
@@ -336,7 +336,7 @@
                           osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)
                             (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
                           osgi.serviceloader;
-                            filter:="(osgi.serviceloader=jakarta.json.spi.JsonProvider";
+                            filter:="(osgi.serviceloader=jakarta.json.spi.JsonProvider)";
                               osgi.serviceloader="jakarta.json.spi.JsonProvider";
                               cardinality:=multiple;resolution:=optional
                           ]]>

From 357e30ae7523782d0a6c7718d70994af87fce92b Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Fri, 20 Oct 2023 14:12:00 +0200
Subject: [PATCH 19/24] Update gh action build

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 29b87491..5922b5a8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,7 +27,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [ 11, 17, 21-ea ]
+        java_version: [ 11, 17, 21 ]
 
     steps:
     - name: Checkout for build

From b7f9d851b854686ccbc1495ad8c71615265f6b71 Mon Sep 17 00:00:00 2001
From: Eclipse JSON-P Bot <jsonp-bot@eclipse.org>
Date: Fri, 20 Oct 2023 12:30:15 +0000
Subject: [PATCH 20/24] Update API version of jakarta.json:jsonp to 2.1.3

---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index 0781dd53..0f4906a6 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,7 +30,7 @@
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-api</artifactId>
 
-    <version>2.1.3-SNAPSHOT</version>
+    <version>2.1.3</version>
     <name>Jakarta JSON Processing API</name>
     <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

From 6e2cd612b228b7bc2317a074c1357e030e50716d Mon Sep 17 00:00:00 2001
From: Eclipse JSON-P Bot <jsonp-bot@eclipse.org>
Date: Fri, 20 Oct 2023 12:32:51 +0000
Subject: [PATCH 21/24] Update API version of jakarta.json:jsonp to
 2.1.4-SNAPSHOT

---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index 0f4906a6..2f76e074 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,7 +30,7 @@
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-api</artifactId>
 
-    <version>2.1.3</version>
+    <version>2.1.4-SNAPSHOT</version>
     <name>Jakarta JSON Processing API</name>
     <description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
     <url>https://github.com/eclipse-ee4j/jsonp</url>

From 05d3a9a0860734074e8c5b21b1ee33d19e82c8ef Mon Sep 17 00:00:00 2001
From: Gurunandan Rao <gurunandan.rao@oracle.com>
Date: Mon, 18 Dec 2023 16:14:33 +0530
Subject: [PATCH 22/24] use classpath for jakarta api libraries.

Signed-off-by: Gurunandan Rao <gurunandan.rao@oracle.com>
---
 tck/tck-dist-eftl/src/main/bin/pom.xml        | 23 ++++---------------
 .../main/bin/tck-tests-pluggability/pom.xml   | 12 +++-------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/tck/tck-dist-eftl/src/main/bin/pom.xml b/tck/tck-dist-eftl/src/main/bin/pom.xml
index 09be95a5..7cf50b2b 100644
--- a/tck/tck-dist-eftl/src/main/bin/pom.xml
+++ b/tck/tck-dist-eftl/src/main/bin/pom.xml
@@ -16,47 +16,36 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
         <version>1.0.7</version>
         <relativePath/>
     </parent>
-
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-tck-impl</artifactId>
     <version>${project.version}</version>
     <packaging>pom</packaging>
-
     <properties>
         <!-- Vendor Implementation (VI) -->
         <jsonp-api.groupId>jakarta.json</jsonp-api.groupId>
         <jsonp-api.artifactId>jakarta.json-api</jsonp-api.artifactId>
         <jsonp-api.version>2.1.0</jsonp-api.version>
-
         <!-- Compatible Implementation (CI) -->
         <jsonp-impl.groupId>org.eclipse.parsson</jsonp-impl.groupId>
         <jsonp-impl.artifactId>parsson</jsonp-impl.artifactId>
         <jsonp-impl.version>1.1.0</jsonp-impl.version>
-
         <!-- TCK -->
         <jakarta.json-tck.version>${project.version}</jakarta.json-tck.version>
-
         <!-- properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jimage.dir>\${project.build.directory}/jdk-bundle</jimage.dir>
-
         <!-- !!! DO NOT EDIT !!! -->
         <jakarta.json-api.version>2.1.0</jakarta.json-api.version>
         <impl.alltests>true</impl.alltests>
     </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -68,12 +57,10 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <modules>
         <module>tck-tests</module>
         <module>tck-tests-pluggability</module>
     </modules>
-
     <dependencies>
         <dependency>
             <groupId>\${jsonp-api.groupId}</groupId>
@@ -92,7 +79,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <defaultGoal>verify</defaultGoal>
         <pluginManagement>
@@ -120,14 +106,14 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>3.0.0-M5</version>
                     <configuration>
+                        <useModulePath>false</useModulePath>
                         <trimStackTrace>false</trimStackTrace>
                         <failIfNoTests>\${impl.alltests}</failIfNoTests>
                         <forkCount>1</forkCount>
                         <reuseForks>false</reuseForks>
                         <systemPropertyVariables>
                             <jimage.dir>\${jimage.dir}</jimage.dir>
-                            <signature.sigTestClasspath>
-                                \${project.build.directory}/signaturedirectory/jakarta.json-api.jar:\${jimage.dir}/java.base:\${jimage.dir}/java.rmi:\${jimage.dir}/java.sql:\${jimage.dir}/java.naming
+                            <signature.sigTestClasspath>\${project.build.directory}/signaturedirectory/jakarta.json-api.jar:\${jimage.dir}/java.base:\${jimage.dir}/java.rmi:\${jimage.dir}/java.sql:\${jimage.dir}/java.naming
                             </signature.sigTestClasspath>
                         </systemPropertyVariables>
                     </configuration>
@@ -135,7 +121,6 @@
             </plugins>
         </pluginManagement>
     </build>
-
     <profiles>
         <profile>
             <id>single-test</id>
@@ -149,4 +134,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml b/tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml
index 61f8934e..80a0d74c 100644
--- a/tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml
+++ b/tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml
@@ -16,21 +16,15 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>jakarta.json</groupId>
         <artifactId>jakarta.json-tck-impl</artifactId>
         <version>${project.version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
     <artifactId>tck-tests-pluggability</artifactId>
-
     <dependencies>
         <dependency>
             <groupId>jakarta.json</groupId>
@@ -38,7 +32,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -48,8 +41,9 @@
                     <dependenciesToScan>
                         <dependency>jakarta.json:jakarta.json-tck-tests-pluggability</dependency>
                     </dependenciesToScan>
+                    <useModulePath>false</useModulePath>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file

From 29c792a4c775d5152d52fd0729d36d160dd64174 Mon Sep 17 00:00:00 2001
From: Gregor Gottschewski
 <85785843+Gregor-Gottschewski@users.noreply.github.com>
Date: Sat, 10 Feb 2024 18:10:51 +0100
Subject: [PATCH 23/24] Fix typo in Java Doc

---
 api/src/main/java/jakarta/json/Json.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/jakarta/json/Json.java b/api/src/main/java/jakarta/json/Json.java
index 373ab4c5..3f47967f 100644
--- a/api/src/main/java/jakarta/json/Json.java
+++ b/api/src/main/java/jakarta/json/Json.java
@@ -255,7 +255,7 @@ public static JsonArrayBuilder createArrayBuilder(JsonArray array) {
 
     /**
      * Creates a JSON array builder, initialized with the content of specified {@code collection}.
-     * If the @{code collection} contains {@link Optional}s then resulting JSON array builder
+     * If the {@code collection} contains {@link Optional}s then resulting JSON array builder
      * contains the value from the {@code collection} only if the {@link Optional} is not empty.
      *
      * @param collection the initial data for the builder

From 21733cff9ddf08338710d87d23739c9c3276553f Mon Sep 17 00:00:00 2001
From: Gregor Gottschewski
 <85785843+Gregor-Gottschewski@users.noreply.github.com>
Date: Sun, 11 Feb 2024 12:43:31 +0100
Subject: [PATCH 24/24] Update copyright year in header

---
 api/src/main/java/jakarta/json/Json.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/jakarta/json/Json.java b/api/src/main/java/jakarta/json/Json.java
index 3f47967f..736f7aa2 100644
--- a/api/src/main/java/jakarta/json/Json.java
+++ b/api/src/main/java/jakarta/json/Json.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at