From 840285deabcc2046296e3889c84915b425781086 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Fri, 7 Jun 2024 16:35:06 +0200
Subject: [PATCH] Integrate Rest 4.0.0

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 pom.xml                                               |  2 +-
 rest/pom.xml                                          | 11 ++++++++++-
 .../eclipse/parsson/media/JsonValueBodyReader.java    |  8 +++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0755b8da..c9121862 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
 
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
         <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
-        <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
+        <jakarta.ws.rs-api.version>4.0.0</jakarta.ws.rs-api.version>
     </properties>
 
     <build>
diff --git a/rest/pom.xml b/rest/pom.xml
index 8016078a..08134a1e 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 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
@@ -69,6 +69,15 @@
                         <goals>
                             <goal>manifest</goal>
                         </goals>
+                        <configuration>
+                            <instructions>
+                                <Import-Package>
+                                    jakarta.annotation*;version=!,
+                                    jakarta.ws.rs*;version=!,
+                                    *
+                                </Import-Package>
+                            </instructions>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/rest/src/main/java/org/eclipse/parsson/media/JsonValueBodyReader.java b/rest/src/main/java/org/eclipse/parsson/media/JsonValueBodyReader.java
index 70ffc243..d8f8a47b 100644
--- a/rest/src/main/java/org/eclipse/parsson/media/JsonValueBodyReader.java
+++ b/rest/src/main/java/org/eclipse/parsson/media/JsonValueBodyReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -47,6 +47,12 @@ public class JsonValueBodyReader implements MessageBodyReader<JsonValue> {
     private static final String JSON = "json";
     private static final String PLUS_JSON = "+json";
 
+    /**
+     * Constructor.
+     */
+    public JsonValueBodyReader() {
+    }
+
     @Override
     public boolean isReadable(Class<?> aClass, Type type,
             Annotation[] annotations, MediaType mediaType) {