From 2609b4e609f512fe9faaa1d7dbdc7684a0caca90 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Fri, 24 Sep 2021 15:17:33 +0200
Subject: [PATCH] Json.createObjectBuilder(Map) has impractical type bounds

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 .github/workflows/pr.yml                                    | 3 ++-
 .../java/org/eclipse/parsson/JsonObjectBuilderImpl.java     | 6 +++---
 .../src/main/java/org/eclipse/parsson/JsonProviderImpl.java | 2 +-
 pom.xml                                                     | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9c61004e..fd156afd 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -33,5 +33,6 @@ jobs:
       with:
         distribution: 'zulu'
         java-version: ${{ matrix.java_version }}
+        cache: 'maven'
     - name: Verify
-      run: mvn -B -V -U -C -Poss-release clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true
\ No newline at end of file
+      run: mvn -B -V -U -C -Poss-release,staging clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true
\ No newline at end of file
diff --git a/impl/src/main/java/org/eclipse/parsson/JsonObjectBuilderImpl.java b/impl/src/main/java/org/eclipse/parsson/JsonObjectBuilderImpl.java
index 43619d4e..a47e6e43 100644
--- a/impl/src/main/java/org/eclipse/parsson/JsonObjectBuilderImpl.java
+++ b/impl/src/main/java/org/eclipse/parsson/JsonObjectBuilderImpl.java
@@ -60,14 +60,14 @@ class JsonObjectBuilderImpl implements JsonObjectBuilder {
         this.rejectDuplicateKeys = rejectDuplicateKeys;
     }
 
-    JsonObjectBuilderImpl(Map<String, Object> map, BufferPool bufferPool) {
+    JsonObjectBuilderImpl(Map<String, ?> map, BufferPool bufferPool) {
         this.bufferPool = bufferPool;
         valueMap = new LinkedHashMap<>();
         populate(map);
         rejectDuplicateKeys = false;
     }
     
-    JsonObjectBuilderImpl(Map<String, Object> map, BufferPool bufferPool, boolean rejectDuplicateKeys) {
+    JsonObjectBuilderImpl(Map<String, ?> map, BufferPool bufferPool, boolean rejectDuplicateKeys) {
     	this.bufferPool = bufferPool;
     	valueMap = new LinkedHashMap<>();
     	populate(map);
@@ -189,7 +189,7 @@ public JsonObject build() {
         return new JsonObjectImpl(snapshot, bufferPool);
     }
 
-    private void populate(Map<String, Object> map) {
+    private void populate(Map<String, ?> map) {
         final Set<String> fields = map.keySet();
         for (String field : fields) {
             Object value = map.get(field);
diff --git a/impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java b/impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java
index 05ca3048..1204236d 100644
--- a/impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java
+++ b/impl/src/main/java/org/eclipse/parsson/JsonProviderImpl.java
@@ -183,7 +183,7 @@ public JsonObjectBuilder createObjectBuilder(JsonObject object) {
     }
 
     @Override
-    public JsonObjectBuilder createObjectBuilder(Map<String, Object> map) {
+    public JsonObjectBuilder createObjectBuilder(Map<String, ?> map) {
         return new JsonObjectBuilderImpl(map, bufferPool);
     }
 
diff --git a/pom.xml b/pom.xml
index d3b1c06b..88e8b672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
         <spotbugs.threshold>Low</spotbugs.threshold>
         <spotbugs.version>4.2.2</spotbugs.version>
 
-        <jakarta.json-api.version>2.0.1</jakarta.json-api.version>
+        <jakarta.json-api.version>2.1.0-RC1</jakarta.json-api.version>
 
         <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
         <jakarta.xml.bind-api.version>3.0.1</jakarta.xml.bind-api.version>