Changes required for the resteasy-parent 2.0.3.Final upgrade. Reforma…

…tted resources and fixed tests based on these reformats. Signed-off-by: James R. Perkins <jperkins@redhat.com>
resteasy · Apr 19, 2023 · 64fd638 · 64fd638
1 parent e8dcc32
commit 64fd638
Show file tree

Hide file tree

Showing 147 changed files with 1,478 additions and 1,557 deletions.
diff --git a/arquillian/RESTEASY-1056-jetty-bv11/src/test/resources/arquillian.xml b/arquillian/RESTEASY-1056-jetty-bv11/src/test/resources/arquillian.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://jboss.org/schema/arquillian
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://jboss.org/schema/arquillian
         http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
-   <!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
-   <defaultProtocol type="Servlet 5.0" />
-   
-   <engine>
-      <property name="deploymentExportPath">target/deployments</property>
-   </engine>
-    
+    <!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
+    <defaultProtocol type="Servlet 5.0" />
+
+    <engine>
+        <property name="deploymentExportPath">target/deployments</property>
+    </engine>
+
     <container qualifier="jetty" default="true">
-       <configuration>
-           <property name="bindHttpPort">0</property>
-           <property name="javaVmArguments">${additionalJvmArgs}</property>
-           <!--property name="javaVmArguments">${additionalJvmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8585,server=y, suspend=y</property-->
-       </configuration>
+        <configuration>
+            <property name="bindHttpPort">0</property>
+            <property name="javaVmArguments">${additionalJvmArgs}</property>
+            <!--property name="javaVmArguments">${additionalJvmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8585,server=y, suspend=y</property-->
+        </configuration>
     </container>
 </arquillian>
diff --git a/arquillian/RESTEASY-1056-jetty-bv11/src/test/resources/web.xml b/arquillian/RESTEASY-1056-jetty-bv11/src/test/resources/web.xml
@@ -1,12 +1,11 @@
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
 
     <display-name>RESTEASY-1056</display-name>
 
     <servlet>
         <servlet-name>Resteasy</servlet-name>
-       <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+        <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
         <init-param>
             <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>org.jboss.resteasy.resteasy1056.TestApplication</param-value>

diff --git a/...illian/RESTEASY-1630-jetty-resteasy-servlet-initializer/src/test/resources/arquillian.xml b/...illian/RESTEASY-1630-jetty-resteasy-servlet-initializer/src/test/resources/arquillian.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://jboss.org/schema/arquillian
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://jboss.org/schema/arquillian
         http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
-   <!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
-   <defaultProtocol type="Servlet 5.0" />
-   
-   <engine>
-      <property name="deploymentExportPath">target/deployments</property>
-   </engine>
-    
+    <!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
+    <defaultProtocol type="Servlet 5.0" />
+
+    <engine>
+        <property name="deploymentExportPath">target/deployments</property>
+    </engine>
+
     <container qualifier="jetty" default="true">
-       <configuration>
-           <property name="bindHttpPort">0</property>
-           <property name="javaVmArguments">${additionalJvmArgs}</property>
-         <!--
+        <configuration>
+            <property name="bindHttpPort">0</property>
+            <property name="javaVmArguments">${additionalJvmArgs}</property>
+            <!--
            <property name="javaVmArguments">${additionalJvmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8585,server=y, suspend=n</property>
          -->
-       </configuration>
+        </configuration>
     </container>
 </arquillian>
diff --git a/arquillian/RESTEASY-1630-jetty-resteasy-servlet-initializer/src/test/resources/web.xml b/arquillian/RESTEASY-1630-jetty-resteasy-servlet-initializer/src/test/resources/web.xml
@@ -1,12 +1,11 @@
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
 
     <display-name>RESTEASY-1630</display-name>
 
     <servlet>
         <servlet-name>Resteasy</servlet-name>
-       <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+        <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
         <init-param>
             <param-name>jakarta.ws.rs.Application</param-name>
             <param-value>org.jboss.resteasy.resteasy1630.TestApplication</param-value>

diff --git a/arquillian/RESTEASY-736-jetty/src/test/resources/arquillian.xml b/arquillian/RESTEASY-736-jetty/src/test/resources/arquillian.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<arquillian xmlns="http://jboss.org/schema/arquillian"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://jboss.org/schema/arquillian
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://jboss.org/schema/arquillian
         http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
     <!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
-    <defaultProtocol type="Servlet 5.0"/>
+    <defaultProtocol type="Servlet 5.0" />
 
     <engine>
         <property name="deploymentExportPath">target/deployments</property>

diff --git a/arquillian/RESTEASY-736-jetty/src/test/resources/web.xml b/arquillian/RESTEASY-736-jetty/src/test/resources/web.xml
@@ -1,6 +1,5 @@
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
 
     <display-name>RESTEASY-736</display-name>
 

diff --git a/resteasy-cdi/src/main/resources/META-INF/beans.xml b/resteasy-cdi/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
-       version="4.0" bean-discovery-mode="annotated">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+    version="4.0" bean-discovery-mode="annotated">
 </beans>
diff --git a/resteasy-cdi/src/main/resources/META-INF/web-fragment.xml b/resteasy-cdi/src/main/resources/META-INF/web-fragment.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
+<web-fragment xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
       http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
-	version="3.0">
+    version="3.0">
 
-	<name>resteasy_cdi</name>
-	<context-param>
-		<param-name>resteasy.injector.factory</param-name>
-		<param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value>
-	</context-param>
-        <distributable/>
+    <name>resteasy_cdi</name>
+    <context-param>
+        <param-name>resteasy.injector.factory</param-name>
+        <param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value>
+    </context-param>
+    <distributable />
 </web-fragment>
diff --git a/...modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml b/...modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml
@@ -20,6 +20,6 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-annotations">
     <resources>
-        <artifact name="${com.fasterxml.jackson.core:jackson-annotations}"/>
+        <artifact name="${com.fasterxml.jackson.core:jackson-annotations}" />
     </resources>
 </module>
diff --git a/...ources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml b/...ources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml
@@ -20,6 +20,6 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-core">
     <resources>
-        <artifact name="${com.fasterxml.jackson.core:jackson-core}"/>
+        <artifact name="${com.fasterxml.jackson.core:jackson-core}" />
     </resources>
 </module>
diff --git a/...es/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml b/...es/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml
@@ -21,15 +21,15 @@
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-databind">
 
     <resources>
-        <artifact name="${com.fasterxml.jackson.core:jackson-databind}"/>
+        <artifact name="${com.fasterxml.jackson.core:jackson-databind}" />
     </resources>
 
     <dependencies>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <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" />
+        <module name="java.desktop" />
+        <module name="java.logging" />
+        <module name="java.sql" />
+        <module name="java.xml" />
     </dependencies>
 </module>
diff --git a/...s/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml b/...s/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml
@@ -20,12 +20,12 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8">
     <resources>
-        <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jdk8}"/>
+        <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jdk8}" />
     </resources>
 
     <dependencies>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <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="com.fasterxml.jackson.core.jackson-core" />
+        <module name="com.fasterxml.jackson.core.jackson-databind" />
     </dependencies>
 </module>
diff --git a/...system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml b/...system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml
@@ -20,12 +20,12 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310">
     <resources>
-        <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jsr310}"/>
+        <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jsr310}" />
     </resources>
 
     <dependencies>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <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="com.fasterxml.jackson.core.jackson-core" />
+        <module name="com.fasterxml.jackson.core.jackson-databind" />
     </dependencies>
 </module>
diff --git a/...m/layers/base/com/fasterxml/jackson/jakarta/jackson-jakarta-json-provider/main/module.xml b/...m/layers/base/com/fasterxml/jackson/jakarta/jackson-jakarta-json-provider/main/module.xml
@@ -20,16 +20,16 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.jakarta.jackson-jakarta-json-provider">
     <resources>
-        <artifact name="${com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider}"/>
-        <artifact name="${com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base}"/>
-        <artifact name="${com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations}"/>
+        <artifact name="${com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider}" />
+        <artifact name="${com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base}" />
+        <artifact name="${com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations}" />
     </resources>
 
     <dependencies>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="com.fasterxml.jackson.core.jackson-databind"/>
-        <module name="jakarta.ws.rs.api"/>
-        <module name="jakarta.xml.bind.api"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations" />
+        <module name="com.fasterxml.jackson.core.jackson-core" />
+        <module name="com.fasterxml.jackson.core.jackson-databind" />
+        <module name="jakarta.ws.rs.api" />
+        <module name="jakarta.xml.bind.api" />
     </dependencies>
 </module>
diff --git a/...ystem/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml b/...ystem/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml
@@ -18,4 +18,5 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<module-alias xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" target-name="com.fasterxml.jackson.jakarta.jackson-jakarta-json-provider"/>
+<module-alias xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"
+    target-name="com.fasterxml.jackson.jakarta.jackson-jakarta-json-provider" />
diff --git a/...k/common/src/main/resources/modules/system/layers/base/com/github/fge/btf/main/module.xml b/...k/common/src/main/resources/modules/system/layers/base/com/github/fge/btf/main/module.xml
@@ -22,10 +22,10 @@
 <module xmlns="urn:jboss:module:1.9" name="com.github.fge.btf">
 
     <properties>
-        <property name="jboss.api" value="private"/>
+        <property name="jboss.api" value="private" />
     </properties>
 
     <resources>
-        <artifact name="${com.github.java-json-tools:btf}"/>
+        <artifact name="${com.github.java-json-tools:btf}" />
     </resources>
 </module>
diff --git a/...ain/resources/modules/system/layers/base/com/github/fge/jackson-coreutils/main/module.xml b/...ain/resources/modules/system/layers/base/com/github/fge/jackson-coreutils/main/module.xml
@@ -20,18 +20,18 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="com.github.fge.jackson-coreutils">
     <properties>
-        <property name="jboss.api" value="private"/>
+        <property name="jboss.api" value="private" />
     </properties>
 
     <resources>
-        <artifact name="${com.github.java-json-tools:jackson-coreutils}"/>
+        <artifact name="${com.github.java-json-tools:jackson-coreutils}" />
     </resources>
 
     <dependencies>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="com.fasterxml.jackson.core.jackson-databind"/>
-        <module name="com.github.fge.msg-simple" export="true"/>
-        <module name="com.google.guava"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations" />
+        <module name="com.fasterxml.jackson.core.jackson-core" />
+        <module name="com.fasterxml.jackson.core.jackson-databind" />
+        <module name="com.github.fge.msg-simple" export="true" />
+        <module name="com.google.guava" />
     </dependencies>
 </module>
diff --git a/...n/src/main/resources/modules/system/layers/base/com/github/fge/json-patch/main/module.xml b/...n/src/main/resources/modules/system/layers/base/com/github/fge/json-patch/main/module.xml
@@ -20,18 +20,18 @@
   -->
 <module xmlns="urn:jboss:module:1.9" name="com.github.fge.json-patch">
     <properties>
-        <property name="jboss.api" value="private"/>
+        <property name="jboss.api" value="private" />
     </properties>
 
     <resources>
-        <artifact name="${com.github.java-json-tools:json-patch}"/>
+        <artifact name="${com.github.java-json-tools:json-patch}" />
     </resources>
 
     <dependencies>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="com.fasterxml.jackson.core.jackson-databind"/>
-        <module name="com.github.fge.jackson-coreutils"/>
-        <module name="com.google.guava"/>
+        <module name="com.fasterxml.jackson.core.jackson-annotations" />
+        <module name="com.fasterxml.jackson.core.jackson-core" />
+        <module name="com.fasterxml.jackson.core.jackson-databind" />
+        <module name="com.github.fge.jackson-coreutils" />
+        <module name="com.google.guava" />
     </dependencies>
 </module>
diff --git a/...n/src/main/resources/modules/system/layers/base/com/github/fge/msg-simple/main/module.xml b/...n/src/main/resources/modules/system/layers/base/com/github/fge/msg-simple/main/module.xml
@@ -22,14 +22,14 @@
 <module xmlns="urn:jboss:module:1.9" name="com.github.fge.msg-simple">
 
     <properties>
-        <property name="jboss.api" value="private"/>
+        <property name="jboss.api" value="private" />
     </properties>
 
     <resources>
-        <artifact name="${com.github.java-json-tools:msg-simple}"/>
+        <artifact name="${com.github.java-json-tools:msg-simple}" />
     </resources>
 
     <dependencies>
-        <module name="com.github.fge.btf" export="true"/>
+        <module name="com.github.fge.btf" export="true" />
     </dependencies>
 </module>
diff --git a/.../main/resources/modules/system/layers/base/com/google/guava/failureaccess/main/module.xml b/.../main/resources/modules/system/layers/base/com/google/guava/failureaccess/main/module.xml
@@ -22,10 +22,10 @@
 <module xmlns="urn:jboss:module:1.9" name="com.google.guava.failureaccess">
 
     <properties>
-        <property name="jboss.api" value="private"/>
+        <property name="jboss.api" value="private" />
     </properties>
 
     <resources>
-        <artifact name="${com.google.guava:failureaccess}"/>
+        <artifact name="${com.google.guava:failureaccess}" />
     </resources>
 </module>
diff --git a/...ack/common/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml b/...ack/common/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml
@@ -22,16 +22,16 @@
 <module xmlns="urn:jboss:module:1.9" name="com.google.guava">
 
     <properties>
-        <property name="jboss.api" value="private"/>
+        <property name="jboss.api" value="private" />
     </properties>
 
     <resources>
-        <artifact name="${com.google.guava:guava}"/>
+        <artifact name="${com.google.guava:guava}" />
     </resources>
 
     <dependencies>
-        <module name="com.google.guava.failureaccess" export="true"/>
-        <module name="java.logging"/>
-        <module name="jdk.unsupported"/>
+        <module name="com.google.guava.failureaccess" export="true" />
+        <module name="java.logging" />
+        <module name="jdk.unsupported" />
     </dependencies>
 </module>