[RESTEASY-1665] Use final releases of javax.json.bind-api and yasson …

…+ misc minor fixes
resteasy · Aug 28, 2017 · bd91946 · bd91946
1 parent 1fed896
commit bd91946
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 11 deletions.
diff --git a/jboss-modules/src/main/resources/modules/javax/json/bind/api/main/module.xml b/jboss-modules/src/main/resources/modules/javax/json/bind/api/main/module.xml
@@ -23,6 +23,11 @@
   -->
 
 <module xmlns="urn:jboss:module:1.3" name="javax.json.bind.api">
+
+    <properties>
+        <property name="jboss.api" value="public"/>
+    </properties>
+
     <resources>
         <!-- Insert resources here -->
     </resources>

diff --git a/jboss-modules/src/main/resources/modules/org/eclipse/yasson/main/module.xml b/jboss-modules/src/main/resources/modules/org/eclipse/yasson/main/module.xml
@@ -23,7 +23,10 @@
   -->
 
 <module xmlns="urn:jboss:module:1.3" name="org.eclipse.yasson">
-    <!-- todo  this will be moved into wildfly at some point -->
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
     <resources>
         <!-- Insert resources here -->
     </resources>

diff --git a/jboss-modules/src/main/resources/modules/org/glassfish/javax/json/main/module.xml b/jboss-modules/src/main/resources/modules/org/glassfish/javax/json/main/module.xml
@@ -23,16 +23,14 @@
   -->
 
 <module xmlns="urn:jboss:module:1.5" name="org.glassfish.javax.json">
-    <!-- todo this is temporary and should be removed when wildfly makes the needed update
-     -->
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <dependencies>
     </dependencies>
     <resources>
-        <artifact name="org.glassfish:javax.json:1.1"/>
+        <!-- Insert resources here -->
     </resources>
 
 </module>
diff --git a/.../main/resources/modules/org/jboss/resteasy/resteasy-json-binding-provider/main/module.xml b/.../main/resources/modules/org/jboss/resteasy/resteasy-json-binding-provider/main/module.xml
@@ -24,6 +24,10 @@
 
 <module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-json-binding-provider">
 
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
     <resources>
         <!-- Insert resources here -->
     </resources>

diff --git a/...binding/src/main/java/org/jboss/resteasy/plugins/providers/jsonb/JsonBindingProvider.java b/...binding/src/main/java/org/jboss/resteasy/plugins/providers/jsonb/JsonBindingProvider.java
@@ -23,8 +23,8 @@
  * Created by rsearls on 6/26/17.
  */
 @Provider
-@Produces({"application/*+json", "text/json", "*/*"})
-@Consumes({"application/*+json", "text/json", "*/*"})
+@Produces({"application/json", "application/*+json", "text/json", "*/*"})
+@Consumes({"application/json", "application/*+json", "text/json", "*/*"})
 public class JsonBindingProvider extends AbstractJsonBindingProvider
         implements MessageBodyReader<Object>, MessageBodyWriter<Object> {
 

diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -34,6 +34,7 @@
         <version.io.undertow>1.3.25.Final</version.io.undertow>
         <version.javax.activation>1.1.1</version.javax.activation>
         <version.javax.enterprise.cdi-api>1.2</version.javax.enterprise.cdi-api>
+        <version.javax.json.bind-api>1.0</version.javax.json.bind-api>
         <version.javax.ws.rs-api>1.0.0.Alpha1</version.javax.ws.rs-api>
         <version.junit>4.12</version.junit>
         <version.log4j>2.6.2</version.log4j>
@@ -47,7 +48,9 @@
         <version.org.codehaus.jettison>1.3.8</version.org.codehaus.jettison>
         <version.org.eclipse.aether>1.1.0</version.org.eclipse.aether>
         <version.org.eclipse.jetty>9.2.13.v20150730</version.org.eclipse.jetty>
+        <version.org.eclipse.yasson>1.0</version.org.eclipse.yasson>
         <version.org.glassfish.javax.el>3.0.1-b08</version.org.glassfish.javax.el>
+        <version.org.glassfish.javax.json>1.1</version.org.glassfish.javax.json>
         <version.org.hibernate.hibernate-validator>5.2.4.Final</version.org.hibernate.hibernate-validator>
         <version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>1.0.0.Final</version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>
         <version.org.infinispan>8.2.6.Final</version.org.infinispan>
@@ -310,17 +313,17 @@
             <dependency>
                 <groupId>javax.json.bind</groupId>
                 <artifactId>javax.json.bind-api</artifactId>
-                <version>1.0.0-RC2</version>
+                <version>${version.javax.json.bind-api}</version>
             </dependency>
             <dependency> <!-- json-b ri -->
                 <groupId>org.eclipse</groupId>
                 <artifactId>yasson</artifactId>
-                <version>1.0.0-RC2</version>
+                <version>${version.org.eclipse.yasson}</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>
                 <artifactId>javax.json</artifactId>
-                <version>1.1</version>
+                <version>${version.org.glassfish.javax.json}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.servlet</groupId>

diff --git a/...on-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/JsonBindingTest.java b/...on-tests/src/test/java/org/jboss/resteasy/test/providers/jsonb/basic/JsonBindingTest.java
@@ -31,7 +31,7 @@
  * Resteasy's JSON-P providers currently supports this.  A general object such as Cat will be processed by
  * the JSON-B provider.
  * @tpChapter Integration test
- * @tpSince RESTEasy 3.1.4
+ * @tpSince RESTEasy 4.0.0
  */
 @RunWith(Arquillian.class)
 @RunAsClient
@@ -70,7 +70,7 @@ private String generateURL(String path) {
     * response and should contain the same field values as original request.
     *
     * @tpPassCrit The resource returns object with correct values
-    * @tpSince RESTEasy 3.1.4
+    * @tpSince RESTEasy 4.0.0
     */
    @Test
    public void doTestCat() throws Exception {