Merge pull request #2861 from jamezp/modules-update

[RESTEASY-2958] Synchronize the modules with WildFly.

jboss-modules/build.xml

@@ -65,6 +65,14 @@
             <maven-resource group="com.fasterxml.jackson.module" artifact="jackson-module-jaxb-annotations" />
         </module-def>
 
+        <module-def name="com.google.guava.failureaccess">
+            <maven-resource group="com.google.guava" artifact="failureaccess"/>
+        </module-def>
+
+        <module-def name="com.google.guava">
+            <maven-resource group="com.google.guava" artifact="guava"/>
+        </module-def>
+
         <!-- todo this is temporary and should be removed when wildfly makes the needed update
              -->
         <module-def name="org.apache.james.mime4j">
@@ -109,10 +117,16 @@
             <maven-resource group="io.smallrye" artifact="smallrye-context-propagation-propagators-rxjava2"/>
         </module-def>
 
+        <module-def name="com.github.fge.btf">
+            <maven-resource group="com.github.java-json-tools" artifact="btf"/>
+        </module-def>
+
+        <module-def name="com.github.fge.msg-simple">
+            <maven-resource group="com.github.java-json-tools" artifact="msg-simple"/>
+        </module-def>
+
         <module-def name="com.github.fge.jackson-coreutils">
             <maven-resource group="com.github.java-json-tools" artifact="jackson-coreutils"/>
-            <maven-resource group="com.github.java-json-tools" artifact="msg-simple"/>
-            <maven-resource group="com.github.java-json-tools" artifact="btf"/>
         </module-def>
 
         <module-def name="com.github.fge.json-patch">
@@ -123,19 +137,30 @@
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-jaxb-provider"/>
         </module-def>
 
-        <module-def name="org.jboss.resteasy.resteasy-jaxrs-public">
+        <module-def name="org.jboss.resteasy.resteasy-core-spi">
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-core-spi"/>
-            <maven-resource group="org.jboss.resteasy" artifact="resteasy-client-api"/>
+            <maven-resource group="org.jboss.resteasy" artifact="resteasy-tracing-api"/>
         </module-def>
 
-        <module-def name="org.jboss.resteasy.resteasy-jaxrs">
+        <module-def name="org.jboss.resteasy.resteasy-core">
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-core"/>
+        </module-def>
+
+        <module-def name="org.jboss.resteasy.resteasy-client-api">
+            <maven-resource group="org.jboss.resteasy" artifact="resteasy-client-api"/>
+        </module-def>
+
+        <module-def name="org.jboss.resteasy.resteasy-client">
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-client"/>
+        </module-def>
+
+        <module-def name="org.jboss.resteasy.resteasy-client-microprofile">
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-client-microprofile"/>
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-client-microprofile-base"/>
-            <maven-resource group="org.jboss.resteasy" artifact="resteasy-tracing-api"/>
         </module-def>
 
+        <module-def name="org.jboss.resteasy.resteasy-jaxrs"/>
+
         <module-def name="org.jboss.resteasy.jose-jwt">
             <maven-resource group="org.jboss.resteasy" artifact="jose-jwt"/>
         </module-def>
@@ -168,9 +193,6 @@
             <maven-resource group="org.jboss.resteasy" artifact="resteasy-validator-provider"/>
         </module-def>
 
-        <module-def name="org.jboss.resteasy.resteasy-validator-provider-11">
-        </module-def>
-
         <!-- no need to create zip file as maven-assembly-plugin running after antrun plugin takes care of that -->
         <!--
         <zip destfile="${output.dir}/zz-resteasy-jboss-modules-${project.version}.zip">

jboss-modules/pom.xml

@@ -60,6 +60,14 @@
           <groupId>com.fasterxml.jackson.module</groupId>
           <artifactId>jackson-module-jaxb-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>failureaccess</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>

jboss-modules/src/main/resources/modules/com/fasterxml/jackson/core/jackson-annotations/main/module.xml

@@ -2,31 +2,27 @@
 
 <!--
   ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2011, 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.
+  ~ Copyright 2021 Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags.
   ~
-  ~ 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.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~ 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.
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.core.jackson-annotations">
-     <resources>
+<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-annotations">
+    <resources>
         <!-- Insert resources here -->
     </resources>
 
     <dependencies>
-        <module name="javax.api"/>
     </dependencies>
 </module>

jboss-modules/src/main/resources/modules/com/fasterxml/jackson/core/jackson-core/main/module.xml

@@ -2,31 +2,27 @@
 
 <!--
   ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2011, 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.
+  ~ Copyright 2021 Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags.
   ~
-  ~ 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.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~ 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.
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.core.jackson-core">
-     <resources>
+<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-core">
+    <resources>
         <!-- Insert resources here -->
     </resources>
 
     <dependencies>
-        <module name="javax.api"/>
     </dependencies>
 </module>

jboss-modules/src/main/resources/modules/com/fasterxml/jackson/core/jackson-databind/main/module.xml

@@ -2,32 +2,32 @@
 
 <!--
   ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2011, 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.
+  ~ Copyright 2021 Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags.
   ~
-  ~ 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.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~ 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.
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.core.jackson-databind">
-     <resources>
+<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-databind">
+    <resources>
         <!-- Insert resources here -->
     </resources>
 
     <dependencies>
-        <module name="javax.api"/>
+        <module name="java.desktop"/>
+        <module name="java.logging"/>
+        <module name="java.sql"/>
+        <module name="java.xml"/>
         <module name="com.fasterxml.jackson.core.jackson-annotations"/>
         <module name="com.fasterxml.jackson.core.jackson-core"/>
     </dependencies>

jboss-modules/src/main/resources/modules/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml

@@ -2,34 +2,30 @@
 
 <!--
   ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2011, 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.
+  ~ Copyright 2021 Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags.
   ~
-  ~ 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.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~ 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.
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8">
-     <resources>
+<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8">
+    <resources>
         <!-- Insert resources here -->
     </resources>
 
     <dependencies>
         <module name="com.fasterxml.jackson.core.jackson-core"/>
         <module name="com.fasterxml.jackson.core.jackson-databind"/>
         <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="javax.api"/>
     </dependencies>
 </module>

jboss-modules/src/main/resources/modules/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml

@@ -2,34 +2,30 @@
 
 <!--
   ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2011, 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.
+  ~ Copyright 2021 Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags.
   ~
-  ~ 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.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~ 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.
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310">
-     <resources>
+<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310">
+    <resources>
         <!-- Insert resources here -->
     </resources>
 
     <dependencies>
         <module name="com.fasterxml.jackson.core.jackson-core"/>
         <module name="com.fasterxml.jackson.core.jackson-databind"/>
         <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="javax.api"/>
     </dependencies>
 </module>

jboss-modules/src/main/resources/modules/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml

@@ -2,32 +2,28 @@
 
 <!--
   ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2011, 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.
+  ~ Copyright 2021 Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags.
   ~
-  ~ 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.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~ 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.
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider">
-     <resources>
+<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider">
+    <resources>
         <!-- Insert resources here -->
     </resources>
 
     <dependencies>
-        <module name="javax.api"/>
         <module name="javax.ws.rs.api"/>
         <module name="javax.xml.bind.api"/>
         <module name="com.fasterxml.jackson.core.jackson-annotations"/>