Solve conflicts

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>

api/src/main/java/jakarta/json/spi/JsonProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022 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
@@ -105,12 +105,11 @@ protected JsonProvider() {
      *
      * @see ServiceLoader
      * @return a JSON provider
-     * 
      */
     public static JsonProvider provider() {
         return provider(null);
     }
-    
+
     /**
      * Creates a JSON provider object.
      *
@@ -133,11 +132,18 @@ public static JsonProvider provider() {
      * @param providerClassName The name of the class to be found from the {@link ServiceLoader#load(Class)}.
      * @return a JSON provider
      * 
-     * @since 2.1.1
+     * @since 2.2.0
      */
     public static JsonProvider provider(String providerClassName) {
-        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");
@@ -146,6 +152,8 @@ public static JsonProvider provider(String providerClassName) {
         while (it.hasNext()) {
             JsonProvider provider = it.next();
             if (providerClassName == null || provider.getClass().getName().equals(providerClassName)) {
+                LOG.log(Level.FINE, "ServiceLoader loading Facility used; returning object [{0}]",
+                        provider.getClass().getName());
                 return provider;
             }
         }