Fix distribution

resteasy · May 6, 2019 · 6490fec · 6490fec
1 parent 809a3ae
commit 6490fec
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/distribution/assembly.xml b/distribution/assembly.xml
@@ -39,6 +39,8 @@
                 <include>org.jboss.resteasy:resteasy-core</include>
                 <include>org.jboss.resteasy:resteasy-client-api</include>
                 <include>org.jboss.resteasy:resteasy-client</include>
+                <include>org.jboss.resteasy:resteasy-client-jetty</include>
+                <include>org.jboss.resteasy:resteasy-client-microprofile</include>
                 <include>org.jboss.resteasy:resteasy-servlet-initializer</include>
                 <include>org.jboss.resteasy:resteasy-jaxb-provider</include>
                 <include>org.jboss.resteasy:resteasy-fastinfoset-provider</include>
@@ -50,21 +52,14 @@
                 <include>org.jboss.resteasy:resteasy-spring</include>
                 <include>org.jboss.resteasy:resteasy-guice</include>
                 <include>org.jboss.resteasy:resteasy-cache-core</include>
-                <include>org.jboss.resteasy:resteasy-oauth</include>
                 <include>org.jboss.resteasy:resteasy-cdi</include>
                 <include>org.jboss.resteasy:resteasy-jsapi</include>
                 <include>org.jboss.resteasy:resteasy-links</include>
                 <include>org.jboss.resteasy:resteasy-crypto</include>
+                <include>org.jboss.resteasy:resteasy-rxjava2</include>
                 <include>org.jboss.resteasy:jose-jwt</include>
                 <include>org.jboss.resteasy:resteasy-validator-provider</include>
             </includes>
-            <excludes>
-                <exclude>org.jboss.resteasy:resteasy-undertow</exclude>
-                <exclude>org.jboss.resteasy:resteasy-jdk-http</exclude>
-                <exclude>org.jboss.resteasy:resteasy-netty4</exclude>
-                <exclude>org.jboss.resteasy:resteasy-vertx</exclude>
-                <exclude>javax.servlet:servlet-api</exclude>
-            </excludes>
             <outputDirectory>lib</outputDirectory>
         </dependencySet>
         <dependencySet>
@@ -75,7 +70,7 @@
                 <include>org.jboss.resteasy:resteasy-netty4</include>
                 <include>org.jboss.resteasy:resteasy-vertx</include>
                 <include>org.jboss.resteasy:resteasy-jdk-http</include>
-                <include>javax.servlet:servlet-api</include>
+                <include>org.jboss.spec.javax.servlet:jboss-servlet-api_4.0_spec</include>
             </includes>
             <outputDirectory>embedded-lib</outputDirectory>
         </dependencySet>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -33,11 +33,26 @@
             <artifactId>resteasy-client</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-client-jetty</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-client-microprofile</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>
             <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.servlet</groupId>
+            <artifactId>jboss-servlet-api_4.0_spec</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-servlet-initializer</artifactId>
@@ -77,6 +92,12 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson2-provider</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                  <groupId>com.google.guava</groupId>
+                  <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -93,11 +114,6 @@
             <artifactId>resteasy-cache-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-oauth</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-cdi</artifactId>
@@ -133,6 +149,11 @@
             <artifactId>resteasy-undertow</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-rxjava2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-vertx</artifactId>