[RESTEASY-1834] Fixing json modules to allow deploying and testing ag…

…ainst WFLY 12+, removing bouncycastle from distribution as it's included in WFLY since years, restoring testing against WFLY on Travis CI.
resteasy · Mar 21, 2018 · fc6f7e1 · fc6f7e1
1 parent 2665821
commit fc6f7e1
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 55 deletions.
diff --git a/jboss-modules/build.xml b/jboss-modules/build.xml
@@ -49,12 +49,6 @@
           ~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
           -->
 
-        <module-def name="org.bouncycastle">
-            <maven-resource group="org.bouncycastle" artifact="bcprov-jdk15on"/>
-            <maven-resource group="org.bouncycastle" artifact="bcmail-jdk15on"/>
-            <maven-resource group="org.bouncycastle" artifact="bcpkix-jdk15on"/>
-        </module-def>
-
         <module-def name="org.codehaus.jackson.jackson-core-asl">
             <maven-resource group="org.codehaus.jackson" artifact="jackson-core-asl"/>
         </module-def>
@@ -109,6 +103,10 @@
             <maven-resource group="com.fasterxml.jackson.module" artifact="jackson-module-jaxb-annotations" />
         </module-def>
 
+        <module-def name="javax.json.api">
+            <maven-resource group="javax.json" artifact="javax.json-api"/>
+        </module-def>
+
         <module-def name="javax.json.bind.api">
             <maven-resource group="javax.json.bind" artifact="javax.json.bind-api"/>
         </module-def>

diff --git a/jboss-modules/pom.xml b/jboss-modules/pom.xml
@@ -232,10 +232,16 @@
             <artifactId>jboss-annotations-api_1.2_spec</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.json</groupId>
+            <artifactId>javax.json-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>javax.json.bind</groupId>
             <artifactId>javax.json.bind-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>yasson</artifactId>

diff --git a/.../modules/org/bouncycastle/main/module.xml → ...es/modules/javax/json/api/main/module.xml b/.../modules/org/bouncycastle/main/module.xml → ...es/modules/javax/json/api/main/module.xml
@@ -1,40 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
-<module xmlns="urn:jboss:module:1.3" name="org.bouncycastle">
-
-    <properties>
-        <property name="jboss.api" value="private"/>
-    </properties>
-
-    <resources>
-        <!-- Insert resources here -->
-    </resources>
-    <dependencies>
-        <module name="javax.api"/>
-        <module name="javax.mail.api" optional="true"/>
-        <module name="javax.activation.api" optional="true"/>
-    </dependencies>
-
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module name="javax.json.api" xmlns="urn:jboss:module:1.5">
+
+    <properties>
+        <property name="jboss.api" value="public"/>
+    </properties>
+    <resources>
+        <!-- Insert resources here -->
+    </resources>
+    <dependencies>
+        <!-- The 1.0 RI ships with the API bundled. We can just export the API from the 1.0 RI if it's present. -->
+        <module name="org.glassfish.javax.json" services="import">
+            <exports>
+                <include-set>
+                    <path name="javax/json"/>
+                    <path name="javax/json/spi"/>
+                    <path name="javax/json/stream"/>
+                </include-set>
+            </exports>
+        </module>
+    </dependencies>
+</module>
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
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.json.bind.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.json.bind.api">
 
     <properties>
         <property name="jboss.api" value="public"/>
@@ -33,5 +33,6 @@
     </resources>
 
     <dependencies>
+        <module name="javax.json.api"/>
     </dependencies>
-</module>
+</module>
diff --git a/jboss-modules/src/main/resources/modules/javax/ws/rs/api/main/module.xml b/jboss-modules/src/main/resources/modules/javax/ws/rs/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.ws.rs.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.ws.rs.api">
     <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
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.eclipse.yasson">
+<module xmlns="urn:jboss:module:1.5" name="org.eclipse.yasson">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
@@ -37,4 +37,4 @@
         <module name="javax.api"/>
         <module name="javax.enterprise.api"/>
     </dependencies>
-</module>
+</module>
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
@@ -28,6 +28,7 @@
     </properties>
 
     <dependencies>
+        <module name="javax.json.api"/>
     </dependencies>
     <resources>
         <!-- Insert resources here -->

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
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-json-binding-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-json-binding-provider">
 
     <properties>
         <property name="jboss.api" value="private"/>

diff --git a/...es/src/main/resources/modules/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml b/...es/src/main/resources/modules/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-json-p-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-json-p-provider">
 
     <resources>
         <!-- Insert resources here -->

diff --git a/jboss-modules/src/main/resources/modules/org/reactivestreams/main/module.xml b/jboss-modules/src/main/resources/modules/org/reactivestreams/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.reactivestreams">
+<module xmlns="urn:jboss:module:1.5" name="org.reactivestreams">
 
     <properties>
         <property name="jboss.api" value="private"/>

diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -34,6 +34,7 @@
         <version.io.undertow>1.4.18.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-api>1.1.2</version.javax.json-api>
         <version.javax.json.bind-api>1.0</version.javax.json.bind-api>
         <version.javax.ws.rs-api>1.0.0.Final</version.javax.ws.rs-api>
         <version.junit>4.12</version.junit>
@@ -51,7 +52,7 @@
         <version.org.eclipse.jetty>9.4.7.v20170914</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.glassfish.javax.json>1.1.2</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.8.Final</version.org.infinispan>
@@ -348,6 +349,11 @@
                 <version>${version.javax.enterprise.cdi-api}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>javax.json</groupId>
+                <artifactId>javax.json-api</artifactId>
+                <version>${version.javax.json-api}</version>
+            </dependency>
             <dependency>
                 <groupId>javax.json.bind</groupId>
                 <artifactId>javax.json.bind-api</artifactId>