commit 7680e0848c24bc79eb6aea3c90635479e22bc9a9
author Arjan Tijms <arjan.tijms@gmail.com> Mon Mar 07 11:57:54 2022 +0100
committer Arjan Tijms <arjan.tijms@gmail.com> Mon Mar 07 11:57:54 2022 +0100
tree 64576e49947693973f3bfef90fa1cfe620f017cc
parent bacef5b2516b9f7dda99cae925fb938207143b2c

Restore JSON support for REST

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>

appserver/featuresets/web/pom.xml

diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
index 987973c..a3df966 100644
--- a/appserver/featuresets/web/pom.xml
+++ b/appserver/featuresets/web/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021 Contributors to Eclipse Foundation.
+    Copyright (c) 2021, 2022 Contributors to Eclipse Foundation.
     Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -163,9 +163,8 @@
             </exclusions>
           </dependency>
 
-        <!-- jersey -->
-        <!-- TODO: see https://github.com/eclipse-ee4j/jersey/issues/4454 -->
-<!--        <dependency>
+        <!-- Jersey -->
+        <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-moxy</artifactId>
             <exclusions>
@@ -174,7 +173,7 @@
                     <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.ext.cdi</groupId>
             <artifactId>jersey-cdi1x</artifactId>
@@ -225,8 +224,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- TODO: see https://github.com/eclipse-ee4j/jersey/issues/4454 -->
-<!--        <dependency>
+        <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-processing</artifactId>
             <exclusions>
@@ -235,7 +233,7 @@
                     <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.ext</groupId>
             <artifactId>jersey-mvc</artifactId>
@@ -1662,6 +1660,16 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson-media</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jsonp-jaxrs</artifactId>
             <exclusions>

appserver/pom.xml

diff --git a/appserver/pom.xml b/appserver/pom.xml
index 9e4c74e..d32a200 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -428,6 +428,11 @@
                 <version>${parsson.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.eclipse.parsson</groupId>
+                <artifactId>parsson-media</artifactId>
+                <version>${parsson.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.eclipse</groupId>
                 <artifactId>yasson</artifactId>
                 <version>${yasson.version}</version>