[WFLY-6899] Upgrade to RESTEasy 3.1.0.CR2

wildfly · Oct 5, 2016 · c190a74 · c190a74
1 parent da4f969
commit c190a74
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 46 deletions.
diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
@@ -1075,11 +1075,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>async-http-servlet-3.0</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-spring</artifactId>

diff --git a/feature-pack/src/license/licenses.xml b/feature-pack/src/license/licenses.xml
@@ -2850,17 +2850,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>async-http-servlet-3.0</artifactId>
-      <licenses>
-        <license>
-          <name>Apache Software License, Version 2.0</name>
-          <url>http://repository.jboss.org/licenses/apache-2.0.txt</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>jose-jwt</artifactId>

diff --git a/feature-pack/src/main/resources/content/docs/licenses/licenses.xml b/feature-pack/src/main/resources/content/docs/licenses/licenses.xml
@@ -2850,17 +2850,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>async-http-servlet-3.0</artifactId>
-      <licenses>
-        <license>
-          <name>Apache Software License, Version 2.0</name>
-          <url>http://repository.jboss.org/licenses/apache-2.0.txt</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>jose-jwt</artifactId>

diff --git a/...in/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml b/...in/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml
@@ -25,7 +25,6 @@
 <module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-jaxrs">
 
     <resources>
-        <artifact name="${org.jboss.resteasy:async-http-servlet-3.0}"/>
         <artifact name="${org.jboss.resteasy:resteasy-jaxrs}"/>
         <artifact name="${org.jboss.resteasy:resteasy-client}"/>
     </resources>

diff --git a/...rces/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml b/...rces/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml
@@ -41,5 +41,6 @@
         <module name="org.yaml.snakeyaml"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.resteasy.resteasy-jaxb-provider"/>
+        <module name="org.jboss.logging"/>
     </dependencies>
 </module>
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
@@ -116,11 +116,6 @@
             <artifactId>resteasy-jaxrs</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>async-http-servlet-3.0</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.spec.javax.annotation</groupId>
             <artifactId>jboss-annotations-api_1.2_spec</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -169,7 +169,7 @@
         <version.org.jboss.openjdk-orb>8.0.6.Final</version.org.jboss.openjdk-orb>
         <version.org.jboss.xnio.netty.netty-xnio-transport>0.1.1.Final</version.org.jboss.xnio.netty.netty-xnio-transport>
         <version.org.jboss.remote-naming>2.0.4.Final</version.org.jboss.remote-naming>
-        <version.org.jboss.resteasy>3.0.19.Final</version.org.jboss.resteasy>
+        <version.org.jboss.resteasy>3.1.0.CR2</version.org.jboss.resteasy>
         <version.org.jboss.seam.int>7.0.0.GA</version.org.jboss.seam.int>
         <version.org.jboss.security.jboss-negotiation>3.0.3.Final</version.org.jboss.security.jboss-negotiation>
         <version.org.jboss.security.jbossxacml>2.0.8.Final</version.org.jboss.security.jbossxacml>
@@ -4746,18 +4746,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>async-http-servlet-3.0</artifactId>
-                <version>${version.org.jboss.resteasy}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.jboss.logging</groupId>
-                        <artifactId>jboss-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-spring</artifactId>